@niibase/bottom-sheet-manager 1.2.0 → 1.4.0

package/lib/module/router/index.js

@@ -1,13 +1,23 @@
 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 { createNavigatorFactory, useNavigationBuilder } from "@react-navigation/native";
-import React from "react";
+import { createNavigatorFactory, StackActions, useNavigationBuilder } from "@react-navigation/native";
+import * as React from "react";
 import { BottomSheetRouter } from "./router";
 import { BottomSheetView } from "./view";
-function BottomSheetNavigator({
+
+/**
+ * Unified Navigator that renders the first screen as the base content
+ * and all subsequent screens as bottom sheet overlays.
+ *
+ * Uses BottomSheetRouter (extending StackRouter) to manage navigation state,
+ * with react-native-screens ScreenStack for the base screen rendering
+ * and BottomSheetView for the sheet overlays.
+ */
+function Navigator({
   id,
   children,
   screenListeners,
   screenOptions,
+  initialRouteName,
   ...rest
 }) {
   const {
@@ -19,8 +29,25 @@ function BottomSheetNavigator({
     id,
     children,
     screenListeners,
-    screenOptions
+    screenOptions,
+    initialRouteName
   });
+
+  // Handle tab press → popToTop behavior
+  React.useEffect(() => {
+    // @ts-expect-error: there may not be a tab navigator in parent
+    return navigation?.addListener?.("tabPress", e => {
+      const isFocused = navigation.isFocused();
+      requestAnimationFrame(() => {
+        if (state.index > 0 && isFocused && !e.defaultPrevented) {
+          navigation.dispatch({
+            ...StackActions.popToTop(),
+            target: state.key
+          });
+        }
+      });
+    });
+  }, [navigation, state.index, state.key]);
   return /*#__PURE__*/React.createElement(NavigationContent, null, /*#__PURE__*/React.createElement(BottomSheetView, _extends({}, rest, {
     state: state,
     navigation: navigation,
@@ -29,18 +56,38 @@ function BottomSheetNavigator({
 }
 
 /**
- * To use BottomSheetNavigator with expo-router, the first screen should be your app content
- * and add a border radius of 24px to the root view if want to snap to 100%.
+ * Creates a bottom sheet navigator that renders the first screen as the
+ * main content and all subsequent screens as bottom sheet modals.
+ *
+ * @example
+ * ```tsx
+ * // With React Navigation
+ * const { Navigator, Screen } = createBottomSheetNavigator();
+ *
+ * function App() {
+ *   return (
+ *     <Navigator>
+ *       <Screen name="Home" component={HomeScreen} />
+ *       <Screen
+ *         name="Details"
+ *         component={DetailsSheet}
+ *         options={{ snapPoints: ['50%', '100%'] }}
+ *       />
+ *     </Navigator>
+ *   );
+ * }
+ * ```
  *
  * @example
  * ```tsx
+ * // With Expo Router
+ * import { Slot, withLayoutContext } from "expo-router";
  * import {
  *   createBottomSheetNavigator,
  *   BottomSheetNavigationOptions,
  *   BottomSheetNavigationEventMap,
  *   BottomSheetNavigationState,
- * } from "@repo/bottom-sheet";
- * import { Slot, withLayoutContext } from "expo-router";
+ * } from "@niibase/bottom-sheet-manager";
  *
  * const { Navigator } = createBottomSheetNavigator();
  *
@@ -56,24 +103,24 @@ function BottomSheetNavigator({
  * };
  *
  * export default function Layout() {
+ *   // SSR guard - navigator doesn't work on server
  *   if (typeof window === "undefined") return <Slot />;
+ *
  *   return (
- *     <BottomSheet
- *       screenOptions={
- *         {
- *           // API Reference: `@repo/design/bottom-sheet/types.ts`
- *           // And: https://gorhom.github.io/react-native-bottom-sheet/modal/props/
- *         }
- *       }
- *.    />
+ *     <BottomSheet>
+ *       <BottomSheet.Screen name="index" />
+ *       <BottomSheet.Screen
+ *         name="details"
+ *         options={{ snapPoints: ["50%"] }}
+ *       />
+ *     </BottomSheet>
  *   );
  * }
  * ```
  */
 export function createBottomSheetNavigator(config) {
-  // We call `createNavigatorFactory` with our un-typed navigator
-  // but pass in the config to get the typed container
-  return createNavigatorFactory(BottomSheetNavigator)(config);
+  return createNavigatorFactory(Navigator)(config);
 }
 export * from "./types";
+export { BottomSheetActions, useBottomSheetNavigation } from "./router";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createNavigatorFactory","useNavigationBuilder","React","BottomSheetRouter","BottomSheetView","BottomSheetNavigator","id","children","screenListeners","screenOptions","rest","state","descriptors","navigation","NavigationContent","createElement","_extends","createBottomSheetNavigator","config"],"sourceRoot":"../../../src","sources":["router/index.tsx"],"mappings":";AAAA,SACEA,sBAAsB,EAKtBC,oBAAoB,QACf,0BAA0B;AACjC,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAASC,iBAAiB,QAAkC,UAAU;AAStE,SAASC,eAAe,QAAQ,QAAQ;AAExC,SAASC,oBAAoBA,CAAC;EAC5BC,EAAE;EACFC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACb,GAAGC;AACsB,CAAC,EAAE;EAC5B,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GAAGb,oBAAoB,CAMhFE,iBAAiB,EAAE;IACnBG,EAAE;IACFC,QAAQ;IACRC,eAAe;IACfC;EACF,CAAC,CAAC;EAEF,oBACEP,KAAA,CAAAa,aAAA,CAACD,iBAAiB,qBAChBZ,KAAA,CAAAa,aAAA,CAACX,eAAe,EAAAY,QAAA,KACVN,IAAI;IACRC,KAAK,EAAEA,KAAM;IACbE,UAAU,EAAEA,UAAW;IACvBD,WAAW,EAAEA;EAAY,EAC1B,CACgB,CAAC;AAExB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASK,0BAA0BA,CA4BxCC,MAAe,EAAmC;EAClD;EACA;EACA,OAAOlB,sBAAsB,CAACK,oBAAoB,CAAC,CAACa,MAAM,CAAC;AAC7D;AAEA,cAAc,SAAS","ignoreList":[]}
+{"version":3,"names":["createNavigatorFactory","StackActions","useNavigationBuilder","React","BottomSheetRouter","BottomSheetView","Navigator","id","children","screenListeners","screenOptions","initialRouteName","rest","state","descriptors","navigation","NavigationContent","useEffect","addListener","e","isFocused","requestAnimationFrame","index","defaultPrevented","dispatch","popToTop","target","key","createElement","_extends","createBottomSheetNavigator","config","BottomSheetActions","useBottomSheetNavigation"],"sourceRoot":"../../../src","sources":["router/index.tsx"],"mappings":";AAAA,SACEA,sBAAsB,EAEtBC,YAAY,EACZC,oBAAoB,QAKf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAU9B,SAASC,iBAAiB,QAAuC,UAAU;AAC3E,SAASC,eAAe,QAAQ,QAAQ;;AAExC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,SAASA,CAAC;EACjBC,EAAE;EACFC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACbC,gBAAgB;EAChB,GAAGC;AACsB,CAAC,EAAE;EAC5B,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GAAGd,oBAAoB,CAMhFE,iBAAiB,EAAE;IACnBG,EAAE;IACFC,QAAQ;IACRC,eAAe;IACfC,aAAa;IACbC;EACF,CAAC,CAAC;;EAEF;EACAR,KAAK,CAACc,SAAS,CAAC,MAAM;IACpB;IACA,OAAOF,UAAU,EAAEG,WAAW,GAAG,UAAU,EAAGC,CAAM,IAAK;MACvD,MAAMC,SAAS,GAAGL,UAAU,CAACK,SAAS,CAAC,CAAC;MAExCC,qBAAqB,CAAC,MAAM;QAC1B,IACER,KAAK,CAACS,KAAK,GAAG,CAAC,IACfF,SAAS,IACT,CAAED,CAAC,CAAgCI,gBAAgB,EACnD;UACAR,UAAU,CAACS,QAAQ,CAAC;YAClB,GAAGvB,YAAY,CAACwB,QAAQ,CAAC,CAAC;YAC1BC,MAAM,EAAEb,KAAK,CAACc;UAChB,CAAC,CAAC;QACJ;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,EAAE,CAACZ,UAAU,EAAEF,KAAK,CAACS,KAAK,EAAET,KAAK,CAACc,GAAG,CAAC,CAAC;EAExC,oBACExB,KAAA,CAAAyB,aAAA,CAACZ,iBAAiB,qBAChBb,KAAA,CAAAyB,aAAA,CAACvB,eAAe,EAAAwB,QAAA,KACVjB,IAAI;IACRC,KAAK,EAAEA,KAAM;IACbE,UAAU,EAAEA,UAAW;IACvBD,WAAW,EAAEA;EAAY,EAC1B,CACgB,CAAC;AAExB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASgB,0BAA0BA,CAmBxCC,MAAe,EAAmC;EAClD,OAAO/B,sBAAsB,CAACM,SAAS,CAAC,CAACyB,MAAM,CAAC;AAClD;AAEA,cAAc,SAAS;AACvB,SAASC,kBAAkB,EAAEC,wBAAwB,QAAQ,UAAU","ignoreList":[]}

package/lib/module/router/router.js

@@ -1,23 +1,63 @@
-import { StackActions, StackRouter } from "@react-navigation/native";
+import { StackActions, StackRouter, useNavigation } from "@react-navigation/native";
 import { nanoid } from "nanoid/non-secure";
 export const BottomSheetActions = {
   ...StackActions,
-  snapTo(index) {
+  /**
+   * Snap the bottom sheet to a specific index.
+   */
+  snapTo: index => ({
+    type: "SNAP_TO",
+    index
+  }),
+  /**
+   * Dismiss the current bottom sheet.
+   */
+  dismiss: () => ({
+    type: "DISMISS"
+  }),
+  /**
+   * Remove the sheet from navigation state after dismiss animation completes.
+   */
+  remove: () => ({
+    type: "REMOVE"
+  })
+};
+
+/**
+ * Ensures the base route (first screen) exists in the navigation state.
+ * This is important because the first screen is the main content,
+ * and subsequent screens are rendered as bottom sheets.
+ */
+const ensureBaseRoute = (state, baseRouteName, routeParamList) => {
+  if (!baseRouteName) {
+    return state;
+  }
+  const hasBaseRoute = state.routes.some(r => r.name === baseRouteName);
+  if (!hasBaseRoute) {
+    const baseRoute = {
+      key: `${baseRouteName}-${nanoid()}`,
+      name: baseRouteName,
+      params: routeParamList?.[baseRouteName]
+    };
     return {
-      type: "SNAP_TO",
-      index
+      ...state,
+      index: state.routes.length,
+      routes: [baseRoute, ...state.routes]
     };
   }
+  return state;
 };
-export function BottomSheetRouter(routerOptions) {
+export const BottomSheetRouter = routerOptions => {
   const baseRouter = StackRouter(routerOptions);
   return {
     ...baseRouter,
     type: "bottom-sheet",
     getInitialState(options) {
       const state = baseRouter.getInitialState(options);
+      const baseRouteName = routerOptions.initialRouteName ?? options.routeNames[0];
+      const stateWithBaseRoute = ensureBaseRoute(state, baseRouteName, options.routeParamList);
       return {
-        ...state,
+        ...stateWithBaseRoute,
         stale: false,
         type: "bottom-sheet",
         key: `bottom-sheet-${nanoid()}`
@@ -27,15 +67,76 @@ export function BottomSheetRouter(routerOptions) {
       switch (action.type) {
         case "SNAP_TO":
           {
-            const index = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
+            const routeIndex = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
+            return {
+              ...state,
+              routes: state.routes.map((route, i) => i === routeIndex ? {
+                ...route,
+                snapToIndex: action.index,
+                snapToKey: (route.snapToKey ?? 0) + 1
+              } : route)
+            };
+          }
+        case "GO_BACK":
+        case "DISMISS":
+          {
+            return this.getStateForAction(state, StackActions.pop(1), options);
+          }
+        case "POP":
+          {
+            // Only base screen remains - let parent navigator handle it
+            if (state.routes.length <= 1) {
+              return null;
+            }
+            const count = "payload" in action && typeof action.payload?.count === "number" ? action.payload.count : 1;
+
+            // Calculate how many routes we can actually pop (don't pop base screen)
+            const maxPopCount = state.routes.length - 1;
+            const actualCount = Math.min(count, maxPopCount);
+
+            // Base screen - let parent navigator handle it
+            if (actualCount <= 0) {
+              return null;
+            }
+
+            // Target index is the route we want to stay on (land on after pop)
+            // closingIndex is the first route to be dismissed (the one after target)
+            const targetIndex = state.routes.length - 1 - actualCount;
+            const closingIndex = targetIndex + 1;
+
+            // Mark only the bottom-most route to pop as closing
+            // The sheet's dismiss() will handle dismissing sheets above it first
             return {
               ...state,
-              routes: state.routes.map((route, i) => i === index ? {
+              index: closingIndex,
+              routes: state.routes.map((route, i) => i === closingIndex ? {
                 ...route,
-                snapToIndex: action.index
+                closing: true
               } : route)
             };
           }
+        case "POP_TO_TOP":
+          {
+            const popCount = state.routes.length - 1;
+            return this.getStateForAction(state, StackActions.pop(popCount), options);
+          }
+        case "REMOVE":
+          {
+            // Actually remove the closing route and all routes above it
+            const routeKey = action.source;
+            const routeIndex = routeKey ? state.routes.findIndex(r => r.key === routeKey) : state.routes.findIndex(r => r.closing);
+            if (routeIndex === -1) {
+              return state;
+            }
+
+            // Remove the route and all routes above it (they were dismissed together)
+            const routes = state.routes.filter((_, i) => i < routeIndex);
+            return {
+              ...state,
+              index: Math.min(state.index, routes.length - 1),
+              routes
+            };
+          }
         default:
           return baseRouter.getStateForAction(state, action, options);
       }
@@ -53,13 +154,36 @@ export function BottomSheetRouter(routerOptions) {
         routeParamList,
         routeGetIdList
       });
+      const baseRouteName = routerOptions.initialRouteName ?? routeNames[0];
+      const stateWithBaseRoute = ensureBaseRoute(state, baseRouteName, routeParamList);
       return {
-        ...state,
+        ...stateWithBaseRoute,
         type: "bottom-sheet",
         key: `bottom-sheet-${nanoid()}`
       };
     },
     actionCreators: BottomSheetActions
   };
-}
+};
+
+/**
+ * Hook to access BottomSheet navigation with the snapTo helper.
+ *
+ * @example
+ * ```tsx
+ * function MySheet() {
+ *   const navigation = useBottomSheetNavigation();
+ *
+ *   // Snap to a specific index
+ *   const handleExpand = () => {
+ *     navigation.snapTo(1); // Snap to second index
+ *   };
+ *
+ *   return (
+ *     <Button title="Expand" onPress={handleExpand} />
+ *   );
+ * }
+ * ```
+ */
+export const useBottomSheetNavigation = () => useNavigation();
 //# sourceMappingURL=router.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["StackActions","StackRouter","nanoid","BottomSheetActions","snapTo","index","type","BottomSheetRouter","routerOptions","baseRouter","getInitialState","options","state","stale","key","getStateForAction","action","target","source","routes","findIndex","r","map","route","i","snapToIndex","getRehydratedState","partialState","routeNames","routeParamList","routeGetIdList","actionCreators"],"sourceRoot":"../../../src","sources":["router/router.ts"],"mappings":"AAAA,SAGIA,YAAY,EAEZC,WAAW,QAER,0BAA0B;AACjC,SAASC,MAAM,QAAQ,mBAAmB;AAe1C,OAAO,MAAMC,kBAAkB,GAAG;EAC9B,GAAGH,YAAY;EACfI,MAAMA,CAACC,KAAa,EAAyB;IACzC,OAAO;MAAEC,IAAI,EAAE,SAAS;MAAED;IAAM,CAAC;EACrC;AACJ,CAAC;AAED,OAAO,SAASE,iBAAiBA,CAC7BC,aAAiC,EACuC;EACxE,MAAMC,UAAU,GAAGR,WAAW,CAACO,aAAa,CAG3C;EACD,OAAO;IACH,GAAGC,UAAU;IACbH,IAAI,EAAE,cAAc;IACpBI,eAAeA,CAACC,OAAO,EAAE;MACrB,MAAMC,KAAK,GAAGH,UAAU,CAACC,eAAe,CAACC,OAAO,CAAC;MAEjD,OAAO;QACH,GAAGC,KAAK;QACRC,KAAK,EAAE,KAAK;QACZP,IAAI,EAAE,cAAc;QACpBQ,GAAG,EAAE,gBAAgBZ,MAAM,CAAC,CAAC;MACjC,CAAC;IACL,CAAC;IACDa,iBAAiBA,CAACH,KAAK,EAAEI,MAAM,EAAEL,OAAO,EAAE;MACtC,QAAQK,MAAM,CAACV,IAAI;QACf,KAAK,SAAS;UAAE;YACZ,MAAMD,KAAK,GACPW,MAAM,CAACC,MAAM,KAAKL,KAAK,CAACE,GAAG,IAAIE,MAAM,CAACE,MAAM,GACtCN,KAAK,CAACO,MAAM,CAACC,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAACP,GAAG,KAAKE,MAAM,CAACE,MAAM,CAAC,GACtDN,KAAK,CAACP,KAAK;YAErB,OAAO;cACH,GAAGO,KAAK;cACRO,MAAM,EAAEP,KAAK,CAACO,MAAM,CAACG,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,KAC9BA,CAAC,KAAKnB,KAAK,GACL;gBACI,GAAGkB,KAAK;gBACRE,WAAW,EAAET,MAAM,CAACX;cACxB,CAAC,GACDkB,KACV;YACJ,CAAC;UACL;QACA;UACI,OAAOd,UAAU,CAACM,iBAAiB,CAACH,KAAK,EAAEI,MAAM,EAAEL,OAAO,CAAC;MACnE;IACJ,CAAC;IACDe,kBAAkBA,CAACC,YAAY,EAAE;MAAEC,UAAU;MAAEC,cAAc;MAAEC;IAAe,CAAC,EAAE;MAC7E,IAAIH,YAAY,CAACd,KAAK,KAAK,KAAK,EAAE;QAC9B,OAAOc,YAAY;MACvB;MAEA,MAAMf,KAAK,GAAGH,UAAU,CAACiB,kBAAkB,CAACC,YAAY,EAAE;QACtDC,UAAU;QACVC,cAAc;QACdC;MACJ,CAAC,CAAC;MAEF,OAAO;QACH,GAAGlB,KAAK;QACRN,IAAI,EAAE,cAAc;QACpBQ,GAAG,EAAE,gBAAgBZ,MAAM,CAAC,CAAC;MACjC,CAAC;IACL,CAAC;IACD6B,cAAc,EAAE5B;EACpB,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["StackActions","StackRouter","useNavigation","nanoid","BottomSheetActions","snapTo","index","type","dismiss","remove","ensureBaseRoute","state","baseRouteName","routeParamList","hasBaseRoute","routes","some","r","name","baseRoute","key","params","length","BottomSheetRouter","routerOptions","baseRouter","getInitialState","options","initialRouteName","routeNames","stateWithBaseRoute","stale","getStateForAction","action","routeIndex","target","source","findIndex","map","route","i","snapToIndex","snapToKey","pop","count","payload","maxPopCount","actualCount","Math","min","targetIndex","closingIndex","closing","popCount","routeKey","filter","_","getRehydratedState","partialState","routeGetIdList","actionCreators","useBottomSheetNavigation"],"sourceRoot":"../../../src","sources":["router/router.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/router/view.js

@@ -1,173 +1,139 @@
 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 { BottomSheetBackdrop, BottomSheetModal, BottomSheetModalProvider } from "@gorhom/bottom-sheet";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTheme } from "@react-navigation/native";
 import * as React from "react";
-import { StatusBar } from "react-native";
-import Animated, { Easing, interpolate, interpolateColor, runOnJS, useAnimatedReaction, useAnimatedStyle, useSharedValue, withSpring } from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-function BottomSheetModalScreen({
-  index,
-  navigation,
-  clickThrough,
-  iosModalSheetTypeOfAnimation,
-  opacity,
+import { BottomSheetActions } from "./router";
+import BottomSheet from "../sheet";
+function BottomSheetScreen({
   children,
+  navigation,
+  route,
   ...props
 }) {
   const ref = React.useRef(null);
-  const lastIndexRef = React.useRef(index);
+  const lastSnapIndexRef = React.useRef(route.snapToIndex ?? props.index ?? 0);
 
-  // Present on mount.
-  React.useEffect(() => {
-    ref.current?.present();
-  }, []);
-  const isMounted = React.useRef(true);
+  // Handle route closing state
   React.useEffect(() => {
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
+    if (route.closing) {
+      ref.current?.close();
+    }
+  }, [route.closing]);
+
+  // Handle snap point changes from navigation actions
   React.useEffect(() => {
-    if (index != null && lastIndexRef.current !== index) {
-      ref.current?.snapToIndex(index);
+    if (route.snapToIndex != null && route.snapToIndex !== lastSnapIndexRef.current) {
+      ref.current?.snapToIndex(route.snapToIndex);
+      lastSnapIndexRef.current = route.snapToIndex;
     }
-  }, [index]);
-  const onChange = React.useCallback(newIndex => {
-    const currentIndex = lastIndexRef.current;
-    lastIndexRef.current = newIndex;
+  }, [route.snapToIndex, route.snapToKey]);
+  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.snapTo(newIndex);
-    }
-  }, [navigation]);
-  const onDismiss = React.useCallback(() => {
-    // BottomSheetModal will call onDismiss on unmount, be we do not want that since
-    // we already popped the screen.
-    if (isMounted.current) {
-      navigation.goBack();
+      navigation.dispatch(BottomSheetActions.snapTo(newIndex));
     }
   }, [navigation]);
-  return /*#__PURE__*/React.createElement(BottomSheetModal, _extends({
+  return /*#__PURE__*/React.createElement(BottomSheet, _extends({
     ref: ref,
-    onDismiss: onDismiss,
-    onChange: onChange,
-    index: index,
-    backdropComponent: props => /*#__PURE__*/React.createElement(BottomSheetBackdrop, _extends({}, props, {
-      appearsOnIndex: 0,
-      disappearsOnIndex: -1,
-      enableTouchThrough: !!clickThrough,
-      opacity: opacity || 0.45
-    }))
+    onChange: handleChange
   }, props), children);
 }
-const DEFAULT_SNAP_POINTS = ["66%"];
 export function BottomSheetView({
   state,
+  navigation,
   descriptors
 }) {
   const {
     colors
   } = useTheme();
   const {
-    top
+    bottom,
+    left,
+    right
   } = useSafeAreaInsets();
   const themeBackgroundStyle = React.useMemo(() => ({
+    borderCurve: "continuous",
     backgroundColor: colors.card
   }), [colors.card]);
   const themeHandleIndicatorStyle = React.useMemo(() => ({
-    backgroundColor: colors.border,
-    height: 5,
-    width: 50
+    borderCurve: "continuous",
+    backgroundColor: colors.border
   }), [colors.border]);
-
-  // IOS modal sheet type of animation
-  const isFullScreen = useSharedValue(0);
-  const colorStyle = useAnimatedStyle(() => ({
-    flex: 1,
-    backgroundColor: interpolateColor(isFullScreen.value, [0, 1], ["transparent", "#000"])
-  }));
-  const animatedStyle = useAnimatedStyle(() => ({
-    flex: 1,
-    transform: [{
-      scaleX: withSpring(interpolate(isFullScreen.value, [0, 1], [1, 0.92]), {
-        damping: 15,
-        stiffness: 100
-      })
-    }, {
-      translateY: withSpring(interpolate(isFullScreen.value, [0, 1], [0, top + 5]), {
-        damping: 15,
-        stiffness: 100
-      })
-    }]
-  }));
-
-  // 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");
-    }
-  }, []);
-
-  // Avoid rendering provider if we only have one screen.
-  const shouldRenderProvider = React.useRef(false);
-  shouldRenderProvider.current = shouldRenderProvider.current || state.routes.length > 1;
-  const firstRoute = state.routes[0];
-  if (!firstRoute) {
-    // no routes at all, probably shouldn't happen, but let's be defensive
-    return null;
-  }
-  const firstDescriptor = descriptors[firstRoute.key];
-  if (!firstDescriptor) {
-    // if we don't have a descriptor for the first route, bail out
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Animated.View, {
-    style: colorStyle
-  }, /*#__PURE__*/React.createElement(Animated.View, {
-    style: animatedStyle
-  }, firstDescriptor.render?.())), shouldRenderProvider.current && /*#__PURE__*/React.createElement(BottomSheetModalProvider, null, state.routes.slice(1).map(route => {
+  const defaultStyle = React.useMemo(() => ({
+    paddingBottom: bottom,
+    paddingLeft: left,
+    paddingRight: right
+  }), [bottom, left, right]);
+  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;
     const {
       options,
-      navigation,
       render
     } = descriptor;
     const {
-      index,
-      snapPoints,
-      handleStyle,
+      index = 0,
+      style,
       backgroundStyle,
       handleIndicatorStyle,
-      enableDynamicSizing,
-      ...sheetProps
+      handleStyle,
+      ...props
     } = options;
-    return /*#__PURE__*/React.createElement(BottomSheetModalScreen, _extends({
-      key: route.key
-      // Make sure index is in range, it could be out if snapToIndex is persisted
-      // and snapPoints is changed.
-      ,
-      index: Math.min(route.snapToIndex ?? index ?? 0, !!snapPoints ? snapPoints.length - 1 : 0),
-      snapPoints: !snapPoints && !enableDynamicSizing ? DEFAULT_SNAP_POINTS : snapPoints,
-      onAnimate: (_, to) => {
-        // @ts-ignore TODO: Fix types
-        isFullScreen.value = ["%100", "100%"].includes(snapPoints?.[to]) ? 1 : 0;
-      },
-      animationConfigs: {
-        duration: 300,
-        easing: Easing.bezier(0.25, 0.1, 0.25, 1)
-      },
-      topInset: top + 18,
+    return /*#__PURE__*/React.createElement(BottomSheetScreen, _extends({
+      key: route.key,
+      id: route.key,
+      route: route,
+      index: index,
       navigation: navigation,
-      enableDynamicSizing: enableDynamicSizing,
+      style: [defaultStyle, style],
       backgroundStyle: [themeBackgroundStyle, backgroundStyle],
       handleIndicatorStyle: [themeHandleIndicatorStyle, handleIndicatorStyle],
       handleStyle: [themeBackgroundStyle, {
-        borderRadius: 20
-      }, handleStyle]
-    }, sheetProps), render?.());
-  })));
+        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