don't deep assign arrays

KingSora · Aug 27, 2023 · 3771592 · 3771592
1 parent 5c6af50
commit 3771592
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/overlayscrollbars/src/support/utils/object.ts b/packages/overlayscrollbars/src/support/utils/object.ts
@@ -68,7 +68,7 @@ export const assignDeep: AssignDeep = <T, U, V, W, X, Y, Z>(
       const copyIsArray = isArray(copy);
 
       // Recurse if we're merging plain objects or arrays
-      if (copy && (isPlainObject(copy) || copyIsArray)) {
+      if (copy && isPlainObject(copy)) {
         const src = target[key];
         let clone: any = src;
 
@@ -82,7 +82,7 @@ export const assignDeep: AssignDeep = <T, U, V, W, X, Y, Z>(
         // Never move original objects, clone them
         target[key] = assignDeep(clone, copy) as any;
       } else {
-        target[key] = copy;
+        target[key] = copyIsArray ? copy.slice() : copy;
       }
     });
   });

diff --git a/packages/overlayscrollbars/test/jest-jsdom/support/utils/object.test.ts b/packages/overlayscrollbars/test/jest-jsdom/support/utils/object.test.ts
@@ -55,9 +55,12 @@ describe('object utilities', () => {
       expect(deep1.foo2).toBe(document);
 
       const arr = [1, 2, 3];
+      const o = {};
       const nestedArray: NestedArray = { arr };
+      const nestedObj = { o };
 
       expect(assignDeep({}, nestedArray).arr).not.toBe(arr);
+      expect(assignDeep({}, nestedObj).o).not.toBe(o);
       expect(Array.isArray(assignDeep({ arr: {} }, nestedArray).arr)).toBeTruthy();
       expect(Array.isArray(assignDeep({ arr: {} }, nestedArray).arr)).toBeTruthy();
       expect(isPlainObject(assignDeep({ arr }, { arr: {} }).arr)).toBeTruthy();
@@ -163,6 +166,8 @@ describe('object utilities', () => {
         foo: 1,
         deep: { foo: null, text: '' },
       });
+
+      console.log(assignDeep({ arr: ['a', 'b', 'c'] }, { arr: [] }));
     });
   });