@niibase/bottom-sheet-manager 1.3.0 → 1.4.0

package/lib/module/router/view.js

@@ -1,141 +1,22 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import Animated, { Easing, interpolate, interpolateColor, runOnJS, useAnimatedReaction, useAnimatedStyle, useSharedValue, withSpring, withTiming } from "react-native-reanimated";
-import { BottomSheetBackdrop, BottomSheetModal, BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTheme } from "@react-navigation/native";
-import { StatusBar } from "react-native";
 import * as React from "react";
 import { BottomSheetActions } from "./router";
-const DEFAULT_SNAP_POINTS = ["66%"];
-function AnimatedSheetWrapper({
-  route,
+import BottomSheet from "../sheet";
+function BottomSheetScreen({
+  children,
   navigation,
-  descriptor,
-  isFullScreen,
-  previousIndex,
-  defaultStyle,
-  themeBackgroundStyle,
-  themeHandleIndicatorStyle
-}) {
-  const {
-    options,
-    render
-  } = descriptor;
-  const {
-    index = 0,
-    snapPoints = DEFAULT_SNAP_POINTS,
-    animatedIndex: defaultAnimatedIndex,
-    onAnimate,
-    handleStyle,
-    backgroundStyle,
-    handleIndicatorStyle,
-    enableDynamicSizing,
-    iosModalSheetTypeOfAnimation,
-    clickThrough,
-    style,
-    ...sheetProps
-  } = options;
-
-  // Calculate safe index
-  const safeIndex = Math.min(route.snapToIndex ?? index, snapPoints.length - 1);
-
-  // Create animatedIndex for this sheet
-  const animatedIndex = useSharedValue(0);
-
-  // Use animated reaction to watch animatedIndex and update isFullScreen reactively
-  useAnimatedReaction(() => animatedIndex.value, index => {
-    "worklet";
-
-    if (defaultAnimatedIndex) {
-      defaultAnimatedIndex.set(index);
-    }
-    if (!iosModalSheetTypeOfAnimation) {
-      if (isFullScreen.value > 0) isFullScreen.set(0);
-      previousIndex.set(index);
-      return;
-    }
-    if (isFullScreen.value < 0) {
-      isFullScreen.set(0);
-    }
-    const isClosing = index < 0 || previousIndex.value >= 0 && index < previousIndex.value - 0.05;
-    previousIndex.set(index);
-    if (isClosing) {
-      if (isFullScreen.value > 0.01) {
-        isFullScreen.set(withTiming(0, {
-          duration: 150 * 0.85,
-          easing: Easing.bezier(0.25, 0.1, 0.25, 1)
-        }));
-      }
-      return;
-    }
-    const points = ["%90", "90%"];
-    const fullScreenIndex = snapPoints.findIndex(p => points.includes(p));
-    if (index >= fullScreenIndex - 0.5 && index <= fullScreenIndex + 0.5) {
-      isFullScreen.set(1);
-    } else if (index >= 0) {
-      isFullScreen.set(0);
-    }
-  }, [snapPoints, iosModalSheetTypeOfAnimation]);
-  return /*#__PURE__*/React.createElement(BottomSheetModalScreen, _extends({
-    route: route,
-    navigation: navigation,
-    index: safeIndex,
-    snapPoints: enableDynamicSizing ? undefined : snapPoints,
-    enableDynamicSizing: enableDynamicSizing,
-    animatedIndex: animatedIndex,
-    clickThrough: clickThrough,
-    animationConfigs: {
-      duration: 300,
-      easing: Easing.bezier(0.25, 0.1, 0.25, 1)
-    },
-    onAnimate: (from, to, ...args) => {
-      if (to >= isFullScreen.value && to > snapPoints.length - 1) {
-        isFullScreen.set(0);
-      } else if (to > 0 && to === previousIndex.value && isFullScreen.value === 0) {
-        isFullScreen.set(1);
-      }
-      onAnimate?.(from, to, ...args);
-    },
-    topInset: 0,
-    bottomInset: 0,
-    style: [defaultStyle, style],
-    backgroundStyle: [themeBackgroundStyle, backgroundStyle],
-    handleIndicatorStyle: [themeHandleIndicatorStyle, handleIndicatorStyle],
-    handleStyle: [themeBackgroundStyle, {
-      borderRadius: 24
-    }, handleStyle]
-  }, sheetProps), render?.());
-}
-function BottomSheetModalScreen({
   route,
-  navigation,
-  clickThrough,
-  opacity,
-  animatedIndex,
-  onChange,
-  children,
   ...props
 }) {
   const ref = React.useRef(null);
   const lastSnapIndexRef = React.useRef(route.snapToIndex ?? props.index ?? 0);
 
-  // Present on mount.
-  React.useEffect(() => {
-    ref.current?.present();
-  }, []);
-
-  // Track mount state to avoid dismissing on unmount
-  const isMounted = React.useRef(true);
-  React.useEffect(() => {
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
-
   // Handle route closing state
   React.useEffect(() => {
     if (route.closing) {
-      ref.current?.dismiss();
+      ref.current?.close();
     }
   }, [route.closing]);
 
@@ -146,36 +27,26 @@ function BottomSheetModalScreen({
       lastSnapIndexRef.current = route.snapToIndex;
     }
   }, [route.snapToIndex, route.snapToKey]);
-  const handleChange = React.useCallback(newIndex => {
+  const handleChange = React.useCallback((newIndex, position, type) => {
+    navigation.emit({
+      type: "sheetOnChange",
+      target: route.key,
+      data: {
+        index: newIndex,
+        position,
+        type
+      }
+    });
     const currentIndex = lastSnapIndexRef.current;
     lastSnapIndexRef.current = newIndex;
     if (newIndex >= 0 && newIndex !== currentIndex) {
       navigation.dispatch(BottomSheetActions.snapTo(newIndex));
     }
   }, [navigation]);
-  const handleDismiss = React.useCallback(() => {
-    // BottomSheetModal will call onDismiss on unmount, but we don't want that
-    // since we handle navigation state separately
-    if (isMounted.current) {
-      navigation.dispatch({
-        ...BottomSheetActions.remove(),
-        source: route.key
-      });
-    }
-  }, [navigation, route.key]);
-  return /*#__PURE__*/React.createElement(BottomSheetModal, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(BottomSheet, _extends({
     ref: ref,
-    onDismiss: handleDismiss,
-    onChange: handleChange,
-    animatedIndex: animatedIndex,
-    index: props.index,
-    backdropComponent: backdropProps => /*#__PURE__*/React.createElement(BottomSheetBackdrop, _extends({}, backdropProps, {
-      appearsOnIndex: 0,
-      disappearsOnIndex: -1,
-      enableTouchThrough: !!clickThrough,
-      opacity: opacity ?? 0.45
-    }))
-  }), children);
+    onChange: handleChange
+  }, props), children);
 }
 export function BottomSheetView({
   state,
@@ -186,98 +57,83 @@ export function BottomSheetView({
     colors
   } = useTheme();
   const {
-    top,
     bottom,
     left,
     right
   } = useSafeAreaInsets();
   const themeBackgroundStyle = React.useMemo(() => ({
     borderCurve: "continuous",
-    backgroundColor: colors.card,
-    borderTopLeftRadius: 20,
-    borderTopRightRadius: 20
+    backgroundColor: colors.card
   }), [colors.card]);
   const themeHandleIndicatorStyle = React.useMemo(() => ({
-    backgroundColor: colors.border,
-    height: 5,
-    width: 50
+    borderCurve: "continuous",
+    backgroundColor: colors.border
   }), [colors.border]);
   const defaultStyle = React.useMemo(() => ({
     paddingBottom: bottom,
     paddingLeft: left,
     paddingRight: right
   }), [bottom, left, right]);
-
-  // IOS modal sheet type of animation
-  const isFullScreen = useSharedValue(-1);
-  const previousIndex = useSharedValue(-1);
-  const colorStyle = useAnimatedStyle(() => ({
-    flex: 1,
-    backgroundColor: withSpring(interpolateColor(isFullScreen.value, [0, 1], ["transparent", "#000"]), {
-      duration: 150
-    })
-  }));
-  const animatedStyle = useAnimatedStyle(() => ({
-    flex: 1,
-    overflow: "hidden",
-    borderRadius: interpolate(isFullScreen.value, [0, 0.8, 1], [0, 20, 24], "clamp"),
-    transform: [{
-      scaleX: withSpring(interpolate(isFullScreen.value, [0, 0.8], [1, 0.92], "clamp"), {
-        duration: 150
-      })
-    }, {
-      translateY: withSpring(interpolate(isFullScreen.value, [0, 0.8, 1], [0, top, top + 5], "clamp"), {
-        duration: 150,
-        dampingRatio: 1.5
-      })
-    }]
-  }), [top]);
-
-  // Since background color is white, we need to set status bar to light
-  const setStatusBar = StatusBar.setBarStyle;
-  useAnimatedReaction(() => isFullScreen.value, currentValue => {
-    "worklet";
-
-    if (currentValue > -1) {
-      runOnJS(setStatusBar)(currentValue >= 0.5 ? "light-content" : "default");
-    }
-  }, []);
-
-  // Get the base (first) route - this is the main content
-  const baseRoute = state.routes[0];
-  if (!baseRoute) {
-    return null;
-  }
-  const baseDescriptor = descriptors[baseRoute.key];
-  if (!baseDescriptor) {
-    return null;
-  }
-
-  // Sheet routes are all routes after the base route
-  const sheetRoutes = state.routes.slice(1);
-  const hasSheets = sheetRoutes.length > 0;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Animated.View, {
-    style: colorStyle
-  }, /*#__PURE__*/React.createElement(Animated.View, {
-    style: animatedStyle
-  }, baseDescriptor.render?.())), hasSheets && /*#__PURE__*/React.createElement(BottomSheetModalProvider, null, sheetRoutes.map(route => {
-    // Skip routes that are being removed
-    if (route.closing && !descriptors[route.key]) {
-      return null;
-    }
+  const [baseRoute, ...sheetRoutes] = state.routes;
+  const baseDescriptor = baseRoute ? descriptors[baseRoute.key] : null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, baseDescriptor?.render(), sheetRoutes.map(route => {
     const descriptor = descriptors[route.key];
     if (!descriptor) return null;
-    return /*#__PURE__*/React.createElement(AnimatedSheetWrapper, {
+    const {
+      options,
+      render
+    } = descriptor;
+    const {
+      index = 0,
+      style,
+      backgroundStyle,
+      handleIndicatorStyle,
+      handleStyle,
+      ...props
+    } = options;
+    return /*#__PURE__*/React.createElement(BottomSheetScreen, _extends({
       key: route.key,
+      id: route.key,
       route: route,
+      index: index,
       navigation: navigation,
-      descriptor: descriptor,
-      isFullScreen: isFullScreen,
-      previousIndex: previousIndex,
-      defaultStyle: defaultStyle,
-      themeBackgroundStyle: themeBackgroundStyle,
-      themeHandleIndicatorStyle: themeHandleIndicatorStyle
-    });
-  })));
+      style: [defaultStyle, style],
+      backgroundStyle: [themeBackgroundStyle, backgroundStyle],
+      handleIndicatorStyle: [themeHandleIndicatorStyle, handleIndicatorStyle],
+      handleStyle: [themeBackgroundStyle, {
+        borderRadius: 24
+      }, handleStyle],
+      onClose: data => {
+        navigation.dispatch({
+          ...BottomSheetActions.remove(),
+          source: route.key
+        });
+        navigation.emit({
+          type: "sheetDismiss",
+          target: route.key,
+          data
+        });
+      },
+      onBeforeShow: data => {
+        navigation.emit({
+          type: "sheetPresent",
+          target: route.key,
+          data
+        });
+      },
+      onAnimate: (fromIndex, toIndex, fromPosition, toPosition) => {
+        navigation.emit({
+          type: "sheetOnAnimate",
+          target: route.key,
+          data: {
+            fromIndex,
+            toIndex,
+            fromPosition,
+            toPosition
+          }
+        });
+      }
+    }, props), render());
+  }));
 }
 //# sourceMappingURL=view.js.map

package/lib/module/router/view.js.map

@@ -1 +1 @@
-{"version":3,"names":["Animated","Easing","interpolate","interpolateColor","runOnJS","useAnimatedReaction","useAnimatedStyle","useSharedValue","withSpring","withTiming","BottomSheetBackdrop","BottomSheetModal","BottomSheetModalProvider","useSafeAreaInsets","useTheme","StatusBar","React","BottomSheetActions","DEFAULT_SNAP_POINTS","AnimatedSheetWrapper","route","navigation","descriptor","isFullScreen","previousIndex","defaultStyle","themeBackgroundStyle","themeHandleIndicatorStyle","options","render","index","snapPoints","animatedIndex","defaultAnimatedIndex","onAnimate","handleStyle","backgroundStyle","handleIndicatorStyle","enableDynamicSizing","iosModalSheetTypeOfAnimation","clickThrough","style","sheetProps","safeIndex","Math","min","snapToIndex","length","value","set","isClosing","duration","easing","bezier","points","fullScreenIndex","findIndex","p","includes","createElement","BottomSheetModalScreen","_extends","undefined","animationConfigs","from","to","args","topInset","bottomInset","borderRadius","opacity","onChange","children","props","ref","useRef","lastSnapIndexRef","useEffect","current","present","isMounted","closing","dismiss","snapToKey","handleChange","useCallback","newIndex","currentIndex","dispatch","snapTo","handleDismiss","remove","source","key","onDismiss","backdropComponent","backdropProps","appearsOnIndex","disappearsOnIndex","enableTouchThrough","BottomSheetView","state","descriptors","colors","top","bottom","left","right","useMemo","borderCurve","backgroundColor","card","borderTopLeftRadius","borderTopRightRadius","border","height","width","paddingBottom","paddingLeft","paddingRight","colorStyle","flex","animatedStyle","overflow","transform","scaleX","translateY","dampingRatio","setStatusBar","setBarStyle","currentValue","baseRoute","routes","baseDescriptor","sheetRoutes","slice","hasSheets","Fragment","View","map"],"sourceRoot":"../../../src","sources":["router/view.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useSafeAreaInsets","useTheme","React","BottomSheetActions","BottomSheet","BottomSheetScreen","children","navigation","route","props","ref","useRef","lastSnapIndexRef","snapToIndex","index","useEffect","closing","current","close","snapToKey","handleChange","useCallback","newIndex","position","type","emit","target","key","data","currentIndex","dispatch","snapTo","createElement","_extends","onChange","BottomSheetView","state","descriptors","colors","bottom","left","right","themeBackgroundStyle","useMemo","borderCurve","backgroundColor","card","themeHandleIndicatorStyle","border","defaultStyle","paddingBottom","paddingLeft","paddingRight","baseRoute","sheetRoutes","routes","baseDescriptor","Fragment","render","map","descriptor","options","style","backgroundStyle","handleIndicatorStyle","handleStyle","id","borderRadius","onClose","remove","source","onBeforeShow","onAnimate","fromIndex","toIndex","fromPosition","toPosition"],"sourceRoot":"../../../src","sources":["router/view.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/sheet.js

@@ -1,13 +1,13 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import RNBottomSheet, { BottomSheetBackdrop, BottomSheetFlatList, BottomSheetFooter, BottomSheetFooterContainer, BottomSheetHandle, BottomSheetScrollView, BottomSheetSectionList, BottomSheetTextInput, BottomSheetView, BottomSheetVirtualizedList } from "@gorhom/bottom-sheet";
 import { BackHandler, Platform, StyleSheet, View } from "react-native";
-import { Easing, useAnimatedReaction, useSharedValue, withTiming } from "react-native-reanimated";
+import { interpolate, useAnimatedReaction, useSharedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTheme } from "@react-navigation/native";
 import React from "react";
-import { useProviderContext, useSheetAnimationContext, useSheetIDContext, useSheetRef, useStackBehaviorContext } from "./provider";
+import { useProviderContext, useSheetIDContext, useSheetRef, useSheetSharedContext, useStackBehaviorContext } from "./provider";
 import { PrivateManager } from "./manager";
 import { eventManager } from "./events";
+const FULL_SCREEN_POINTS = Platform.OS === "ios" ? ["%90", "90%"] : ["%93", "93%"];
 const useSheetManager = ({
   id,
   onHide,
@@ -38,69 +38,64 @@ const useSheetManager = ({
 };
 const BottomSheetComponent = /*#__PURE__*/React.forwardRef(({
   children,
-  snapPoints,
   onClose,
   onBeforeShow,
   stackBehavior = "switch",
   hardwareBackPressToClose = true,
   enableDynamicSizing = false,
   handleIndicatorStyle,
-  iosModalSheetTypeOfAnimation: pageAnimation,
+  iosModalSheetTypeOfAnimation,
+  snapPoints: defaultSnapPoints,
   animatedIndex: defaultAnimatedIndex,
   backgroundStyle,
   onAnimate,
   handleStyle,
   style,
-  clickThrough,
+  passThrough,
   opacity,
   ...props
 }, ref) => {
   const currentSheetRef = useSheetRef();
   const currentCtx = useProviderContext();
   const stackContext = useStackBehaviorContext();
-  const {
-    isFullScreen,
-    iosModalSheetTypeOfAnimation,
-    duration
-  } = useSheetAnimationContext();
   const animatedIndex = useSharedValue(0);
-  const previousIndex = useSharedValue(-1);
   const [currentStackBehavior, setCurrentStackBehavior] = React.useState(stackBehavior);
   const isPushed = currentStackBehavior === "push";
-  const {
-    colors
-  } = useTheme();
   const {
     bottom,
     left,
     right
   } = useSafeAreaInsets();
-  const themeBackgroundStyle = React.useMemo(() => ({
-    borderCurve: "continuous",
-    backgroundColor: colors.card,
-    borderTopLeftRadius: 20,
-    borderTopRightRadius: 20
-  }), [colors.card]);
-  const themeHandleIndicatorStyle = React.useMemo(() => ({
-    backgroundColor: colors.border,
-    height: 5,
-    width: 50
-  }), [colors.border]);
   const defaultStyle = React.useMemo(() => ({
     paddingBottom: bottom,
     paddingLeft: left,
     paddingRight: right
   }), [bottom, left, right]);
+  const {
+    isFullScreen
+  } = useSheetSharedContext();
+  const [snapPoints, fullScreenIndex] = React.useMemo(() => {
+    let resolved = defaultSnapPoints;
+    if (Platform.OS === "android" && iosModalSheetTypeOfAnimation && Array.isArray(resolved)) {
+      resolved = resolved.map(p => p === "90%" || p === "%90" ? "93%" : p);
+    }
+    const fullScreenIndex = resolved instanceof Array ? resolved.findIndex(p => FULL_SCREEN_POINTS.includes(p)) : resolved?.value?.findIndex(p => FULL_SCREEN_POINTS.includes(p)) || -1;
+    return [resolved, fullScreenIndex];
+  }, [defaultSnapPoints, iosModalSheetTypeOfAnimation]);
   const valueRef = React.useRef(null);
   const bottomSheetRef = React.useRef(null);
   const hardwareBackPressEvent = React.useRef(null);
   const id = useSheetIDContext();
   const sheetId = props.id || id;
+  const hideSheetRef = React.useRef(null);
   useSheetManager({
     id: sheetId,
     onHide: (data, dismiss, behavior) => {
+      // Update state for future renders, but also pass behavior directly
+      // so hideSheet doesn't read a stale closure value (React state update
+      // is async — hideSheet runs before the re-render).
       if (behavior) setCurrentStackBehavior(behavior);
-      hideSheet(data, true, dismiss);
+      hideSheetRef.current(data, true, dismiss, behavior);
     },
     onBeforeShow: (data, behavior) => {
       if (behavior) setCurrentStackBehavior(behavior);
@@ -119,68 +114,61 @@ const BottomSheetComponent = /*#__PURE__*/React.forwardRef(({
   });
   useAnimatedReaction(() => animatedIndex.value, index => {
     "worklet";
+
     if (defaultAnimatedIndex) {
       defaultAnimatedIndex.set(index);
     }
-    if (!iosModalSheetTypeOfAnimation && !pageAnimation) {
-      if (isFullScreen.value > 0) isFullScreen.set(0);
-      previousIndex.set(index);
-      return;
-    }
-    if (isFullScreen.value < 0) {
-      isFullScreen.set(0);
-    }
-    const isClosing = index < 0 || previousIndex.value >= 0 && index < previousIndex.value - 0.05;
-    previousIndex.set(index);
-    if (isClosing) {
-      if (isFullScreen.value > 0.01) {
-        isFullScreen.set(withTiming(0, {
-          duration: duration * 0.85,
-          easing: Easing.bezier(0.25, 0.1, 0.25, 1)
-        }));
-      }
-      return;
+    if (iosModalSheetTypeOfAnimation) {
+      isFullScreen.set(interpolate(index, [fullScreenIndex - 1, fullScreenIndex, fullScreenIndex + 1], [0, 1, 0]));
     }
-    const points = ["%90", "90%"];
-    const fullScreenIndex = snapPoints instanceof Array ? snapPoints.findIndex(p => points.includes(p)) : snapPoints?.value?.findIndex(p => points.includes(p)) || -1;
-    if (index >= fullScreenIndex - 0.5 && index <= fullScreenIndex + 0.5) {
-      isFullScreen.set(1);
-    } else if (index >= 0) {
-      isFullScreen.set(0);
-    }
-  }, [snapPoints, iosModalSheetTypeOfAnimation, pageAnimation, duration]);
-  const hideSheet = React.useCallback((data, fromManager, dismiss) => {
+  }, [iosModalSheetTypeOfAnimation]);
+  const hideSheet = React.useCallback((data, fromManager, dismiss, incomingBehavior) => {
+    // Use the freshly-delivered behavior from the event when available.
+    // currentStackBehavior comes from React state which may not have flushed
+    // yet when this callback fires synchronously from the manager.
+    const activeBehavior = incomingBehavior ?? currentStackBehavior;
     let value = data ?? valueRef.current;
     hardwareBackPressEvent.current?.remove();
     const closeValue = onClose?.(value);
     if (closeValue !== undefined) value = closeValue;
-    if (dismiss && currentStackBehavior === "push") {
+    if (dismiss && activeBehavior === "push") {
+      // For push behavior, a "dismiss" event means another sheet wants to
+      // appear on top — do not close this sheet.
       if (fromManager) valueRef.current = data;
       return;
     }
-    if (currentStackBehavior !== "replace" || !dismiss) {
+    if (activeBehavior !== "replace" || !dismiss) {
       bottomSheetRef.current?.close();
     }
     if (sheetId) {
       const hasHistory = PrivateManager.history.length > 0;
-      const shouldRestorePrevious = currentStackBehavior !== "replace";
-      eventManager.publish(`onclose_${sheetId}`, value, currentCtx, hasHistory || !!dismiss, currentStackBehavior);
+      const shouldRestorePrevious = activeBehavior !== "replace";
+      eventManager.publish(`onclose_${sheetId}`, value, currentCtx, hasHistory || !!dismiss, activeBehavior);
       if (shouldRestorePrevious) {
         if (dismiss) {
-          PrivateManager.history.push({
-            id: sheetId,
-            context: currentCtx,
-            behavior: currentStackBehavior
-          });
+          // it will surface naturally when the push sheet is closed.
+          if (activeBehavior !== "push") {
+            PrivateManager.history.push({
+              id: sheetId,
+              context: currentCtx,
+              behavior: activeBehavior
+            });
+          }
         } else if (hasHistory) {
-          const prev = PrivateManager.history.pop();
-          eventManager.publish(`show_wrap_${prev.id}`, undefined, prev.context, true, prev.behavior);
+          const otherSheetsStillOpen = PrivateManager.stack().some(s => !(s.id === sheetId && s.context === currentCtx));
+          if (!otherSheetsStillOpen) {
+            const prev = PrivateManager.history.pop();
+            eventManager.publish(`show_wrap_${prev.id}`, undefined, prev.context, true, prev.behavior);
+          }
         }
       }
       PrivateManager.remove(sheetId, currentCtx);
     }
     if (fromManager) valueRef.current = data;
   }, [sheetId, currentCtx, onClose, currentStackBehavior]);
+  React.useEffect(() => {
+    hideSheetRef.current = hideSheet;
+  }, [hideSheet]);
   const getInstance = React.useCallback(() => ({
     close(options = {}) {
       valueRef.current = options.value;
@@ -210,20 +198,16 @@ const BottomSheetComponent = /*#__PURE__*/React.forwardRef(({
   React.useEffect(() => {
     if (Platform.OS === "android" && hardwareBackPressToClose) {
       hardwareBackPressEvent.current = BackHandler.addEventListener("hardwareBackPress", () => {
-        bottomSheetRef.current?.close();
+        // Go through hideSheet so internal state (PrivateManager, events,
+        // history) is updated correctly — not just the visual sheet.
+        hideSheetRef.current(undefined, true, false);
         return true;
       });
     }
     return () => hardwareBackPressEvent.current?.remove();
   }, [hardwareBackPressToClose]);
   React.useImperativeHandle(ref, getInstance, [getInstance]);
-  const zIndex = React.useMemo(() => {
-    if (!sheetId) return 0;
-    if (isPushed) {
-      return PrivateManager.zIndex(sheetId, currentCtx);
-    }
-    return 0;
-  }, [sheetId, isPushed, currentCtx]);
+  const zIndex = React.useMemo(() => isPushed && sheetId ? PrivateManager.zIndex(sheetId, currentCtx) : 0, [sheetId, isPushed, currentCtx]);
   const backdropOpacity = React.useMemo(() => {
     if (isPushed && stackContext.previousSheetId) {
       return (opacity || 0.45) * 0.6;
@@ -238,31 +222,23 @@ const BottomSheetComponent = /*#__PURE__*/React.forwardRef(({
   }, /*#__PURE__*/React.createElement(RNBottomSheet, _extends({
     enableDynamicSizing: enableDynamicSizing,
     backdropComponent: backdropProps => /*#__PURE__*/React.createElement(BottomSheetBackdrop, _extends({
-      enableTouchThrough: !!clickThrough,
+      enableTouchThrough: !!passThrough,
       opacity: backdropOpacity,
       disappearsOnIndex: -1,
       appearsOnIndex: 0
     }, backdropProps)),
-    onAnimate: (from, to, ...args) => {
-      const snapPointLen = Array.isArray(snapPoints) ? snapPoints.length : snapPoints?.value?.length ?? 0;
-      if (to >= isFullScreen.value && to > snapPointLen - 1) {
-        isFullScreen.set(0);
-      } else if (to > 0 && to === previousIndex.value && isFullScreen.value === 0) {
-        isFullScreen.set(1);
-      }
-      onAnimate?.(from, to, ...args);
-    },
     topInset: 0,
     bottomInset: 0
   }, props, {
     ref: bottomSheetRef,
     onClose: hideSheet,
+    onAnimate: onAnimate,
     animatedIndex: animatedIndex,
     style: [defaultStyle, style],
-    snapPoints: enableDynamicSizing ? undefined : snapPoints ?? ["66%"],
-    handleIndicatorStyle: [themeHandleIndicatorStyle, handleIndicatorStyle],
-    backgroundStyle: [themeBackgroundStyle, backgroundStyle],
-    handleStyle: [themeBackgroundStyle, handleStyle]
+    snapPoints: enableDynamicSizing ? undefined : snapPoints,
+    handleIndicatorStyle: handleIndicatorStyle,
+    backgroundStyle: backgroundStyle,
+    handleStyle: handleStyle
   }), children));
 });
 const BottomSheet = /*#__PURE__*/React.memo(BottomSheetComponent);