fix: use proper state for replace action

example/ios/Podfile.lock

@@ -608,4 +608,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 85b06d0ed137749e786ec852f3aa1ff84759e876
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.14.2

packages/navigation/src/buildWebScreen.tsx

@@ -4,6 +4,7 @@ import {
   Route,
   getStateFromPath,
 } from '@react-navigation/native';
+import { unpackState } from './utils/unpackState';
 
 type Options = Parameters<typeof getStateFromPath>[1];
 
@@ -14,9 +15,6 @@ function getParams(
 ): LinkedParams | undefined {
   const firstRoute = routes?.[0];
   if (firstRoute) {
-    if (firstRoute.state?.routes) {
-      return getParams(firstRoute.state.routes);
-    }
     if (firstRoute.params) {
       return firstRoute.params;
     } else {
@@ -38,10 +36,12 @@ export function getLinkingObject(
     config: linking,
     getStateFromPath(path: string, options?: Options) {
       const state = getStateFromPath(path, options);
-      const params = getParams(state?.routes);
-      if (params) {
-        params.baseURL = baseURL;
-        params.fullPath = path;
+      if (state) {
+        const params = getParams(unpackState(state)?.routes);
+        if (params) {
+          params.baseURL = baseURL;
+          params.fullPath = path;
+        }
       }
       return state;
     },

packages/navigation/src/hooks/useWebviewNavigate.ts

@@ -1,8 +1,8 @@
 import {
   getActionFromState,
   getStateFromPath,
-  NavigationContainerRefContext,
   StackActions,
+  useNavigation,
 } from '@react-navigation/native';
 import * as React from 'react';
 import LinkingContext from '@react-navigation/native/src/LinkingContext';
@@ -13,6 +13,7 @@ import type {
   NavigatorScreenParams,
 } from '@react-navigation/core';
 import type { Action } from 'react-native-turbo';
+import { unpackState } from '../utils/unpackState';
 
 type NavigateAction<State extends NavigationState> = {
   type: 'NAVIGATE';
@@ -46,14 +47,9 @@ function isNavigateAction(
 
 function getAction(
   action: NavigateAction<NavigationState>,
-  actionType: Action | undefined,
-  path: string,
-  isModal: boolean
+  actionType: Action | undefined
 ) {
   if (actionType === 'replace') {
-    if (isModal) {
-      return CommonActions.setParams({ path });
-    }
     return StackActions.replace(action.payload.name, {
       ...action.payload.params,
       __disable_animation: true,
@@ -77,7 +73,7 @@ function getAction(
 export function useWebviewNavigate<
   ParamList extends ReactNavigation.RootParamList
 >() {
-  const navigation = React.useContext(NavigationContainerRefContext);
+  const navigation = useNavigation();
   const linking = React.useContext(LinkingContext);
 
   const linkTo = React.useCallback(
@@ -105,19 +101,15 @@ export function useWebviewNavigate<
         : getStateFromPath(path, options?.config);
 
       if (state) {
-        const action = getActionFromState(state, options?.config);
-
+        const actionState =
+          actionType === 'replace' ? unpackState(state) : state;
+        const action = getActionFromState(actionState, options?.config);
         if (isNavigateAction(action)) {
-          const currentOptions = navigation.getCurrentOptions();
-          const isModal =
-            !!currentOptions &&
-            'presentation' in currentOptions &&
-            currentOptions.presentation === 'modal';
-
-          const actionToDispatch = getAction(action, actionType, path, isModal);
+          const actionToDispatch = getAction(action, actionType);
 
           navigation.dispatch(actionToDispatch);
         } else if (action === undefined) {
+          // @ts-expect-error
           navigation.reset(state);
         }
       } else {

packages/navigation/src/utils/unpackState.ts

@@ -0,0 +1,12 @@
+import { getStateFromPath } from '@react-navigation/core';
+
+type ResultState = NonNullable<ReturnType<typeof getStateFromPath>>;
+
+export function unpackState(state: ResultState) {
+  const nestedState = state?.routes[0]?.state;
+  if (nestedState) {
+    return unpackState(nestedState);
+  } else {
+    return state;
+  }
+}