test(project): add large test cases

.eslintrc

@@ -17,7 +17,8 @@
     }
   },
   "globals": {
-    "sleep": true
+    "sleep": true,
+    "prettyFormat": true
   },
   "rules": {
     // don't force es6 functions to include space before paren

package.json

@@ -64,6 +64,7 @@
     "json5": "^2.1.0",
     "lerna": "^3.10.1",
     "prettier-eslint-cli": "^4.7.1",
+    "pretty-format": "^24.0.0",
     "react": "^16.8.3",
     "react-dom": "^16.8.3",
     "react-testing-library": "^6.0.0",

packages/core/src/field.js

@@ -51,11 +51,11 @@ export class Field {
     const rules = this.getRulesFromProps(options.props)
     this.rules = !isEmpty(rules) ? rules : this.rules
     this.required = hasRequired(this.rules)
-
-    this.props = isEmpty(options.props)
-      ? clone(this.props, filterSchema)
-      : clone({ ...this.props, ...options.props }, filterSchema)
-
+    this.props = !isEmpty(options.props)
+      ? !isEmpty(this.props)
+        ? { ...this.props, ...clone(options.props) }
+        : clone(options.props)
+      : this.props
     if (isFn(options.onChange)) {
       this.onChange(options.onChange)
     }

packages/core/src/form.js

@@ -58,7 +58,7 @@ export class Form {
       errors: [],
       pristine: true,
       initialValues: clone(values) || {},
-      values: values || {},
+      values: clone(values) || {},
       dirty:
         lastDirty || (this.initialized ? !isEqual(values, lastValues) : false)
     }
@@ -337,7 +337,6 @@ export class Form {
         value: value !== undefined ? value : initialValue,
         path: options.path,
         initialValue: initialValue,
-        rules: options.rules,
         props: options.props
       })
       let field = this.fields[name]

packages/core/src/index.js

@@ -43,7 +43,6 @@ export const createForm = ({
 
   fields = fields.map(({ name, path, schemaPath, schema, value }) => {
     return form.registerField(name || schemaPath.join('.'), {
-      rules: schema['x-rules'],
       path: schemaPath,
       props: schema
     })

packages/react/src/__tests__/destruct.spec.js

@@ -0,0 +1,65 @@
+import React, { Fragment } from 'react'
+import SchemaForm, { Field, registerFormField, connect } from '../index'
+import { toArr } from '@uform/utils'
+import { render } from 'react-testing-library'
+
+beforeEach(() => {
+  registerFormField('string', connect()(props => <div>{props.value}</div>))
+
+  registerFormField('array', props => {
+    const { value, mutators, renderField } = props
+    return (
+      <Fragment>
+        {toArr(value).map((item, index) => {
+          return (
+            <div data-testid='item' key={index}>
+              {renderField(index)}
+            </div>
+          )
+        })}
+        <button
+          type='button'
+          onClick={() => {
+            mutators.push()
+          }}
+        >
+          Add Field
+        </button>
+      </Fragment>
+    )
+  })
+})
+
+test('destruct with initial values', async () => {
+  const TestComponent = () => {
+    return (
+      <SchemaForm initialValues={{ aa: 123, bb: 321 }}>
+        <Field type='string' name='[aa,bb]' />
+      </SchemaForm>
+    )
+  }
+
+  const { queryByText } = render(<TestComponent />)
+
+  await sleep(33)
+  expect(queryByText('123321')).toBeVisible()
+})
+
+test('destruct with initial values in array', async () => {
+  const TestComponent = () => {
+    return (
+      <SchemaForm initialValues={{ array: [{ aa: 123, bb: 321 }] }}>
+        <Field type='array' name='array'>
+          <Field type='object'>
+            <Field type='string' name='[aa,bb]' />
+          </Field>
+        </Field>
+      </SchemaForm>
+    )
+  }
+
+  const { queryByText } = render(<TestComponent />)
+
+  await sleep(33)
+  expect(queryByText('123321')).toBeVisible()
+})