@colisweb/rescript-toolkit 5.4.0 → 5.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/form/ReSchema.res

@@ -361,6 +361,17 @@ module Make = (Lenses: Lenses) => {
     )
   }
 
+  let rec getIsNestedStateErrored = nestedErrors2 =>
+    nestedErrors2->Array.some(form => {
+      form->Array.some(((_, fieldState)) => {
+        switch fieldState {
+        | Error(_)
+        | NestedErrors(_) => true
+        | NestedErrors2(nextLevel) => getIsNestedStateErrored(nextLevel)
+        | _ => false
+        }
+      })
+    })
   let validate = (~i18n=ReSchemaI18n.default, values: Lenses.state, schema: Validation.schema) => {
     let validationList =
       schema->Belt.Array.map(validator => validateField(~validator, ~values, ~i18n))
@@ -370,24 +381,7 @@ module Make = (Lenses: Lenses) => {
       | Error(_) as e => Some((field, e))
       | NestedErrors(_) as e => Some((field, e))
       | NestedErrors2(nestedErrors2) as e =>
-        {
-          let rec getIsErrored = nestedErrors2 =>
-            nestedErrors2->Array.some(form => {
-              form->Array.some(
-                ((_, fieldState)) => {
-                  switch fieldState {
-                  | Error(_)
-                  | NestedErrors(_) => true
-                  | NestedErrors2(nextLevel) => getIsErrored(nextLevel)
-                  | _ => false
-                  }
-                },
-              )
-            })
-          getIsErrored(nestedErrors2)
-        }
-          ? Some((field, e))
-          : None
+        getIsNestedStateErrored(nestedErrors2) ? Some((field, e)) : None
       | _ => None
       }
     )

package/src/primitives/Toolkit__Primitives.res

@@ -5,13 +5,6 @@ module String = {
   @ocaml.doc(" TODO: remove ")
   let join = joinNonEmty
 
-  let includes = (str1, str2) => {
-    str1
-    ->Js.String2.toLowerCase
-    ->Js.String2.normalizeByForm("NFD")
-    ->Js.String2.includes(str2->Js.String2.toLowerCase->Js.String2.normalizeByForm("NFD"))
-  }
-
   /**
   *Normalize NFD*: replace by re remove split by commponents the accent letters
   and deletes the accent component only, leaving the un-accented letter
@@ -23,8 +16,8 @@ module String = {
     ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
   }
 
-  let includes = (str, search) => {
-    str->normalizeForSearch->Js.String2.includes(search)
+  let normalizedIncludes = (str, search) => {
+    str->normalizeForSearch->Js.String2.includes(search->normalizeForSearch)
   }
 }
 

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -46,12 +46,7 @@ let make = (
   let filterOptionsBySearch = (~options, ~search) => {
     options->Array.keep(({label}) =>
       // 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)
+      search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
     )
   }
 
@@ -99,12 +94,7 @@ let make = (
               onChange={event => {
                 let target = event->ReactEvent.Form.currentTarget
                 // 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"), "")
-                )
+                setSearch(_ => target["value"])
               }}
             />
           </div>
@@ -112,12 +102,7 @@ let make = (
       {options
       ->Array.keep(({label}) =>
         // 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)
+        search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
       )
       ->Array.mapWithIndex((i, item) => {
         let {label, value} = item

package/src/ui/Toolkit__Ui_MultiSelectWithValidation.res

@@ -121,12 +121,7 @@ let make = (
   let filterOptionsBySearch = (~options, ~search) => {
     options->Array.keep(({label}) =>
       // 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)
+      search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
     )
   }
 
@@ -173,7 +168,7 @@ let make = (
               onChange={event => {
                 let target = event->ReactEvent.Form.currentTarget
 
-                setSearch(_ => target["value"]->Toolkit__Primitives.String.normalizeForSearch)
+                setSearch(_ => target["value"])
               }}
             />
           </div>

package/src/ui/Toolkit__Ui_SelectWithValidation.res

@@ -50,8 +50,7 @@ module Options = {
   let make = (~options, ~deferredSearch, ~itemClassName, ~setSelectedOption, ~selectedOption) => {
     options
     ->Array.keep(({label}) =>
-      deferredSearch == "" ||
-        label->Toolkit__Primitives.String.normalizeForSearch->Js.String2.includes(deferredSearch)
+      deferredSearch == "" || Toolkit__Primitives.String.normalizedIncludes(label, deferredSearch)
     )
     ->Array.mapWithIndex((i, item) => {
       let {label, value} = item