fix(core): fix array field remove with memory leak (#2963)

alibaba · Mar 20, 2022 · 1658ae3 · 1658ae3
1 parent 221d39f
commit 1658ae3
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 4 deletions.
diff --git a/packages/core/src/__tests__/array.spec.ts b/packages/core/src/__tests__/array.spec.ts
@@ -1,5 +1,6 @@
 import { createForm } from '../'
 import { onFieldValueChange, onFormValuesChange } from '../effects'
+import { DataField } from '../types'
 import { attach } from './shared'
 
 test('create array field', () => {
@@ -648,3 +649,51 @@ test('array field reset', () => {
   expect(form.values).toEqual({ array: [] })
   expect(array.value).toEqual([])
 })
+
+test('array field remove can not memory leak', async () => {
+  const handler = jest.fn()
+  const form = attach(
+    createForm({
+      values: {
+        array: [{ aa: 1 }, { aa: 2 }],
+      },
+      effects() {
+        onFieldValueChange('array.*.aa', handler)
+      },
+    })
+  )
+  const array = attach(
+    form.createArrayField({
+      name: 'array',
+    })
+  )
+  attach(
+    form.createObjectField({
+      name: '0',
+      basePath: 'array',
+    })
+  )
+  attach(
+    form.createField({
+      name: 'aa',
+      basePath: 'array.0',
+    })
+  )
+  attach(
+    form.createObjectField({
+      name: '1',
+      basePath: 'array',
+    })
+  )
+  attach(
+    form.createField({
+      name: 'aa',
+      basePath: 'array.1',
+    })
+  )
+  await array.remove(0)
+  form.query('array.0.aa').take((field) => {
+    ;(field as DataField).value = '123'
+  })
+  expect(handler).toBeCalledTimes(2)
+})
diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -162,7 +162,10 @@ export const patchFieldStates = (
     } else if (type === 'update') {
       if (payload) {
         target[address] = payload
-        if (target[oldAddress] === payload) delete target[oldAddress]
+        if (target[oldAddress] === payload) {
+          target[oldAddress]?.dispose()
+          delete target[oldAddress]
+        }
       }
       if (address && payload) {
         locateNode(payload, address)
@@ -506,9 +509,9 @@ export const cleanupArrayChildren = (field: ArrayField, start: number) => {
 
   const isNeedCleanup = (identifier: string) => {
     const afterStr = identifier.slice(address.length)
-    const number = afterStr.match(NumberIndexReg)?.[1]
-    if (number === undefined) return false
-    const index = Number(number)
+    const numStr = afterStr.match(NumberIndexReg)?.[1]
+    if (numStr === undefined) return false
+    const index = Number(numStr)
     return index >= start
   }