@colisweb/rescript-toolkit 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",

package/src/router/Toolkit__Router.res

@@ -5,16 +5,21 @@ module type RouterConfig = {
 }
 
 module Make = (Config: RouterConfig) => {
+  type contextState = {
+    currentRoute: Config.t,
+    previousRoute: option<Config.t>,
+  }
   let navigate = (route: Config.t) => RescriptReactRouter.push(route->Config.toString)
 
   let replace = (route: Config.t) => RescriptReactRouter.replace(route->Config.toString)
 
-  let routerContext = React.createContext(
-    RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make,
-  )
+  let routerContext = React.createContext({
+    currentRoute: RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make,
+    previousRoute: None,
+  })
 
   module RouterContextProvider = {
-    let makeProps = (~value: Config.t, ~children, ()) =>
+    let makeProps = (~value: contextState, ~children, ()) =>
       {
         "value": value,
         "children": children,
@@ -30,6 +35,8 @@ module Make = (Config: RouterConfig) => {
         RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make
       )
 
+      let previousRoute = Toolkit__Hooks.usePrevious(currentRoute)
+
       React.useLayoutEffect1(() => {
         let watcherID = RescriptReactRouter.watchUrl(url =>
           setCurrentRoute(_ => url |> Config.make)
@@ -37,7 +44,14 @@ module Make = (Config: RouterConfig) => {
         Some(() => RescriptReactRouter.unwatchUrl(watcherID))
       }, [setCurrentRoute])
 
-      <RouterContextProvider value=currentRoute> {children(~currentRoute)} </RouterContextProvider>
+      let contextValue: contextState = {
+        previousRoute: previousRoute,
+        currentRoute: currentRoute,
+      }
+
+      <RouterContextProvider value={contextValue}>
+        {children(~currentRoute)}
+      </RouterContextProvider>
     }
   }
 
@@ -47,7 +61,7 @@ module Make = (Config: RouterConfig) => {
     routeA->Config.toString === routeB->Config.toString
 
   let useIsCurrentRoute = (route: Config.t): bool => {
-    let currentRoute = React.useContext(routerContext)
+    let {currentRoute} = React.useContext(routerContext)
     isRouteEqual(currentRoute, route)
   }