fix(path): fix getIn unexpect value with null (#3305)

alibaba · Aug 2, 2022 · 140aa52 · 140aa52
1 parent 42fcc28
commit 140aa52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/path/src/__tests__/accessor.spec.ts b/packages/path/src/__tests__/accessor.spec.ts
@@ -2,6 +2,12 @@ import { Path } from '../'
 
 const { getIn, setIn } = Path
 
+test('test getIn null parent', () => {
+  const value = { aa: null }
+  expect(getIn(value, 'aa')).toEqual(null)
+  expect(getIn(value, 'aa.bb.cc')).toEqual(undefined)
+})
+
 test('test getIn and setIn', () => {
   const value = { a: { b: { c: 2, d: 333 } } }
   expect(getIn(value, 'a.b.c')).toEqual(2)

diff --git a/packages/path/src/index.ts b/packages/path/src/index.ts
@@ -37,12 +37,7 @@ const getIn = (segments: Segments, source: any) => {
     const index = segments[i]
     const rules = getDestructor(index as string)
     if (!rules) {
-      if (!isValid(source)) {
-        if (i !== segments.length - 1) {
-          return source
-        }
-        break
-      }
+      if (!isValid(source)) return
       source = source[index]
     } else {
       source = getInByDestructor(source, rules, { setIn, getIn })

diff --git a/packages/react/src/__tests__/field.spec.tsx b/packages/react/src/__tests__/field.spec.tsx
@@ -318,7 +318,6 @@ test('fields unmount and validate', async () => {
     try {
       await form.validate()
     } catch {}
-
     expect(form.invalid).toBeTruthy()
 
     form.query('parent').take((field) => {