Skip to content

fix: let user-initiated snaps interrupt a forceClose #2671

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

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

fix: let user-initiated snaps interrupt a forceClose #2671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd6b6b
fix: let user-initiated snaps interrupt a forceClose
ycmjason May 12, 2026
35942a1
fix: use .value when checking isLayoutCalculated in handleSnapToPosit…
ycmjason May 12, 2026
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
32 changes: 9 additions & 23 deletions src/components/bottomSheet/BottomSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,15 +1126,12 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
* exit method if :
* - layout is not calculated.
* - already animating to next position.
* - sheet is forced closing.
*/
const { nextPosition, nextIndex, isForcedClosing } =
animatedAnimationState.get();
const { nextPosition, nextIndex } = animatedAnimationState.get();
if (
!isLayoutCalculated.value ||
index === nextIndex ||
targetPosition === nextPosition ||
isForcedClosing
targetPosition === nextPosition
) {
return;
}
Expand Down Expand Up @@ -1177,14 +1174,9 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
* exit method if :
* - layout is not calculated.
* - already animating to next position.
* - sheet is forced closing.
*/
const { nextPosition, isForcedClosing } = animatedAnimationState.get();
if (
!isLayoutCalculated ||
targetPosition === nextPosition ||
isForcedClosing
) {
const { nextPosition } = animatedAnimationState.get();
if (!isLayoutCalculated.value || targetPosition === nextPosition) {
return;
}

Expand Down Expand Up @@ -1344,15 +1336,12 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
* exit method if :
* - layout is not calculated.
* - already animating to next position.
* - sheet is forced closing.
*/
const { nextPosition, nextIndex, isForcedClosing } =
animatedAnimationState.get();
const { nextPosition, nextIndex } = animatedAnimationState.get();
if (
!isLayoutCalculated.value ||
targetIndex === nextIndex ||
targetPosition === nextPosition ||
isForcedClosing
targetPosition === nextPosition
) {
return;
}
Expand Down Expand Up @@ -1399,15 +1388,12 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
* exit method if :
* - layout is not calculated.
* - already animating to next position.
* - sheet is forced closing.
*/
const { nextPosition, nextIndex, isForcedClosing } =
animatedAnimationState.get();
const { nextPosition, nextIndex } = animatedAnimationState.get();
if (
!isLayoutCalculated ||
!isLayoutCalculated.value ||
nextIndex === 0 ||
targetPosition === nextPosition ||
isForcedClosing
targetPosition === nextPosition
) {
return;
}
Expand Down