revert: revert initialValues protect (#376)

* Revert "fix: initValues should not be modified if preserve is false (#370)"

This reverts commit 23f4f5f.

* chore: update gitignore

Author: MadCcc

.gitignore

@@ -18,7 +18,7 @@
 # misc
 .DS_Store
 .vscode
-.idea
+.idea/
 
 # umi
 .umi

docs/demo/initialValues.md

@@ -35,7 +35,6 @@ import {
   setValue,
   setValues,
 } from './utils/valueUtil';
-import cloneDeep from './utils/cloneDeep';
 
 type InvalidateFieldEntity = { INVALIDATE_NAME_PATH: InternalNamePath };
 
@@ -134,9 +133,7 @@ export class FormStore {
     }
   };
 
-  private getInitialValue = (namePath: InternalNamePath) => {
-    return cloneDeep(getValue(this.initialValues, namePath));
-  };
+  private getInitialValue = (namePath: InternalNamePath) => getValue(this.initialValues, namePath);
 
   private setCallbacks = (callbacks: Callbacks) => {
     this.callbacks = callbacks;
@@ -552,13 +549,14 @@ export class FormStore {
     // un-register field callback
     return (isListField?: boolean, preserve?: boolean, subNamePath: InternalNamePath = []) => {
       this.fieldEntities = this.fieldEntities.filter(item => item !== entity);
+
       // Clean up store value if not preserve
       const mergedPreserve = preserve !== undefined ? preserve : this.preserve;
 
       if (mergedPreserve === false && (!isListField || subNamePath.length > 1)) {
         const namePath = entity.getNamePath();
 
-        const defaultValue = isListField ? undefined : this.getInitialValue(namePath);
+        const defaultValue = isListField ? undefined : getValue(this.initialValues, namePath);
 
         if (
           namePath.length &&

docs/examples/initialValues.tsx

@@ -44,11 +44,7 @@ export function containsNamePath(namePathList: InternalNamePath[], namePath: Int
 }
 
 function isObject(obj: StoreValue) {
-  return (
-    typeof obj === 'object' &&
-    obj !== null &&
-    (Object.getPrototypeOf(obj) === Object.prototype || Array.isArray(obj))
-  );
+  return typeof obj === 'object' && obj !== null && Object.getPrototypeOf(obj) === Object.prototype;
 }
 
 /**
@@ -66,11 +62,9 @@ function internalSetValues<T>(store: T, values: T): T {
     const prevValue = newStore[key];
     const value = values[key];
 
-    const recursive = isObject(value);
-    const isArrayValue = Array.isArray(value);
-    newStore[key] = recursive
-      ? internalSetValues(prevValue || (isArrayValue ? [] : {}), value || {})
-      : value;
+    // If both are object (but target is not array), we use recursion to set deep value
+    const recursive = isObject(prevValue) && isObject(value);
+    newStore[key] = recursive ? internalSetValues(prevValue, value || {}) : value;
   });
 
   return newStore;

src/useForm.ts

@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { mount } from 'enzyme';
 import { resetWarned } from 'rc-util/lib/warning';
-import Form, { Field, useForm, List } from '../src';
+import Form, { Field, useForm } from '../src';
 import { Input } from './common/InfoField';
 import { changeValue, getField } from './common';
 
@@ -47,8 +47,16 @@ describe('Form.InitialValues', () => {
         path2: 'Bamboo',
       },
     });
-    expect(getField(wrapper, 'username').find('input').props().value).toEqual('Light');
-    expect(getField(wrapper, ['path1', 'path2']).find('input').props().value).toEqual('Bamboo');
+    expect(
+      getField(wrapper, 'username')
+        .find('input')
+        .props().value,
+    ).toEqual('Light');
+    expect(
+      getField(wrapper, ['path1', 'path2'])
+        .find('input')
+        .props().value,
+    ).toEqual('Bamboo');
   });
 
   it('update and reset should use new initialValues', () => {
@@ -83,15 +91,23 @@ describe('Form.InitialValues', () => {
     expect(form.getFieldsValue()).toEqual({
       username: 'Bamboo',
     });
-    expect(getField(wrapper, 'username').find('input').props().value).toEqual('Bamboo');
+    expect(
+      getField(wrapper, 'username')
+        .find('input')
+        .props().value,
+    ).toEqual('Bamboo');
 
     // Should not change it
     wrapper.setProps({ initialValues: { username: 'Light' } });
     wrapper.update();
     expect(form.getFieldsValue()).toEqual({
       username: 'Bamboo',
     });
-    expect(getField(wrapper, 'username').find('input').props().value).toEqual('Bamboo');
+    expect(
+      getField(wrapper, 'username')
+        .find('input')
+        .props().value,
+    ).toEqual('Bamboo');
 
     // Should change it
     form.resetFields();
@@ -100,68 +116,11 @@ describe('Form.InitialValues', () => {
     expect(form.getFieldsValue()).toEqual({
       username: 'Light',
     });
-    expect(getField(wrapper, 'username').find('input').props().value).toEqual('Light');
-  });
-
-  it(`initialValues shouldn't be modified if preserve is false`, () => {
-    const formValue = {
-      test: 'test',
-      users: [{ first: 'aaa', last: 'bbb' }],
-    };
-
-    const Demo = () => {
-      const [form] = Form.useForm();
-      const [show, setShow] = useState(false);
-
-      return (
-        <>
-          <button onClick={() => setShow(prev => !prev)}>switch show</button>
-          {show && (
-            <Form form={form} initialValues={formValue} preserve={false}>
-              <Field shouldUpdate>
-                {() => (
-                  <Field name="test" preserve={false}>
-                    <Input />
-                  </Field>
-                )}
-              </Field>
-              <List name="users">
-                {fields => (
-                  <>
-                    {fields.map(({ key, name, ...restField }) => (
-                      <>
-                        <Field
-                          {...restField}
-                          name={[name, 'first']}
-                          rules={[{ required: true, message: 'Missing first name' }]}
-                        >
-                          <Input className="first-name-input" placeholder="First Name" />
-                        </Field>
-                        <Field
-                          {...restField}
-                          name={[name, 'last']}
-                          rules={[{ required: true, message: 'Missing last name' }]}
-                        >
-                          <Input placeholder="Last Name" />
-                        </Field>
-                      </>
-                    ))}
-                  </>
-                )}
-              </List>
-            </Form>
-          )}
-        </>
-      );
-    };
-
-    const wrapper = mount(<Demo />);
-    wrapper.find('button').simulate('click');
-    expect(formValue.users[0].last).toEqual('bbb');
-    wrapper.find('button').simulate('click');
-    expect(formValue.users[0].last).toEqual('bbb');
-    wrapper.find('button').simulate('click');
-    expect(wrapper.find('.first-name-input').first().find('input').instance().value).toEqual('aaa');
+    expect(
+      getField(wrapper, 'username')
+        .find('input')
+        .props().value,
+    ).toEqual('Light');
   });
 
   describe('Field with initialValue', () => {
@@ -278,12 +237,21 @@ describe('Form.InitialValues', () => {
       expect(wrapper.find('input').props().value).toEqual('story');
 
       // First reset will get nothing
-      wrapper.find('button').first().simulate('click');
+      wrapper
+        .find('button')
+        .first()
+        .simulate('click');
       expect(wrapper.find('input').props().value).toEqual('');
 
       // Change field initialValue and reset
-      wrapper.find('button').last().simulate('click');
-      wrapper.find('button').first().simulate('click');
+      wrapper
+        .find('button')
+        .last()
+        .simulate('click');
+      wrapper
+        .find('button')
+        .first()
+        .simulate('click');
       expect(wrapper.find('input').props().value).toEqual('light');
     });
 

src/utils/cloneDeep.ts

@@ -1,6 +1,5 @@
 import { move, isSimilar, setValues } from '../src/utils/valueUtil';
 import NameMap from '../src/utils/NameMap';
-import cloneDeep from '../src/utils/cloneDeep';
 
 describe('utils', () => {
   describe('arrayMove', () => {
@@ -72,12 +71,4 @@ describe('utils', () => {
       });
     });
   });
-
-  describe('clone deep', () => {
-    it('should not deep clone Class', () => {
-      const data = { a: new Date() };
-      const clonedData = cloneDeep(data);
-      expect(data.a === clonedData.a).toBeTruthy();
-    });
-  });
 });