fix(Form): internal logic fixes * 6

Author: tenphi

src/components/form/Form/use-field/use-field-props.tsx

@@ -81,13 +81,20 @@ export function useFieldProps<
   );
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const onChangeEvent = useEvent((value, dontTouch: boolean) =>
-    field?.onChange?.(
+  const onChangeEvent = useEvent((value, dontTouch: boolean) => {
+    console.log(
+      '! uikit onChange',
+      value,
+      dontTouch,
+      field?.validateTrigger || defaultValidationTrigger,
+    );
+
+    return field?.onChange?.(
       value,
       dontTouch,
       field?.validateTrigger ?? defaultValidationTrigger,
-    ),
-  );
+    );
+  });
 
   const valueProps = !isOutsideOfForm
     ? valuePropsMapper({ value: field.value, onChange: onChangeEvent })

src/components/form/Form/use-field/use-field.ts

@@ -127,6 +127,16 @@ export function useField<T extends FieldTypes, Props extends CubeFieldProps<T>>(
 
     const field = form.getFieldInstance(fieldName);
 
+    console.log(
+      '! uikit set field before',
+      fieldName,
+      val,
+      !dontTouch,
+      false,
+      dontTouch,
+      shouldUpdate,
+    );
+
     if (shouldUpdate) {
       const fieldsValue = form.getFieldsValue();
 
@@ -144,17 +154,17 @@ export function useField<T extends FieldTypes, Props extends CubeFieldProps<T>>(
       }
     }
 
+    form.setFieldValue(fieldName, val, !dontTouch, false, dontTouch);
+
     console.log(
-      '! uikit set field',
+      '! uikit set field after',
       fieldName,
       val,
       !dontTouch,
       false,
       dontTouch,
     );
 
-    form.setFieldValue(fieldName, val, !dontTouch, false, dontTouch);
-
     if (
       !dontTouch &&
       (validateTrigger === 'onChange' ||