Skip to content
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

Add buttons programmatic opening possibility, Add RTL support #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add buttons programmatic opening possibility, Add RTL support #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df1928
add automatic buttons opening possibility
sergey-kozel Dec 12, 2018
075dc86
add RTL support
sergey-kozel Jan 23, 2019
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
114 changes: 95 additions & 19 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export default class Swipeable extends PureComponent {
onRef: PropTypes.func,
onPanAnimatedValueRef: PropTypes.func,
swipeStartMinDistance: PropTypes.number,
isRTL: PropTypes.bool,

// styles
style: ViewPropTypes.style,
Expand Down Expand Up @@ -151,9 +152,16 @@ export default class Swipeable extends PureComponent {
// misc
onRef: noop,
onPanAnimatedValueRef: noop,
swipeStartMinDistance: 15
swipeStartMinDistance: 15,
isRTL: false
};

static AutoSwipeType = Object.freeze({
Recenter: 'recenter',
OpenRightButtons: 'open-right-buttons',
OpenLeftButtons: 'open-left-buttons'
});

state = {
pan: new Animated.ValueXY(),
width: 0,
Expand All @@ -177,26 +185,58 @@ export default class Swipeable extends PureComponent {
this._unmounted = true;
}

openLeftButtons = (
animationFn,
animationConfig,
onDone
) => {
this._autoSwipe(Swipeable.AutoSwipeType.OpenLeftButtons, animationFn, animationConfig, onDone);
};

openRightButtons = (
animationFn,
animationConfig,
onDone
) => {
this._autoSwipe(Swipeable.AutoSwipeType.OpenRightButtons, animationFn, animationConfig, onDone);
};

recenter = (
animationFn = this.props.swipeReleaseAnimationFn,
animationConfig = this.props.swipeReleaseAnimationConfig,
onDone
) => {
this._autoSwipe(Swipeable.AutoSwipeType.Recenter, animationFn, animationConfig, onDone);
};

_autoSwipe = (
type,
animationFn,
animationConfig,
onDone
) => {
const {pan} = this.state;

const finalAnimationFn = animationFn || Animated.timing;
const finalAnimationConfig = animationConfig || {
toValue: this._getAutoSwipeTargetPoint(type),
duration: 250,
easing: Easing.elastic(0.5)
};

this.setState({
lastOffset: {x: 0, y: 0},
lastOffset: this._getAutoSwipeTargetPoint(type),
leftActionActivated: false,
leftButtonsActivated: false,
leftButtonsOpen: false,
leftButtonsActivated: type === Swipeable.AutoSwipeType.OpenLeftButtons,
leftButtonsOpen: type === Swipeable.AutoSwipeType.OpenLeftButtons,
rightActionActivated: false,
rightButtonsActivated: false,
rightButtonsOpen: false
rightButtonsActivated: type === Swipeable.AutoSwipeType.OpenRightButtons,
rightButtonsOpen: type === Swipeable.AutoSwipeType.OpenRightButtons
});

pan.flattenOffset();

animationFn(pan, animationConfig).start(onDone);
finalAnimationFn(pan, finalAnimationConfig).start(onDone);
};

_unmounted = false;
Expand All @@ -206,6 +246,30 @@ export default class Swipeable extends PureComponent {
dy: this.state.pan.y
}]);

_invertInRtl(value) {
return this.props.isRTL ? -value : value;
}

_getTextDirectionDependentValue(ltrValue, rtlValue) {
return this.props.isRTL ? rtlValue : ltrValue;
}

_getAutoSwipeTargetPoint(type) {
switch (type) {
case Swipeable.AutoSwipeType.Recenter:
return {x: 0, y: 0};

case Swipeable.AutoSwipeType.OpenLeftButtons:
return {x: this.props.leftButtons && this._invertInRtl(this.props.leftButtons.length * this.props.leftButtonWidth), y: 0};

case Swipeable.AutoSwipeType.OpenRightButtons:
return {x: this.props.rightButtons && this._invertInRtl(-this.props.rightButtons.length * this.props.rightButtonWidth), y: 0};

default:
return {x: 0, y: 0};
}
}

_handleMoveShouldSetPanResponder = (event, gestureState) => (
Math.abs(gestureState.dx) > this.props.swipeStartMinDistance
);
Expand Down Expand Up @@ -240,7 +304,8 @@ export default class Swipeable extends PureComponent {
rightActionActivated,
rightButtonsActivated
} = this.state;
const {dx, vx} = gestureState;
const dx = this._invertInRtl(gestureState.dx);
const vx = this._invertInRtl(gestureState.vx);
const x = dx + lastOffset.x;
const canSwipeRight = this._canSwipeRight();
const canSwipeLeft = this._canSwipeLeft();
Expand Down Expand Up @@ -530,7 +595,7 @@ export default class Swipeable extends PureComponent {
return {
...swipeReleaseAnimationConfig,
toValue: {
x: leftButtons.length * leftButtonWidth,
x: this._invertInRtl(leftButtons.length * leftButtonWidth),
y: 0
},
...leftButtonsOpenReleaseAnimationConfig
Expand All @@ -541,7 +606,7 @@ export default class Swipeable extends PureComponent {
return {
...swipeReleaseAnimationConfig,
toValue: {
x: rightButtons.length * rightButtonWidth * -1,
x: this._invertInRtl(rightButtons.length * rightButtonWidth * -1),
y: 0
},
...rightButtonsOpenReleaseAnimationConfig
Expand All @@ -565,13 +630,17 @@ export default class Swipeable extends PureComponent {
const canSwipeLeft = this._canSwipeLeft();
const canSwipeRight = this._canSwipeRight();
const count = buttons.length;
const leftEnd = canSwipeLeft ? -width : 0;
const rightEnd = canSwipeRight ? width : 0;
const inputRange = isLeftButtons ? [0, rightEnd] : [leftEnd, 0];
const leftEnd = this._getTextDirectionDependentValue(canSwipeLeft ? -width : 0, canSwipeLeft ? 0 : -width);
const rightEnd = this._getTextDirectionDependentValue(canSwipeRight ? width : 0, canSwipeRight ? 0 : width);
const inputRange = this._getTextDirectionDependentValue(
isLeftButtons ? [0, rightEnd] : [leftEnd, 0],
isLeftButtons ? [leftEnd, 0] : [0, rightEnd]);

return buttons.map((buttonContent, index) => {
const outputMultiplier = -index / count;
const outputRange = isLeftButtons ? [0, rightEnd * outputMultiplier] : [leftEnd * outputMultiplier, 0];
const outputRange = this._getTextDirectionDependentValue(
isLeftButtons ? [0, rightEnd * outputMultiplier] : [leftEnd * outputMultiplier, 0],
isLeftButtons ? [leftEnd * outputMultiplier, 0] : [0, rightEnd * outputMultiplier]);
const transform = [{
translateX: pan.x.interpolate({
inputRange,
Expand Down Expand Up @@ -611,11 +680,18 @@ export default class Swipeable extends PureComponent {
const canSwipeRight = this._canSwipeRight();
const transform = [{
translateX: pan.x.interpolate({
inputRange: [canSwipeLeft ? -width : 0, canSwipeRight ? width : 0],
outputRange: [
canSwipeLeft ? -width + StyleSheet.hairlineWidth : 0,
canSwipeRight ? width - StyleSheet.hairlineWidth : 0
],
inputRange: this._getTextDirectionDependentValue(
[canSwipeLeft ? -width : 0, canSwipeRight ? width : 0],
[canSwipeLeft ? 0 : -width, canSwipeRight ? 0 : width]),
outputRange: this._getTextDirectionDependentValue(
[
canSwipeLeft ? -width + StyleSheet.hairlineWidth : 0,
canSwipeRight ? width - StyleSheet.hairlineWidth : 0
],
[
canSwipeLeft ? 0 : -width + StyleSheet.hairlineWidth,
canSwipeRight ? 0 : width - StyleSheet.hairlineWidth
]),
extrapolate: 'clamp'
})
}];
Expand Down