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.

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: fixed position x index sequencing with container resizing (#1356) #1675

Merged
merged 1 commit into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
81 changes: 64 additions & 17 deletions src/components/bottomSheet/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -683,9 +683,9 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
method: animateToPosition.name,
params: {
currentPosition: animatedPosition.value,
position,
nextPosition: position,
velocity,
animatedContainerHeight: animatedContainerHeight.value,
source,
},
});

Expand Down Expand Up @@ -733,6 +733,47 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
},
[handleOnAnimate, _providedAnimationConfigs]
);
/**
* Set to position without animation.
*
* @param targetPosition position to be set.
*/
const setToPosition = useWorkletCallback(function setToPosition(
targetPosition: number
) {
if (
targetPosition === animatedPosition.value ||
targetPosition === undefined ||
(animatedAnimationState.value === ANIMATION_STATE.RUNNING &&
targetPosition === animatedNextPosition.value)
) {
return;
}

runOnJS(print)({
component: BottomSheet.name,
method: setToPosition.name,
params: {
currentPosition: animatedPosition.value,
targetPosition,
},
});

/**
* store next position
*/
animatedNextPosition.value = targetPosition;
animatedNextPositionIndex.value =
animatedSnapPoints.value.indexOf(targetPosition);

stopAnimation();

/**
* set position.
*/
animatedPosition.value = targetPosition;
},
[]);
//#endregion

//#region public methods
Expand Down Expand Up @@ -1311,16 +1352,8 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
animatedNextPositionIndex.value === -1 &&
_previousContainerHeight !== containerHeight
) {
animationSource = ANIMATION_SOURCE.CONTAINER_RESIZE;
animationConfig = {
duration: 0,
};
animateToPosition(
containerHeight,
animationSource,
0,
animationConfig
);
setToPosition(containerHeight);
return;
}

if (
Expand Down Expand Up @@ -1361,13 +1394,11 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(

/**
* if snap points changes because of the container height change,
* then we skip the snap animation by setting the duration to 0.
* then we set the new position without animation.
*/
if (containerHeight !== _previousContainerHeight) {
animationSource = ANIMATION_SOURCE.CONTAINER_RESIZE;
animationConfig = {
duration: 0,
};
setToPosition(nextPosition);
return;
}
}
animateToPosition(nextPosition, animationSource, 0, animationConfig);
Expand Down Expand Up @@ -1524,6 +1555,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
}),
({
_animatedIndex,
_animatedPosition,
_animationState,
_contentGestureState,
_handleGestureState,
Expand All @@ -1535,6 +1567,21 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
return;
}

/**
* exit the method if index value is not synced with
* position value.
*
* [read more](https://github.com/gorhom/react-native-bottom-sheet/issues/1356)
*/
if (
animatedNextPosition.value !== INITIAL_VALUE &&
animatedNextPositionIndex.value !== INITIAL_VALUE &&
(_animatedPosition !== animatedNextPosition.value ||
_animatedIndex !== animatedNextPositionIndex.value)
) {
return;
}

/**
* exit the method if animated index value
* has fraction, e.g. 1.99, 0.52
Expand Down
6 changes: 1 addition & 5 deletions src/hooks/useBottomSheetTimingConfigs.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import { useMemo } from 'react';
import type { EasingFunction } from 'react-native';
import type {
EasingFunctionFactory,
ReduceMotion,
} from 'react-native-reanimated';
import type { EasingFunctionFactory } from 'react-native-reanimated';
import { ANIMATION_DURATION, ANIMATION_EASING } from '../constants';

interface TimingConfig {
duration?: number;
reduceMotion?: ReduceMotion;
easing?: EasingFunction | EasingFunctionFactory;
}

Expand Down
Loading