@colisweb/rescript-toolkit 5.20.4 → 5.21.1

package/package.json

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

package/src/form/ReSchema.res

@@ -26,7 +26,7 @@ module Make = (Lenses: Lenses) => {
 
   module Validation = {
     type rec t =
-      | Email({field: Lenses.field<string>, error: option<string>}): t
+      | Email({field: Lenses.field<string>, isOptional: bool, error: option<string>}): t
       | Phone({field: Lenses.field<string>, error: option<string>}): t
       | Password({
           field: Lenses.field<string>,
@@ -91,7 +91,7 @@ module Make = (Lenses: Lenses) => {
 
     let false_ = (~error=?, field) => [False({field, error})]
 
-    let email = (~error=?, field) => [Email({field, error})]
+    let email = (~error=?, ~isOptional=false, field) => [Email({field, isOptional, error})]
     let phone = (~error=?, field) => [Phone({field, error})]
     let password = (~error=?, ~login=?, field) => [Password({field, ?login, error})]
     let optionalPassword = (~error=?, ~login=?, field) => [OptionalPassword({field, ?login, error})]
@@ -204,13 +204,17 @@ module Make = (Lenses: Lenses) => {
           ? Valid
           : Error(error->Belt.Option.getWithDefault(i18n.floatMax(~value, ~max))),
       )
-    | Validation.Email({field, error}) =>
+    | Validation.Email({field, isOptional, error}) =>
       let value = Lenses.get(values, field)
       (
         Field(field),
-        Js.Re.test_(ReSchemaRegExp.email, value)
-          ? Valid
-          : Error(error->Belt.Option.getWithDefault(i18n.email(~value))),
+        switch value {
+        | "" if isOptional => Valid
+        | value =>
+          Js.Re.test_(ReSchemaRegExp.email, value)
+            ? Valid
+            : Error(error->Belt.Option.getWithDefault(i18n.email(~value)))
+        },
       )
     | Validation.Phone({field, error}) =>
       let value = Lenses.get(values, field)

package/src/request/Request.res

@@ -284,3 +284,48 @@ let mutateWithParams = (
     revalidate,
   )
 }
+
+module FetchAndRender = {
+  @react.component
+  let make = (
+    type argument response err,
+    ~config: module(Config with
+      type argument = argument
+      and type response = response
+      and type error = err
+    ),
+    ~argument,
+    ~children,
+  ) => {
+    let (data, _, _) = useFetcher(config, Some(argument))
+
+    children(data)
+  }
+}
+
+module FetchAndRenderWithSuspense = {
+  @react.component
+  let make = (
+    type argument response err,
+    ~config: module(Config with
+      type argument = argument
+      and type response = response
+      and type error = err
+    ),
+    ~argument,
+    ~children,
+    ~fallback=?,
+    ~fallbackRender,
+  ) => {
+    <Toolkit.Ui.ErrorBoundary
+      fallbackRender={({error}) => {
+        let module(C) = config
+        let apiError: error<C.error> = error->Obj.magic
+        fallbackRender(apiError)
+      }}>
+      <React.Suspense fallback={fallback->Option.getWithDefault(<Toolkit.Ui.SpinnerFullScreen />)}>
+        <FetchAndRender config argument> {data => children(data)} </FetchAndRender>
+      </React.Suspense>
+    </Toolkit.Ui.ErrorBoundary>
+  }
+}