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

fix performance issue on android #72

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

fix performance issue on android #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50de294
fix performance issue on android
muhamad-rizki Aug 15, 2018
b95ebd6
fix package json
muhamad-rizki Aug 15, 2018
a5d5c50
fixing recenter method
muhamad-rizki Aug 16, 2018
ca62a64
fixing recenter method
muhamad-rizki Aug 16, 2018
62790ee
Merge branch 'master' of https://github.com/muhamad-rizki/react-nativ…
muhamad-rizki Aug 16, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "react-native-swipeable",
"version": "0.6.0",
"description": "A powerful React Native swipe component",
"main": "lib/index.js",
"main": "src/index.js",
"scripts": {
"build": "make build",
"lint": "make lint"
Expand Down
54 changes: 30 additions & 24 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable import/no-unresolved, import/extensions */
import React, {PureComponent} from 'react';
import {Animated, Easing, PanResponder, StyleSheet, View, ViewPropTypes} from 'react-native';
import {PropTypes} from 'prop-types';
import React, { PureComponent } from 'react';
import { Animated, Easing, PanResponder, StyleSheet, View, ViewPropTypes } from 'react-native';
import { PropTypes } from 'prop-types';
/* eslint-enable import/no-unresolved, import/extensions */

function noop() {}
function noop() { }

export default class Swipeable extends PureComponent {

Expand Down Expand Up @@ -143,9 +143,10 @@ export default class Swipeable extends PureComponent {
onSwipeComplete: noop,
swipeReleaseAnimationFn: Animated.timing,
swipeReleaseAnimationConfig: {
toValue: {x: 0, y: 0},
toValue: { x: 0, y: 0 },
duration: 250,
easing: Easing.elastic(0.5)
easing: Easing.elastic(0.5),
useNativeDriver: true,
},

// misc
Expand All @@ -157,7 +158,7 @@ export default class Swipeable extends PureComponent {
state = {
pan: new Animated.ValueXY(),
width: 0,
lastOffset: {x: 0, y: 0},
lastOffset: { x: 0, y: 0 },
leftActionActivated: false,
leftButtonsActivated: false,
leftButtonsOpen: false,
Expand All @@ -167,7 +168,7 @@ export default class Swipeable extends PureComponent {
};

componentWillMount() {
const {onPanAnimatedValueRef, onRef} = this.props;
const { onPanAnimatedValueRef, onRef } = this.props;

onRef(this);
onPanAnimatedValueRef(this.state.pan);
Expand All @@ -182,10 +183,10 @@ export default class Swipeable extends PureComponent {
animationConfig = this.props.swipeReleaseAnimationConfig,
onDone
) => {
const {pan} = this.state;
const { pan } = this.state;

this.setState({
lastOffset: {x: 0, y: 0},
lastOffset: { x: 0, y: 0 },
leftActionActivated: false,
leftButtonsActivated: false,
leftButtonsOpen: false,
Expand All @@ -196,7 +197,11 @@ export default class Swipeable extends PureComponent {

pan.flattenOffset();

animationFn(pan, animationConfig).start(onDone);
if (animationFn && animationConfig && onDone) {
animationFn(pan, animationConfig).start(onDone);
} else {
this.props.swipeReleaseAnimationFn(pan, this.props.swipeReleaseAnimationConfig).start(onDone);
}
};

_unmounted = false;
Expand All @@ -211,8 +216,9 @@ export default class Swipeable extends PureComponent {
);

_handlePanResponderStart = (event, gestureState) => {
const {lastOffset, pan} = this.state;
const { lastOffset, pan } = this.state;

pan.setValue({ x: 0, y: 0 });
pan.setOffset(lastOffset);
this.props.onSwipeStart(event, gestureState, this);
};
Expand Down Expand Up @@ -240,7 +246,7 @@ export default class Swipeable extends PureComponent {
rightActionActivated,
rightButtonsActivated
} = this.state;
const {dx, vx} = gestureState;
const { dx, vx } = gestureState;
const x = dx + lastOffset.x;
const canSwipeRight = this._canSwipeRight();
const canSwipeLeft = this._canSwipeLeft();
Expand Down Expand Up @@ -363,7 +369,7 @@ export default class Swipeable extends PureComponent {
}

this.setState({
lastOffset: {x: animationConfig.toValue.x, y: animationConfig.toValue.y},
lastOffset: { x: animationConfig.toValue.x, y: animationConfig.toValue.y },
leftActionActivated: false,
rightActionActivated: false,
leftButtonsOpen: leftButtonsActivated,
Expand Down Expand Up @@ -427,7 +433,7 @@ export default class Swipeable extends PureComponent {
onPanResponderTerminationRequest: this._handlePanResponderEnd
});

_handleLayout = ({nativeEvent: {layout: {width}}}) => this.setState({width});
_handleLayout = ({ nativeEvent: { layout: { width } } }) => this.setState({ width });

_canSwipeRight() {
return this.props.leftContent || this._hasLeftButtons();
Expand All @@ -438,13 +444,13 @@ export default class Swipeable extends PureComponent {
}

_hasLeftButtons() {
const {leftButtons, leftContent} = this.props;
const { leftButtons, leftContent } = this.props;

return !leftContent && leftButtons && leftButtons.length;
}

_hasRightButtons() {
const {rightButtons, rightContent} = this.props;
const { rightButtons, rightContent } = this.props;

return !rightContent && rightButtons && rightButtons.length;
}
Expand Down Expand Up @@ -560,8 +566,8 @@ export default class Swipeable extends PureComponent {
}

_renderButtons(buttons, isLeftButtons) {
const {leftButtonContainerStyle, rightButtonContainerStyle} = this.props;
const {pan, width} = this.state;
const { leftButtonContainerStyle, rightButtonContainerStyle } = this.props;
const { pan, width } = this.state;
const canSwipeLeft = this._canSwipeLeft();
const canSwipeRight = this._canSwipeRight();
const count = buttons.length;
Expand All @@ -581,7 +587,7 @@ export default class Swipeable extends PureComponent {
}];
const buttonStyle = [
StyleSheet.absoluteFill,
{width, transform},
{ width, transform },
isLeftButtons ? leftButtonContainerStyle : rightButtonContainerStyle
];

Expand All @@ -606,7 +612,7 @@ export default class Swipeable extends PureComponent {
style,
...props
} = this.props;
const {pan, width} = this.state;
const { pan, width } = this.state;
const canSwipeLeft = this._canSwipeLeft();
const canSwipeRight = this._canSwipeRight();
const transform = [{
Expand All @@ -623,13 +629,13 @@ export default class Swipeable extends PureComponent {
return (
<View onLayout={this._handleLayout} style={[styles.container, style]} {...this._panResponder.panHandlers} {...props}>
{canSwipeRight && (
<Animated.View style={[{transform, marginLeft: -width, width}, leftContainerStyle]}>
<Animated.View style={[{ transform, marginLeft: -width, width }, leftContainerStyle]}>
{leftContent || this._renderButtons(leftButtons, true)}
</Animated.View>
)}
<Animated.View style={[{transform}, styles.content, contentContainerStyle]}>{children}</Animated.View>
<Animated.View style={[{ transform }, styles.content, contentContainerStyle]}>{children}</Animated.View>
{canSwipeLeft && (
<Animated.View style={[{transform, marginRight: -width, width}, rightContainerStyle]}>
<Animated.View style={[{ transform, marginRight: -width, width }, rightContainerStyle]}>
{rightContent || this._renderButtons(rightButtons, false)}
</Animated.View>
)}
Expand Down