Skip to content

Fix for #22 #26

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
fivenp wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for #22 #26

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afc7c26
fix for #22
fivenp Oct 4, 2018
2b03747
being even more accurate about rounding
fivenp Oct 4, 2018
0400bac
v0.2.6
fivenp Oct 10, 2018
11323c1
adding the ability to open/close the drawer from the whole "canvas"
fivenp Oct 15, 2018
dbdb88c
make me insensitive
fivenp Oct 18, 2018
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
18 changes: 9 additions & 9 deletions Drawer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export default class Drawer extends Component {
_handlePanResponderEnd (evt, gestureState) {
let currentWidth = Math.abs(this._getCurrentDrawerWidth());
let isOpen = this.isLeftOpen || this.isRightOpen;
if (isOpen && gestureState.dx === 0) return this._handleMainBoardPress();
if (isOpen && gestureState.dx === 0 && (gestureState.x0 < this.MAX_DX * 0.2)) return this._handleMainBoardPress();
if (currentWidth === this.MAX_DX) return this._drawerDidOpen();
if (currentWidth === 0) return this._drawerDidClose();
if (currentWidth > this.MAX_DX / 2) {
Expand All @@ -231,18 +231,18 @@ export default class Drawer extends Component {
if (Math.abs(dx) < Math.abs(dy)) return false;
// swipe when drawer is fully opened
if (
this.isLeftOpen && !leftDisabled && dx < 0 ||
(this.isRightOpen && !rightDisabled && dx > 0)
this.isLeftOpen && !leftDisabled && dx < -10 ||
(this.isRightOpen && !rightDisabled && dx > 10)
) {
return true;
}
// swipe right to open left drawer
if (!leftDisabled && this.isLeft && x0 <= width * 0.2 && !isOpen && dx > 0) {
if (!leftDisabled && this.isLeft && x0 <= width * 0.2 && !isOpen && dx > 10) {
this.isLeftActive = true;
return true;
}
// swipe left to open right drawer
if (!rightDisabled && this.isRight && x0 >= this.MAX_DX && !isOpen && dx < 0) {
if (!rightDisabled && this.isRight && x0 >= width * 0.2 && !isOpen && dx < -10) {
this.isRightActive = true;
return true;
}
Expand Down Expand Up @@ -362,8 +362,9 @@ export default class Drawer extends Component {
this._rightDrawer && this._rightDrawer.setNativeProps(this.styles.rightDrawer);
this._mask && this._mask.setNativeProps(this.styles.mask);
if (this.props.type === types.Default || dx === 0) {
this.styles.main.style.left = dx;
this.styles.main.style.right = -dx;
const val = Math.round( dx * 1e0 ) / 1e0;
this.styles.main.style.left = val;
this.styles.main.style.right = -val;
this._main && this._main.setNativeProps(this.styles.main);
}
}
Expand Down Expand Up @@ -394,11 +395,10 @@ export default class Drawer extends Component {
let leftDrawerContent = this.props.leftDrawerContent ? this._bindDrawerRef(this.props.leftDrawerContent) : null;
let rightDrawerContent = this.props.rightDrawerContent ? this._bindDrawerRef(this.props.rightDrawerContent) : null;
return (
<View style={styles.container}>
<View style={styles.container} {...this._pan.panHandlers}>
<View
ref={this._mainRefBind}
style={[customStyles.main, styles.absolute]}
{...this._pan.panHandlers}
>
{this.props.children}
{this.state.showMask && <View
Expand Down