Skip to content

Drawer - block frame update for missing items #1619

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

Merged
merged 3 commits into from
Nov 3, 2021
Merged

Drawer - block frame update for missing items #1619

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14dc9a9
Drawer - block frame update for missing items
Inbal-Tish Oct 26, 2021
43b7c51
fix crash when swiping without right/left items
Inbal-Tish Nov 2, 2021
a8e2438
change func to const
Inbal-Tish Nov 3, 2021
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
48 changes: 31 additions & 17 deletions src/components/drawer/Swipeable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ export default class Swipeable extends Component<Props, StateType> {
}
};

_hasLeftActions = this.props.renderLeftActions !== undefined;

_hasRightActions = this.props.renderRightActions !== undefined;

_handleRelease = nativeEvent => {
const {velocityX, translationX: dragX} = nativeEvent;
const {leftWidth = 0, rowWidth = 0} = this.state;
Expand All @@ -263,34 +267,38 @@ export default class Swipeable extends Component<Props, StateType> {

let toValue = 0;
if (this.rowState === 0) {
if (onToggleSwipeLeft && translationX > rowWidth * LEFT_TOGGLE_THRESHOLD && !this.dragThresholdReached) {
if (this._hasLeftActions && onToggleSwipeLeft && translationX > rowWidth * LEFT_TOGGLE_THRESHOLD && !this.dragThresholdReached) {
// Swipe left toggle
toValue = rowWidth * LEFT_TOGGLE_THRESHOLD;
} else if (!onToggleSwipeLeft && fullSwipeLeft && translationX > rowWidth * fullLeftThreshold) {
// Full left swipe
this._triggerHaptic();
toValue = rowWidth;
} else if (fullSwipeRight && translationX < -rowWidth * fullRightThreshold) {
} else if (this._hasRightActions && fullSwipeRight && translationX < -rowWidth * fullRightThreshold) {
// Full right swipe
this._triggerHaptic();
toValue = -rowWidth;
} else if (translationX > leftThreshold) {
} else if (this._hasLeftActions && translationX > leftThreshold) {
// left swipe
if (!onToggleSwipeLeft || onToggleSwipeLeft && translationX < rowWidth * LEFT_TOGGLE_THRESHOLD) {
// left swipe with toggle
toValue = leftWidth;
}
} else if (translationX < -rightThreshold) {
} else if (this._hasRightActions && translationX < -rightThreshold) {
// right swipe
toValue = -rightWidth;
}
} else if (this.rowState === 1) {
// swiped to left
// swiped to the right (left swipe)
if (translationX > -leftThreshold) {
toValue = leftWidth;
}
} else {
// swiped to right
// swiped to the left (right swipe)
if (translationX < rightThreshold) {
toValue = -rightWidth;
}
}

this._animateRow(startOffsetX, toValue, velocityX / friction);
};

Expand Down Expand Up @@ -389,14 +397,18 @@ export default class Swipeable extends Component<Props, StateType> {
};

openLeftFull = () => {
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), rowWidth);
if (this._hasLeftActions) {
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), rowWidth);
}
};

toggleLeft = () => {
// Programmatically left toggle
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), rowWidth * LEFT_TOGGLE_THRESHOLD);
if (this._hasLeftActions) {
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), rowWidth * LEFT_TOGGLE_THRESHOLD);
}
};

openRight = () => {
Expand All @@ -407,8 +419,10 @@ export default class Swipeable extends Component<Props, StateType> {
};

openRightFull = () => {
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), -rowWidth);
if (this._hasRightActions) {
const {rowWidth} = this.state;
this._animateRow(this._currentOffset(), -rowWidth);
}
};

_onRowLayout = ({nativeEvent}) => this.handleMeasure('rowWidth', nativeEvent);
Expand All @@ -432,8 +446,8 @@ export default class Swipeable extends Component<Props, StateType> {
break;
}

const leftRender = this.props.renderLeftActions ? this.leftWidth : true;
const rightRender = this.props.renderRightActions ? this.rightOffset : true;
const leftRender = this._hasLeftActions ? this.leftWidth : true;
const rightRender = this._hasRightActions ? this.rightOffset : true;

if (this.rowWidth && leftRender && rightRender) {
this.setState({
Expand All @@ -457,7 +471,7 @@ export default class Swipeable extends Component<Props, StateType> {
testID
} = this.props;

const left = renderLeftActions && (
const left = this._hasLeftActions && (
<Animated.View
style={[
styles.leftActions,
Expand All @@ -470,7 +484,7 @@ export default class Swipeable extends Component<Props, StateType> {
</Animated.View>
);

const right = renderRightActions && (
const right = this._hasRightActions && (
<Animated.View
style={[
styles.rightActions,
Expand Down