refactor(reactive): break change to redefine action semantics (#1930)

alibaba · Aug 3, 2021 · 1b0a753 · 1b0a753
1 parent c74e7f9
commit 1b0a753
Show file tree

Hide file tree

Showing 48 changed files with 1,289 additions and 313 deletions.
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
@@ -5,7 +5,10 @@
     "autorun",
     "Formily",
     "formily",
+    "untrack",
+    "untracker",
     "untracked",
+    "Untracking",
     "Unmount",
     "antd",
     "Antd",

diff --git a/docs/guide/scenes/edit-detail.md b/docs/guide/scenes/edit-detail.md
@@ -86,7 +86,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -408,7 +408,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -731,7 +731,7 @@ const fetchAddress = (field) => {
   fetch('//unpkg.com/china-location/dist/location.json')
     .then((res) => res.json())
     .then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = transform(data)
         field.loading = false
       })
@@ -1058,7 +1058,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1379,7 +1379,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1702,7 +1702,7 @@ const fetchAddress = (field) => {
   fetch('//unpkg.com/china-location/dist/location.json')
     .then((res) => res.json())
     .then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = transform(data)
         field.loading = false
       })

diff --git a/docs/guide/scenes/edit-detail.zh-CN.md b/docs/guide/scenes/edit-detail.zh-CN.md
@@ -86,7 +86,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -404,7 +404,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -723,7 +723,7 @@ const fetchAddress = (field) => {
   fetch('//unpkg.com/china-location/dist/location.json')
     .then((res) => res.json())
     .then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = transform(data)
         field.loading = false
       })
@@ -1048,7 +1048,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1363,7 +1363,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1680,7 +1680,7 @@ const fetchAddress = (field) => {
   fetch('//unpkg.com/china-location/dist/location.json')
     .then((res) => res.json())
     .then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = transform(data)
         field.loading = false
       })

diff --git a/docs/guide/scenes/login-register.md b/docs/guide/scenes/login-register.md
@@ -514,7 +514,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -849,7 +849,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1321,7 +1321,7 @@ export default () => {
               fetch('//unpkg.com/china-location/dist/location.json')
                 .then((res) => res.json())
                 .then(
-                  action((data) => {
+                  action.bound((data) => {
                     field.dataSource = transform(data)
                     field.loading = false
                   })

diff --git a/docs/guide/scenes/login-register.zh-CN.md b/docs/guide/scenes/login-register.zh-CN.md
@@ -514,7 +514,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -849,7 +849,7 @@ const SchemaField = createSchemaField({
       fetch('//unpkg.com/china-location/dist/location.json')
         .then((res) => res.json())
         .then(
-          action((data) => {
+          action.bound((data) => {
             field.dataSource = transform(data)
             field.loading = false
           })
@@ -1321,7 +1321,7 @@ export default () => {
               fetch('//unpkg.com/china-location/dist/location.json')
                 .then((res) => res.json())
                 .then(
-                  action((data) => {
+                  action.bound((data) => {
                     field.dataSource = transform(data)
                     field.loading = false
                   })

diff --git a/packages/antd/docs/components/Cascader.md b/packages/antd/docs/components/Cascader.md
@@ -45,7 +45,7 @@ const useAddress = (pattern: FormPathPattern) => {
     fetch('//unpkg.com/china-location/dist/location.json')
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })
@@ -126,7 +126,7 @@ const useAsyncDataSource =
     fetch(url)
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })
@@ -204,7 +204,7 @@ const useAddress = (pattern: FormPathPattern) => {
     fetch('//unpkg.com/china-location/dist/location.json')
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })

diff --git a/packages/antd/docs/components/Cascader.zh-CN.md b/packages/antd/docs/components/Cascader.zh-CN.md
@@ -45,7 +45,7 @@ const useAddress = (pattern: FormPathPattern) => {
     fetch('//unpkg.com/china-location/dist/location.json')
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })
@@ -126,7 +126,7 @@ const useAsyncDataSource =
     fetch(url)
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })
@@ -204,7 +204,7 @@ const useAddress = (pattern: FormPathPattern) => {
     fetch('//unpkg.com/china-location/dist/location.json')
       .then((res) => res.json())
       .then(
-        action((data) => {
+        action.bound((data) => {
           field.dataSource = transform(data)
           field.loading = false
         })

diff --git a/packages/antd/docs/components/Select.md b/packages/antd/docs/components/Select.md
@@ -118,7 +118,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service({ field, keyword: keyword.value }).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -185,7 +185,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -365,7 +365,7 @@ const loadData = async (field) => {
 const useAsyncDataSource = (service) => (field) => {
   field.loading = true
   service(field).then(
-    action((data) => {
+    action.bound((data) => {
       field.dataSource = data
       field.loading = false
     })
@@ -474,7 +474,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })

diff --git a/packages/antd/docs/components/Select.zh-CN.md b/packages/antd/docs/components/Select.zh-CN.md
@@ -118,7 +118,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service({ field, keyword: keyword.value }).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -185,7 +185,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -365,7 +365,7 @@ const loadData = async (field) => {
 const useAsyncDataSource = (service) => (field) => {
   field.loading = true
   service(field).then(
-    action((data) => {
+    action.bound((data) => {
       field.dataSource = data
       field.loading = false
     })
@@ -474,7 +474,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })

diff --git a/packages/antd/docs/components/TreeSelect.md b/packages/antd/docs/components/TreeSelect.md
@@ -115,7 +115,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -478,7 +478,7 @@ const loadData = async (field) => {
 const useAsyncDataSource = (service) => (field) => {
   field.loading = true
   service(field).then(
-    action((data) => {
+    action.bound((data) => {
       field.dataSource = data
       field.loading = false
     })
@@ -626,7 +626,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })

diff --git a/packages/antd/docs/components/TreeSelect.zh-CN.md b/packages/antd/docs/components/TreeSelect.zh-CN.md
@@ -115,7 +115,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })
@@ -478,7 +478,7 @@ const loadData = async (field) => {
 const useAsyncDataSource = (service) => (field) => {
   field.loading = true
   service(field).then(
-    action((data) => {
+    action.bound((data) => {
       field.dataSource = data
       field.loading = false
     })
@@ -626,7 +626,7 @@ const useAsyncDataSource = (
   onFieldReact(pattern, (field) => {
     field.loading = true
     service(field).then(
-      action((data) => {
+      action.bound((data) => {
         field.dataSource = data
         field.loading = false
       })

diff --git a/packages/antd/src/form-step/index.tsx b/packages/antd/src/form-step/index.tsx
@@ -67,7 +67,7 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
     steps: [],
   }
 
-  const setDisplay = action((target: number) => {
+  const setDisplay = action.bound((target: number) => {
     const currentStep = env.steps[target]
     env.steps.forEach(({ name }) => {
       env.form.query(`${env.field.address}.${name}`).take((field) => {
@@ -80,14 +80,14 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
     })
   })
 
-  const next = action(() => {
+  const next = action.bound(() => {
     if (formStep.allowNext) {
       setDisplay(formStep.current + 1)
       formStep.setCurrent(formStep.current + 1)
     }
   })
 
-  const back = action(() => {
+  const back = action.bound(() => {
     if (formStep.allowBack) {
       setDisplay(formStep.current - 1)
       formStep.setCurrent(formStep.current - 1)