fix: fix

Author: li-jia-nan

package.json

@@ -60,8 +60,8 @@
     "@types/jest": "^29.2.5",
     "@types/lodash": "^4.14.135",
     "@types/node": "^22.0.2",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
+    "@types/react": "^19.0.6",
+    "@types/react-dom": "^19.0.1",
     "@umijs/fabric": "^4.0.1",
     "dumi": "^2.0.0",
     "eslint": "^8.54.0",

src/Field.tsx

@@ -543,9 +543,10 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
     }
 
     // Filed element only
-    const childList = toChildrenArray(children);
+    const childList = toChildrenArray(children as any);
+
     if (childList.length !== 1 || !React.isValidElement(childList[0])) {
-      return { child: childList, isFunction: false };
+      return { child: childList as React.ReactNode, isFunction: false };
     }
 
     return { child: childList[0], isFunction: false };

src/Form.tsx

@@ -138,7 +138,7 @@ const Form: React.ForwardRefRenderFunction<FormRef, FormProps> = (
   useSubscribe(!childrenRenderProps);
 
   // Listen if fields provided. We use ref to save prev data here to avoid additional render
-  const prevFieldsRef = React.useRef<FieldData[] | undefined>();
+  const prevFieldsRef = React.useRef<FieldData[] | undefined>(null);
   React.useEffect(() => {
     if (!isSimilar(prevFieldsRef.current || [], fields || [])) {
       formInstance.setFields(fields || []);

src/useForm.ts

@@ -1027,7 +1027,7 @@ export class FormStore {
 }
 
 function useForm<Values = any>(form?: FormInstance<Values>): [FormInstance<Values>] {
-  const formRef = React.useRef<FormInstance>();
+  const formRef = React.useRef<FormInstance>(null);
   const [, forceUpdate] = React.useState({});
 
   if (!formRef.current) {

tests/useWatch.test.tsx

@@ -288,9 +288,13 @@ describe('useWatch', () => {
       const more = Form.useWatch(['age', 'name', 'gender'], form);
       const demo = Form.useWatch<string>(['demo']);
 
-      const values2 = Form.useWatch(values => ({ newName: values.name, newAge: values.age }), form);
-      const values3 = Form.useWatch<FieldType, { newName?: string }>(values => ({
-        newName: values.name,
+      const values2 = Form.useWatch(
+        _values => ({ newName: _values.name, newAge: _values.age }),
+        form,
+      );
+
+      const values3 = Form.useWatch<FieldType, { newName?: string }>(_values => ({
+        newName: _values.name,
       }));
 
       return (
@@ -393,7 +397,7 @@ describe('useWatch', () => {
   it('first undefined', () => {
     const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
     const Demo: React.FC = () => {
-      const formRef = useRef<FormInstance>();
+      const formRef = useRef<FormInstance>(null);
       const name = Form.useWatch('name', formRef.current);
       const [, setUpdate] = useState({});
       return (