optimize useMakeLinkWithPreservedPath

zth · Sep 13, 2024 · 2d4f46c · 2d4f46c
1 parent 561844b
commit 2d4f46c
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 124 deletions.
diff --git a/.changeset/silent-geese-check.md b/.changeset/silent-geese-check.md
@@ -0,0 +1,5 @@
+---
+"rescript-relay-router": patch
+---
+
+Optimize useMakeLinkWithPreservedPath
diff --git a/...ent-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecodedExtra_route.res b/...ent-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecodedExtra_route.res
diff --git a/...t-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecoded__Child_route.res b/...t-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecoded__Child_route.res
diff --git a/...s/client-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecoded_route.res b/...s/client-rendering/src/routes/__generated__/Route__Root__Todos__ByStatusDecoded_route.res
diff --git a/examples/client-rendering/src/routes/__generated__/Route__Root__Todos__ByStatus_route.res b/examples/client-rendering/src/routes/__generated__/Route__Root__Todos__ByStatus_route.res
diff --git a/examples/client-rendering/src/routes/__generated__/Route__Root__Todos__Single_route.res b/examples/client-rendering/src/routes/__generated__/Route__Root__Todos__Single_route.res
diff --git a/examples/client-rendering/src/routes/__generated__/Route__Root__Todos_route.res b/examples/client-rendering/src/routes/__generated__/Route__Root__Todos_route.res
diff --git a/examples/express/src/routes/__generated__/Route__Root__Todos__ByStatus_route.res b/examples/express/src/routes/__generated__/Route__Root__Todos__ByStatus_route.res
diff --git a/examples/express/src/routes/__generated__/Route__Root__Todos__Single_route.res b/examples/express/src/routes/__generated__/Route__Root__Todos__Single_route.res
diff --git a/examples/express/src/routes/__generated__/Route__Root__Todos_route.res b/examples/express/src/routes/__generated__/Route__Root__Todos_route.res
diff --git a/packages/rescript-relay-router/cli/RescriptRelayRouterCli__Codegen.res b/packages/rescript-relay-router/cli/RescriptRelayRouterCli__Codegen.res
@@ -151,18 +151,7 @@ let makeLinkFromQueryParams = (`->addToStr
 
     `
 @live
-let useMakeLinkWithPreservedPath = () => {
-  let location = RelayRouter.Utils.useLocation()
-  React.useMemo(() => {
-    (makeNewQueryParams: queryParams => queryParams) => {
-      let newQueryParams = location.search->parseQueryParams->makeNewQueryParams
-      open RelayRouter.Bindings
-      let queryParams = location.search->QueryParams.parse
-      queryParams->applyQueryParams(~newParams=newQueryParams)
-      location.pathname ++ queryParams->QueryParams.toString
-    }
-  }, [location.search])
-}
+let useMakeLinkWithPreservedPath = (): ((queryParams => queryParams) => string) => RelayRouter__Internal.useMakeLinkWithPreservedPath(~parseQueryParams, ~applyQueryParams)
 `->addToStr
   }
 

diff --git a/packages/rescript-relay-router/src/RelayRouter__Internal.res b/packages/rescript-relay-router/src/RelayRouter__Internal.res
@@ -16,9 +16,15 @@ type setQueryParamsFn<'queryParams> = (
   ~shallow: bool=?,
 ) => unit
 
+type parseQueryParamsFn<'queryParams> = string => 'queryParams
+type applyQueryParamsFn<'queryParams> = (
+  RelayRouter__Bindings.QueryParams.t,
+  ~newParams: 'queryParams,
+) => unit
+
 let useSetQueryParams = (
-  ~parseQueryParams: string => 'queryParams,
-  ~applyQueryParams: (RelayRouter__Bindings.QueryParams.t, ~newParams: 'queryParams) => unit,
+  ~parseQueryParams: parseQueryParamsFn<'queryParams>,
+  ~applyQueryParams: applyQueryParamsFn<'queryParams>,
 ): setQueryParamsFn<'queryParams> => {
   let router = RelayRouter__Context.useRouterContext()
 
@@ -75,6 +81,31 @@ let useSetQueryParams = (
   }, (parseQueryParams, applyQueryParams, router))
 }
 
+type makeNewQueryParamsMakerFn<'queryParams> = 'queryParams => 'queryParams
+
+type makeNewQueryParamsFn<'queryParams> = makeNewQueryParamsMakerFn<'queryParams> => string
+
+let useMakeLinkWithPreservedPath = (
+  ~parseQueryParams: parseQueryParamsFn<'queryParams>,
+  ~applyQueryParams: applyQueryParamsFn<'queryParams>,
+): makeNewQueryParamsFn<'queryParams> => {
+  let router = RelayRouter__Context.useRouterContext()
+  React.useMemo3(() => {
+    (makeNewQueryParams: 'queryParams => 'queryParams) => {
+      let location = router.history->RelayRouter__History.getLocation
+      let newQueryParams =
+        location.search
+        ->parseQueryParams
+        ->makeNewQueryParams
+
+      open RelayRouter__Bindings
+      let queryParams = location.search->QueryParams.parse
+      queryParams->applyQueryParams(~newParams=newQueryParams)
+      location.pathname ++ queryParams->QueryParams.toString
+    }
+  }, (router, parseQueryParams, applyQueryParams))
+}
+
 type pathMatch = {params: Js.Dict.t<string>}
 
 @module("./vendor/react-router.js") @return(nullable)

diff --git a/packages/rescript-relay-router/src/RelayRouter__Internal.resi b/packages/rescript-relay-router/src/RelayRouter__Internal.resi
@@ -6,11 +6,26 @@ type setQueryParamsFn<'queryParams> = (
   ~shallow: bool=?,
 ) => unit
 
+type parseQueryParamsFn<'queryParams> = string => 'queryParams
+type applyQueryParamsFn<'queryParams> = (
+  RelayRouter__Bindings.QueryParams.t,
+  ~newParams: 'queryParams,
+) => unit
+
 let useSetQueryParams: (
-  ~parseQueryParams: string => 'queryParams,
-  ~applyQueryParams: (RelayRouter__Bindings.QueryParams.t, ~newParams: 'queryParams) => unit,
+  ~parseQueryParams: parseQueryParamsFn<'queryParams>,
+  ~applyQueryParams: applyQueryParamsFn<'queryParams>,
 ) => setQueryParamsFn<'queryParams>
 
+type makeNewQueryParamsMakerFn<'queryParams> = 'queryParams => 'queryParams
+
+type makeNewQueryParamsFn<'queryParams> = makeNewQueryParamsMakerFn<'queryParams> => string
+
+let useMakeLinkWithPreservedPath: (
+  ~parseQueryParams: parseQueryParamsFn<'queryParams>,
+  ~applyQueryParams: applyQueryParamsFn<'queryParams>,
+) => makeNewQueryParamsFn<'queryParams>
+
 type pathMatch = {params: Js.Dict.t<string>}
 
 @module("./vendor/react-router.js") @return(nullable)