fix hash support on index routes

expo · Mar 4, 2024 · a384a1f · a384a1f
1 parent e0deb8f
commit a384a1f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/packages/expo-router/build/fork/getStateFromPath.d.ts.map b/packages/expo-router/build/fork/getStateFromPath.d.ts.map
diff --git a/packages/expo-router/build/fork/getStateFromPath.js b/packages/expo-router/build/fork/getStateFromPath.js
diff --git a/packages/expo-router/build/fork/getStateFromPath.js.map b/packages/expo-router/build/fork/getStateFromPath.js.map
diff --git a/packages/expo-router/src/__tests__/hashs.test.ios.tsx b/packages/expo-router/src/__tests__/hashs.test.ios.tsx
@@ -114,21 +114,23 @@ it('navigating to the same route with a hash will only rerender the screen', ()
     stale: true,
   });
 
-  act(() => router.navigate('/?#=hash1'));
+  act(() => router.navigate('/?#hash1'));
 
   expect(store.rootStateSnapshot()).toStrictEqual({
     index: 0,
     key: expect.any(String),
+    routeNames: ['index', '_sitemap', '+not-found'],
     routes: [
       {
         name: 'index',
+        key: expect.any(String),
         path: '/',
         params: {
           '#': 'hash1',
         },
       },
     ],
-    stale: true,
+    stale: false,
     type: 'stack',
   });
 });
diff --git a/packages/expo-router/src/fork/getStateFromPath.ts b/packages/expo-router/src/fork/getStateFromPath.ts
@@ -306,6 +306,7 @@ function sortConfigs(a: RouteConfig, b: RouteConfig): number {
 
 function getStateFromEmptyPathWithConfigs(
   path: string,
+  hash: string,
   configs: RouteConfig[],
   initialRoutes: InitialRouteConfig[]
 ): ResultState | undefined {
@@ -353,7 +354,7 @@ function getStateFromEmptyPathWithConfigs(
     };
   });
 
-  return createNestedStateObject(path, undefined, routes, configs, initialRoutes);
+  return createNestedStateObject(path, hash, routes, configs, initialRoutes);
 }
 
 function getStateFromPathWithConfigs(
@@ -373,7 +374,12 @@ function getStateFromPathWithConfigs(
   if (!path.startsWith('/')) cleanPath = cleanPath.slice(1);
 
   if (formattedPaths.nonstandardPathname === '/') {
-    return getStateFromEmptyPathWithConfigs(cleanPath, configs, initialRoutes);
+    return getStateFromEmptyPathWithConfigs(
+      cleanPath,
+      formattedPaths.url.hash.slice(1),
+      configs,
+      initialRoutes
+    );
   }
 
   // We match the whole path against the regex instead of segments