chore(project): release v0.1.15 (#94)

* fix(@uform/core): fix #84 #91
alibaba · Jun 4, 2019 · bc3125d · bc3125d
1 parent d29a32f
commit bc3125d
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 40 deletions.
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/antd",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -21,7 +21,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/react": "0.1.14",
+    "@uform/react": "0.1.15",
     "@uform/utils": "0.1.8",
     "classnames": "^2.2.6",
     "moveto": "^1.7.4",

diff --git a/packages/builder-next/package.json b/packages/builder-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/builder-next",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/builder": "0.1.14"
+    "@uform/builder": "0.1.15"
   },
   "devDependencies": {
     "@alifd/next": "^1.13.1"

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/builder",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib/index.js",
   "repository": {
@@ -24,7 +24,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/react": "0.1.14",
+    "@uform/react": "0.1.15",
     "@uform/utils": "0.1.8",
     "@uform/validator": "0.1.8",
     "classnames": "^2.2.5",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/core",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {

diff --git a/packages/core/src/field.js b/packages/core/src/field.js
@@ -28,49 +28,56 @@ export class Field {
     this.destructed = false
     this.loading = false
     this.errors = []
+    this.props = {}
     this.effectErrors = []
     this.initialized = false
     this.initialize(options)
     this.initialized = true
   }
 
   initialize(options) {
-    const editable = this.getEditableFromProps(options.props)
     const rules = this.getRulesFromProps(options.props)
     this.value = !isEmpty(options.value) ? clone(options.value) : this.value
-    this.initialValue = !isEmpty(options.initialValue)
-      ? options.initialValue
-      : !isEmpty(this.initialValue)
-        ? this.initialValue
-        : this.getInitialValueFromProps(options.props)
     this.name = !isEmpty(options.name) ? options.name : this.name || ''
     this.namePath = resolveFieldPath(this.name)
-    this.editable = !isEmpty(editable)
-      ? editable
-      : isEmpty(this.editable)
-        ? this.editable
-        : this.getContextEditable()
+
     this.path = resolveFieldPath(
       !isEmpty(options.path) ? options.path : this.path || []
     )
     this.rules = !isEmpty(rules) ? rules : this.rules
     this.required = hasRequired(this.rules)
-    this.props = !isEmpty(options.props)
-      ? !isEmpty(this.props)
+
+    if (isEmpty(options.props)) {
+      this.initialValue = !isEmpty(options.initialValue)
+        ? options.initialValue
+        : this.initialValue
+    } else {
+      this.initialValue = !isEmpty(options.initialValue)
+        ? options.initialValue
+        : !isEmpty(this.initialValue)
+          ? this.initialValue
+          : this.getInitialValueFromProps(options.props)
+      this.props = !isEmpty(this.props)
         ? { ...this.props, ...clone(options.props) }
         : clone(options.props)
-      : this.props || {}
-    if (this.removed) {
-      this.removed = false
-      this.visible = true
+      const editable = this.getEditableFromProps(options.props)
+      this.editable = !isEmpty(editable) ? editable : this.getContextEditable()
     }
+
     if (!this.initialized) {
       if (isEmpty(this.value) && !isEmpty(this.initialValue)) {
         this.value = clone(this.initialValue)
         this.context.setIn(this.name, this.value)
         this.context.setInitialValueIn(this.name, this.initialValue)
       }
     }
+
+    if (this.removed) {
+      this.removed = false
+      this.visible = true
+      this.context.triggerEffect('onFieldChange', this.publishState())
+    }
+
     if (isFn(options.onChange)) {
       this.onChange(options.onChange)
     }
@@ -192,14 +199,15 @@ export class Field {
     this.notify()
   }
 
-  restore() {
+  mount() {
     if (this.removed) {
       this.visible = true
       this.removed = false
+      this.context.triggerEffect('onFieldChange', this.publishState())
     }
   }
 
-  remove() {
+  unmount() {
     this.value = undefined
     this.initialValue = undefined
     this.visible = false

diff --git a/packages/core/src/form.js b/packages/core/src/form.js
@@ -333,14 +333,14 @@ export class Form {
     const field = this.fields[name]
     if (field) {
       field.initialize({
-        ...options,
+        path: options.path,
+        onChange: options.onChange,
         value: !isEmpty(value) ? value : initialValue,
         initialValue: initialValue
       })
       this.asyncUpdate(() => {
         this.updateFieldStateFromBuffer(field)
       })
-      this.triggerEffect('onFieldChange', field.publishState())
     } else {
       this.fields[name] = new Field(this, {
         name,

diff --git a/packages/core/src/index.js b/packages/core/src/index.js
@@ -52,6 +52,9 @@ export const createForm = ({
 
   form.syncUpdate(() => {
     form.triggerEffect('onFormInit', form.publishState())
+    fields.forEach(field => {
+      form.triggerEffect('onFieldChange', field.publishState())
+    })
   })
   return form
 }

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/next",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -21,7 +21,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/react": "0.1.14",
+    "@uform/react": "0.1.15",
     "@uform/utils": "0.1.8",
     "classnames": "^2.2.6",
     "moveto": "^1.7.4",

diff --git a/packages/printer/package.json b/packages/printer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/printer",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -20,7 +20,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/react": "0.1.14",
+    "@uform/react": "0.1.15",
     "react-modal": "^3.8.1",
     "styled-components": "^4.1.1"
   },

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/react",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -20,7 +20,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@uform/core": "0.1.14",
+    "@uform/core": "0.1.15",
     "@uform/utils": "0.1.8",
     "@uform/validator": "0.1.8",
     "pascal-case": "^2.0.1",

diff --git a/packages/react/src/__tests__/effects.spec.js b/packages/react/src/__tests__/effects.spec.js
@@ -26,7 +26,13 @@ beforeEach(() => {
   })
   registerFormField(
     'string',
-    connect()(props => <input {...props} value={props.value || ''} />)
+    connect()(props =>
+      props.disabled ? (
+        'Disabled'
+      ) : (
+        <input {...props} value={props.value || ''} />
+      )
+    )
   )
 })
 
@@ -130,3 +136,28 @@ test('onFieldChange will trigger with initialValues', async () => {
   expect(callback.mock.calls[0][0].value).toBe(undefined)
   expect(callback.mock.calls[1][0].value).toBe(123)
 })
+
+test('setFieldState x-props with onFormInit', async () => {
+  const TestComponent = () => {
+    return (
+      <SchemaForm
+        effects={($, { setFieldState }) => {
+          $('onFormInit').subscribe(() => {
+            setFieldState('aaa', state => {
+              state.props['x-props'].disabled = true
+            })
+          })
+        }}
+      >
+        <Field name='aaa' type='string' x-props={{ disabled: false }} />
+        <button type='submit' data-testid='btn'>
+          Submit
+        </button>
+      </SchemaForm>
+    )
+  }
+
+  const { queryByText } = render(<TestComponent />)
+  await sleep(33)
+  expect(queryByText('Disabled')).toBeVisible()
+})
diff --git a/packages/react/src/state/field.js b/packages/react/src/state/field.js
@@ -44,12 +44,12 @@ const StateField = createHOC((options, Field) => {
 
     componentWillUnmount() {
       this.unmounted = true
-      this.field.remove()
+      this.field.unmount()
     }
 
     componentDidMount() {
       this.unmounted = false
-      this.field.restore()
+      this.field.mount()
     }
 
     componentDidUpdate(prevProps) {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/utils",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {

diff --git a/packages/validator/package.json b/packages/validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uform/validator",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -18,7 +18,7 @@
     "@babel/runtime": "^7.4.4"
   },
   "dependencies": {
-    "@uform/utils": "0.1.14"
+    "@uform/utils": "0.1.15"
   },
   "publishConfig": {
     "access": "public"