fix: shallowEqual(null, null) shold be true

NervJS · Aug 22, 2020 · 3371308 · 3371308
1 parent aaa405e
commit 3371308
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/nerv-utils/__tests__/shallow-equal.spec.js b/packages/nerv-utils/__tests__/shallow-equal.spec.js
@@ -11,6 +11,7 @@ describe('shallowEqual', () => {
     const g = { a: 1, v: arr1 }
     expect(shallowEqual(a, b)).not.toBeTruthy()
     expect(shallowEqual(null, 110)).toBeFalsy()
+    expect(shallowEqual(null, null)).toBeTruthy()
     expect(shallowEqual(+0, -0)).toBeTruthy()
     expect(shallowEqual([], [1])).toBeFalsy()
     expect(shallowEqual(a, c)).toBeTruthy()

diff --git a/packages/nerv-utils/src/shallow-equal.ts b/packages/nerv-utils/src/shallow-equal.ts
@@ -8,12 +8,12 @@ Object.is = Object.is || function (x, y) {
 }
 
 export default function shallowEqual (obj1, obj2) {
-  if (obj1 === null || obj2 === null) {
-    return false
-  }
   if (Object.is(obj1, obj2)) {
     return true
   }
+  if (obj1 === null || obj2 === null) {
+    return false
+  }
   const obj1Keys = obj1 ? Object.keys(obj1) : []
   const obj2Keys = obj2 ? Object.keys(obj2) : []
   if (obj1Keys.length !== obj2Keys.length) {