@react-navigation/native 7.0.0-rc.17 → 7.0.0-rc.19

package/src/createStaticNavigation.tsx

@@ -51,19 +51,46 @@ export function createStaticNavigation(tree: StaticNavigation<any, any, any>) {
     { linking, ...rest }: Props,
     ref: React.Ref<NavigationContainerRef<ParamListBase>>
   ) {
-    const screens = React.useMemo(() => {
-      if (tree.config.screens) {
-        return createPathConfigForStaticNavigation(
-          tree,
-          { initialRouteName: linking?.config?.initialRouteName },
-          linking?.enabled === 'auto'
-        );
+    const linkingConfig = React.useMemo(() => {
+      if (!tree.config.screens) return;
+
+      const screens = createPathConfigForStaticNavigation(
+        tree,
+        { initialRouteName: linking?.config?.initialRouteName },
+        linking?.enabled === 'auto'
+      );
+
+      if (!screens) return;
+
+      return {
+        path: linking?.config?.path,
+        initialRouteName: linking?.config?.initialRouteName,
+        screens,
+      };
+    }, [
+      linking?.enabled,
+      linking?.config?.path,
+      linking?.config?.initialRouteName,
+    ]);
+
+    const memoizedLinking = React.useMemo(() => {
+      if (!linking) {
+        return undefined;
       }
 
-      return undefined;
-    }, [linking?.config, linking?.enabled]);
+      const enabled =
+        typeof linking.enabled === 'boolean'
+          ? linking.enabled
+          : linkingConfig?.screens != null;
+
+      return {
+        ...linking,
+        enabled,
+        config: linkingConfig,
+      };
+    }, [linking, linkingConfig]);
 
-    if (linking?.enabled === true && screens == null) {
+    if (linking?.enabled === true && linkingConfig?.screens == null) {
       throw new Error(
         'Linking is enabled but no linking configuration was found for the screens.\n\n' +
           'To solve this:\n' +
@@ -74,22 +101,7 @@ export function createStaticNavigation(tree: StaticNavigation<any, any, any>) {
     }
 
     return (
-      <NavigationContainer
-        {...rest}
-        ref={ref}
-        linking={
-          linking
-            ? {
-                ...linking,
-                enabled:
-                  typeof linking.enabled === 'boolean'
-                    ? linking.enabled
-                    : screens != null,
-                config: screens ? { ...linking.config, screens } : undefined,
-              }
-            : undefined
-        }
-      >
+      <NavigationContainer {...rest} ref={ref} linking={memoizedLinking}>
         <Component />
       </NavigationContainer>
     );

package/src/useLinkProps.tsx

@@ -19,11 +19,11 @@ export type LinkProps<
   | ({
       href?: string;
       action?: NavigationAction;
-    } & (RouteName extends unknown // Similar conditional to navigation.navigate
-      ? undefined extends ParamList[RouteName]
-        ? { screen: RouteName; params?: ParamList[RouteName] }
-        : { screen: RouteName; params: ParamList[RouteName] }
-      : never))
+    } & {
+      [Screen in keyof ParamList]: undefined extends ParamList[Screen]
+        ? { screen: Screen; params?: ParamList[Screen] }
+        : { screen: Screen; params: ParamList[Screen] };
+    }[RouteName])
   | {
       href?: string;
       action: NavigationAction;