@colisweb/rescript-toolkit 5.48.2 → 5.49.0

package/package.json

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

package/src/form/Reform.res

@@ -189,6 +189,7 @@ module Make = (Config: Config) => {
   let use = (
     ~initialState,
     ~schema=[]: Validation.schema,
+    ~beforeSubmit: option<state => bool>=None,
     ~onSubmit,
     ~onSubmitFail=ignore,
     ~i18n: ReSchemaI18n.t=ReSchemaI18n.default,
@@ -199,7 +200,8 @@ module Make = (Config: Config) => {
       (state, action) => {
         switch action {
         | Submit =>
-          state.formState == Submitting
+          state.formState == Submitting ||
+            beforeSubmit->Option.mapWithDefault(false, fn => fn(state))
             ? NoUpdate
             : UpdateWithSideEffects(
                 {...state, formState: Submitting},

package/src/utils/Toolkit__Utils.res

@@ -12,19 +12,23 @@ let wait = ms =>
   ->Promise.Js.toResult
 
 let durationMinutesToHourMinutesString = (durationMinutes: float, ~separator=":", ()) => {
-  let hours = (durationMinutes /. 60.)->Js.Math.trunc
-  let minutes = (durationMinutes -. hours *. 60.)->Js.Math.round
+  if durationMinutes === 0. {
+    "0h"
+  } else {
+    let hours = (durationMinutes /. 60.)->Js.Math.trunc
+    let minutes = (durationMinutes -. hours *. 60.)->Js.Math.round
 
-  let hours = minutes === 60. ? hours +. 1. : hours
-  let minutes = minutes === 60. ? 0. : minutes
+    let hours = minutes === 60. ? hours +. 1. : hours
+    let minutes = minutes === 60. ? 0. : minutes
 
-  switch (hours, minutes) {
-  | (0., min) => min->Js.Float.toFixed ++ " min"
-  | (h, 0.) => h->Js.Float.toFixed ++ " h"
-  | (h, min) =>
-    `${h < 10. ? "0" : ""}${h->Js.Float.toFixed}${separator}${min < 10.
-        ? "0"
-        : ""}${min->Js.Float.toFixed}`
+    switch (hours, minutes) {
+    | (0., min) => min->Js.Float.toFixed ++ " min"
+    | (h, 0.) => h->Js.Float.toFixed ++ " h"
+    | (h, min) =>
+      `${h < 10. ? "0" : ""}${h->Js.Float.toFixed}${separator}${min < 10.
+          ? "0"
+          : ""}${min->Js.Float.toFixed}`
+    }
   }
 }