fix(chunkEqual): 修复临界值错误

fjc0k · Sep 29, 2021 · 1a08efe · 1a08efe
1 parent 706fa4a
commit 1a08efe
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/src/utils/__snapshots__/chunkEqual.test.ts.snap b/src/utils/__snapshots__/chunkEqual.test.ts.snap
@@ -116,3 +116,48 @@ Array [
   ],
 ]
 `;
+
+exports[`chunkEqual 表现正常 10`] = `
+Array [
+  Array [
+    1,
+    2,
+  ],
+  Array [
+    3,
+    4,
+  ],
+]
+`;
+
+exports[`chunkEqual 表现正常 11`] = `
+Array [
+  Array [
+    1,
+    2,
+    3,
+  ],
+  Array [
+    4,
+    5,
+    6,
+  ],
+]
+`;
+
+exports[`chunkEqual 表现正常 12`] = `
+Array [
+  Array [
+    1,
+    2,
+  ],
+  Array [
+    3,
+    4,
+  ],
+  Array [
+    5,
+    6,
+  ],
+]
+`;
diff --git a/src/utils/chunkEqual.test.ts b/src/utils/chunkEqual.test.ts
@@ -11,5 +11,8 @@ describe('chunkEqual', () => {
     expect(chunkEqual([1, 2, 3, 4, 5], 2, i => i)).toMatchSnapshot()
     expect(chunkEqual([1, 2, 3, 4, 5], 8, i => i)).toMatchSnapshot()
     expect(chunkEqual([1, 2, 3, 4, 5], 4, i => i)).toMatchSnapshot()
+    expect(chunkEqual([1, 2, 3, 4], 2, () => 100)).toMatchSnapshot()
+    expect(chunkEqual([1, 2, 3, 4, 5, 6], 3, () => 100)).toMatchSnapshot()
+    expect(chunkEqual([1, 2, 3, 4, 5, 6], 2, () => 100)).toMatchSnapshot()
   })
 })
diff --git a/src/utils/chunkEqual.ts b/src/utils/chunkEqual.ts
@@ -12,10 +12,12 @@ export function chunkEqual<T>(
   size: number,
   filler: (index: number) => T,
 ): T[][] {
-  if (1 < size && size < array.length) {
+  const len = array.length
+  const remain = len % size
+  if (remain !== 0 && size < array.length) {
     array = array.slice()
-    for (let i = 0, l = array.length, n = size - (l % size); i < n; i++) {
-      array.push(filler(l + i))
+    for (let i = 0, n = size - remain; i < n; i++) {
+      array.push(filler(len + i))
     }
   }
   return chunk(array, size)