Merge branch 'master' into fix-hidden

ayatkyo · ayatkyo · commit a91dcef62a2d · 2020-05-23T03:35:06.000+08:00
diff --git a/gruntfile.js b/gruntfile.js
@@ -61,8 +61,8 @@ module.exports = function(grunt) {
         sourceMap: true,
         output: {
           preamble: '/*! ExcelJS <%= grunt.template.today("dd-mm-yyyy") %> */\n',
+          ascii_only: true,
         },
-        ascii_only: true
       },
       dist: {
         files: {
diff --git a/lib/stream/xlsx/worksheet-writer.js b/lib/stream/xlsx/worksheet-writer.js
@@ -31,6 +31,7 @@ const PageSetupXform = require('../../xlsx/xform/sheet/page-setup-xform');
 const AutoFilterXform = require('../../xlsx/xform/sheet/auto-filter-xform');
 const PictureXform = require('../../xlsx/xform/sheet/picture-xform');
 const ConditionalFormattingsXform = require('../../xlsx/xform/sheet/cf/conditional-formattings-xform');
+const RowBreaksXform = require('../../xlsx/xform/sheet/row-breaks-xform');
 
 // since prepare and render are functional, we can use singletons
 const xform = {
@@ -47,6 +48,7 @@ const xform = {
   autoFilter: new AutoFilterXform(),
   picture: new PictureXform(),
   conditionalFormattings: new ConditionalFormattingsXform(),
+  rowBreaks: new RowBreaksXform(),
 };
 
 // ============================================================================================
@@ -72,7 +74,7 @@ class WorksheetWriter {
     // column keys (addRow convenience): key ==> this._columns index
     this._keys = {};
 
-    // keep record of all merges
+    // keep a record of all row and column pageBreaks
     this._merges = [];
     this._merges.add = function() {}; // ignore cell instruction
 
@@ -100,6 +102,9 @@ class WorksheetWriter {
     // keep a record of conditionalFormattings
     this.conditionalFormatting = [];
 
+    // keep a record of all row and column pageBreaks
+    this.rowBreaks = [];
+
     // for default row height, outline levels, etc
     this.properties = Object.assign(
       {},
@@ -214,6 +219,7 @@ class WorksheetWriter {
     this._writePageMargins();
     this._writePageSetup();
     this._writeBackground();
+    this._writeRowBreaks();
 
     // Legacy Data tag for comments
     this._writeLegacyData();
@@ -580,6 +586,10 @@ class WorksheetWriter {
     this.stream.write(xform.conditionalFormattings.toXml(this.conditionalFormatting));
   }
 
+  _writeRowBreaks() {
+    this.stream.write(xform.rowBreaks.toXml(this.rowBreaks));
+  }
+
   _writeDataValidations() {
     this.stream.write(xform.dataValidations.toXml(this.dataValidations.model));
   }
diff --git a/spec/integration/worksheet-xlsx-writer.spec.js b/spec/integration/worksheet-xlsx-writer.spec.js
@@ -1,4 +1,4 @@
-const testutils = require('./../utils/index');
+const testutils = require('../utils/index');
 
 const ExcelJS = verquire('exceljs');
 
@@ -514,4 +514,25 @@ describe('WorksheetWriter', () => {
       }).to.throw(Error);
     });
   });
+
+  describe('Page Breaks', () => {
+    it('adds multiple row breaks', () => {
+      const wb = new ExcelJS.stream.xlsx.WorkbookWriter();
+      const ws = wb.addWorksheet('blort');
+
+      // initial values
+      ws.getCell('A1').value = 'A1';
+      ws.getCell('B1').value = 'B1';
+      ws.getCell('A2').value = 'A2';
+      ws.getCell('B2').value = 'B2';
+      ws.getCell('A3').value = 'A3';
+      ws.getCell('B3').value = 'B3';
+
+      let row = ws.getRow(1);
+      row.addPageBreak();
+      row = ws.getRow(2);
+      row.addPageBreak();
+      expect(ws.rowBreaks.length).to.equal(2);
+    });
+  });
 });
