Skip to content

Update to allow swipe to close #15

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

Closed
wants to merge 3 commits into from
Closed

Update to allow swipe to close #15

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22a21ea
Update to allow swipe to close
ljknight Nov 2, 2016
544529f
Use const
ljknight Nov 2, 2016
1416daf
Prevent triggering open on wrong direction
ljknight Nov 9, 2016
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
53 changes: 44 additions & 9 deletions src/Swipeout.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,26 @@ class Swipeout extends React.Component {
this.openedRight = false;
}

state = {
direction: 'DIRECTION_HORIZONTAL',
}

componentDidMount() {
const { left, right } = this.props;
const width = this.refs.content.offsetWidth;

if (left.length && right.length === 0) {
this.setState({
direction: 'DIRECTION_RIGHT',
});
}

if (right.length && left.length === 0) {
this.setState({
direction: 'DIRECTION_LEFT',
});
}

this.contentWidth = width;
this.btnsLeftWidth = left ? (width / 5) * left.length : 0;
this.btnsRightWidth = right ? (width / 5) * right.length : 0;
Expand Down Expand Up @@ -93,7 +109,11 @@ class Swipeout extends React.Component {
openLeft = posX + openX > openX;
}

if (openRight && posX < 0) {
if (this.openedRight && openLeft && posX > 0) {
this.close();
} else if (this.openedLeft && openRight && posX < 0) {
this.close();
} else if (openRight && posX < 0) {
this.open(-btnsRightWidth, false, true);
} else if (openLeft && posX > 0) {
this.open(btnsLeftWidth, true, false);
Expand Down Expand Up @@ -153,13 +173,35 @@ class Swipeout extends React.Component {

this.openedLeft = openedLeft;
this.openedRight = openedRight;

this.setState({
direction: 'DIRECTION_HORIZONTAL',
});

this._setStyle(value);
}

close() {
const { left, right } = this.props;

if (this.openedLeft || this.openedRight) {
this.props.onClose();
}

if (left.length && right.length) {
this.setState({
direction: 'DIRECTION_HORIZONTAL',
});
} else if (left.length && right.length === 0) {
this.setState({
direction: 'DIRECTION_RIGHT',
});
} else if (right.length && left.length === 0) {
this.setState({
direction: 'DIRECTION_LEFT',
});
}

this.openedLeft = false;
this.openedRight = false;
this._setStyle(0);
Expand Down Expand Up @@ -197,17 +239,10 @@ class Swipeout extends React.Component {
'onClose',
]);

let direction = 'DIRECTION_HORIZONTAL';
if (left.length && right.length === 0) {
direction = 'DIRECTION_RIGHT';
}
if (right.length && left.length === 0) {
direction = 'DIRECTION_LEFT';
}
return (left.length || right.length) ? (
<div className={`${prefixCls}`} {...divProps}>
<Hammer
direction={direction}
direction={this.state.direction}
onPanStart={this.onPanStart}
onPan={this.onPan}
onPanEnd={this.onPanEnd}
Expand Down