Skip to content

Fix bug about child components in the control panel can't be touched. #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug about child components in the control panel can't be touched. #257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export default class Drawer extends Component {
onMoveShouldSetPanResponderCapture: this.onMoveShouldSetPanResponderCapture,
onPanResponderMove: this.onPanResponderMove,
onPanResponderRelease: this.onPanResponderRelease,
onPanResponderTerminate: this.onPanResponderTerminate
onPanResponderTerminate: this.onPanResponderTerminate
})
}

Expand Down Expand Up @@ -244,7 +244,7 @@ export default class Drawer extends Component {
this._panning = false
this.shouldOpenDrawer(gestureState.dx) ? this.open() : this.close()
};

onStartShouldSetPanResponderCapture = (e, gestureState) => {
if (this.shouldCaptureGestures()) return this.processShouldSet(e, gestureState)
return false
Expand Down Expand Up @@ -354,11 +354,9 @@ export default class Drawer extends Component {
if (this._childDrawer && this._childDrawer._open) return false

let x0 = e.nativeEvent.pageX
let deltaOpen = this.props.side === 'left' ? this.state.viewport.width - x0 : x0
let deltaClose = this.props.side === 'left' ? x0 : this.state.viewport.width - x0

if ( this._open && deltaOpen > this.getOpenMask() ) return false
if ( !this._open && deltaClose > this.getClosedMask() ) return false
let deltaX0 = this.props.side === 'left' ? x0 : this.state.viewport.width - x0
if ( this._open && deltaX0 < this.getOpenLeft()) return false
if ( !this._open && deltaX0 > this.getClosedMask() ) return false
return true
};

Expand Down Expand Up @@ -398,7 +396,7 @@ export default class Drawer extends Component {
if(typeof type === 'function') {
type() // this is actually a callback
} else cb && cb()

}
})
};
Expand Down