@colisweb/rescript-toolkit 2.46.0 → 2.46.4

package/.gitlab-ci.yml

@@ -35,6 +35,7 @@ publish rescript-toolkit:
   script:
     - export NPM_TOKEN=${NPM_TOKEN:-undefined}
     - npm --no-git-tag-version version $(echo $CI_COMMIT_TAG | sed -e 's/^v//')
+    - yarn
     - npm publish
   cache:
     key: "yarn-$CI_COMMIT_REF_SLUG"

package/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn intl:extract && yarn intl:check

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.46.0",
+  "version": "2.46.4",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",
@@ -11,7 +11,8 @@
     "storybook": "STORYBOOK=true start-storybook -p 6006 --no-manager-cache",
     "build-storybook": "TAILWIND_MODE=build STORYBOOK=true build-storybook",
     "intl:check": "node src/intl/check.js",
-    "intl:extract": "node src/intl/extract.js"
+    "intl:extract": "node src/intl/extract.js",
+    "prepare": "is-ci || husky install"
   },
   "keywords": [
     "ReScript",
@@ -41,6 +42,7 @@
     "@reach/tooltip": "0.17.0",
     "@reach/visually-hidden": "0.17.0",
     "@rescript/react": "0.10.3",
+    "@tailwindcss/line-clamp": "0.4.0",
     "autoprefixer": "10.4.7",
     "axios": "0.24.0",
     "bs-axios": "0.0.43",
@@ -91,6 +93,8 @@
     "@storybook/theming": "6.1.21",
     "babel-loader": "8.2.5",
     "highlight.js": "11.3.1",
+    "husky": "8.0.0",
+    "is-ci": "3.0.1",
     "raw-loader": "4.0.2",
     "react-is": "17.0.2",
     "sass": "1.45.0"

package/src/decoders/Toolkit__Decoders.res

@@ -228,11 +228,15 @@ module UnitMeasure = {
       | Some([_match, None, _unit]) => Decco.error(`${errorPrefix} unhandled no value`, jsonString)
       | Some([Some(_match), Some(value), Some(unit)]) => {
           let value = value->Js.Float.fromString
-          switch unit->Js.Json.string->Config.unitEnum_decode {
+          switch unit
+          ->Js.String2.replaceByRe(%re("/\s/"), "")
+          ->Js.Json.string
+          ->Config.unitEnum_decode {
           | Ok(unit) => Config.wrapValue(unit, value)->Ok
           | Error(_) => Decco.error(`${errorPrefix} unhandled unit '${unit}'`, jsonString)
           }
         }
+
       | Some(_) => Decco.error(`${errorPrefix} regex capture group error`, jsonString)
       }
     }

package/src/tailwind/tailwind.config.js

@@ -11,7 +11,8 @@ module.exports = {
       },
       boxShadow: {
         sidenav: "inset 0 0 1px 2px rgba(0, 0, 0, 0.2)",
-        sm: "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
+        sm:
+          "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
       },
       borderColor: {
         currentColor: "currentColor",
@@ -149,6 +150,7 @@ module.exports = {
       },
     },
   },
+  plugins: [require("@tailwindcss/line-clamp")],
   content: [
     "public/index.html",
     "lib/es6_global/src/**/**.js",

package/src/ui/Toolkit__Ui_Dropdown.res

@@ -18,18 +18,20 @@ let make = (
   ~buttonVariant: Toolkit__Ui_Button.variant=#default,
   ~position=#bottom,
 ) => {
-  let ref = React.useRef(Js.Nullable.null)
+  let dropDownRef = React.useRef(Js.Nullable.null)
+  let buttonRef = React.useRef(Js.Nullable.null)
   let (position, setPosition) = React.useState(() => position)
   let {isOpen, hide, toggle} = Toolkit__Hooks.useDisclosure(~defaultIsOpen, ())
 
-  Toolkit__Hooks.useOnClickOutside(ref, _ => {
+  Toolkit__Hooks.useOnClickOutside(buttonRef, _ => {
     hide()
   })
+
   let (adjustmentStyle, setAdjustmentStyle) = React.useState(() => None)
 
   React.useEffect2(() => {
     if isOpen {
-      ref.current
+      dropDownRef.current
       ->Js.Nullable.toOption
       ->Option.forEach(dom => {
         let {left, right} = dom->Browser.DomElement.getBoundingClientRect
@@ -52,7 +54,7 @@ let make = (
       setAdjustmentStyle(_ => None)
     }
     None
-  }, (isOpen, ref))
+  }, (isOpen, dropDownRef))
 
   <div className={cx(["relative", containerClassName])}>
     <Toolkit__Ui_Button
@@ -60,11 +62,12 @@ let make = (
       size=buttonSize
       type_="button"
       color=buttonColor
+      buttonRef={ReactDOM.Ref.domRef(buttonRef)}
       onClick={event => {
-        switch ref.current->Js.Nullable.toOption {
+        switch dropDownRef.current->Js.Nullable.toOption {
         | None => toggle()
-        | Some(domRef) => {
-            let isInDropdown = ReactEvent.Mouse.currentTarget(event)["contains"](. domRef)
+        | Some(dropDownRef) => {
+            let isInDropdown = ReactEvent.Mouse.currentTarget(event)["contains"](. dropDownRef)
             if !isInDropdown {
               toggle()
             }
@@ -75,7 +78,7 @@ let make = (
       label
       {isOpen
         ? <div
-            ref={ReactDOM.Ref.domRef(ref)}
+            ref={ReactDOM.Ref.domRef(dropDownRef)}
             className={cx([
               "dropdown",
               "absolute  z-20 bg-white p-2 transform shadow rounded text-base font-normal text-neutral-700 opacity-0",

package/src/ui/Toolkit__Ui_Table.res

@@ -45,6 +45,7 @@ module Core = {
     ~className="",
     ~emptyMessage,
     ~additionalRow: option<(ReactTable.instanceRow<'a>, 'a) => React.element>=?,
+    ~trClassName="",
   ) =>
     <div className={cx([className, "flex flex-auto w-full overflow-x-auto relative"])}>
       <Toolkit__Ui_Spread props={table.getTableProps()}>
@@ -98,7 +99,7 @@ module Core = {
 
                 <React.Fragment key={"tr" ++ index->Int.toString}>
                   <Toolkit__Ui_Spread props={row.getRowProps()}>
-                    <tr className={"block even:bg-gray-200 min-h-[5.5rem]"}>
+                    <tr className={cx([trClassName, "block even:bg-gray-200 min-h-[5.5rem]"])}>
                       {row.cells
                       ->Array.mapWithIndex((index, cell) =>
                         <Toolkit__Ui_Spread

package/src/ui/Toolkit__Ui_Table.resi

@@ -10,6 +10,7 @@ module Core: {
     ~className: string=?,
     ~emptyMessage: string,
     ~additionalRow: (ReactTable.instanceRow<'a>, 'a) => React.element=?,
+    ~trClassName: string=?,
   ) => React.element
 }
 

package/src/utils/Toolkit__Utils_UnitMeasure.res

@@ -24,8 +24,8 @@ module Unit = (Config: UnitConfig) => {
   @decco
   type unitEnum = @decco.codec(codec) Config.unitEnum
 
-  let unitEnumToString = v => v->Config.unitEnumToJs
-  let unitEnumFromString = v => v->Config.unitEnumFromJs
+  let unitEnumToString = Config.unitEnumToJs
+  let unitEnumFromString = Config.unitEnumFromJs
 }
 
 module Weight = {