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

package/src/useBottomSheetControl.ts

@@ -1,18 +1,14 @@
 import React from 'react';
 import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 
-import {
-  useBottomSheetStore,
-  type BottomSheetStatus,
-  type OpenMode,
-} 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;
@@ -38,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>(
@@ -50,14 +44,13 @@ export function useBottomSheetControl<T extends BottomSheetPortalId>(
   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);
 
     storeOpen(
       {
@@ -84,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,
   };
 }

package/src/useBottomSheetManager.tsx

@@ -2,17 +2,17 @@ import React from 'react';
 
 import { useBottomSheetStore, type OpenMode } from './bottomSheet.store';
 import { useMaybeBottomSheetManagerContext } from './BottomSheetManager.provider';
-import { sheetRefs } from './refsMap';
+import { setSheetRef } from './refsMap';
 import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/types';
 import { shallow } from 'zustand/shallow';
 
 export const useBottomSheetManager = () => {
   const bottomSheetManagerContext = useMaybeBottomSheetManagerContext();
 
-  const { storeOpen, startClosing, storeClearAll } = useBottomSheetStore(
+  const { storeOpen, startClosing, storeClearGroup } = useBottomSheetStore(
     (store) => ({
       storeOpen: store.open,
-      storeClearAll: store.clearAll,
+      storeClearGroup: store.clearGroup,
       startClosing: store.startClosing,
     }),
     shallow
@@ -33,10 +33,11 @@ export const useBottomSheetManager = () => {
     const id = options.id || Math.random().toString(36);
     const ref = React.createRef<BottomSheetMethods>();
 
-    sheetRefs[id] = ref;
+    setSheetRef(id, ref);
 
-    // @ts-ignore
-    const contentWithRef = React.cloneElement(content, { ref });
+    const contentWithRef = React.cloneElement(content, {
+      ref,
+    } as { ref: typeof ref });
 
     storeOpen(
       {
@@ -55,13 +56,18 @@ export const useBottomSheetManager = () => {
     startClosing(id);
   };
 
-  const clearAll = () => {
-    storeClearAll();
+  const clear = () => {
+    const groupId = bottomSheetManagerContext?.groupId || 'default';
+    storeClearGroup(groupId);
   };
 
   return {
-    clearAll,
+    open: openBottomSheet,
     close,
+    clear,
+    /** @deprecated Use `open` instead */
     openBottomSheet,
+    /** @deprecated Use `clear` instead */
+    clearAll: clear,
   };
 };

package/src/useBottomSheetState.ts

@@ -8,26 +8,23 @@ import type {
   BottomSheetPortalParams,
 } from './portal.types';
 
-// Marker type to detect when no generic is provided
-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 function useBottomSheetState<
-  T extends BottomSheetPortalId | Unspecified = Unspecified,
->(): UseBottomSheetStateReturn<T> {
+/** Without generic - params typed as unknown */
+export function useBottomSheetContext(): UseBottomSheetContextReturn<unknown>;
+/** With generic - params typed based on portal registry */
+export function useBottomSheetContext<
+  T extends BottomSheetPortalId,
+>(): UseBottomSheetContextReturn<BottomSheetPortalParams<T>>;
+export function useBottomSheetContext<
+  T extends BottomSheetPortalId,
+>(): UseBottomSheetContextReturn<BottomSheetPortalParams<T> | unknown> {
   const context = useMaybeBottomSheetContext();
 
   const bottomSheetState = useBottomSheetStore(
@@ -38,7 +35,7 @@ export function useBottomSheetState<
 
   if (!bottomSheetState) {
     throw new Error(
-      'useBottomSheetState must be used within a BottomSheetProvider'
+      'useBottomSheetContext must be used within a BottomSheet component'
     );
   }
 
@@ -46,8 +43,13 @@ export function useBottomSheetState<
 
   return {
     bottomSheetState,
-    params: bottomSheetState.params as ResolveParams<T>,
+    params: bottomSheetState.params as BottomSheetPortalParams<T>,
     close,
     closeBottomSheet: close,
   };
 }
+
+/**
+ * @deprecated Use `useBottomSheetContext` instead
+ */
+export const useBottomSheetState = useBottomSheetContext;

package/src/useBottomSheetStatus.ts

@@ -0,0 +1,25 @@
+import {
+  useBottomSheetStore,
+  type BottomSheetStatus,
+} from './bottomSheet.store';
+import type { BottomSheetPortalId } from './portal.types';
+
+export interface UseBottomSheetStatusReturn {
+  status: BottomSheetStatus | null;
+  isOpen: boolean;
+}
+
+export function useBottomSheetStatus(
+  id: BottomSheetPortalId
+): UseBottomSheetStatusReturn {
+  const status = useBottomSheetStore(
+    (state) => state.sheetsById[id]?.status ?? null
+  );
+
+  const isOpen = status === 'open' || status === 'opening';
+
+  return {
+    status,
+    isOpen,
+  };
+}