@colisweb/rescript-toolkit 2.33.1 → 2.34.0

package/package.json

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

package/src/Toolkit.res

@@ -9,5 +9,6 @@ module Router = Toolkit__Router
 module Ui = Toolkit__Ui
 module Utils = Toolkit__Utils
 module Form = Toolkit__Form
+module FormValidationFunctions = Toolkit__FormValidationFunctions
 module BrowserLogger = Toolkit__BrowserLogger
 module NativeLogger = Toolkit__NativeLogger

package/src/form/{FormValidationFunctions.res → Toolkit__FormValidationFunctions.res}

@@ -19,7 +19,7 @@ module Msg = {
   }
 }
 
-let toReformResult = (opt: option<string>): Reform.fieldState =>
+let toReSchemaResult = (opt: option<string>): ReSchema.fieldState =>
   switch opt {
   | Some(e) => Error(e)
   | None => Valid
@@ -35,7 +35,7 @@ let requiredStringNonEmpty = (intl, value) => {
 let requiredPosInt = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
-  | value if !Toolkit.Utils.Regex.Test.isPositiveInt(value) =>
+  | value if !Toolkit__Utils_Regex.Test.isPositiveInt(value) =>
     Some(Intl.formatMessage(intl, Msg.requiredPosInt))
   | _ => None
   }
@@ -44,7 +44,7 @@ let requiredPosInt = (intl, value) => {
 let optionalPosInt = (intl, value) => {
   switch value {
   | "" => None
-  | value if !Toolkit.Utils.Regex.Test.isPositiveInt(value) =>
+  | value if !Toolkit__Utils_Regex.Test.isPositiveInt(value) =>
     Some(Intl.formatMessage(intl, Msg.requiredPosInt))
   | _ => None
   }
@@ -52,7 +52,7 @@ let optionalPosInt = (intl, value) => {
 let requiredPosFloat = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
-  | value if !Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+  | value if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) =>
     Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
   | _ => None
   }
@@ -62,7 +62,7 @@ let requiredFloat = (intl, value) => {
   switch value->Js.String2.split("-") {
   | _ if value === "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | ["", value]
-  | [value] if Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+  | [value] if Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) =>
     None
   | _ => Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
   }
@@ -72,7 +72,7 @@ let optionalFloat = (intl, value) => {
   switch value->Js.String2.split("-") {
   | _ if value === "" => None
   | ["", value]
-  | [value] if Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+  | [value] if Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) =>
     None
   | _ => Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
   }
@@ -82,7 +82,7 @@ let requiredPosFloatCurrencyEur = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Currency.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Currency.WithUnit.decodeFromString {
     | Ok(#EUR(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 EUR' '0.5 EUR'"}))
@@ -94,7 +94,7 @@ let requiredPosFloatTimeHour = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
     | Ok(#h(_)) => None
     | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 h' '0.5 h'"}))
     }
@@ -105,7 +105,7 @@ let requiredPosFloatTimeMin = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
     | Ok(#min(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 min' '0.5 min'"}))
@@ -117,7 +117,7 @@ let requiredPosFloatTimeHour_Min = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
     | Ok(#h(_)) => None
     | Ok(#min(_)) => None
     | _ =>
@@ -130,7 +130,7 @@ let optionalPosFloatTimeMin = (intl, value) => {
   switch value {
   | "" => None
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
     | Ok(#min(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 min' '0.5 min'"}))
@@ -142,7 +142,7 @@ let requiredPosFloatPriceEurByHour = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.CompositeUnits.CurrencyPerTime.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.CompositeUnits.CurrencyPerTime.WithUnit.decodeFromString {
     | Ok(#EUR_h(_)) => None
     | _ =>
       Some(
@@ -155,7 +155,7 @@ let requiredPosFloatPriceEurByKm = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.CompositeUnits.CurrencyPerDistance.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.CompositeUnits.CurrencyPerDistance.WithUnit.decodeFromString {
     | Ok(#EUR_km(_)) => None
     | _ =>
       Some(
@@ -173,7 +173,7 @@ let requiredPosFloatDistanceKm = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
     | Ok(#km(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 km' '0.5 km'"}))
@@ -184,7 +184,7 @@ let requiredPosFloatDistanceKm_M = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
     | Ok(#km(_)) => None
     | Ok(#m(_)) => None
     | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'15 m' '0.5 km'"}))
@@ -196,7 +196,7 @@ let optionalPosFloatDistanceKm = (intl, value) => {
   switch value {
   | "" => None
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
     | Ok(#km(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 km' '0.5 km'"}))
@@ -208,7 +208,7 @@ let requiredPosFloatVolumeM3 = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Volume.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Volume.WithUnit.decodeFromString {
     | Ok(#m3(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": `'10 m³' '0.5 m³'`}))
@@ -220,7 +220,7 @@ let requiredPosFloatDimensionCm = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
     | Ok(#cm(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 cm' '0.5 cm'"}))
@@ -231,7 +231,7 @@ let requiredPosFloatDimensionCm_M = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
     | Ok(#cm(_)) => None
     | Ok(#m(_)) => None
     | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 cm' '0.5 m'"}))
@@ -243,7 +243,7 @@ let requiredPosFloatWeightKg = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
     | Ok(#kg(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))
@@ -254,7 +254,7 @@ let optionalPosFloatWeightKg = (intl, value) => {
   switch value {
   | "" => None
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
     | Ok(#kg(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))
@@ -265,7 +265,7 @@ let requiredPosFloatWeightG = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | v =>
-    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    switch v->Toolkit__Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
     | Ok(#g(_)) => None
     | _ =>
       Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))

package/src/mock/MockOverlay.res

@@ -8,7 +8,7 @@ let make = (~worker: Msw.worker, ~children) => {
     ->Option.mapWithDefault(false, bool_of_string)
   )
 
-  React.useEffect1(() => {
+  React.useLayoutEffect1(() => {
     if mockEnabled {
       worker->Msw.start
       Browser.LocalStorage.setItem(localStorageKey, Js.Nullable.return("true"))

package/src/ui/Toolkit__Ui_Checkbox.res

@@ -22,6 +22,7 @@ let make = (
   ~onChange=?,
   ~name=?,
   ~checked=?,
+  ~defaultChecked=?,
   ~className="",
   ~size: size=#sm,
   ~checkboxClassName="",
@@ -31,6 +32,17 @@ let make = (
   ~hideLabel=false,
 ) => {
   let (isChecked, setChecked) = React.useState(() => checked->Option.getWithDefault(false))
+  let previousChecked = Toolkit__Hooks.usePrevious(isChecked)
+
+  React.useEffect2(() => {
+    switch (previousChecked, checked) {
+    | (Some(previous), Some(checked)) if previous != checked => setChecked(_ => checked)
+    | _ => ()
+    }
+
+    None
+  }, (previousChecked, checked))
+
   <label
     className={cx([
       Styles.label,
@@ -45,6 +57,7 @@ let make = (
     <input
       type_="checkbox"
       value
+      ?defaultChecked
       className="hidden"
       onChange={event => {
         let target = ReactEvent.Form.target(event)

package/src/ui/Toolkit__Ui_Checkbox.resi

@@ -8,6 +8,7 @@ let make: (
   ~onChange: (bool, string) => unit=?,
   ~name: string=?,
   ~checked: bool=?,
+  ~defaultChecked: bool=?,
   ~className: string=?,
   ~size: size=?,
   ~checkboxClassName: string=?,