@juantroconisf/lib 9.4.0 → 11.0.0

package/dist/index.mjs

@@ -566,10 +566,17 @@ function useForm(schema, {
       const { compositeKey, fieldPath, realPath, value } = resolution;
       const meta = metadataRef.current.get(compositeKey);
       const isTouched = meta?.isTouched;
+      let isRequired = false;
+      try {
+        const rule = getRule(fieldPath, validationSchema);
+        if (rule) isRequired = rule.describe().optional === false;
+      } catch {
+      }
       return {
         id: compositeKey,
         isInvalid: Boolean(isTouched && meta?.isInvalid),
         errorMessage: isTouched ? meta?.errorMessage || "" : "",
+        isRequired,
         onBlur: () => {
           if (metadataRef.current.get(compositeKey)?.isTouched) return;
           validateField(
@@ -592,7 +599,7 @@ function useForm(schema, {
         }
       };
     },
-    [validateField]
+    [validateField, getRule, validationSchema]
   );
   const on = useMemo(
     () => ({
@@ -644,6 +651,62 @@ function useForm(schema, {
             handleFieldChange(data, fixed);
           }
         };
+      },
+      numberInput: (...args) => {
+        const data = resolveFieldData(
+          args,
+          stateRef.current,
+          getIndex,
+          getNestedValue
+        );
+        if (!data) return {};
+        return {
+          ...createHandlers(data),
+          value: data.value ?? 0,
+          onValueChange: (v) => handleFieldChange(data, v)
+        };
+      },
+      checkbox: (...args) => {
+        const data = resolveFieldData(
+          args,
+          stateRef.current,
+          getIndex,
+          getNestedValue
+        );
+        if (!data) return {};
+        return {
+          ...createHandlers(data),
+          isSelected: Boolean(data.value),
+          onValueChange: (v) => handleFieldChange(data, v)
+        };
+      },
+      switch: (...args) => {
+        const data = resolveFieldData(
+          args,
+          stateRef.current,
+          getIndex,
+          getNestedValue
+        );
+        if (!data) return {};
+        return {
+          ...createHandlers(data),
+          isSelected: Boolean(data.value),
+          onValueChange: (v) => handleFieldChange(data, v)
+        };
+      },
+      radio: (...args) => {
+        const data = resolveFieldData(
+          args,
+          stateRef.current,
+          getIndex,
+          getNestedValue
+        );
+        if (!data) return {};
+        return {
+          ...createHandlers(data),
+          value: data.value ?? "",
+          onValueChange: (v) => handleFieldChange(data, v)
+        };
       }
     }),
     [createHandlers, getIndex, handleFieldChange]
@@ -663,7 +726,7 @@ function useForm(schema, {
           });
         });
       },
-      removeItem: (arrayKey, index) => {
+      removeItemByIndexByIndex: (arrayKey, index) => {
         const currentArr = getNestedValue(stateRef.current, arrayKey) || [];
         const item = currentArr[index];
         const idKey = arrayIdentifiers?.[arrayKey] || "id";
@@ -700,10 +763,10 @@ function useForm(schema, {
           setMetadata((prev) => removeCompositeKeysByPrefix(prev, prefix));
         }
       },
-      updateItem: (arrayKey, index, value) => {
+      updateByIndex: (arrayKey, index, value) => {
         setState((prev) => {
           const arr = [...getNestedValue(prev, arrayKey) || []];
-          arr[index] = value;
+          arr[index] = typeof arr[index] === "object" && typeof value === "object" ? { ...arr[index], ...value } : value;
           return handleNestedChange({
             state: prev,
             id: arrayKey,
@@ -712,7 +775,22 @@ function useForm(schema, {
           });
         });
       },
-      moveItem: (arrayKey, from, to) => {
+      updateById: (arrayKey, itemId, value) => {
+        const index = getIndex(arrayKey, itemId);
+        if (index !== void 0) {
+          setState((prev) => {
+            const arr = [...getNestedValue(prev, arrayKey) || []];
+            arr[index] = typeof arr[index] === "object" && typeof value === "object" ? { ...arr[index], ...value } : value;
+            return handleNestedChange({
+              state: prev,
+              id: arrayKey,
+              value: arr,
+              hasNestedValues: String(arrayKey).includes(".")
+            });
+          });
+        }
+      },
+      moveItemByIndex: (arrayKey, from, to) => {
         setState((prev) => {
           const arr = [...getNestedValue(prev, arrayKey) || []];
           const [item] = arr.splice(from, 1);
@@ -742,7 +820,7 @@ function useForm(schema, {
           });
         }
       },
-      getItem: (arrayKey, itemId) => {
+      getItemById: (arrayKey, itemId) => {
         const index = getIndex(arrayKey, itemId);
         if (index === void 0) return void 0;
         return getNestedValue(stateRef.current, arrayKey)[index];
@@ -772,12 +850,26 @@ function useForm(schema, {
     },
     [validateField]
   );
-  const polymorphicOnValueChange = useCallback(
-    (...args) => {
-      const value = args[args.length - 1];
-      const idArgs = args.slice(0, args.length - 1);
+  const scalarOnFieldChange = useCallback(
+    (id, value) => {
+      const data = resolveFieldData(
+        [id],
+        stateRef.current,
+        getIndex,
+        getNestedValue
+      );
+      if (data) handleFieldChange(data, value);
+    },
+    [getIndex, handleFieldChange]
+  );
+  const arrayItemChange = useCallback(
+    ({
+      at: compositePath,
+      id: itemId,
+      value
+    }) => {
       const data = resolveFieldData(
-        idArgs,
+        [compositePath, itemId],
         stateRef.current,
         getIndex,
         getNestedValue
@@ -786,7 +878,7 @@ function useForm(schema, {
     },
     [getIndex, handleFieldChange]
   );
-  const polymorphicOnSelectionChange = useCallback(
+  const scalarOnSelectionChange = useCallback(
     (id, val) => {
       const fixed = typeof val === "string" || val === null ? val : Array.from(val);
       let nextState = handleNestedChange({
@@ -800,6 +892,23 @@ function useForm(schema, {
     },
     [validateField]
   );
+  const arraySelectionChange = useCallback(
+    ({
+      at: compositePath,
+      id: itemId,
+      value: val
+    }) => {
+      const fixed = typeof val === "string" || val === null ? val : Array.from(val);
+      const data = resolveFieldData(
+        [compositePath, itemId],
+        stateRef.current,
+        getIndex,
+        getNestedValue
+      );
+      if (data) handleFieldChange(data, fixed);
+    },
+    [getIndex, handleFieldChange]
+  );
   const onFormSubmit = useCallback(
     (fn) => (e) => {
       e.preventDefault();
@@ -866,9 +975,11 @@ function useForm(schema, {
       metadata,
       on,
       helpers,
-      onFieldChange: polymorphicOnValueChange,
+      onFieldChange: scalarOnFieldChange,
+      onArrayItemChange: arrayItemChange,
       onFieldBlur: onBlur,
-      onSelectionChange: polymorphicOnSelectionChange,
+      onSelectionChange: scalarOnSelectionChange,
+      onArraySelectionChange: arraySelectionChange,
       isDirty: Array.from(metadata.values()).some((m) => m.isTouched),
       onFormReset: handleReset,
       onFormSubmit,
@@ -881,8 +992,10 @@ function useForm(schema, {
       on,
       helpers,
       onBlur,
-      polymorphicOnValueChange,
-      polymorphicOnSelectionChange,
+      scalarOnFieldChange,
+      arrayItemChange,
+      scalarOnSelectionChange,
+      arraySelectionChange,
       validateAll,
       onFormSubmit,
       ControlledForm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juantroconisf/lib",
-  "version": "9.4.0",
+  "version": "11.0.0",
   "description": "A form validation library for HeroUI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",