Merge pull request #257 from Dias999/feature/Navigation-initial_route…

…_adjustments feat: adjust initial route to prevent redirect on refresh
conceptadev · Oct 15, 2024 · 5540037 · 5540037
2 parents 6f095ec + 547febc
commit 5540037
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/packages/react-navigation/src/components/Router.tsx b/packages/react-navigation/src/components/Router.tsx
@@ -28,21 +28,19 @@ const Router = ({
     {
       path: '/',
       element: rootElement ? (
-        React.cloneElement(
-          rootElement,
-          {},
-          <>
-            <Outlet />
-            {initialRoute && <Navigate to={initialRoute} replace />}
-          </>,
-        )
+        React.cloneElement(rootElement, {}, <Outlet />)
       ) : (
-        <div>
-          Home test no root
-          <Outlet />
-        </div>
+        <Outlet />
       ),
       children: [
+        ...(initialRoute
+          ? [
+              {
+                path: '/',
+                element: <Navigate to={initialRoute} replace />,
+              },
+            ]
+          : []),
         {
           path: '*',
           element: childRoutes,