@lodev09/react-native-true-sheet 3.8.0-beta.1 → 3.8.0-beta.3

package/src/navigation/TrueSheetRouter.ts

@@ -116,40 +116,74 @@ export const TrueSheetRouter = (
         }
 
         case 'GO_BACK':
-        case 'POP':
         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;
           }
 
-          // Find the route to dismiss
-          const routeIndex =
-            action.target === state.key && 'source' in action && action.source
-              ? state.routes.findIndex((r) => r.key === action.source)
-              : state.index;
+          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 (routeIndex === 0) {
+          if (actualCount <= 0) {
             return null;
           }
 
-          // Mark the route as closing instead of removing it
+          // 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,
+            index: closingIndex,
             routes: state.routes.map((route, i) =>
-              i === routeIndex
-                ? {
-                    ...route,
-                    closing: true,
-                  }
-                : route
+              i === closingIndex ? { ...route, closing: true } : route
             ),
           };
         }
 
+        case 'POP_TO_TOP': {
+          const popCount = state.routes.length - 1;
+          return this.getStateForAction(state, StackActions.pop(popCount), options);
+        }
+
+        case 'POP_TO': {
+          const targetName =
+            'payload' in action && typeof action.payload?.name === 'string'
+              ? action.payload.name
+              : null;
+
+          if (!targetName) {
+            return null;
+          }
+
+          const targetIndex = state.routes.findIndex((r) => r.name === targetName);
+
+          // Target not found or is the current route
+          if (targetIndex === -1 || targetIndex >= state.index) {
+            return null;
+          }
+
+          const popCount = state.routes.length - 1 - targetIndex;
+          return this.getStateForAction(state, StackActions.pop(popCount), options);
+        }
+
         case 'REMOVE': {
-          // Actually remove the closing route
+          // Actually remove the closing route and all routes above it
           const routeKey = action.source;
           const routeIndex = routeKey
             ? state.routes.findIndex((r) => r.key === routeKey)
@@ -159,7 +193,8 @@ export const TrueSheetRouter = (
             return state;
           }
 
-          const routes = state.routes.filter((_, i) => i !== routeIndex);
+          // Remove the route and all routes above it (they were dismissed together)
+          const routes = state.routes.filter((_, i) => i < routeIndex);
 
           return {
             ...state,

package/src/navigation/screen/useSheetScreenState.ts

@@ -47,14 +47,9 @@ export const useSheetScreenState = (props: UseSheetScreenStateProps) => {
   useEffect(() => {
     if (closing && !isDismissedRef.current) {
       isDismissedRef.current = true;
-      (async () => {
-        await ref.current?.dismiss();
-        navigation.dispatch({ ...TrueSheetActions.remove(), source: routeKey });
-      })();
-    } else if (closing && isDismissedRef.current) {
-      navigation.dispatch({ ...TrueSheetActions.remove(), source: routeKey });
+      ref.current?.dismiss();
     }
-  }, [closing, navigation, routeKey]);
+  }, [closing]);
 
   useEffect(() => {
     if (isFirstRenderRef.current) {
@@ -77,10 +72,9 @@ export const useSheetScreenState = (props: UseSheetScreenStateProps) => {
 
   const onDidDismiss = () => {
     emitEvent('sheetDidDismiss', undefined);
-    if (!isDismissedRef.current) {
-      isDismissedRef.current = true;
-      navigation.goBack();
-    }
+    isDismissedRef.current = true;
+    // Remove route from state (works for both programmatic and user-initiated dismiss)
+    navigation.dispatch({ ...TrueSheetActions.remove(), source: routeKey });
   };
 
   return {

package/src/reanimated/ReanimatedTrueSheet.web.tsx

@@ -1,8 +1,8 @@
 import { forwardRef, useEffect } from 'react';
 import { useWindowDimensions } from 'react-native';
 
-import { TrueSheet } from '../TrueSheet.web';
-import type { TrueSheetProps, TrueSheetRef, PositionChangeEvent } from '../TrueSheet.types';
+import { TrueSheet } from '../TrueSheet';
+import type { TrueSheetProps, PositionChangeEvent } from '../TrueSheet.types';
 import { useReanimatedTrueSheet } from './ReanimatedTrueSheetProvider';
 
 interface ReanimatedTrueSheetProps extends TrueSheetProps {
@@ -25,7 +25,7 @@ interface ReanimatedTrueSheetProps extends TrueSheetProps {
  * import { ReanimatedTrueSheet, ReanimatedTrueSheetProvider } from '@lodev09/react-native-true-sheet/reanimated'
  *
  * function MyScreen() {
- *   const sheetRef = useRef<TrueSheetRef>(null)
+ *   const sheetRef = useRef<TrueSheet>(null)
  *
  *   return (
  *     <ReanimatedTrueSheetProvider>
@@ -43,36 +43,34 @@ interface ReanimatedTrueSheetProps extends TrueSheetProps {
  * }
  * ```
  */
-export const ReanimatedTrueSheet = forwardRef<TrueSheetRef, ReanimatedTrueSheetProps>(
-  (props, ref) => {
-    const { onPositionChange, detents = [0.5, 1], ...rest } = props;
-    const { height: windowHeight } = useWindowDimensions();
+export const ReanimatedTrueSheet = forwardRef<TrueSheet, ReanimatedTrueSheetProps>((props, ref) => {
+  const { onPositionChange, detents = [0.5, 1], ...rest } = props;
+  const { height: windowHeight } = useWindowDimensions();
 
-    const { animatedPosition, animatedIndex, animatedDetent } = useReanimatedTrueSheet();
+  const { animatedPosition, animatedIndex, animatedDetent } = useReanimatedTrueSheet();
 
-    // Reset animated values when component unmounts
-    useEffect(() => {
-      return () => {
-        animatedPosition.value = windowHeight;
-        animatedIndex.value = -1;
-        animatedDetent.value = 0;
-      };
-    }, [windowHeight]);
+  // Reset animated values when component unmounts
+  useEffect(() => {
+    return () => {
+      animatedPosition.value = windowHeight;
+      animatedIndex.value = -1;
+      animatedDetent.value = 0;
+    };
+  }, [windowHeight]);
 
-    const handlePositionChange = (event: PositionChangeEvent) => {
-      const { position, index, detent } = event.nativeEvent;
+  const handlePositionChange = (event: PositionChangeEvent) => {
+    const { position, index, detent } = event.nativeEvent;
 
-      // Sync with provider's shared values
-      animatedPosition.value = position;
-      animatedIndex.value = index;
-      animatedDetent.value = detent;
+    // Sync with provider's shared values
+    animatedPosition.value = position;
+    animatedIndex.value = index;
+    animatedDetent.value = detent;
 
-      // Call user's callback
-      onPositionChange?.(event);
-    };
+    // Call user's callback
+    onPositionChange?.(event);
+  };
 
-    return (
-      <TrueSheet ref={ref} detents={detents} onPositionChange={handlePositionChange} {...rest} />
-    );
-  }
-);
+  return (
+    <TrueSheet ref={ref} detents={detents} onPositionChange={handlePositionChange} {...rest} />
+  );
+});

package/src/specs/NativeTrueSheetModule.ts

@@ -20,7 +20,7 @@ interface Spec extends TurboModule {
   presentByRef(viewTag: number, index: number, animated: boolean): Promise<void>;
 
   /**
-   * Dismiss a sheet by reference
+   * Dismiss a sheet and all sheets presented on top of it
    * @param viewTag - Native view tag of the sheet component
    * @param animated - Whether to animate the dismissal
    * @returns Promise that resolves when sheet is fully dismissed
@@ -28,6 +28,15 @@ interface Spec extends TurboModule {
    */
   dismissByRef(viewTag: number, animated: boolean): Promise<void>;
 
+  /**
+   * Dismiss only the sheets presented on top of this sheet, keeping this sheet presented
+   * @param viewTag - Native view tag of the sheet component
+   * @param animated - Whether to animate the dismissal
+   * @returns Promise that resolves when all child sheets are fully dismissed
+   * @throws DISMISS_FAILED if dismissal fails
+   */
+  dismissStackByRef(viewTag: number, animated: boolean): Promise<void>;
+
   /**
    * Resize a sheet to a different index by reference
    * @param viewTag - Native view tag of the sheet component