@lodev09/react-native-true-sheet 4.0.0-beta.1 → 4.0.0-beta.2

package/src/TrueSheet.tsx

@@ -553,16 +553,19 @@ export class TrueSheet
         onWillBlur={this.onWillBlur}
         onDidBlur={this.onDidBlur}
         onVisibilityChange={this.onVisibilityChange}
+        // These must stay on this host view, not on the container. The container is
+        // reparented into the native sheet, so this view is never a native ancestor of
+        // the sheet content. Claiming the responder here stops the negotiation at the
+        // sheet boundary without making an ancestor of the content the JS responder,
+        // which would block scrolling inside the sheet.
+        onStartShouldSetResponder={absorbUnclaimedTouches}
+        onTouchStart={stopTouchPropagation}
+        onTouchMove={stopTouchPropagation}
+        onTouchEnd={stopTouchPropagation}
+        onTouchCancel={stopTouchPropagation}
       >
         {this.state.shouldRenderNativeView && (
-          <TrueSheetContainerViewNativeComponent
-            style={styles.container}
-            onStartShouldSetResponder={absorbUnclaimedTouches}
-            onTouchStart={stopTouchPropagation}
-            onTouchMove={stopTouchPropagation}
-            onTouchEnd={stopTouchPropagation}
-            onTouchCancel={stopTouchPropagation}
-          >
+          <TrueSheetContainerViewNativeComponent style={styles.container}>
             {header && (
               <TrueSheetHeaderViewNativeComponent
                 style={[

package/src/TrueSheet.web.tsx

@@ -10,7 +10,7 @@ import {
   useRef,
   useState,
 } from 'react';
-import type { LayoutChangeEvent, ViewStyle } from 'react-native';
+import type { DimensionValue, LayoutChangeEvent } from 'react-native';
 import { StyleSheet, useColorScheme, useWindowDimensions, View } from 'react-native';
 
 import type {
@@ -51,6 +51,7 @@ import {
   DEFAULT_GRABBER_WIDTH,
   DEFAULT_MAX_WIDTH,
 } from './web/constants';
+import { getDOMElement } from './web/dom';
 import { Drawer } from './web/vaul';
 import { DEFAULT_PEEK_HEIGHT, TRANSITIONS } from './web/vaul/constants';
 
@@ -302,8 +303,9 @@ const TrueSheetComponent = forwardRef<TrueSheetMethods, TrueSheetProps>((props,
     return [
       footerStyle,
       {
-        paddingBottom: `calc(${baseCss} + env(safe-area-inset-bottom, 0px))`,
-      } as unknown as ViewStyle,
+        // RN types don't model CSS calc(), but RN-web passes it through
+        paddingBottom: `calc(${baseCss} + env(safe-area-inset-bottom, 0px))` as DimensionValue,
+      },
     ];
   }, [footerOwnsInset, footerStyle]);
 
@@ -327,14 +329,10 @@ const TrueSheetComponent = forwardRef<TrueSheetMethods, TrueSheetProps>((props,
   // scrollable's viewport replaced by its content size) — the height the
   // content wants regardless of the sheet's bounds.
   const measureNaturalHeight = useCallback(() => {
-    const contentEl = contentRef.current as unknown as HTMLElement | null;
+    const contentEl = getDOMElement(contentRef.current);
     if (!contentEl || !contentEl.isConnected) return 0;
-    const headerEl = absoluteHeaderRef.current
-      ? null
-      : (headerElRef.current as unknown as HTMLElement | null);
-    const footerEl = absoluteFooterRef.current
-      ? null
-      : (footerElRef.current as unknown as HTMLElement | null);
+    const headerEl = absoluteHeaderRef.current ? null : getDOMElement(headerElRef.current);
+    const footerEl = absoluteFooterRef.current ? null : getDOMElement(footerElRef.current);
     let height =
       (headerEl?.offsetHeight ?? 0) + (footerEl?.offsetHeight ?? 0) + contentEl.offsetHeight;
     const scroller = pinnedScrollerRef.current;
@@ -377,8 +375,8 @@ const TrueSheetComponent = forwardRef<TrueSheetMethods, TrueSheetProps>((props,
       // observation). Resolves the content node live: the layout-branch swap
       // (natural flow ↔ sized) remounts it.
       const observe = () => {
-        const contentEl = contentRef.current as unknown as HTMLElement | null;
-        const headerEl = headerElRef.current as unknown as HTMLElement | null;
+        const contentEl = getDOMElement(contentRef.current);
+        const headerEl = getDOMElement(headerElRef.current);
 
         // Skip mutations that don't change the observed topology — e.g. a
         // virtualized list mounting rows inside the pinned scroller, which
@@ -549,13 +547,11 @@ const TrueSheetComponent = forwardRef<TrueSheetMethods, TrueSheetProps>((props,
     // measure either: they fire while the portal subtree is still detached.
     // Geometry only runs while the drawer is mounted, so the elements are
     // measurable here; fall back to the state value when they're absent.
-    const headerEl = headerElRef.current as unknown as HTMLElement | null;
+    const headerEl = getDOMElement(headerElRef.current);
     // A relative footer is pushed off-screen at the peek detent — excluded
-    const footerEl = absoluteFooterRef.current
-      ? (footerElRef.current as unknown as HTMLElement | null)
-      : null;
-    const peekEl = peekElRef.current as unknown as HTMLElement | null;
-    const contentEl = contentRef.current as unknown as HTMLElement | null;
+    const footerEl = absoluteFooterRef.current ? getDOMElement(footerElRef.current) : null;
+    const peekEl = getDOMElement(peekElRef.current);
+    const contentEl = getDOMElement(contentRef.current);
     const livePeekContentHeight =
       peekEl && contentEl ? measurePeekContentHeight(peekEl, contentEl) : inputs.peekContentHeight;
     const livePeekHeight =

package/src/TrueSheetPeek.web.tsx

@@ -1,6 +1,8 @@
 import { createContext, type RefObject, useContext, useEffect, useRef } from 'react';
 import { type LayoutChangeEvent, View, type ViewProps } from 'react-native';
 
+import { getDOMElement } from './web/dom';
+
 /**
  * Reports the measured peek content height to the owning TrueSheet.
  * @internal
@@ -44,9 +46,8 @@ export const TrueSheetPeek = ({ onLayout, ...rest }: ViewProps) => {
 
   const handleLayout = (event: LayoutChangeEvent) => {
     if (context) {
-      // On web, View refs resolve to the underlying DOM elements.
-      const peekElement = viewRef.current as unknown as HTMLElement | null;
-      const contentElement = context.contentRef.current as unknown as HTMLElement | null;
+      const peekElement = getDOMElement(viewRef.current);
+      const contentElement = getDOMElement(context.contentRef.current);
 
       const bottom =
         peekElement && contentElement

package/src/mocks/navigation.ts

@@ -12,6 +12,11 @@ export const createTrueSheetNavigator = jest.fn(() => ({
   Group: jest.fn(() => null),
 }));
 
+/**
+ * Mock createTrueSheetScreen for testing the static API.
+ */
+export const createTrueSheetScreen = jest.fn((config: object) => config);
+
 /**
  * Mock TrueSheetActions for testing.
  */
@@ -35,32 +40,34 @@ export const TrueSheetActions = {
 /**
  * Mock useTrueSheetNavigation hook for testing.
  */
-export const useTrueSheetNavigation = jest.fn(
-  <T extends ParamListBase = ParamListBase>() =>
-    ({
-      navigate: jest.fn(),
-      goBack: jest.fn(),
-      reset: jest.fn(),
-      setParams: jest.fn(),
-      dispatch: jest.fn(),
-      isFocused: jest.fn(() => true),
-      canGoBack: jest.fn(() => true),
-      getId: jest.fn(),
-      getParent: jest.fn(),
-      getState: jest.fn(),
-      addListener: jest.fn(() => jest.fn()),
-      removeListener: jest.fn(),
-      setOptions: jest.fn(),
-      push: jest.fn(),
-      pop: jest.fn(),
-      popTo: jest.fn(),
-      popToTop: jest.fn(),
-      replace: jest.fn(),
-      resize: jest.fn(),
-    }) as unknown as TrueSheetNavigationProp<T>
-);
+export const useTrueSheetNavigation = jest.fn(<T extends ParamListBase = ParamListBase>() => {
+  // Partial drops react-navigation's private-brand member (PrivateValueStore),
+  // which no mock can implement — the members themselves stay type-checked.
+  const navigation: Partial<TrueSheetNavigationProp<T>> = {
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+    reset: jest.fn(),
+    setParams: jest.fn(),
+    dispatch: jest.fn(),
+    isFocused: jest.fn(() => true),
+    canGoBack: jest.fn(() => true),
+    getId: jest.fn(),
+    getParent: jest.fn(),
+    getState: jest.fn(),
+    addListener: jest.fn(() => jest.fn()),
+    removeListener: jest.fn(),
+    setOptions: jest.fn(),
+    push: jest.fn(),
+    pop: jest.fn(),
+    popTo: jest.fn(),
+    popToTop: jest.fn(),
+    replace: jest.fn(),
+    resize: jest.fn(),
+  };
+  return navigation as TrueSheetNavigationProp<T>;
+});
 
-export type { TrueSheetActionType } from '../navigation/TrueSheetRouter';
+export type { TrueSheetActionType } from '../navigation/actions';
 export type { DetentInfoEventPayload, PositionChangeEventPayload } from '../TrueSheet.types';
 export type {
   TrueSheetNavigationEventMap,

package/src/mocks/navigationExpoRouter.ts

@@ -0,0 +1,40 @@
+import type { ParamListBase } from '@react-navigation/native';
+
+import type { TrueSheetNavigationProp } from '../navigation/types';
+import {
+  TrueSheetActions,
+  useTrueSheetNavigation as useTrueSheetNavigationMock,
+} from './navigation';
+
+/**
+ * Mock Sheet layout for testing.
+ * Import from '@lodev09/react-native-true-sheet/navigation/expo-router/mock' in your test setup.
+ */
+export const Sheet = Object.assign(
+  jest.fn(({ children }: { children: React.ReactNode }) => children),
+  {
+    Screen: jest.fn(() => null),
+    Protected: jest.fn(() => null),
+  }
+);
+
+/**
+ * Mock useTrueSheetNavigation hook for testing.
+ */
+export const useTrueSheetNavigation = jest.fn(
+  <T extends ParamListBase = ParamListBase>(): TrueSheetNavigationProp<T> =>
+    useTrueSheetNavigationMock() as TrueSheetNavigationProp<T>
+);
+
+export { TrueSheetActions };
+
+export type { TrueSheetActionType } from '../navigation/actions';
+export type { DetentInfoEventPayload, PositionChangeEventPayload } from '../TrueSheet.types';
+export type {
+  TrueSheetNavigationEventMap,
+  TrueSheetNavigationHelpers,
+  TrueSheetNavigationOptions,
+  TrueSheetNavigationProp,
+  TrueSheetNavigationState,
+  TrueSheetScreenProps,
+} from '../navigation/types';

package/src/mocks/reanimated.ts

@@ -14,15 +14,14 @@ interface MockReanimatedTrueSheetContextValue {
   animatedDetent: SharedValue<number>;
 }
 
-const createMockSharedValue = <T>(initialValue: T): SharedValue<T> =>
-  ({
-    value: initialValue,
-    get: () => initialValue,
-    set: () => {},
-    addListener: () => () => {},
-    removeListener: () => {},
-    modify: () => {},
-  }) as unknown as SharedValue<T>;
+const createMockSharedValue = <T>(initialValue: T): SharedValue<T> => ({
+  value: initialValue,
+  get: () => initialValue,
+  set: () => {},
+  addListener: () => {},
+  removeListener: () => {},
+  modify: () => {},
+});
 
 /**
  * Mock ReanimatedTrueSheet component for testing.

package/src/navigation/{TrueSheetView.tsx → TrueSheetNavigatorContent.tsx}

@@ -1,9 +1,9 @@
-import type { ParamListBase } from '@react-navigation/core';
+import type { NavigatorArgs } from 'standard-navigation';
 
 import type {
-  TrueSheetDescriptorMap,
-  TrueSheetNavigationHelpers,
-  TrueSheetNavigationState,
+  TrueSheetNavigationOptions,
+  TrueSheetNavigatorContentExtraProps,
+  TrueSheetStandardEventMap,
 } from './types';
 import { TrueSheetScreen, type TrueSheetScreenProps } from './screen';
 
@@ -22,15 +22,22 @@ const DEFAULT_DETENTS: ('auto' | number)[] = ['auto'];
 const clampDetentIndex = (index: number, detentsLength: number): number =>
   Math.min(index, Math.max(detentsLength - 1, 0));
 
-interface TrueSheetViewProps {
-  state: TrueSheetNavigationState<ParamListBase>;
-  navigation: TrueSheetNavigationHelpers;
-  descriptors: TrueSheetDescriptorMap;
-}
+export type TrueSheetNavigatorContentProps = NavigatorArgs<
+  TrueSheetNavigationOptions,
+  TrueSheetStandardEventMap
+> &
+  TrueSheetNavigatorContentExtraProps;
 
-export const TrueSheetView = ({ state, navigation, descriptors }: TrueSheetViewProps) => {
-  // First route is the base screen, rest are sheets
-  const [baseRoute, ...sheetRoutes] = state.routes;
+export const TrueSheetNavigatorContent = ({
+  routes,
+  dispatch,
+  descriptors,
+  emitter,
+}: TrueSheetNavigatorContentProps) => {
+  // First route is the base screen, rest are sheets.
+  // Rendered from the raw routes (not the standard state) so custom fields are
+  // available and preloaded routes never present as sheets.
+  const [baseRoute, ...sheetRoutes] = routes;
 
   const baseDescriptor = baseRoute ? descriptors[baseRoute.key] : null;
 
@@ -47,7 +54,7 @@ export const TrueSheetView = ({ state, navigation, descriptors }: TrueSheetViewP
           return null;
         }
 
-        const { options, navigation: screenNavigation, render } = descriptor;
+        const { options, render } = descriptor;
         const {
           detentIndex = 0,
           detents = DEFAULT_DETENTS,
@@ -67,8 +74,8 @@ export const TrueSheetView = ({ state, navigation, descriptors }: TrueSheetViewP
               detentIndex={resolvedIndex}
               resizeKey={route.resizeKey}
               detents={detents}
-              navigation={screenNavigation}
-              emit={navigation.emit}
+              dispatch={dispatch}
+              emit={emitter.emit}
               positionChangeHandler={positionChangeHandler}
               {...sheetProps}
             >
@@ -85,8 +92,8 @@ export const TrueSheetView = ({ state, navigation, descriptors }: TrueSheetViewP
             detentIndex={resolvedIndex}
             resizeKey={route.resizeKey}
             detents={detents}
-            navigation={screenNavigation}
-            emit={navigation.emit}
+            dispatch={dispatch}
+            emit={emitter.emit}
             positionChangeHandler={positionChangeHandler}
             {...sheetProps}
           >

package/src/navigation/actions.ts

@@ -0,0 +1,78 @@
+export type TrueSheetActionType =
+  | {
+      type: 'PUSH';
+      payload: { name: string; params?: object };
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'POP';
+      payload: { count: number };
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'POP_TO';
+      payload: { name: string; params?: object; merge?: boolean };
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'POP_TO_TOP';
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'REPLACE';
+      payload: { name: string; params?: object };
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'GO_BACK';
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'RESIZE';
+      index: number;
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'DISMISS';
+      source?: string;
+      target?: string;
+    }
+  | {
+      type: 'REMOVE';
+      source?: string;
+      target?: string;
+    };
+
+/**
+ * Action creators for the TrueSheet navigator.
+ * Plain objects matching `StackActions` shapes, plus sheet-specific actions.
+ */
+export const TrueSheetActions = {
+  push: (name: string, params?: object): TrueSheetActionType => ({
+    type: 'PUSH',
+    payload: { name, params },
+  }),
+  pop: (count: number = 1): TrueSheetActionType => ({
+    type: 'POP',
+    payload: { count },
+  }),
+  popTo: (name: string, params?: object, options?: { merge?: boolean }): TrueSheetActionType => ({
+    type: 'POP_TO',
+    payload: { name, params, merge: options?.merge },
+  }),
+  popToTop: (): TrueSheetActionType => ({ type: 'POP_TO_TOP' }),
+  replace: (name: string, params?: object): TrueSheetActionType => ({
+    type: 'REPLACE',
+    payload: { name, params },
+  }),
+  resize: (index: number): TrueSheetActionType => ({ type: 'RESIZE', index }),
+  dismiss: (): TrueSheetActionType => ({ type: 'DISMISS' }),
+  remove: (): TrueSheetActionType => ({ type: 'REMOVE' }),
+};

package/src/navigation/createTrueSheetRouter.ts

@@ -0,0 +1,222 @@
+import type {
+  NavigationAction,
+  NavigationState,
+  ParamListBase,
+  Router,
+  StackRouterOptions,
+} from '@react-navigation/core';
+
+import { TrueSheetActions, type TrueSheetActionType } from './actions';
+import type { TrueSheetNavigationState } from './types';
+
+export type TrueSheetRouterOptions = StackRouterOptions;
+
+/**
+ * The base `StackRouter` factory to wrap, typed generically over the state and
+ * action types the wrapper threads through — `StackRouter` is structural and
+ * never touches the sheet-specific fields.
+ * Injected by each entry point so the shared router never imports
+ * `@react-navigation/*` at runtime (Expo Router apps don't install it).
+ */
+export type StackRouterFactory = <
+  State extends NavigationState<ParamListBase>,
+  Action extends NavigationAction,
+>(
+  options: TrueSheetRouterOptions
+) => Router<State, Action>;
+
+const uid = () => Math.random().toString(36).slice(2, 10);
+
+const ensureBaseRoute = <T extends { routes: { name: string }[] }>(
+  state: T,
+  baseRouteName: string | undefined,
+  routeParamList: Record<string, object | undefined> | undefined
+): T & { index: number; routes: T['routes'] } => {
+  if (!baseRouteName) {
+    return state as T & { index: number; routes: T['routes'] };
+  }
+
+  const hasBaseRoute = state.routes.some((r) => r.name === baseRouteName);
+
+  if (!hasBaseRoute) {
+    const baseRoute = {
+      key: `${baseRouteName}-${uid()}`,
+      name: baseRouteName,
+      params: routeParamList?.[baseRouteName],
+    };
+
+    return {
+      ...state,
+      index: state.routes.length,
+      routes: [baseRoute, ...state.routes],
+    } as T & { index: number; routes: T['routes'] };
+  }
+
+  return state as T & { index: number; routes: T['routes'] };
+};
+
+export const createTrueSheetRouter =
+  (stackRouter: StackRouterFactory) =>
+  (
+    routerOptions: TrueSheetRouterOptions
+  ): Router<TrueSheetNavigationState<ParamListBase>, TrueSheetActionType> => {
+    const baseRouter = stackRouter<TrueSheetNavigationState<ParamListBase>, TrueSheetActionType>(
+      routerOptions
+    );
+
+    return {
+      ...baseRouter,
+      type: 'true-sheet',
+
+      getInitialState(options) {
+        const state = baseRouter.getInitialState(options);
+        const baseRouteName = routerOptions.initialRouteName ?? options.routeNames[0];
+        const stateWithBaseRoute = ensureBaseRoute(state, baseRouteName, options.routeParamList);
+
+        return {
+          ...stateWithBaseRoute,
+          stale: false,
+          type: 'true-sheet',
+          key: `true-sheet-${uid()}`,
+        };
+      },
+
+      getStateForAction(state, action, options) {
+        switch (action.type) {
+          case 'RESIZE': {
+            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,
+                      resizeIndex: action.index,
+                      resizeKey: (route.resizeKey ?? 0) + 1,
+                    }
+                  : route
+              ),
+            };
+          }
+
+          case 'GO_BACK':
+          case 'DISMISS': {
+            return this.getStateForAction(state, TrueSheetActions.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,
+              index: closingIndex,
+              routes: state.routes.map((route, i) =>
+                i === closingIndex ? { ...route, closing: true } : route
+              ),
+            };
+          }
+
+          case 'POP_TO_TOP': {
+            const popCount = state.routes.length - 1;
+            return this.getStateForAction(state, TrueSheetActions.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, TrueSheetActions.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);
+        }
+      },
+
+      getRehydratedState(partialState, { routeNames, routeParamList, routeGetIdList }) {
+        if (partialState.stale === false) {
+          return partialState;
+        }
+
+        const state = baseRouter.getRehydratedState(partialState, {
+          routeNames,
+          routeParamList,
+          routeGetIdList,
+        });
+
+        const baseRouteName = routerOptions.initialRouteName ?? routeNames[0];
+        const stateWithBaseRoute = ensureBaseRoute(state, baseRouteName, routeParamList);
+
+        return {
+          ...stateWithBaseRoute,
+          type: 'true-sheet',
+          key: `true-sheet-${uid()}`,
+        };
+      },
+
+      actionCreators: TrueSheetActions,
+    };
+  };