@colisweb/rescript-toolkit 4.0.0 → 4.1.1

package/package.json

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

package/src/form/Toolkit__Form.res

@@ -45,7 +45,7 @@ module Make = (StateLenses: Config) => {
       (),
     ): api => {
       let intl = useIntl()
-    
+
       use(
         ~initialState,
         ~schema,
@@ -66,7 +66,7 @@ module Make = (StateLenses: Config) => {
         ~validationStrategy,
         (),
       )
-  }
+    }
   }
 
   module CustomValidation = {
@@ -143,6 +143,7 @@ module Make = (StateLenses: Config) => {
       ~errorClassName=?,
       ~optionalMessage: option<React.element>=?,
       ~autoComplete=?,
+      ~allowWhiteSpace=false,
     ) => {
       let (showPassword, setShowPassword) = React.useState(() => false)
       let isPasswordType = type_->Option.mapWithDefault(false, type_ => type_ === "password")
@@ -153,8 +154,6 @@ module Make = (StateLenses: Config) => {
         render={({handleChange, error, value, validate, state}) => {
           let isInvalid = error->Option.isSome
 
-          let onChange = Helpers.handleChange(handleChange)
-
           let onBlur = _ =>
             switch state {
             | Pristine => ()
@@ -195,12 +194,13 @@ module Make = (StateLenses: Config) => {
                   )}
                   ?disabled
                   ?placeholder
+                  allowWhiteSpace
                   ?autoFocus
                   ?step
                   ?min
                   ?max
                   isInvalid
-                  onChange
+                  onChangeText={handleChange}
                   onBlur
                 />
                 {type_->Option.mapWithDefault(React.null, type_ => {

package/src/form/Toolkit__FormValidationFunctions.res

@@ -95,6 +95,16 @@ let requiredPosFloat = (intl, value) => {
   }
 }
 
+let requiredStrictPosFloat = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | value
+    if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) || value->Float.fromString === Some(0.) =>
+    Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
+  | _ => None
+  }
+}
+
 let requiredFloat = (intl, value) => {
   switch value->Js.String2.split("-") {
   | _ if value === "" => Some(Intl.formatMessage(intl, Msg.requiredValue))

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -19,8 +19,8 @@ let make = (
   ~allowFilter=true,
   ~defaultValue: array<item>=[],
   ~onChange: array<item> => unit,
-  ~disabled: bool=?,
-  ~onClose: unit => unit=?,
+  ~disabled: option<bool>=?,
+  ~onClose: option<unit => unit>=?,
   ~displaySelectOnlyOption=false,
 ) => {
   let (selectedOptions, setSelectedOptions) = React.useState(() => defaultValue)
@@ -85,6 +85,7 @@ let make = (
               id="search"
               autoFocus={true}
               placeholder=?{searchPlaceholder}
+              allowWhiteSpace={true}
               onKeyDown={event => {
                 if event->ReactEvent.Keyboard.key === "Enter" && search !== "" {
                   let selectedOptions = filterOptionsBySearch(~options, ~search)

package/src/ui/Toolkit__Ui_TextInput.res

@@ -19,6 +19,8 @@ let make = React.forwardRef((
   ~onBlur: option<ReactEvent.Focus.t => unit>=?,
   ~onKeyDown: option<ReactEvent.Keyboard.t => unit>=?,
   ~onChange: option<ReactEvent.Form.t => unit>=?,
+  ~onChangeText: option<string => unit>=?,
+  ~allowWhiteSpace=false,
   ~isInvalid: option<bool>=?,
   ~className: string="",
   ~style: option<ReactDOM.style>=?,
@@ -48,7 +50,18 @@ let make = React.forwardRef((
     ?step
     ?min
     ?max
-    ?onChange
+    onChange={event => {
+      let value = (event->ReactEvent.Form.target)["value"]
+
+      onChangeText->Option.forEach(fn => {
+        if allowWhiteSpace {
+          fn(value)
+        } else {
+          fn(value->Js.String2.trim)
+        }
+      })
+      onChange->Option.forEach(fn => fn(event))
+    }}
     ?onBlur
     ?onKeyDown
   />