fix(form): formRef.current change will update formitem list

close #7250
ant-design · Jun 24, 2023 · 5e977db · 5e977db
1 parent a550039
commit 5e977db
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/form/src/components/SchemaForm/index.tsx b/packages/form/src/components/SchemaForm/index.tsx
@@ -69,7 +69,7 @@ function BetaSchemaForm<T, ValueType = 'text'>(
   const formInstance = Form.useFormInstance();
 
   const [, forceUpdate] = useState<[]>([]);
-  const [formDomsDeps, updatedFormDoms] = useState<[]>([]);
+  const [formDomsDeps, updatedFormDoms] = useState<[]>(() => []);
 
   const formRef = useReactiveRef<ProFormInstance | undefined>(
     props.form || formInstance || form,
@@ -166,7 +166,7 @@ function BetaSchemaForm<T, ValueType = 'text'>(
             return Boolean(field);
           });
       },
-      [action, formRef, type],
+      [action, !!formRef.current, type],
     );
 
   const onValuesChange: FormProps<T>['onValuesChange'] = useCallback(
@@ -184,14 +184,13 @@ function BetaSchemaForm<T, ValueType = 'text'>(
     },
     [propsRef, shouldUpdate],
   );
-
   const formChildrenDoms = useMemo(() => {
     if (!formRef.current) return;
     // like StepsForm's columns but not only for StepsForm
     if (columns.length && Array.isArray(columns[0])) return;
     return genItems(columns as ProFormColumnsType<T, ValueType>[]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columns, genItems, formDomsDeps]);
+  }, [columns, genItems, formDomsDeps, !!formRef.current]);
 
   /**
    * Append layoutType component specific props
@@ -207,9 +206,13 @@ function BetaSchemaForm<T, ValueType = 'text'>(
     return {};
   }, [columns, layoutType]);
 
-  useImperativeHandle(propsFormRef, () => {
-    return formRef.current;
-  });
+  useImperativeHandle(
+    propsFormRef,
+    () => {
+      return formRef.current;
+    },
+    [formRef.current],
+  );
 
   return (
     <FormRenderComponents