@colisweb/rescript-toolkit 2.13.5 → 2.13.6

package/package.json

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

package/src/decoders/Toolkit__Decoders.res

@@ -358,6 +358,143 @@ module UnitMeasure = {
       let convert = Toolkit__Utils_UnitMeasure.Time.makeH
     })
   }
+
+  module Currency = {
+    module WithUnit = {
+      let encoder: Decco.encoder<Toolkit__Utils_UnitMeasure.Currency.t> = value =>
+        switch value {
+        | #EUR(v) => Js.Json.string(v->Js.Float.toString ++ " EUR")
+        }
+
+      let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Currency.t> = json =>
+        switch Decco.stringFromJson(json) {
+        | Ok(v) =>
+          let valueUnitArray = v->Js.String2.split(" ")
+          switch (
+            valueUnitArray[0]->Belt.Option.flatMap(Belt.Float.fromString),
+            valueUnitArray[1],
+          ) {
+          | (Some(v), Some("EUR")) => #EUR(v)->Ok
+          | (None, _) => Decco.error("unhandled no value", json)
+          | (_, None) => Decco.error("unhandled no unit", json)
+          | (_, Some(_)) => Decco.error("unhandled currency unit", json)
+          }
+
+        | Error(_) as err => err
+        }
+
+      let codec: Decco.codec<Toolkit__Utils_UnitMeasure.Currency.t> = (encoder, decoder)
+
+      @decco
+      type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.Currency.t
+    }
+
+    module type CurrencyConfig = {
+      let convert: float => Toolkit__Utils_UnitMeasure.Currency.t
+    }
+
+    module Make = (C: CurrencyConfig) => {
+      type currency = Toolkit__Utils_UnitMeasure.Currency.t
+
+      let encoder: Decco.encoder<Toolkit__Utils_UnitMeasure.Currency.t> = value =>
+        switch value {
+        | #EUR(v) => Js.Json.string(v->Js.Float.toString ++ " EUR")
+        }
+
+      let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Currency.t> = json =>
+        switch Decco.floatFromJson(json) {
+        | Ok(v) => v->C.convert->Ok
+        | Error(_) as err => err
+        }
+
+      let codec: Decco.codec<currency> = (encoder, decoder)
+
+      let toValue = Toolkit__Utils_UnitMeasure.Currency.toValue
+      let display = Toolkit__Utils_UnitMeasure.Currency.toString
+
+      @decco
+      type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.Currency.t
+    }
+
+    module EUR = Make({
+      let convert = Toolkit__Utils_UnitMeasure.Currency.makeEUR
+    })
+  }
+
+  module CompositeUnits = {
+    module CurrencyPerDistance = {
+      module WithUnit = {
+        let encoder: Decco.encoder<
+          Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t,
+        > = value =>
+          switch value {
+          | #EUR_km(v) => Js.Json.string(v->Js.Float.toString ++ " EUR/km")
+          }
+
+        let decoder: Decco.decoder<
+          Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t,
+        > = json =>
+          switch Decco.stringFromJson(json) {
+          | Ok(v) =>
+            let valueUnitArray = v->Js.String2.split(" ")
+            switch (
+              valueUnitArray[0]->Belt.Option.flatMap(Belt.Float.fromString),
+              valueUnitArray[1],
+            ) {
+            | (Some(v), Some("EUR/km")) => #EUR_km(v)->Ok
+            | (None, _) => Decco.error("unhandled no value", json)
+            | (_, None) => Decco.error("unhandled no unit", json)
+            | (_, Some(_)) => Decco.error("unhandled currencyPerDistance unit", json)
+            }
+
+          | Error(_) as err => err
+          }
+
+        let codec: Decco.codec<Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t> = (
+          encoder,
+          decoder,
+        )
+
+        @decco
+        type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t
+      }
+
+      module type CurrencyPerDistanceConfig = {
+        let convert: float => Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t
+      }
+
+      module Make = (C: CurrencyPerDistanceConfig) => {
+        type currencyPerDistance = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t
+
+        let encoder: Decco.encoder<
+          Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t,
+        > = value =>
+          switch value {
+          | #EUR_km(v) => Js.Json.string(v->Js.Float.toString ++ " EUR/km")
+          }
+
+        let decoder: Decco.decoder<
+          Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t,
+        > = json =>
+          switch Decco.floatFromJson(json) {
+          | Ok(v) => v->C.convert->Ok
+          | Error(_) as err => err
+          }
+
+        let codec: Decco.codec<currencyPerDistance> = (encoder, decoder)
+
+        let toValue = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.toValue
+        let display = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.toString
+
+        @decco
+        type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.t
+      }
+
+      module EUR_km = Make({
+        let convert = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance.makeEUR_km
+      })
+    }
+  }
 }
 
 // StringArray

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -64,21 +64,32 @@ let make = (
               placeholder=?{searchPlaceholder}
               onChange={event => {
                 let target = event->ReactEvent.Form.currentTarget
-
-                setSearch(_ => target["value"]->Js.String2.toLowerCase)
+                // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
+                setSearch(_ =>
+                  target["value"]
+                  ->Js.String2.toLowerCase
+                  ->Js.String2.normalizeByForm("NFD")
+                  ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
+                )
               }}
             />
           </div>
         : React.null}
       {options
       ->Array.keep(({label}) =>
-        search == "" || label->Js.String2.toLowerCase->Js.String2.includes(search)
+        // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
+        search == "" ||
+          label
+          ->Js.String2.toLowerCase
+          ->Js.String2.normalizeByForm("NFD")
+          ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
+          ->Js.String2.includes(search)
       )
       ->Array.map(item => {
         let {itemLabel, label, value} = item
 
         <div
-          key={label}
+          key={`multiselectoption-${label}-${value}`}
           className={cx(["flex flex-row items-center gap-2 mt-3 pt-3 text-left", itemClassName])}>
           <Toolkit__Ui_Checkbox
             value

package/src/utils/Toolkit__Utils_UnitMeasure.res

@@ -103,3 +103,43 @@ module Dimension = {
   let makeM = (value: float) => #m(value)
   let makeKm = (value: float) => #km(value)
 }
+
+module Currency = {
+  type t = [
+    | #EUR(float)
+  ]
+
+  let toValue = value =>
+    switch value {
+    | #EUR(v) => v
+    }
+
+  let toString = value => {
+    switch value {
+    | #EUR(v) => v->Float.toString ++ " EUR"
+    }
+  }
+
+  let makeEUR = (value: float) => #EUR(value)
+}
+
+module CompositeUnits = {
+  module CurrencyPerDistance = {
+    type t = [
+      | #EUR_km(float)
+    ]
+
+    let toValue = value =>
+      switch value {
+      | #EUR_km(v) => v
+      }
+
+    let toString = value => {
+      switch value {
+      | #EUR_km(v) => v->Float.toString ++ " EUR/km"
+      }
+    }
+
+    let makeEUR_km = (value: float) => #EUR_km(value)
+  }
+}

package/src/vendors/BsReactSelect.res

@@ -148,7 +148,7 @@ module ReactSelectMultipleCreateInput = {
       ~isLoading: option<bool>=?,
       ~className: option<string>=?,
       ~id: option<string>=?,
-    ) => React.element = "CreatableSelect"
+    ) => React.element = "default"
   }
 
   @react.component
@@ -163,7 +163,7 @@ module ReactSelectMultipleCreateInput = {
     ~isLoading=false,
     ~className: option<string>=?,
     ~id: option<string>=?,
-  ) =>
+  ) => {
     <ReactSelect
       components={"DropDownIndicator": React.null}
       isMulti=true
@@ -194,4 +194,5 @@ module ReactSelectMultipleCreateInput = {
       ?className
       ?id
     />
+  }
 }