Skip to content

Commit

Permalink
fix wheel passive
Browse files Browse the repository at this point in the history
  • Loading branch information
duanchuanxu committed May 8, 2019
1 parent 538acc0 commit 5cc68fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions components/upload/Preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export default class Preview extends Component {
return (
<ReactCSSTransitionGroup
transitionName='hi-preview'
transitionEnterTimeout={300}
transitionLeaveTimeout={300}
transitionEnterTimeout={50}
transitionLeaveTimeout={50}
component='div'
>
<div key={src} className={classNames('hi-preview', extraClass, {'hi-preview--hide': !show})} onClick={this.onClose.bind(this)}>
Expand Down
2 changes: 1 addition & 1 deletion components/upload/UploadAvatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class UploadAvatar extends Upload {
}

zoom(e) { // 缩放canvas
e.preventDefault()
// e.preventDefault()
const wheelDelta = e.wheelDelta || e.deltaY/120
let scale = this.scale + wheelDelta

Expand Down

0 comments on commit 5cc68fe

Please sign in to comment.