check for redirect before throwing not-found

Author: birkskyum

packages/solid-router/src/Match.tsx

@@ -367,31 +367,45 @@ export const Outlet = () => {
     },
   })
 
+  const childMatchStatus = useRouterState({
+    select: (s) => {
+      const matches = s.matches
+      const index = matches.findIndex((d) => d.id === matchId())
+      return matches[index + 1]?.status
+    },
+  })
+
+  // Only show not-found if we're not in a redirected state
+  const shouldShowNotFound = () =>
+    childMatchStatus() !== 'redirected' && parentGlobalNotFound()
+
   return (
-    <>
-      <Solid.Show when={parentGlobalNotFound()}>
-        {renderRouteNotFound(router, route(), undefined)}
-      </Solid.Show>
-      <Solid.Show when={childMatchId()}>
-        {(matchId) => {
-          // const nextMatch = <Match matchId={matchId()} />
-
-          return (
-            <Solid.Show
-              when={matchId() === rootRouteId}
-              fallback={<Match matchId={matchId()} />}
+    <Solid.Show
+      when={!shouldShowNotFound() && childMatchId()}
+      fallback={
+        <Solid.Show when={shouldShowNotFound()}>
+          {renderRouteNotFound(router, route(), undefined)}
+        </Solid.Show>
+      }
+    >
+      {(matchId) => {
+        // const nextMatch = <Match matchId={matchId()} />
+
+        return (
+          <Solid.Show
+            when={matchId() === rootRouteId}
+            fallback={<Match matchId={matchId()} />}
+          >
+            <Solid.Suspense
+              fallback={
+                <Dynamic component={router.options.defaultPendingComponent} />
+              }
             >
-              <Solid.Suspense
-                fallback={
-                  <Dynamic component={router.options.defaultPendingComponent} />
-                }
-              >
-                <Match matchId={matchId()} />
-              </Solid.Suspense>
-            </Solid.Show>
-          )
-        }}
-      </Solid.Show>
-    </>
+              <Match matchId={matchId()} />
+            </Solid.Suspense>
+          </Solid.Show>
+        )
+      }}
+    </Solid.Show>
   )
 }