@colisweb/rescript-toolkit 2.13.5 → 2.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.13.5",
+  "version": "2.15.0",
   "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/ui/Toolkit__Ui_Switch.res

@@ -1,5 +1,11 @@
 type size = [#md | #lg]
-
+type color = [
+  | #info
+  | #success
+  | #primary
+  | #neutral
+  | #danger
+]
 let getBulletSize = size =>
   switch size {
   | #md => "w-5 h-5"
@@ -14,8 +20,8 @@ let getLabelSize = size =>
 
 let getTranslateBySize = size =>
   switch size {
-  | #md => "translate-x-5"
-  | #lg => "translate-x-8"
+  | #md => "translate-x-6"
+  | #lg => "translate-x-9"
   }
 
 @react.component
@@ -33,6 +39,7 @@ let make = (
   ~checkedSwitchClassName="",
   ~disabledSwitchClassName="",
   ~switchRef: option<ReactDOM.domRef>=?,
+  ~color=#primary,
 ) => {
   let (isChecked, setIsChecked) = React.useState(() => checked->Option.getWithDefault(false))
 
@@ -46,9 +53,17 @@ let make = (
     ])}>
     <span
       className={cx([
-        "flex items-center relative rounded-full py-1 cursor-pointer border transition-all",
+        "flex items-center relative rounded-full py-[2px] cursor-pointer border transition-all",
         getLabelSize(size),
-        isChecked ? "bg-info-500" : "bg-gray-300",
+        isChecked
+          ? switch color {
+            | #info => "bg-info-500 border-info-500"
+            | #success => "bg-success-500 border-success-500"
+            | #primary => "bg-primary-700 border-primary-700"
+            | #neutral => "bg-neutral-700 border-neutral-700"
+            | #danger => "bg-danger-500 border-danger-500"
+            }
+          : "bg-gray-300",
         switchClassName,
         isChecked ? checkedSwitchClassName : "",
         disabled->Option.getWithDefault(false) ? disabledSwitchClassName : "",

package/src/ui/Toolkit__Ui_Switch.resi

@@ -1,4 +1,11 @@
 type size = [#md | #lg]
+type color = [
+  | #info
+  | #success
+  | #primary
+  | #neutral
+  | #danger
+]
 
 @react.component
 let make: (
@@ -15,4 +22,5 @@ let make: (
   ~checkedSwitchClassName: string=?,
   ~disabledSwitchClassName: string=?,
   ~switchRef: ReactDOM.domRef=?,
+  ~color: color=?,
 ) => React.element

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/BsDateFns.res

@@ -127,3 +127,22 @@ external isFirstDayOfMonth: Js.Date.t => bool = "isFirstDayOfMonth"
 
 @module("date-fns")
 external getWeekNumber: (Js.Date.t, startOfWeekOptions) => int = "getWeek"
+
+@module("date-fns")
+external getDay: Js.Date.t => int = "getDay"
+
+@module("date-fns")
+external parse: string => Js.Date.t = "parse"
+
+@module("date-fns")
+external nextTuesday: Js.Date.t => Js.Date.t = "nextTuesday"
+@module("date-fns")
+external nextWednesday: Js.Date.t => Js.Date.t = "nextWednesday"
+@module("date-fns")
+external nextThursday: Js.Date.t => Js.Date.t = "nextThursday"
+@module("date-fns")
+external nextFriday: Js.Date.t => Js.Date.t = "nextFriday"
+@module("date-fns")
+external nextSaturday: Js.Date.t => Js.Date.t = "nextSaturday"
+@module("date-fns")
+external nextSunday: Js.Date.t => Js.Date.t = "nextSunday"

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
     />
+  }
 }

package/src/vendors/ReactBigCalendar.res

@@ -0,0 +1,64 @@
+type event<'a> = {
+  title: string,
+  start: Js.Date.t,
+  end: Js.Date.t,
+  resource: Js.t<'a>,
+}
+
+type view = [
+  | #month
+  | #week
+  | #work_week
+  | #day
+  | #agenda
+]
+
+type eventProp<'a> = {
+  resource: Js.t<'a>,
+  start: Js.Date.t,
+  end: Js.Date.t,
+  isSelected: bool,
+  title: string,
+}
+
+type eventClassStyle
+
+@obj
+external makeEventClassStyle: (
+  ~className: string=?,
+  ~style: ReactDOM.Style.t=?,
+  unit,
+) => eventClassStyle = ""
+
+@module("react-big-calendar") @react.component
+external make: (
+  ~localizer: 'a,
+  ~events: array<event<'b>>,
+  ~defaultView: view=?,
+  ~views: array<view>=?,
+  ~culture: string=?,
+  ~timeslots: int=?,
+  ~min: Js.Date.t=?,
+  ~max: Js.Date.t=?,
+  ~step: int=?,
+  ~components: 'z=?,
+  ~eventPropGetter: eventProp<'b> => eventClassStyle,
+  ~messages: Js.t<'message>=?,
+  ~formats: Js.t<'formats>=?,
+  ~onSelectEvent: event<'b> => unit=?,
+  ~onView: view => unit=?,
+  ~onNavigate: Js.Date.t => unit=?,
+) => React.element = "Calendar"
+
+type calendarLocalizer
+
+@module("react-big-calendar")
+external dateFnsLocalizer: 'a => calendarLocalizer = "dateFnsLocalizer"
+
+module Constants = {
+  @module("react-big-calendar/lib/utils/constants") @scope("navigate")
+  external previous: string = "PREVIOUS"
+
+  @module("react-big-calendar/lib/utils/constants") @scope("navigate")
+  external next: string = "NEXT"
+}