Fix plumbing of future prop

remix-run · Dec 5, 2023 · 558d793 · 558d793
1 parent 1c6f3b3
commit 558d793
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/.changeset/empty-ligers-walk.md b/.changeset/empty-ligers-walk.md
@@ -0,0 +1,6 @@
+---
+"react-router-dom": patch
+"react-router": patch
+---
+
+[REMOVE] Fix plumbing of future flags
diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx
@@ -667,9 +667,6 @@ export function RouterProvider({
       navigator,
       static: false,
       basename,
-      future: {
-        v7_relativeSplatPath: router.future.v7_relativeSplatPath,
-      },
     }),
     [router, navigator, basename]
   );
@@ -691,6 +688,9 @@ export function RouterProvider({
                 location={state.location}
                 navigationType={state.historyAction}
                 navigator={navigator}
+                future={{
+                  v7_relativeSplatPath: router.future.v7_relativeSplatPath,
+                }}
               >
                 {state.initialized ? (
                   <DataRoutes

diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
@@ -149,9 +149,6 @@ export function RouterProvider({
       navigator,
       static: false,
       basename,
-      future: {
-        v7_relativeSplatPath: router.future.v7_relativeSplatPath,
-      },
     }),
     [router, navigator, basename]
   );
@@ -171,6 +168,9 @@ export function RouterProvider({
             location={state.location}
             navigationType={state.historyAction}
             navigator={navigator}
+            future={{
+              v7_relativeSplatPath: router.future.v7_relativeSplatPath,
+            }}
           >
             {state.initialized ? (
               <DataRoutes
@@ -396,9 +396,7 @@ export interface RouterProps {
   navigationType?: NavigationType;
   navigator: Navigator;
   static?: boolean;
-  future?: {
-    v7_relativeSplatPath?: boolean;
-  };
+  future?: Partial<Pick<FutureConfig, "v7_relativeSplatPath">>;
 }
 
 /**

diff --git a/packages/react-router/lib/context.ts b/packages/react-router/lib/context.ts
@@ -70,7 +70,10 @@ export interface RouteMatch<
 
 export interface DataRouteMatch extends RouteMatch<string, DataRouteObject> {}
 
-export interface DataRouterContextObject extends NavigationContextObject {
+export interface DataRouterContextObject
+  // Omit `future` since those can be pulled from the `router`
+  // `NavigationContext` needs future since it doesn't have a `router` in all cases
+  extends Omit<NavigationContextObject, "future"> {
   router: Router;
   staticContext?: StaticHandlerContext;
 }