fix: callback will not be executed until it is a function (#3511)

* fix: callback will not be executed until it is a function * test: add test for callback is undefined * style: move import dependent location
alibaba · Nov 2, 2022 · 0c96914 · 0c96914
1 parent f347a7c
commit 0c96914
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/effects.spec.ts b/packages/core/src/__tests__/effects.spec.ts
@@ -132,6 +132,17 @@ test('onFormReact', () => {
   form.setValues({ aa: 123 })
   expect(react).toBeCalled()
   form.onUnmount()
+
+  // will not throw error
+  const form2 = attach(
+    createForm({
+      effects() {
+        onFormReact()
+      },
+    })
+  )
+
+  form2.onUnmount()
 })
 
 test('onFormReset', async () => {

diff --git a/packages/core/src/effects/onFormEffects.ts b/packages/core/src/effects/onFormEffects.ts
@@ -1,3 +1,4 @@
+import { isFn } from '@formily/shared'
 import { autorun, batch } from '@formily/reactive'
 import { Form } from '../models'
 import { LifeCycleTypes } from '../types'
@@ -72,7 +73,7 @@ export function onFormReact(callback?: (form: Form) => void) {
   let dispose = null
   onFormInit((form) => {
     dispose = autorun(() => {
-      callback(form)
+      if (isFn(callback)) callback(form)
     })
   })
   onFormUnmount(() => {