@dynamic-field-kit/react 1.5.1 → 1.6.0

package/dist/index.mjs

@@ -438,24 +438,10 @@ function useFieldRegistry() {
 import { jsxs as jsxs3 } from "react/jsx-runtime";
 var DynamicInputInner = ({
   type,
-  value,
   onChange,
   onBlur,
-  label,
-  options,
-  className,
-  description,
-  disabled,
-  readOnly,
-  required,
-  touched,
-  dirty,
-  error,
-  id,
-  ariaInvalid,
-  ariaDescribedBy,
-  ariaRequired,
-  extraProps
+  extraProps,
+  ...rendererProps
 }) => {
   const registry = useFieldRegistry();
   const Renderer = useMemo(
@@ -470,23 +456,9 @@ var DynamicInputInner = ({
   }
   return React3.createElement(Renderer, {
     ...extraProps,
-    value,
+    ...rendererProps,
     onValueChange: onChange,
-    onBlur,
-    label,
-    options,
-    className,
-    description,
-    disabled,
-    readOnly,
-    required,
-    touched,
-    dirty,
-    error,
-    id,
-    ariaInvalid,
-    ariaDescribedBy,
-    ariaRequired
+    onBlur
   });
 };
 var DynamicInput = /* @__PURE__ */ React3.memo(
@@ -496,10 +468,8 @@ var DynamicInput_default = DynamicInput;
 
 // src/components/FieldInput.tsx
 import {
-  resolveDisabled,
-  resolveOptions,
-  resolveReadOnly,
-  validateField
+  buildFieldRendererProps,
+  makeFieldId
 } from "@dynamic-field-kit/core";
 import React6, { useCallback as useCallback3 } from "react";
 
@@ -507,18 +477,22 @@ import React6, { useCallback as useCallback3 } from "react";
 import {
   canAddGroupItem,
   canRemoveGroupItem,
-  createGroupItem
+  createGroupItem,
+  indexGroupPathMap
 } from "@dynamic-field-kit/core";
-import { useCallback as useCallback2 } from "react";
+import { useCallback as useCallback2, useMemo as useMemo3 } from "react";
 
 // src/components/MultiFieldInput.tsx
 import {
   applyComputedValues,
+  isFieldGroup,
   validateFields
 } from "@dynamic-field-kit/core";
-import {
+import React4, {
   useCallback,
   useEffect as useEffect2,
+  useId,
+  useImperativeHandle,
   useMemo as useMemo2,
   useRef,
   useState as useState2
@@ -533,25 +507,39 @@ function resolveLayout(layout) {
   }
   return { type: layout.type, config: layout };
 }
-var MultiFieldInput = ({
+var MultiFieldInputInner = ({
   fieldDescriptions,
   properties,
   onChange,
   layout,
+  idPrefix,
   rootData,
   onValidityChange,
-  onBlurField
-}) => {
+  onBlurField,
+  touched: touchedProp,
+  errors: errorsProp,
+  onTouchedChange,
+  form
+}, ref) => {
+  const effectiveProperties = properties ?? form?.data;
+  const effectiveOnChange = onChange ?? form?.handleChange;
+  const effectiveOnBlurField = onBlurField ?? form?.handleBlur;
+  const controlledTouched = touchedProp ?? form?.touched;
+  const effectiveErrors = errorsProp ?? form?.errors;
   const [data, setData] = useState2({});
-  const [touchedFields, setTouchedFields] = useState2(
-    {}
-  );
-  const initialPropertiesRef = useRef(properties ?? {});
+  const [internalTouched, setInternalTouched] = useState2({});
+  const initialPropertiesRef = useRef(effectiveProperties ?? {});
+  const autoId = useId().replace(/[^a-zA-Z0-9]/g, "");
+  const effectiveIdPrefix = idPrefix ?? `dfk-${autoId}`;
+  const isTouchedControlled = controlledTouched !== void 0;
+  const effectiveTouched = controlledTouched ?? internalTouched;
   useEffect2(() => {
-    if (properties) {
-      setData(applyComputedValues(fieldDescriptions, properties, rootData));
+    if (effectiveProperties) {
+      setData(
+        applyComputedValues(fieldDescriptions, effectiveProperties, rootData)
+      );
     }
-  }, [properties]);
+  }, [effectiveProperties]);
   const effectiveRoot = rootData ?? data;
   const visibleFields = useMemo2(
     () => fieldDescriptions.filter(
@@ -561,16 +549,22 @@ var MultiFieldInput = ({
   );
   const dataRef = useRef(data);
   dataRef.current = data;
-  const onChangeRef = useRef(onChange);
-  onChangeRef.current = onChange;
+  const onChangeRef = useRef(effectiveOnChange);
+  onChangeRef.current = effectiveOnChange;
   const fieldDescriptionsRef = useRef(fieldDescriptions);
   fieldDescriptionsRef.current = fieldDescriptions;
   const rootDataRef = useRef(rootData);
   rootDataRef.current = rootData;
   const onValidityChangeRef = useRef(onValidityChange);
   onValidityChangeRef.current = onValidityChange;
-  const onBlurFieldRef = useRef(onBlurField);
-  onBlurFieldRef.current = onBlurField;
+  const onBlurFieldRef = useRef(effectiveOnBlurField);
+  onBlurFieldRef.current = effectiveOnBlurField;
+  const onTouchedChangeRef = useRef(onTouchedChange);
+  onTouchedChangeRef.current = onTouchedChange;
+  const isTouchedControlledRef = useRef(isTouchedControlled);
+  isTouchedControlledRef.current = isTouchedControlled;
+  const effectiveTouchedRef = useRef(effectiveTouched);
+  effectiveTouchedRef.current = effectiveTouched;
   useEffect2(() => {
     onValidityChangeRef.current?.(
       validateFields(fieldDescriptions, data, rootData)
@@ -587,10 +581,39 @@ var MultiFieldInput = ({
     setData(next);
     onChangeRef.current?.(next);
   }, []);
-  const handleBlurField = useCallback((key) => {
-    setTouchedFields((prev) => prev[key] ? prev : { ...prev, [key]: true });
-    onBlurFieldRef.current?.(key);
+  const markTouched = useCallback((key, isTouched) => {
+    const current = effectiveTouchedRef.current;
+    if (Boolean(current[key]) === isTouched) {
+      return;
+    }
+    const next = { ...current, [key]: isTouched };
+    if (!isTouchedControlledRef.current) {
+      effectiveTouchedRef.current = next;
+      setInternalTouched(next);
+    }
+    onTouchedChangeRef.current?.(next);
   }, []);
+  const handleBlurField = useCallback(
+    (key) => {
+      markTouched(key, true);
+      onBlurFieldRef.current?.(key);
+    },
+    [markTouched]
+  );
+  useImperativeHandle(
+    ref,
+    () => ({
+      resetTouched: () => {
+        if (!isTouchedControlledRef.current) {
+          effectiveTouchedRef.current = {};
+        }
+        setInternalTouched({});
+      },
+      setFieldTouched: (fieldName, isTouched = true) => markTouched(fieldName, isTouched),
+      getTouched: () => effectiveTouchedRef.current
+    }),
+    [markTouched]
+  );
   const { type, config } = resolveLayout(layout);
   const Layout = layoutRegistry.get(type);
   if (!Layout) {
@@ -602,7 +625,10 @@ var MultiFieldInput = ({
       fieldDescription: f,
       renderInfos: data,
       rootData: effectiveRoot,
-      touched: Boolean(touchedFields[f.name]),
+      idPrefix: effectiveIdPrefix,
+      touched: Boolean(effectiveTouched[f.name]),
+      touchedMap: isFieldGroup(f) ? effectiveTouched : void 0,
+      errors: effectiveErrors,
       dirty: data[f.name] !== initialPropertiesRef.current[f.name],
       onBlurField: handleBlurField,
       onValueChangeField: handleValueChangeField
@@ -610,14 +636,20 @@ var MultiFieldInput = ({
     f.name
   )) });
 };
+var MultiFieldInput = /* @__PURE__ */ React4.forwardRef(MultiFieldInputInner);
+MultiFieldInput.displayName = "MultiFieldInput";
 var MultiFieldInput_default = MultiFieldInput;
 
 // src/components/FieldGroupInput.tsx
 import { jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
+var EMPTY_TOUCHED = Object.freeze({});
 var FieldGroupInput = ({
   fieldDescription,
   items,
   rootData,
+  errors,
+  touched,
+  onBlurField,
   onChange
 }) => {
   const {
@@ -631,6 +663,14 @@ var FieldGroupInput = ({
   const addText = addLabel ?? "Add";
   const removeText = removeLabel ?? "Remove";
   const groupName = label ?? fieldDescription.name;
+  const errorsByItem = useMemo3(
+    () => indexGroupPathMap(errors, fieldDescription.name),
+    [errors, fieldDescription.name]
+  );
+  const touchedByItem = useMemo3(
+    () => indexGroupPathMap(touched, fieldDescription.name),
+    [touched, fieldDescription.name]
+  );
   const handleItemChange = useCallback2(
     (index, next) => {
       const nextItems = items.slice();
@@ -667,6 +707,9 @@ var FieldGroupInput = ({
               fieldDescriptions: fields,
               properties: item,
               rootData,
+              errors: errorsByItem?.[index],
+              touched: touched === void 0 ? void 0 : touchedByItem?.[index] ?? EMPTY_TOUCHED,
+              onBlurField: (key) => onBlurField?.(`${fieldDescription.name}[${index}].${key}`),
               onChange: (next) => handleItemChange(index, next)
             }
           ) }),
@@ -704,12 +747,15 @@ var FieldInputInner = ({
   fieldDescription,
   renderInfos,
   rootData,
+  idPrefix = "dfk-field",
   touched,
+  touchedMap,
   dirty,
+  errors,
   onBlurField,
   onValueChangeField
 }) => {
-  const { name, type, label, className, description, props, fields, required } = fieldDescription;
+  const { name, fields } = fieldDescription;
   const handleChange = useCallback3(
     (v) => onValueChangeField(v, name),
     [onValueChangeField, name]
@@ -726,43 +772,27 @@ var FieldInputInner = ({
         fieldDescription,
         items,
         rootData,
+        errors,
+        touched: touchedMap,
+        onBlurField,
         onChange: handleChange
       }
     );
   }
-  const effectiveDisabled = resolveDisabled(
+  const rendererProps = buildFieldRendererProps({
     fieldDescription,
-    renderInfos,
-    rootData
-  );
-  const readOnly = resolveReadOnly(fieldDescription, renderInfos, rootData);
-  const resolvedOptionsList = resolveOptions(
-    fieldDescription,
-    renderInfos,
-    rootData
-  );
-  const errors = effectiveDisabled ? [] : validateField(fieldDescription, renderInfos[name], renderInfos, rootData);
-  const error = errors.length > 0 ? errors : void 0;
-  const fieldId = `dfk-field-${name}`;
+    data: renderInfos,
+    rootData,
+    id: makeFieldId(fieldDescription, idPrefix),
+    touched,
+    dirty,
+    validationErrors: errors === void 0 ? void 0 : errors[name] ?? []
+  });
   return /* @__PURE__ */ jsx7(
     DynamicInput_default,
     {
-      id: fieldId,
-      type,
-      label,
-      value: renderInfos[name],
-      options: resolvedOptionsList,
-      className,
-      description,
-      disabled: effectiveDisabled,
-      readOnly,
-      required,
-      touched,
-      dirty,
-      error,
-      ariaInvalid: Boolean(error),
-      ariaRequired: Boolean(required),
-      extraProps: props,
+      ...rendererProps,
+      description: rendererProps.description,
       onChange: handleChange,
       onBlur: handleBlur
     }
@@ -770,7 +800,7 @@ var FieldInputInner = ({
 };
 var FieldInput = /* @__PURE__ */ React6.memo(FieldInputInner, (prev, next) => {
   const name = prev.fieldDescription.name;
-  return prev.fieldDescription === next.fieldDescription && prev.onValueChangeField === next.onValueChangeField && prev.onBlurField === next.onBlurField && prev.rootData === next.rootData && prev.touched === next.touched && prev.dirty === next.dirty && prev.renderInfos[name] === next.renderInfos[name];
+  return prev.fieldDescription === next.fieldDescription && prev.onValueChangeField === next.onValueChangeField && prev.onBlurField === next.onBlurField && prev.rootData === next.rootData && prev.idPrefix === next.idPrefix && prev.touched === next.touched && prev.touchedMap === next.touchedMap && prev.dirty === next.dirty && prev.errors === next.errors && prev.renderInfos[name] === next.renderInfos[name];
 });
 var FieldInput_default = FieldInput;
 
@@ -977,9 +1007,20 @@ var DynamicFormDevTools = ({
 // src/useDynamicForm.ts
 import {
   applyComputedValues as applyComputedValues2,
-  validateFields as validateFields2
+  collectFieldPaths,
+  validateFields as validateFields2,
+  validateFieldsAsync
 } from "@dynamic-field-kit/core";
-import { useCallback as useCallback4, useState as useState4 } from "react";
+import { useCallback as useCallback4, useEffect as useEffect3, useRef as useRef2, useState as useState4 } from "react";
+function sameStringMap(left, right) {
+  const keys = Object.keys(left);
+  return keys.length === Object.keys(right).length && keys.every(
+    (key) => left[key]?.length === right[key]?.length && left[key]?.every((value, index) => value === right[key]?.[index])
+  );
+}
+function sameValidationResult(left, right) {
+  return left.valid === right.valid && left.complete === right.complete && left.status === right.status && (left.pending ?? []).join("\0") === (right.pending ?? []).join("\0") && sameStringMap(left.errors, right.errors);
+}
 function useDynamicForm({
   fields,
   initialValues = {},
@@ -994,22 +1035,76 @@ function useDynamicForm({
   const [touched, setTouched] = useState4({});
   const [isSubmitting, setIsSubmitting] = useState4(false);
   const [isSubmitted, setIsSubmitted] = useState4(false);
+  const [validationResult, setValidationResult] = useState4(
+    () => validateFields2(fields, data)
+  );
+  const [isValidating, setIsValidating] = useState4(false);
+  const validationRunRef = useRef2(0);
+  const validationAbortRef = useRef2(void 0);
+  const submitRunRef = useRef2(0);
+  const submitAbortRef = useRef2(void 0);
+  const dataRef = useRef2(data);
+  dataRef.current = data;
+  const commitSyncResult = useCallback4((res) => {
+    setValidationResult(
+      (previous) => sameValidationResult(previous, res) ? previous : res
+    );
+    return res.valid;
+  }, []);
+  useEffect3(() => {
+    commitSyncResult(validateFields2(fields, data));
+  }, [fields, data, commitSyncResult]);
+  useEffect3(
+    () => () => {
+      validationAbortRef.current?.abort();
+      submitAbortRef.current?.abort();
+    },
+    []
+  );
   const validate = useCallback4(() => {
     const res = validateFields2(fields, data);
     setErrors(res.errors);
-    return res.valid;
+    return commitSyncResult(res);
+  }, [fields, data, commitSyncResult]);
+  const validateAsync = useCallback4(async () => {
+    const run = ++validationRunRef.current;
+    validationAbortRef.current?.abort();
+    const controller = new AbortController();
+    validationAbortRef.current = controller;
+    const snapshot = data;
+    setIsValidating(true);
+    try {
+      const res = await validateFieldsAsync(fields, snapshot, snapshot, {
+        signal: controller.signal
+      });
+      if (run !== validationRunRef.current || dataRef.current !== snapshot) {
+        return res.valid;
+      }
+      setErrors(res.errors);
+      setValidationResult(res);
+      return res.valid;
+    } finally {
+      if (run === validationRunRef.current) {
+        setIsValidating(false);
+      }
+    }
   }, [fields, data]);
   const handleChange = useCallback4(
     (newData) => {
       const next = applyComputedValues2(fields, newData);
       setData(next);
+      dataRef.current = next;
       setIsDirty(true);
+      validationAbortRef.current?.abort();
+      validationRunRef.current += 1;
+      setIsValidating(false);
+      const res = validateFields2(fields, next);
+      commitSyncResult(res);
       if (validateOnChange) {
-        const res = validateFields2(fields, next);
         setErrors(res.errors);
       }
     },
-    [fields, validateOnChange]
+    [fields, validateOnChange, commitSyncResult]
   );
   const setFieldValue = useCallback4(
     (name, value) => {
@@ -1020,26 +1115,39 @@ function useDynamicForm({
   const setFieldTouched = useCallback4((name, isTouched = true) => {
     setTouched((prev) => ({ ...prev, [name]: isTouched }));
   }, []);
+  const touchAll = useCallback4(() => {
+    setTouched(
+      Object.fromEntries(
+        collectFieldPaths(fields, data).map((path) => [path, true])
+      )
+    );
+  }, [fields, data]);
+  const resetTouched = useCallback4(() => setTouched({}), []);
   const handleBlur = useCallback4(
     (fieldName) => {
       setFieldTouched(fieldName, true);
       if (validateOnBlur) {
         const res = validateFields2(fields, data);
         setErrors(res.errors);
+        commitSyncResult(res);
       }
     },
-    [fields, data, validateOnBlur, setFieldTouched]
+    [fields, data, validateOnBlur, setFieldTouched, commitSyncResult]
   );
   const reset = useCallback4(
     (newValues) => {
       const seed = newValues ?? initialValues;
       const next = applyComputedValues2(fields, seed);
       setData(next);
+      dataRef.current = next;
       setErrors({});
       setIsDirty(false);
       setTouched({});
       setIsSubmitting(false);
       setIsSubmitted(false);
+      validationAbortRef.current?.abort();
+      validationRunRef.current += 1;
+      setIsValidating(false);
     },
     [fields, initialValues]
   );
@@ -1049,26 +1157,54 @@ function useDynamicForm({
         e.preventDefault();
       }
       setIsSubmitting(true);
+      const submitRun = ++submitRunRef.current;
       try {
-        const res = validateFields2(fields, data);
-        setErrors(res.errors);
+        touchAll();
+        const run = ++validationRunRef.current;
+        validationAbortRef.current?.abort();
+        submitAbortRef.current?.abort();
+        const controller = new AbortController();
+        submitAbortRef.current = controller;
+        const snapshot = data;
+        setIsValidating(true);
+        const res = await validateFieldsAsync(fields, snapshot, snapshot, {
+          signal: controller.signal
+        });
+        if (submitRun !== submitRunRef.current) {
+          return;
+        }
+        if (dataRef.current === snapshot && run === validationRunRef.current) {
+          setErrors(res.errors);
+          setValidationResult(res);
+        } else {
+          const live = validateFields2(fields, dataRef.current);
+          setErrors(live.errors);
+          commitSyncResult(live);
+        }
         setIsSubmitted(true);
         if (res.valid) {
-          await onValid(data);
+          await onValid(snapshot);
         } else if (onInvalid) {
           onInvalid(res.errors);
         }
       } finally {
+        if (submitRun === submitRunRef.current) {
+          setIsValidating(false);
+        }
         setIsSubmitting(false);
       }
     },
-    [fields, data]
+    [fields, data, touchAll, commitSyncResult]
   );
-  const isValid = Object.keys(errors).length === 0;
   return {
     data,
     errors,
-    isValid,
+    isValid: validationResult.valid,
+    isValidating,
+    // Matches Vue and Angular: a run still in flight is not complete, whatever
+    // the last finished pass concluded.
+    isValidationComplete: validationResult.complete && !isValidating,
+    validationStatus: isValidating ? "pending" : validationResult.status,
     isDirty,
     isSubmitting,
     isSubmitted,
@@ -1076,10 +1212,14 @@ function useDynamicForm({
     setData,
     setFieldValue,
     setFieldTouched,
+    setTouched,
+    touchAll,
+    resetTouched,
     handleChange,
     handleBlur,
     reset,
     validate,
+    validateAsync,
     handleSubmit
   };
 }
@@ -1087,34 +1227,46 @@ function useDynamicForm({
 // src/index.ts
 import { FieldRegistry } from "@dynamic-field-kit/core";
 import {
-  validateField as validateField2,
+  buildFieldRendererProps as buildFieldRendererProps2,
+  makeFieldId as makeFieldId2,
+  FIELD_RENDERER_PROP_KEYS
+} from "@dynamic-field-kit/core";
+import {
+  validateField,
   validateFieldAsync,
   validateFields as validateFields3,
-  validateFieldsAsync,
-  resolveDisabled as resolveDisabled2,
-  resolveReadOnly as resolveReadOnly2,
-  resolveOptions as resolveOptions2,
+  validateFieldsAsync as validateFieldsAsync2,
+  collectFieldPaths as collectFieldPaths2,
+  indexGroupPathMap as indexGroupPathMap2,
+  resolveDisabled,
+  resolveReadOnly,
+  resolveOptions,
   validators
 } from "@dynamic-field-kit/core";
 export {
   DynamicFormDevTools,
   DynamicInput_default as DynamicInput,
+  FIELD_RENDERER_PROP_KEYS,
   FieldInput_default as FieldInput,
   FieldRegistry,
   FieldRegistryProvider,
   MultiFieldInput_default as MultiFieldInput,
+  buildFieldRendererProps2 as buildFieldRendererProps,
+  collectFieldPaths2 as collectFieldPaths,
   defaultRenderersMap,
   fieldRegistry,
   getDefaultRenderer,
+  indexGroupPathMap2 as indexGroupPathMap,
   layoutRegistry,
-  resolveDisabled2 as resolveDisabled,
-  resolveOptions2 as resolveOptions,
-  resolveReadOnly2 as resolveReadOnly,
+  makeFieldId2 as makeFieldId,
+  resolveDisabled,
+  resolveOptions,
+  resolveReadOnly,
   useDynamicForm,
   useFieldRegistry,
-  validateField2 as validateField,
+  validateField,
   validateFieldAsync,
   validateFields3 as validateFields,
-  validateFieldsAsync,
+  validateFieldsAsync2 as validateFieldsAsync,
   validators
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-field-kit/react",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "React renderer for dynamic-field-kit",
   "license": "MIT",
   "main": "dist/index.js",
@@ -26,11 +26,11 @@
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@dynamic-field-kit/core": "^1.5.1",
+    "@dynamic-field-kit/core": "^1.6.0",
     "@testing-library/dom": "^10.0.0",
-    "@testing-library/jest-dom": "^6.4.0",
+    "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.0.0",
-    "@testing-library/user-event": "^14.5.0",
+    "@testing-library/user-event": "^14.6.7",
     "@types/react": "^19.2.8",
     "@vitest/coverage-v8": "^4.1.11",
     "@vitejs/plugin-react": "^6.1.1",