@formality-ui/react 0.2.2 → 0.2.3

package/dist/index.js

@@ -430,22 +430,15 @@ function Form({
     await handleSubmit(values);
   }, [methods, handleSubmit, waitForFieldValidation]);
   executeAutoSaveRef.current = executeAutoSave;
-  const getOrCreateDebounced = useCallback(
-    (ms) => {
-      const cached = fieldDebouncersRef.current.get(ms);
-      if (cached) return cached;
-      const debouncedFn = debounce(() => {
-        executeAutoSaveRef.current?.();
-      }, ms);
-      const fn = Object.assign(debouncedFn, {
-        pending: () => false
-        // lodash debounce tracks pending internally
-      });
-      fieldDebouncersRef.current.set(ms, fn);
-      return fn;
-    },
-    []
-  );
+  const getOrCreateDebounced = useCallback((ms) => {
+    const cached = fieldDebouncersRef.current.get(ms);
+    if (cached) return cached;
+    const fn = wrapDebounced(() => {
+      executeAutoSaveRef.current?.();
+    }, ms);
+    fieldDebouncersRef.current.set(ms, fn);
+    return fn;
+  }, []);
   getOrCreateDebouncedRef.current = getOrCreateDebounced;
   useEffect(() => {
     return () => {
@@ -470,13 +463,9 @@ function Form({
         }
       );
     }
-    const debouncedFn = debounce(() => {
+    return wrapDebounced(() => {
       executeAutoSaveRef.current?.();
     }, debounceMs);
-    return Object.assign(debouncedFn, {
-      pending: () => false
-      // lodash debounce handles this internally
-    });
   }, [debounceMs]);
   debouncedSubmitRef.current = debouncedSubmit;
   useEffect(() => {
@@ -485,7 +474,11 @@ function Form({
     };
   }, [debouncedSubmit]);
   const submitImmediate = useCallback(() => {
-    debouncedSubmitRef.current?.flush();
+    const anyPending = debouncedSubmitRef.current?.pending() === true || [...fieldDebouncersRef.current.values()].some((fn) => fn.pending());
+    if (!anyPending) return;
+    debouncedSubmitRef.current?.cancel();
+    fieldDebouncersRef.current.forEach((fn) => fn.cancel());
+    executeAutoSaveRef.current?.();
   }, []);
   const unusedFields = useMemo(() => {
     const allFields = Object.keys(config);
@@ -559,6 +552,30 @@ function Form({
     resolvedTitle
   }) : children }) }) });
 }
+function wrapDebounced(callback, ms) {
+  let isPending = false;
+  const debounced = debounce(() => {
+    isPending = false;
+    callback();
+  }, ms);
+  return Object.assign(
+    () => {
+      isPending = true;
+      debounced();
+    },
+    {
+      cancel: () => {
+        isPending = false;
+        debounced.cancel();
+      },
+      flush: () => {
+        isPending = false;
+        debounced.flush();
+      },
+      pending: () => isPending
+    }
+  );
+}
 function transformValuesForSubmit(values, config, inputs) {
   const result = {};
   for (const [name, value] of Object.entries(values)) {
@@ -1006,18 +1023,52 @@ function Field({
       }
     }
   }, [effectiveSetValue.hasCondition, effectiveSetValue.value, name]);
+  const { providerSelectProps, formSelectProps, fieldSelectProps } = usePropsEvaluation({
+    selectProps: fieldConfig.selectProps,
+    formDefaultFieldProps: formConfig.selectDefaultFieldProps,
+    providerDefaultFieldProps: providerConfig.selectDefaultFieldProps,
+    subscribesTo: fieldConfig.subscribesTo,
+    fieldName: name
+  });
   const isDisabled = useMemo(() => {
     if (disabledProp !== void 0) return disabledProp;
     if (fieldConfig.disabled !== void 0) return fieldConfig.disabled;
     if (conditionResult.hasDisabledCondition)
       return conditionResult.disabled ?? false;
     if (groupContext.state.isDisabled) return true;
+    const propsLayers = [
+      fieldSelectProps,
+      // layer 2: field-level selectProps
+      formSelectProps,
+      // layer 5: form-level selectDefaultFieldProps
+      providerSelectProps,
+      // layer 7: provider-level selectDefaultFieldProps
+      inputConfig.props,
+      // layer 4: input config props
+      fieldConfig.props,
+      // layer 3: field config props
+      formConfig.defaultFieldProps,
+      // layer 6: form-level defaultFieldProps
+      providerConfig.defaultFieldProps
+      // layer 8: provider-level defaultFieldProps
+    ];
+    for (const layer of propsLayers) {
+      const layerDisabled = layer?.disabled;
+      if (layerDisabled !== void 0) return Boolean(layerDisabled);
+    }
     return false;
   }, [
     disabledProp,
     fieldConfig.disabled,
+    fieldConfig.props,
     conditionResult,
-    groupContext.state.isDisabled
+    groupContext.state.isDisabled,
+    fieldSelectProps,
+    formSelectProps,
+    providerSelectProps,
+    inputConfig.props,
+    formConfig.defaultFieldProps,
+    providerConfig.defaultFieldProps
   ]);
   const isVisible = useMemo(() => {
     if (hiddenProp !== void 0) return !hiddenProp;
@@ -1032,13 +1083,6 @@ function Field({
     conditionResult,
     groupContext.state.isVisible
   ]);
-  const { providerSelectProps, formSelectProps, fieldSelectProps } = usePropsEvaluation({
-    selectProps: fieldConfig.selectProps,
-    formDefaultFieldProps: formConfig.selectDefaultFieldProps,
-    providerDefaultFieldProps: providerConfig.selectDefaultFieldProps,
-    subscribesTo: fieldConfig.subscribesTo,
-    fieldName: name
-  });
   const label = useMemo(() => {
     return resolveLabel(name, fieldConfig, fieldSelectProps, restProps);
   }, [name, fieldConfig, fieldSelectProps, restProps]);