@colisweb/rescript-toolkit 2.63.1 → 2.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.63.1",
+  "version": "2.65.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",
@@ -28,19 +28,19 @@
     "@colisweb/react-day-picker": "7.4.16",
     "@colisweb/restorative": "0.5.1",
     "@datadog/browser-rum": "4.26.0",
-    "@reach/accordion": "0.17.0",
-    "@reach/alert-dialog": "0.17.0",
-    "@reach/auto-id": "0.17.0",
-    "@reach/combobox": "0.17.0",
-    "@reach/dialog": "0.17.0",
-    "@reach/disclosure": "0.17.0",
-    "@reach/listbox": "0.17.0",
-    "@reach/menu-button": "0.17.0",
-    "@reach/popover": "0.17.0",
-    "@reach/portal": "0.17.0",
-    "@reach/tabs": "0.17.0",
-    "@reach/tooltip": "0.17.0",
-    "@reach/visually-hidden": "0.17.0",
+    "@reach/accordion": "0.18.0",
+    "@reach/alert-dialog": "0.18.0",
+    "@reach/auto-id": "0.18.0",
+    "@reach/combobox": "0.18.0",
+    "@reach/dialog": "0.18.0",
+    "@reach/disclosure": "0.18.0",
+    "@reach/listbox": "0.18.0",
+    "@reach/menu-button": "0.18.0",
+    "@reach/popover": "0.18.0",
+    "@reach/portal": "0.18.0",
+    "@reach/tabs": "0.18.0",
+    "@reach/tooltip": "0.18.0",
+    "@reach/visually-hidden": "0.18.0",
     "@rescript/react": "0.10.3",
     "@tailwindcss/line-clamp": "0.4.2",
     "autoprefixer": "10.4.13",

package/src/router/Toolkit__Router.res

@@ -86,6 +86,40 @@ module Make = (Config: RouterConfig) => {
 
   let toString = Config.toString
 
+  module Breadcrumb = {
+    type link = {
+      route: Config.t,
+      text: React.element,
+    }
+    type state = {links: option<array<link>>}
+
+    type action =
+      | Reset
+      | Update(array<link>)
+
+    let store = Restorative.createStore({links: None}, (_state, action) =>
+      switch action {
+      | Reset => {links: None}
+      | Update(links) => {links: Some(links)}
+      }
+    )
+
+    let use = (routes: array<link>) => {
+      React.useLayoutEffect0(() => {
+        store.dispatch(Update(routes))
+
+        Some(() => store.dispatch(Reset))
+      })
+    }
+  }
+
+  let usePreviousLinkWithDefault = (defaultRoute, cb) => {
+    let {previousRoute} = React.useContext(routerContext)
+    previousRoute->Option.mapWithDefault(defaultRoute, route => {
+      cb(route) ? route : defaultRoute
+    })
+  }
+
   module Link = {
     @react.component
     let make = (
@@ -185,7 +219,13 @@ module Make = (Config: RouterConfig) => {
 
   module SingleLink = {
     @react.component
-    let make = (~link: link, ~isNavOpen: bool, ~isSubLink=false, ~onLinkClick=() => ()) =>
+    let make = (
+      ~link: link,
+      ~isNavOpen: bool,
+      ~isSubLink=false,
+      ~isActive=false,
+      ~onLinkClick=() => (),
+    ) =>
       switch link {
       | Legacy({icon, label, url}) =>
         <a
@@ -213,7 +253,12 @@ module Make = (Config: RouterConfig) => {
       | App({icon, label, route}) =>
         <Link
           route
-          className={cx([commonClassName, isSubLink ? "ml-3" : "", "sidenav-link"])}
+          className={cx([
+            commonClassName,
+            isSubLink ? "ml-3" : "",
+            "sidenav-link",
+            isActive ? "bg-primary-100/75 text-neutral-700" : "",
+          ])}
           activeClassName="bg-primary-100/75 text-neutral-700"
           onClick={_ => onLinkClick()}>
           <span className="overflow-hidden flex">
@@ -255,6 +300,17 @@ module Make = (Config: RouterConfig) => {
         | App({route}) => isRouteEqual(currentRoute, route)
         }
       })
+      let breadcrumb = Breadcrumb.store.useStore()
+
+      let relativeRoute = breadcrumb.links->Option.mapWithDefault(None, breadcrumbLinks => {
+        links->Array.getBy(link => {
+          switch link {
+          | Legacy(_) => false
+          | App({route}) =>
+            breadcrumbLinks->Array.some(breadcrumbLink => breadcrumbLink.route->isRouteEqual(route))
+          }
+        })
+      })
 
       React.useEffect1(() => {
         if !isNavOpen {
@@ -272,11 +328,7 @@ module Make = (Config: RouterConfig) => {
           className={cx([
             commonClassName,
             "flex items-center w-full sidenav-link",
-            switch (hasActiveSubRoute, isNavOpen) {
-            | (true, true) => "bg-primary-100/50"
-            | (true, false) => "bg-primary-100/75"
-            | (false, _) => ""
-            },
+            hasActiveSubRoute || relativeRoute->Option.isSome ? "bg-primary-100/75" : "",
           ])}>
           <span className={cx(["mr-2 text-neutral-800", isNavOpen ? "pl-2" : "px-2"])}>
             groupInfo.icon
@@ -310,11 +362,21 @@ module Make = (Config: RouterConfig) => {
             isOpen ? "h-auto" : "h-0 overflow-hidden",
           ])}>
           {links
-          ->Array.mapWithIndex((i, link) =>
+          ->Array.mapWithIndex((i, link) => {
+            let isActive = switch (relativeRoute, link) {
+            | (Some(App({route: relativeRoute})), App({route})) =>
+              relativeRoute->isRouteEqual(route)
+            | _ => false
+            }
             <SingleLink
-              key={"sidenav-grouped-" ++ i->Int.toString} link isNavOpen isSubLink=true onLinkClick
+              key={"sidenav-grouped-" ++ i->Int.toString}
+              link
+              isNavOpen
+              isSubLink=true
+              onLinkClick
+              isActive
             />
-          )
+          })
           ->React.array}
         </div>
       </>

package/src/vendors/reach-ui/ReachUi_Portal.res

@@ -1,2 +1,2 @@
 @module("@reach/portal") @react.component
-external make: (~children: React.element) => React.element = "default"
+external make: (~children: React.element) => React.element = "Portal"

package/src/vendors/reach-ui/ReachUi_VisuallyHidden.res

@@ -1,2 +1,2 @@
 @module("@reach/visually-hidden") @react.component
-external make: (~children: React.element) => React.element = "default"
+external make: (~children: React.element) => React.element = "VisuallyHidden"