@colisweb/rescript-toolkit 2.54.0 → 2.54.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.54.0",
+  "version": "2.54.2",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",

package/src/fetcher/Toolkit__Fetcher.res

@@ -10,11 +10,15 @@ module Make = (Config: Config) => {
     ~options: option<Swr.fetcherOptions>=?,
     key: option<Config.Request.argument>,
   ): Toolkit__Hooks.fetcher<Config.Request.response> =>
-    Toolkit__Hooks.useFetcher(~options?, key->Option.map(Config.key), () => {
-      let key = key->Option.getExn
+    Toolkit__Hooks.useFetcher(
+      ~options?,
+      key->Option.map(k => Config.key(k)->Js.Array2.joinWith("--")),
+      () => {
+        let key = key->Option.getExn
 
-      Config.Request.exec(key)->Promise.Js.fromResult
-    })
+        Config.Request.exec(key)->Promise.Js.fromResult
+      },
+    )
 
   let useOptional = (
     ~options: option<Swr.fetcherOptions>=?,

package/src/ui/Toolkit__Ui_PortalDropdown.res

@@ -14,15 +14,18 @@ let make = (
   ~containerClassName="",
   ~defaultIsOpen=false,
   ~onButtonClick=?,
+  ~onClickOutside=?,
   ~buttonColor: Toolkit__Ui_Button.color=#white,
   ~buttonSize: Toolkit__Ui_Button.size=#md,
   ~buttonVariant: Toolkit__Ui_Button.variant=#default,
 ) => {
   let dropDownRef = React.useRef(Js.Nullable.null)
   let buttonRef = React.useRef(Js.Nullable.null)
-  let {isOpen, hide, toggle} = Toolkit__Hooks.useDisclosure(~defaultIsOpen, ())
+  let disclosure = Toolkit__Hooks.useDisclosure(~defaultIsOpen, ())
+  let {isOpen, hide, toggle} = disclosure
 
   Toolkit__Hooks.useOnClickOutside(dropDownRef, _ => {
+    onClickOutside->Option.forEach(fn => fn())
     hide()
   })
 
@@ -93,7 +96,7 @@ let make = (
               dropdownClassName,
             ])}
             style={adjustmentStyle->Option.getWithDefault(ReactDOM.Style.make())}>
-            children
+            {children(disclosure)}
           </div>
         </ReachUi.Portal>
       : React.null}