Merge pull request #1334 from sdg9670/splice-comment-issue

Siemienik · web-flow · commit e2aab24e4292 · 2020-06-20T15:40:12.000+02:00
Fix the error that comment does not delete at spliceColumn
diff --git a/lib/doc/row.js b/lib/doc/row.js
@@ -91,9 +91,13 @@ class Row {
           cDst = this.getCell(i);
           cDst.value = cSrc.value;
           cDst.style = cSrc.style;
+          // eslint-disable-next-line no-underscore-dangle
+          cDst._comment = cSrc._comment;
         } else if (cDst) {
           cDst.value = null;
           cDst.style = {};
+          // eslint-disable-next-line no-underscore-dangle
+          cDst._comment = undefined;
         }
       }
     } else if (nExpand > 0) {
@@ -104,6 +108,8 @@ class Row {
           cDst = this.getCell(i + nExpand);
           cDst.value = cSrc.value;
           cDst.style = cSrc.style;
+          // eslint-disable-next-line no-underscore-dangle
+          cDst._comment = cSrc._comment;
         } else {
           this._cells[i + nExpand - 1] = undefined;
         }
@@ -115,6 +121,8 @@ class Row {
       cDst = this.getCell(start + i);
       cDst.value = inserts[i];
       cDst.style = {};
+      // eslint-disable-next-line no-underscore-dangle
+      cDst._comment = undefined;
     }
   }
 
diff --git a/spec/integration/pr/test-pr-1334.spec.js b/spec/integration/pr/test-pr-1334.spec.js
@@ -0,0 +1,38 @@
+const ExcelJS = verquire('exceljs');
+
+const TEST_XLSX_FILE_NAME = './spec/out/wb.test.xlsx';
+
+describe('github issues', () => {
+  it('pull request 1334 - Fix the error that comment does not delete at spliceColumn', async () => {
+    (async () => {
+      const wb = new ExcelJS.Workbook();
+      const ws = wb.addWorksheet('testSheet');
+
+      ws.addRow([
+        'test1',
+        'test2',
+        'test3',
+        'test4',
+        'test5',
+        'test6',
+        'test7',
+        'test8',
+      ]);
+
+      const row = ws.getRow(1);
+      row.getCell(1).note = 'test1';
+      row.getCell(2).note = 'test2';
+      row.getCell(3).note = 'test3';
+      row.getCell(4).note = 'test4';
+
+      ws.spliceColumns(2, 1);
+
+      expect(row.getCell(1).note).to.equal('test1');
+      expect(row.getCell(2).note).to.equal('test3');
+      expect(row.getCell(3).note).to.equal('test4');
+      expect(row.getCell(4).note).to.equal(undefined);
+
+      await wb.xlsx.writeFile(TEST_XLSX_FILE_NAME);
+    })();
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,13 @@ class Row {`
`91`	`91`	`cDst = this.getCell(i);`
`92`	`92`	`cDst.value = cSrc.value;`
`93`	`93`	`cDst.style = cSrc.style;`
	`94`	`+ // eslint-disable-next-line no-underscore-dangle`
	`95`	`+ cDst._comment = cSrc._comment;`
`94`	`96`	`} else if (cDst) {`
`95`	`97`	`cDst.value = null;`
`96`	`98`	`cDst.style = {};`
	`99`	`+ // eslint-disable-next-line no-underscore-dangle`
	`100`	`+ cDst._comment = undefined;`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`	`} else if (nExpand > 0) {`
`@@ -104,6 +108,8 @@ class Row {`
`104`	`108`	`cDst = this.getCell(i + nExpand);`
`105`	`109`	`cDst.value = cSrc.value;`
`106`	`110`	`cDst.style = cSrc.style;`
	`111`	`+ // eslint-disable-next-line no-underscore-dangle`
	`112`	`+ cDst._comment = cSrc._comment;`
`107`	`113`	`} else {`
`108`	`114`	`this._cells[i + nExpand - 1] = undefined;`
`109`	`115`	`}`
`@@ -115,6 +121,8 @@ class Row {`
`115`	`121`	`cDst = this.getCell(start + i);`
`116`	`122`	`cDst.value = inserts[i];`
`117`	`123`	`cDst.style = {};`
	`124`	`+ // eslint-disable-next-line no-underscore-dangle`
	`125`	`+ cDst._comment = undefined;`
`118`	`126`	`}`
`119`	`127`	`}`
`120`	`128`