react-native-bottom-sheet-stack 1.4.3 → 1.5.1

package/lib/typescript/src/useBottomSheetManager.d.ts

@@ -1,29 +1,22 @@
 import React from 'react';
 import { type OpenMode } from './bottomSheet.store';
 export declare const useBottomSheetManager: () => {
-    clearAll: () => void;
+    open: (content: React.ReactElement, options?: {
+        id?: string;
+        groupId?: string;
+        mode?: OpenMode;
+        scaleBackground?: boolean;
+    }) => string;
     close: (id: string) => void;
+    clear: () => void;
+    /** @deprecated Use `open` instead */
     openBottomSheet: (content: React.ReactElement, options?: {
         id?: string;
         groupId?: string;
         mode?: OpenMode;
         scaleBackground?: boolean;
     }) => string;
-    pushBottomSheet: (sheet: {
-        groupId: string;
-        id: string;
-        content: React.ReactNode;
-        scaleBackground?: boolean | undefined;
-        usePortal?: boolean | undefined;
-        params?: Record<string, unknown> | undefined;
-    }) => void;
-    replaceBottomSheet: (sheet: {
-        groupId: string;
-        id: string;
-        content: React.ReactNode;
-        scaleBackground?: boolean | undefined;
-        usePortal?: boolean | undefined;
-        params?: Record<string, unknown> | undefined;
-    }) => void;
+    /** @deprecated Use `clear` instead */
+    clearAll: () => void;
 };
 //# sourceMappingURL=useBottomSheetManager.d.ts.map

package/lib/typescript/src/useBottomSheetManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useBottomSheetManager.d.ts","sourceRoot":"","sources":["../../../src/useBottomSheetManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAMzE,eAAO,MAAM,qBAAqB;;gBA0Db,MAAM;+BArCd,KAAK,CAAC,YAAY,YAClB;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;;;;;;;;;;;;;;;;;CA8CJ,CAAC"}
+{"version":3,"file":"useBottomSheetManager.d.ts","sourceRoot":"","sources":["../../../src/useBottomSheetManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAMzE,eAAO,MAAM,qBAAqB;oBAarB,KAAK,CAAC,YAAY,YAClB;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;gBA2BgB,MAAM;;IAavB,qCAAqC;+BA9C5B,KAAK,CAAC,YAAY,YAClB;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IA0CD,sCAAsC;;CAGzC,CAAC"}

package/lib/typescript/src/useBottomSheetState.d.ts

@@ -1,14 +1,18 @@
 import { type BottomSheetState } from './bottomSheet.store';
 import type { BottomSheetPortalId, BottomSheetPortalParams } from './portal.types';
-declare const UNSPECIFIED: unique symbol;
-type Unspecified = typeof UNSPECIFIED;
-type ResolveParams<T> = T extends Unspecified ? unknown : T extends BottomSheetPortalId ? BottomSheetPortalParams<T> : unknown;
-export interface UseBottomSheetStateReturn<T> {
+export interface UseBottomSheetContextReturn<TParams> {
     bottomSheetState: BottomSheetState;
-    params: ResolveParams<T>;
+    params: TParams;
     close: () => void;
+    /** @deprecated Use `close` instead */
     closeBottomSheet: () => void;
 }
-export declare function useBottomSheetState<T extends BottomSheetPortalId | Unspecified = Unspecified>(): UseBottomSheetStateReturn<T>;
-export {};
+/** Without generic - params typed as unknown */
+export declare function useBottomSheetContext(): UseBottomSheetContextReturn<unknown>;
+/** With generic - params typed based on portal registry */
+export declare function useBottomSheetContext<T extends BottomSheetPortalId>(): UseBottomSheetContextReturn<BottomSheetPortalParams<T>>;
+/**
+ * @deprecated Use `useBottomSheetContext` instead
+ */
+export declare const useBottomSheetState: typeof useBottomSheetContext;
 //# sourceMappingURL=useBottomSheetState.d.ts.map

package/lib/typescript/src/useBottomSheetState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useBottomSheetState.d.ts","sourceRoot":"","sources":["../../../src/useBottomSheetState.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AACzC,KAAK,WAAW,GAAG,OAAO,WAAW,CAAC;AAEtC,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,GACzC,OAAO,GACP,CAAC,SAAS,mBAAmB,GAC3B,uBAAuB,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC;AAEd,MAAM,WAAW,yBAAyB,CAAC,CAAC;IAC1C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACzB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,wBAAgB,mBAAmB,CACjC,CAAC,SAAS,mBAAmB,GAAG,WAAW,GAAG,WAAW,KACtD,yBAAyB,CAAC,CAAC,CAAC,CAuBhC"}
+{"version":3,"file":"useBottomSheetState.d.ts","sourceRoot":"","sources":["../../../src/useBottomSheetState.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,2BAA2B,CAAC,OAAO;IAClD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,sCAAsC;IACtC,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,gDAAgD;AAChD,wBAAgB,qBAAqB,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAC9E,2DAA2D;AAC3D,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,mBAAmB,KAC1B,2BAA2B,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;AA4B7D;;GAEG;AACH,eAAO,MAAM,mBAAmB,8BAAwB,CAAC"}

package/lib/typescript/src/useBottomSheetStatus.d.ts

@@ -0,0 +1,8 @@
+import { type BottomSheetStatus } from './bottomSheet.store';
+import type { BottomSheetPortalId } from './portal.types';
+export interface UseBottomSheetStatusReturn {
+    status: BottomSheetStatus | null;
+    isOpen: boolean;
+}
+export declare function useBottomSheetStatus(id: BottomSheetPortalId): UseBottomSheetStatusReturn;
+//# sourceMappingURL=useBottomSheetStatus.d.ts.map

package/lib/typescript/src/useBottomSheetStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useBottomSheetStatus.d.ts","sourceRoot":"","sources":["../../../src/useBottomSheetStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,mBAAmB,GACtB,0BAA0B,CAW5B"}

package/lib/typescript/src/useScaleAnimation.d.ts

@@ -19,7 +19,10 @@ export declare function useScaleDepth(groupId: string, sheetId?: string): number
  * Returns animated style for scale effect based on depth.
  * Uses power scaling: scale^depth for cascading effect.
  */
-export declare function useScaleAnimatedStyle(depth: number, config?: ScaleConfig): {
+export declare function useScaleAnimatedStyle({ groupId, id }: {
+    groupId: string;
+    id?: string;
+}, config?: ScaleConfig): {
     transform: ({
         scale: number;
         translateY?: undefined;

package/lib/typescript/src/useScaleAnimation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useScaleAnimation.d.ts","sourceRoot":"","sources":["../../../src/useScaleAnimation.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AASD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAuCvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;EAiCxE"}
+{"version":3,"file":"useScaleAnimation.d.ts","sourceRoot":"","sources":["../../../src/useScaleAnimation.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AASD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAuCvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EACjD,MAAM,CAAC,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;EAoCrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bottom-sheet-stack",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "description": "Bottom Sheet Stack Manager",
   "source": "./src/index.tsx",
   "main": "lib/commonjs/index.js",

package/src/BottomSheetHost.tsx

@@ -6,16 +6,13 @@ import { PortalHost } from 'react-native-teleport';
 
 import { shallow } from 'zustand/shallow';
 import { cleanupAnimatedIndex } from './animatedRegistry';
-import { BottomSheetBackdrop } from './BottomSheetBackdrop';
+import { cleanupSheetRef } from './refsMap';
 import { BottomSheetContext } from './BottomSheet.context';
 import { useBottomSheetStore } from './bottomSheet.store';
-import { useBottomSheetManagerContext } from './BottomSheetManager.provider';
+import { BottomSheetBackdrop } from './BottomSheetBackdrop';
 import { initBottomSheetCoordinator } from './bottomSheetCoordinator';
-import {
-  useScaleAnimatedStyle,
-  useScaleDepth,
-  type ScaleConfig,
-} from './useScaleAnimation';
+import { useBottomSheetManagerContext } from './BottomSheetManager.provider';
+import { useScaleAnimatedStyle, type ScaleConfig } from './useScaleAnimation';
 
 function PortalHostWrapper({
   id,
@@ -27,7 +24,7 @@ function PortalHostWrapper({
   height: number;
 }) {
   return (
-    <View style={{ flex: 1, width, height }}>
+    <View style={{ flex: 1, width, height }} pointerEvents="box-none">
       <PortalHost name={`bottomsheet-${id}`} style={{ width, height }} />
     </View>
   );
@@ -35,7 +32,7 @@ function PortalHostWrapper({
 
 function BottomSheetHostComp() {
   const queueIds = useQueueIds();
-  const clearAll = useBottomSheetStore((store) => store.clearAll);
+  const clearGroup = useBottomSheetStore((store) => store.clearGroup);
 
   const { groupId, scaleConfig } = useBottomSheetManagerContext();
 
@@ -48,9 +45,9 @@ function BottomSheetHostComp() {
 
   useEffect(() => {
     return () => {
-      clearAll();
+      clearGroup(groupId);
     };
-  }, [clearAll]);
+  }, [clearGroup, groupId]);
 
   return (
     <>
@@ -79,15 +76,16 @@ function QueueItem({
   stackIndex: number;
 }) {
   const sheet = useBottomSheetStore((state) => state.sheetsById[id]);
+  const startClosing = useBottomSheetStore((state) => state.startClosing);
 
   const { width, height } = useSafeAreaFrame();
   const value = { id };
 
-  const scaleDepth = useScaleDepth(groupId, id);
-  const scaleStyle = useScaleAnimatedStyle(scaleDepth, scaleConfig);
+  const scaleStyle = useScaleAnimatedStyle({ groupId, id }, scaleConfig);
 
   useEffect(() => {
     return () => {
+      cleanupSheetRef(id);
       cleanupAnimatedIndex(id);
     };
   }, [id]);
@@ -98,7 +96,7 @@ function QueueItem({
   return (
     <BottomSheetContext.Provider value={value}>
       <View style={[StyleSheet.absoluteFillObject, { zIndex: backdropZIndex }]}>
-        <BottomSheetBackdrop sheetId={id} />
+        <BottomSheetBackdrop sheetId={id} onPress={() => startClosing(id)} />
       </View>
 
       {/* Sheet content - rendered with scaling */}

package/src/BottomSheetManaged.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 
 import { getAnimatedIndex } from './animatedRegistry';
 import { createSheetEventHandlers } from './bottomSheetCoordinator';
-import { useBottomSheetState } from './useBottomSheetState';
+import { useBottomSheetContext } from './useBottomSheetState';
 
 export interface BottomSheetRef extends BottomSheetMethods {}
 
@@ -32,7 +32,7 @@ export const BottomSheetManaged = React.forwardRef<
     },
     ref
   ) => {
-    const { bottomSheetState } = useBottomSheetState();
+    const { bottomSheetState } = useBottomSheetContext();
 
     // Get or create shared animated index for this sheet
     const animatedIndex =

package/src/BottomSheetPortal.tsx

@@ -6,7 +6,7 @@ import { Portal } from 'react-native-teleport';
 import { BottomSheetContext } from './BottomSheet.context';
 import { useBottomSheetStore } from './bottomSheet.store';
 import type { BottomSheetPortalId } from './portal.types';
-import { sheetRefs } from './refsMap';
+import { getSheetRef } from './refsMap';
 
 interface BottomSheetPortalProps {
   id: BottomSheetPortalId;
@@ -22,13 +22,14 @@ export function BottomSheetPortal({ id, children }: BottomSheetPortalProps) {
   }
 
   // Get the ref that was created in useBottomSheetControl.open()
-  const ref = sheetRefs[id];
+  const ref = getSheetRef(id);
 
   // Clone the child element to add the ref
-  // @ts-ignore - same pattern as useBottomSheetManager
-  const childWithRef = React.cloneElement(children, { ref });
+  const childWithRef = React.cloneElement(children, {
+    ref,
+  } as { ref: typeof ref });
 
-  // Wrap with BottomSheetContext so useBottomSheetState() works inside portal content
+  // Wrap with BottomSheetContext so useBottomSheetContext() works inside portal content
   return (
     <Portal hostName={`bottomsheet-${id}`}>
       <BottomSheetContext.Provider value={{ id }}>

package/src/BottomSheetScaleView.tsx

@@ -2,7 +2,7 @@ import { useContext, type PropsWithChildren } from 'react';
 import { StyleSheet } from 'react-native';
 import Animated from 'react-native-reanimated';
 import { BottomSheetManagerContext } from './BottomSheetManager.context';
-import { useScaleAnimatedStyle, useScaleDepth } from './useScaleAnimation';
+import { useScaleAnimatedStyle } from './useScaleAnimation';
 
 /**
  * Wraps your app content with iOS-style scale animation when a bottom sheet
@@ -24,8 +24,7 @@ export function BottomSheetScaleView({ children }: PropsWithChildren) {
   const groupId = context?.groupId ?? 'default';
   const scaleConfig = context?.scaleConfig;
 
-  const scaleDepth = useScaleDepth(groupId);
-  const animatedStyle = useScaleAnimatedStyle(scaleDepth, scaleConfig);
+  const animatedStyle = useScaleAnimatedStyle({ groupId }, scaleConfig);
 
   return (
     <Animated.View style={[styles.container, animatedStyle]}>

package/src/bottomSheet.store.ts

@@ -22,20 +22,13 @@ interface BottomSheetStoreState {
   stackOrder: string[];
 }
 
-export interface PortalOpenOptions<TParams = Record<string, unknown>> {
-  scaleBackground?: boolean;
-  params?: TParams;
-}
-
 interface BottomSheetStoreActions {
-  push(sheet: TriggerState): void;
-  switch(sheet: TriggerState): void;
-  replace(sheet: TriggerState): void;
-  openPortal(id: string, groupId: string, options?: PortalOpenOptions): void;
+  open(sheet: TriggerState, mode?: OpenMode): void;
   markOpen(id: string): void;
   startClosing(id: string): void;
   finishClosing(id: string): void;
   updateParams(id: string, params: Record<string, unknown> | undefined): void;
+  clearGroup(groupId: string): void;
   clearAll(): void;
 }
 
@@ -46,21 +39,7 @@ export const useBottomSheetStore = create(
     sheetsById: {},
     stackOrder: [],
 
-    push: (sheet) =>
-      set((state) => {
-        if (state.sheetsById[sheet.id]) {
-          return state;
-        }
-        return {
-          sheetsById: {
-            ...state.sheetsById,
-            [sheet.id]: { ...sheet, status: 'opening' },
-          },
-          stackOrder: [...state.stackOrder, sheet.id],
-        };
-      }),
-
-    switch: (sheet) =>
+    open: (sheet, mode = 'push') =>
       set((state) => {
         if (state.sheetsById[sheet.id]) {
           return state;
@@ -69,31 +48,14 @@ export const useBottomSheetStore = create(
         const newSheetsById = { ...state.sheetsById };
         const topId = state.stackOrder[state.stackOrder.length - 1];
 
-        if (topId && newSheetsById[topId]) {
+        if (mode === 'switch' && topId && newSheetsById[topId]) {
           newSheetsById[topId] = {
             ...newSheetsById[topId],
             status: 'hidden',
           };
         }
 
-        newSheetsById[sheet.id] = { ...sheet, status: 'opening' };
-
-        return {
-          sheetsById: newSheetsById,
-          stackOrder: [...state.stackOrder, sheet.id],
-        };
-      }),
-
-    replace: (sheet) =>
-      set((state) => {
-        if (state.sheetsById[sheet.id]) {
-          return state;
-        }
-
-        const newSheetsById = { ...state.sheetsById };
-        const topId = state.stackOrder[state.stackOrder.length - 1];
-
-        if (topId && newSheetsById[topId]) {
+        if (mode === 'replace' && topId && newSheetsById[topId]) {
           newSheetsById[topId] = {
             ...newSheetsById[topId],
             status: 'closing',
@@ -108,28 +70,6 @@ export const useBottomSheetStore = create(
         };
       }),
 
-    openPortal: (id, groupId, options) =>
-      set((state) => {
-        if (state.sheetsById[id]) {
-          return state;
-        }
-        return {
-          sheetsById: {
-            ...state.sheetsById,
-            [id]: {
-              id,
-              groupId,
-              content: null,
-              status: 'opening',
-              usePortal: true,
-              scaleBackground: options?.scaleBackground,
-              params: options?.params,
-            },
-          },
-          stackOrder: [...state.stackOrder, id],
-        };
-      }),
-
     markOpen: (id) =>
       set((state) => {
         const sheet = state.sheetsById[id];
@@ -205,6 +145,29 @@ export const useBottomSheetStore = create(
         };
       }),
 
+    clearGroup: (groupId) =>
+      set((state) => {
+        const idsToRemove = new Set(
+          state.stackOrder.filter(
+            (id) => state.sheetsById[id]?.groupId === groupId
+          )
+        );
+
+        if (idsToRemove.size === 0) {
+          return state;
+        }
+
+        const newSheetsById = { ...state.sheetsById };
+        idsToRemove.forEach((id) => {
+          delete newSheetsById[id];
+        });
+
+        return {
+          sheetsById: newSheetsById,
+          stackOrder: state.stackOrder.filter((id) => !idsToRemove.has(id)),
+        };
+      }),
+
     clearAll: () => set(() => ({ sheetsById: {}, stackOrder: [] })),
   }))
 );

package/src/bottomSheetCoordinator.ts

@@ -1,5 +1,5 @@
 import { useBottomSheetStore } from './bottomSheet.store';
-import { sheetRefs } from './refsMap';
+import { getSheetRef } from './refsMap';
 
 export function initBottomSheetCoordinator(groupId: string) {
   return useBottomSheetStore.subscribe(
@@ -15,12 +15,12 @@ export function initBottomSheetCoordinator(groupId: string) {
           return;
         }
 
-        const ref = sheetRefs[id]?.current;
+        const ref = getSheetRef(id)?.current;
 
         switch (status) {
           case 'opening':
             requestAnimationFrame(() => {
-              sheetRefs[id]?.current?.expand();
+              getSheetRef(id)?.current?.expand();
             });
             break;
           case 'hidden':

package/src/index.tsx

@@ -1,12 +1,33 @@
-export { BottomSheetHost } from './BottomSheetHost';
+// Components
 export { BottomSheetManagerProvider } from './BottomSheetManager.provider';
-export { useBottomSheetManager } from './useBottomSheetManager';
-export { useBottomSheetState } from './useBottomSheetState';
-export { BottomSheetManaged } from './BottomSheetManaged';
+export { BottomSheetHost } from './BottomSheetHost';
 export { BottomSheetScaleView } from './BottomSheetScaleView';
-export { type ScaleConfig } from './useScaleAnimation';
+export { BottomSheetManaged, type BottomSheetRef } from './BottomSheetManaged';
 export { BottomSheetPortal } from './BottomSheetPortal';
-export { useBottomSheetControl } from './useBottomSheetControl';
+
+// Hooks
+export { useBottomSheetManager } from './useBottomSheetManager';
+export {
+  useBottomSheetControl,
+  type UseBottomSheetControlReturn,
+} from './useBottomSheetControl';
+export {
+  useBottomSheetContext,
+  useBottomSheetState,
+  type UseBottomSheetContextReturn,
+} from './useBottomSheetState';
+export {
+  useBottomSheetStatus,
+  type UseBottomSheetStatusReturn,
+} from './useBottomSheetStatus';
+
+// Types
+export type { ScaleConfig } from './useScaleAnimation';
+export type {
+  BottomSheetStatus,
+  OpenMode,
+  BottomSheetState,
+} from './bottomSheet.store';
 export type {
   BottomSheetPortalRegistry,
   BottomSheetPortalId,

package/src/refsMap.ts

@@ -1,6 +1,18 @@
 import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
+import type { RefObject } from 'react';
 
-export const sheetRefs: Record<
-  string,
-  React.RefObject<BottomSheetMethods | null>
-> = {};
+type SheetRef = RefObject<BottomSheetMethods | null>;
+
+const sheetRefsMap = new Map<string, SheetRef>();
+
+export function getSheetRef(sheetId: string): SheetRef | undefined {
+  return sheetRefsMap.get(sheetId);
+}
+
+export function setSheetRef(sheetId: string, ref: SheetRef): void {
+  sheetRefsMap.set(sheetId, ref);
+}
+
+export function cleanupSheetRef(sheetId: string): void {
+  sheetRefsMap.delete(sheetId);
+}

package/src/useBottomSheetControl.ts

@@ -1,21 +1,23 @@
 import React from 'react';
 import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 
-import {
-  useBottomSheetStore,
-  type BottomSheetStatus,
-  type PortalOpenOptions,
-} from './bottomSheet.store';
+import { useBottomSheetStore, type OpenMode } from './bottomSheet.store';
 import { useMaybeBottomSheetManagerContext } from './BottomSheetManager.provider';
 import type {
   BottomSheetPortalId,
   BottomSheetPortalParams,
   HasParams,
 } from './portal.types';
-import { sheetRefs } from './refsMap';
+import { setSheetRef } from './refsMap';
+
+interface BaseOpenOptions<TParams> {
+  mode?: OpenMode;
+  scaleBackground?: boolean;
+  params?: TParams;
+}
 
 type OpenOptions<T extends BottomSheetPortalId> = Omit<
-  PortalOpenOptions<BottomSheetPortalParams<T>>,
+  BaseOpenOptions<BottomSheetPortalParams<T>>,
   'params'
 > &
   (HasParams<T> extends true
@@ -32,8 +34,6 @@ export interface UseBottomSheetControlReturn<T extends BottomSheetPortalId> {
   close: () => void;
   updateParams: (params: BottomSheetPortalParams<T>) => void;
   resetParams: () => void;
-  isOpen: boolean;
-  status: BottomSheetStatus | null;
 }
 
 export function useBottomSheetControl<T extends BottomSheetPortalId>(
@@ -41,19 +41,28 @@ export function useBottomSheetControl<T extends BottomSheetPortalId>(
 ): UseBottomSheetControlReturn<T> {
   const bottomSheetManagerContext = useMaybeBottomSheetManagerContext();
 
-  const openPortal = useBottomSheetStore((state) => state.openPortal);
+  const storeOpen = useBottomSheetStore((state) => state.open);
   const startClosing = useBottomSheetStore((state) => state.startClosing);
   const storeUpdateParams = useBottomSheetStore((state) => state.updateParams);
-  const sheetState = useBottomSheetStore((state) => state.sheetsById[id]);
 
   const open = (options?: OpenOptions<T>) => {
     const groupId = bottomSheetManagerContext?.groupId || 'default';
 
     // Create ref when opening (same pattern as useBottomSheetManager)
     const ref = React.createRef<BottomSheetMethods>();
-    sheetRefs[id] = ref;
+    setSheetRef(id, ref);
 
-    openPortal(id, groupId, options);
+    storeOpen(
+      {
+        id,
+        groupId,
+        content: null,
+        usePortal: true,
+        scaleBackground: options?.scaleBackground,
+        params: options?.params as Record<string, unknown>,
+      },
+      options?.mode
+    );
   };
 
   const close = () => {
@@ -68,15 +77,10 @@ export function useBottomSheetControl<T extends BottomSheetPortalId>(
     storeUpdateParams(id, undefined);
   };
 
-  const status = sheetState?.status ?? null;
-  const isOpen = status === 'open' || status === 'opening';
-
   return {
     open: open as OpenFunction<T>,
     close,
     updateParams,
     resetParams,
-    isOpen,
-    status,
   };
 }