x-ui-design 0.4.34 → 0.4.36

package/dist/esm/types/types/form.d.ts

@@ -74,7 +74,7 @@ export interface FormItemChildComponentProps {
     error: boolean;
     fieldValue: RuleTypes;
     value: RuleType;
-    setFieldValue: (name: string, value: RuleType) => void;
+    setFieldValue: (name: string, value: RuleType, errors?: string[], reset?: boolean | null | undefined, touch?: boolean) => void;
     onChange?: (e: SyntheticBaseEvent, option?: OptionProps) => void;
     size?: SizeType;
     normalize?: (value: RuleType, prevValue: RuleType, allValues: RuleType) => RuleType;
@@ -87,7 +87,7 @@ export interface FormInstance {
     resetFields: (nameList?: string[], showError?: boolean | null) => void;
     getFieldError: (name: string) => string[];
     registerField: (name: string, rules?: RuleObject[]) => void;
-    setFieldValue: (name: string, value: RuleTypes) => void;
+    setFieldValue: (name: string, value: RuleTypes, errors?: string[], reset?: boolean | null | undefined, touch?: boolean) => void;
     getFieldValue: (name: string) => RuleTypes;
     validateFields: (nameList?: string[]) => Promise<boolean>;
     setFieldsValue: (values: Partial<Record<string, RuleTypes>>, reset?: boolean | null | undefined) => void;
@@ -106,4 +106,6 @@ export interface FormInstance {
     setScrollToFirstError: (value: boolean) => void;
     scrollToFirstError?: boolean;
     isReseting: boolean;
+    setOnFieldsChange?: (onFieldsChange?: (changedFields: FieldData[]) => void) => void;
+    setOnValuesChange?: (onValuesChange?: (changedValues: Record<string, RuleTypes>, allValues: Record<string, RuleTypes>) => void) => void;
 }

package/dist/index.esm.js

@@ -603,6 +603,10 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
   const rulesRef = useRef({});
   const warningsRef = useRef({});
   const _scrollToFirstError = useRef(scrollToFirstError);
+  const onChangeRef = useRef({
+    onFieldsChange,
+    onValuesChange
+  });
   const formRef = useRef({
     ...initialValues
   });
@@ -640,12 +644,14 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
       errors: err
     }));
   }
-  function setFieldValue(name, value, errors, reset = undefined) {
+  function setFieldValue(name, value, errors, reset = undefined, touch) {
     if (!reset && reset !== null && ([undefined, null].includes(value) || formRef.current[name] === value)) {
       return;
     }
     formRef.current[name] = value;
-    touchedFieldsRef.current.add(name);
+    if (touch) {
+      touchedFieldsRef.current.add(name);
+    }
     if (reset === null) {
       setErrors({
         [name]: []
@@ -657,13 +663,13 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
         const allValues = getFieldsValue();
         fieldSubscribers.current[name]?.forEach(callback => callback(value));
         formSubscribers.current.forEach(callback => callback(allValues));
-        if (onValuesChange) {
-          onValuesChange({
+        if (onChangeRef.current.onValuesChange) {
+          onChangeRef.current.onValuesChange({
             [name]: value
           }, allValues);
         }
-        if (onFieldsChange) {
-          onFieldsChange([{
+        if (onChangeRef.current.onFieldsChange) {
+          onChangeRef.current.onFieldsChange([{
             name,
             value
           }]);
@@ -812,6 +818,12 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
   function setScrollToFirstError(value) {
     _scrollToFirstError.current = value;
   }
+  function setOnFieldsChange(onFieldsChange) {
+    onChangeRef.current.onFieldsChange = onFieldsChange;
+  }
+  function setOnValuesChange(onValuesChange) {
+    onChangeRef.current.onValuesChange = onValuesChange;
+  }
   const formInstance = {
     submit,
     setFields,
@@ -836,7 +848,9 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     subscribeToFields,
     setScrollToFirstError,
     scrollToFirstError,
-    isReseting
+    isReseting,
+    setOnFieldsChange,
+    setOnValuesChange
   };
   return formInstance;
 };
@@ -1070,7 +1084,7 @@ const FormItemChildComponent = ({
         return;
       }
     }
-    setFieldValue(name, rawValue);
+    setFieldValue(name, rawValue, undefined, undefined, true);
     onChange?.(e, option);
   };
   const injectPropsIntoFinalLeaf = child => {
@@ -1142,10 +1156,10 @@ const Form$1 = ({
   const childrenList = useMemo(() => flattenChildren(children), [children]);
   useEffect(() => {
     if (onFieldsChange) {
-      formInstance.onFieldsChange = onFieldsChange;
+      formInstance.setOnFieldsChange?.(onFieldsChange);
     }
     if (onValuesChange) {
-      formInstance.onValuesChange = onValuesChange;
+      formInstance.setOnValuesChange?.(onValuesChange);
     }
   }, [formInstance, onFieldsChange, onValuesChange]);
   const injectPropsIntoFinalLeaf = child => {