@react-navigation/native 6.0.3 → 6.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/native",
   "description": "React Native integration for React Navigation",
-  "version": "6.0.3",
+  "version": "6.0.7",
   "keywords": [
     "react-native",
     "react-navigation",
@@ -37,8 +37,9 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/core": "^6.0.2",
+    "@react-navigation/core": "^6.1.1",
     "escape-string-regexp": "^4.0.0",
+    "fast-deep-equal": "^3.1.3",
     "nanoid": "^3.1.23"
   },
   "devDependencies": {
@@ -47,9 +48,9 @@
     "@types/react-dom": "^17.0.6",
     "@types/react-native": "~0.64.9",
     "del-cli": "^3.0.1",
-    "react": "~16.13.1",
-    "react-dom": "^16.13.1",
-    "react-native": "~0.63.4",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native": "~0.64.3",
     "react-native-builder-bob": "^0.18.1",
     "typescript": "^4.3.2"
   },
@@ -71,5 +72,5 @@
       ]
     ]
   },
-  "gitHead": "38ac69f17ee314f96d3d4bcee02349fa4a02d422"
+  "gitHead": "4c5805867ce946d99ba17f71b4d6086bb8751262"
 }

package/src/ServerContext.tsx

@@ -7,7 +7,8 @@ export type ServerContextType = {
   };
 };
 
-const ServerContext =
-  React.createContext<ServerContextType | undefined>(undefined);
+const ServerContext = React.createContext<ServerContextType | undefined>(
+  undefined
+);
 
 export default ServerContext;

package/src/useLinkProps.tsx

@@ -3,7 +3,10 @@ import {
   NavigationAction,
   NavigationContainerRefContext,
   NavigationHelpersContext,
+  NavigatorScreenParams,
+  ParamListBase,
 } from '@react-navigation/core';
+import type { NavigationState, PartialState } from '@react-navigation/routers';
 import * as React from 'react';
 import { GestureResponderEvent, Platform } from 'react-native';
 
@@ -15,6 +18,35 @@ type Props<ParamList extends ReactNavigation.RootParamList> = {
   action?: NavigationAction;
 };
 
+const getStateFromParams = (
+  params: NavigatorScreenParams<ParamListBase, NavigationState> | undefined
+): PartialState<NavigationState> | NavigationState | undefined => {
+  if (params?.state) {
+    return params.state;
+  }
+
+  if (params?.screen) {
+    return {
+      routes: [
+        {
+          name: params.screen,
+          params: params.params,
+          // @ts-expect-error
+          state: params.screen
+            ? getStateFromParams(
+                params.params as
+                  | NavigatorScreenParams<ParamListBase, NavigationState>
+                  | undefined
+              )
+            : undefined,
+        },
+      ],
+    };
+  }
+
+  return undefined;
+};
+
 /**
  * Hook to get props for an anchor tag so it can work with in page navigation.
  *
@@ -74,7 +106,13 @@ export default function useLinkProps<
       : getPathFromStateHelper(
           {
             routes: [
-              { name: to.screen, params: to.params as unknown as object },
+              {
+                name: to.screen,
+                // @ts-expect-error
+                params: to.params,
+                // @ts-expect-error
+                state: getStateFromParams(to.params),
+              },
             ],
           },
           options?.config

package/src/useLinking.native.tsx

@@ -189,7 +189,12 @@ export default function useLinking(
             // Ignore any errors from deep linking.
             // This could happen in case of malformed links, navigation object not being initialized etc.
             console.warn(
-              `An error occurred when trying to handle the link '${url}': ${e.message}`
+              `An error occurred when trying to handle the link '${url}': ${
+                typeof e === 'object' && e != null && 'message' in e
+                  ? // @ts-expect-error: we're already checking for this
+                    e.message
+                  : e
+              }`
             );
           }
         } else {

package/src/useLinking.tsx

@@ -7,6 +7,7 @@ import {
   NavigationState,
   ParamListBase,
 } from '@react-navigation/core';
+import isEqual from 'fast-deep-equal';
 import { nanoid } from 'nanoid/non-secure';
 import * as React from 'react';
 
@@ -121,20 +122,14 @@ const createMemoryHistory = () => {
     go(n: number) {
       interrupt();
 
-      if (n > 0) {
-        // We shouldn't go forward more than available index
-        n = Math.min(n, items.length - 1);
-      } else if (n < 0) {
-        // We shouldn't go back more than the 0 index
-        // Otherwise we'll exit the page
-        n = index + n < 0 ? -index : n;
-      }
-
       if (n === 0) {
         return;
       }
 
-      index += n;
+      // We shouldn't go back more than the 0 index (otherwise we'll exit the page)
+      // Or forward more than the available index (or the app will crash)
+      index =
+        n < 0 ? Math.max(index - n, 0) : Math.min(index + n, items.length - 1);
 
       // When we call `history.go`, `popstate` will fire when there's history to go back to
       // So we need to somehow handle following cases:
@@ -461,7 +456,12 @@ export default function useLinking(
               // Ignore any errors from deep linking.
               // This could happen in case of malformed links, navigation object not being initialized etc.
               console.warn(
-                `An error occurred when trying to handle the link '${path}': ${e.message}`
+                `An error occurred when trying to handle the link '${path}': ${
+                  typeof e === 'object' && e != null && 'message' in e
+                    ? // @ts-expect-error: we're already checking for this
+                      e.message
+                    : e
+                }`
               );
             }
           } else {
@@ -482,6 +482,34 @@ export default function useLinking(
       return;
     }
 
+    const getPathForRoute = (
+      route: ReturnType<typeof findFocusedRoute>,
+      state: NavigationState
+    ): string => {
+      // If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
+      // This makes sure that we preserve the original URL for wildcard routes
+      if (route?.path) {
+        const stateForPath = getStateFromPathRef.current(
+          route.path,
+          configRef.current
+        );
+
+        if (stateForPath) {
+          const focusedRoute = findFocusedRoute(stateForPath);
+
+          if (
+            focusedRoute &&
+            focusedRoute.name === route.name &&
+            isEqual(focusedRoute.params, route.params)
+          ) {
+            return route.path;
+          }
+        }
+      }
+
+      return getPathFromStateRef.current(state, configRef.current);
+    };
+
     if (ref.current) {
       // We need to record the current metadata on the first render if they aren't set
       // This will allow the initial state to be in the history entry
@@ -489,8 +517,7 @@ export default function useLinking(
 
       if (state) {
         const route = findFocusedRoute(state);
-        const path =
-          route?.path ?? getPathFromStateRef.current(state, configRef.current);
+        const path = getPathForRoute(route, state);
 
         if (previousStateRef.current === undefined) {
           previousStateRef.current = state;
@@ -510,10 +537,14 @@ export default function useLinking(
       const previousState = previousStateRef.current;
       const state = navigation.getRootState();
 
+      // root state may not available, for example when root navigators switch inside the container
+      if (!state) {
+        return;
+      }
+
       const pendingPath = pendingPopStatePathRef.current;
       const route = findFocusedRoute(state);
-      const path =
-        route?.path ?? getPathFromStateRef.current(state, configRef.current);
+      const path = getPathForRoute(route, state);
 
       previousStateRef.current = state;
       pendingPopStatePathRef.current = undefined;