pdfmake 0.3.0-beta.7 → 0.3.0-beta.9

package/js/3rd-party/svg-to-pdfkit.js

@@ -3,5 +3,5 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _source = _interopRequireDefault(require("./svg-to-pdfkit/source.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var _default = exports.default = _source.default;

package/js/DocMeasure.js

@@ -10,7 +10,7 @@ var _variableType = require("./helpers/variableType");
 var _node = require("./helpers/node");
 var _tools = require("./helpers/tools");
 var _qrEnc = _interopRequireDefault(require("./qrEnc.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class DocMeasure {
   constructor(pdfDocument, styleDictionary, defaultStyle, svgMeasure, tableLayouts) {
     this.pdfDocument = pdfDocument;
@@ -396,15 +396,14 @@ class DocMeasure {
         if (item.listMarker._inlines) {
           node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
         }
-      } // TODO: else - nested lists numbering
-
+        if (node.reversed) {
+          counter--;
+        } else {
+          counter++;
+        }
+      }
       node._minWidth = Math.max(node._minWidth, items[i]._minWidth);
       node._maxWidth = Math.max(node._maxWidth, items[i]._maxWidth);
-      if (node.reversed) {
-        counter--;
-      } else {
-        counter++;
-      }
     }
     node._minWidth += node._gapSize.width;
     node._maxWidth += node._gapSize.width;

package/js/DocumentContext.js

@@ -18,7 +18,6 @@ class DocumentContext extends _events.EventEmitter {
     this.availableHeight = 0;
     this.page = -1;
     this.snapshots = [];
-    this.endingCell = null;
     this.backgroundLength = [];
     this.addPage(pageSize);
   }
@@ -36,15 +35,13 @@ class DocumentContext extends _events.EventEmitter {
         availableWidth: this.availableWidth,
         page: this.page
       },
-      endingCell: this.endingCell,
       lastColumnWidth: this.lastColumnWidth
     });
     this.lastColumnWidth = 0;
   }
   beginColumn(width, offset, endingCell) {
     let saved = this.snapshots[this.snapshots.length - 1];
-    this.calculateBottomMost(saved);
-    this.endingCell = endingCell;
+    this.calculateBottomMost(saved, endingCell);
     this.page = saved.page;
     this.x = this.x + this.lastColumnWidth + (offset || 0);
     this.y = saved.y;
@@ -52,10 +49,9 @@ class DocumentContext extends _events.EventEmitter {
     this.availableHeight = saved.availableHeight;
     this.lastColumnWidth = width;
   }
-  calculateBottomMost(destContext) {
-    if (this.endingCell) {
-      this.saveContextInEndingCell(this.endingCell);
-      this.endingCell = null;
+  calculateBottomMost(destContext, endingCell) {
+    if (endingCell) {
+      this.saveContextInEndingCell(endingCell);
     } else {
       destContext.bottomMost = bottomMostContext(this, destContext.bottomMost);
     }
@@ -78,10 +74,9 @@ class DocumentContext extends _events.EventEmitter {
       lastColumnWidth: this.lastColumnWidth
     };
   }
-  completeColumnGroup(height) {
+  completeColumnGroup(height, endingCell) {
     let saved = this.snapshots.pop();
-    this.calculateBottomMost(saved);
-    this.endingCell = null;
+    this.calculateBottomMost(saved, endingCell);
     this.x = saved.x;
     let y = saved.bottomMost.y;
     if (height) {
@@ -148,7 +143,6 @@ class DocumentContext extends _events.EventEmitter {
       availableHeight: this.availableHeight,
       availableWidth: this.availableWidth,
       page: this.page,
-      endingCell: this.endingCell,
       lastColumnWidth: this.lastColumnWidth
     });
   }
@@ -159,7 +153,6 @@ class DocumentContext extends _events.EventEmitter {
     this.availableWidth = saved.availableWidth;
     this.availableHeight = saved.availableHeight;
     this.page = saved.page;
-    this.endingCell = saved.endingCell;
     this.lastColumnWidth = saved.lastColumnWidth;
   }
   moveToNextPage(pageOrientation) {

package/js/ElementWriter.js

@@ -6,7 +6,7 @@ var _variableType = require("./helpers/variableType");
 var _tools = require("./helpers/tools");
 var _DocumentContext = _interopRequireDefault(require("./DocumentContext"));
 var _events = require("events");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * A line/vector writer, which adds elements to current page and sets
  * their positions based on the context

package/js/LayoutBuilder.js

@@ -14,7 +14,7 @@ var _node = require("./helpers/node");
 var _tools = require("./helpers/tools");
 var _TextInlines = _interopRequireDefault(require("./TextInlines"));
 var _StyleContextStack = _interopRequireDefault(require("./StyleContextStack"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function addAll(target, otherArray) {
   otherArray.forEach(item => {
     target.push(item);
@@ -425,6 +425,20 @@ class LayoutBuilder {
       return gaps;
     }
   }
+  findStartingSpanCell(arr, i) {
+    let requiredColspan = 1;
+    for (let index = i - 1; index >= 0; index--) {
+      if (!arr[index]._span) {
+        if (arr[index].rowSpan > 1 && (arr[index].colSpan || 1) === requiredColspan) {
+          return arr[index];
+        } else {
+          return null;
+        }
+      }
+      requiredColspan++;
+    }
+    return null;
+  }
   processRow(columns, widths, gaps, tableBody, tableRow, height) {
     const storePageBreakData = data => {
       let pageDesc;
@@ -456,16 +470,52 @@ class LayoutBuilder {
           width += widths[++i]._calcWidth + gaps[i];
         }
       }
-      this.writer.context().beginColumn(width, leftOffset, getEndingCell(column, i));
+
+      // if rowspan starts in this cell, we retrieve the last cell affected by the rowspan
+      const endingCell = getEndingCell(column, i);
+      if (endingCell) {
+        // We store a reference of the ending cell in the first cell of the rowspan
+        column._endingCell = endingCell;
+      }
+
+      // Check if exists and retrieve the cell that started the rowspan in case we are in the cell just after
+      let startingSpanCell = this.findStartingSpanCell(columns, i);
+      let endingSpanCell = null;
+      if (startingSpanCell && startingSpanCell._endingCell) {
+        // Reference to the last cell of the rowspan
+        endingSpanCell = startingSpanCell._endingCell;
+      }
+
+      // We pass the endingSpanCell reference to store the context just after processing rowspan cell
+      this.writer.context().beginColumn(width, leftOffset, endingSpanCell);
       if (!column._span) {
         this.processNode(column);
         addAll(positions, column.positions);
       } else if (column._columnEndingContext) {
         // row-span ending
+        // Recover the context after processing the rowspanned cell
         this.writer.context().markEnding(column);
       }
     }
-    this.writer.context().completeColumnGroup(height);
+
+    // Check if last cell is part of a span
+    let endingSpanCell = null;
+    const lastColumn = columns.length > 0 ? columns[columns.length - 1] : null;
+    if (lastColumn) {
+      // Previous column cell has a rowspan
+      if (lastColumn._endingCell) {
+        endingSpanCell = lastColumn._endingCell;
+        // Previous column cell is part of a span
+      } else if (lastColumn._span === true) {
+        // We get the cell that started the span where we set a reference to the ending cell
+        const startingSpanCell = this.findStartingSpanCell(columns, columns.length);
+        if (startingSpanCell) {
+          // Context will be stored here (ending cell)
+          endingSpanCell = startingSpanCell._endingCell;
+        }
+      }
+    }
+    this.writer.context().completeColumnGroup(height, endingSpanCell);
     this.writer.removeListener('pageChanged', storePageBreakData);
     return {
       pageBreaks: pageBreaks,

package/js/OutputDocumentServer.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _OutputDocument = _interopRequireDefault(require("./OutputDocument"));
 var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class OutputDocumentServer extends _OutputDocument.default {
   /**
    * @param {string} filename

package/js/PDFDocument.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _pdfkit = _interopRequireDefault(require("@foliojs-fork/pdfkit"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const typeName = (bold, italics) => {
   let type = 'normal';
   if (bold && italics) {

package/js/PageElementWriter.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _ElementWriter = _interopRequireDefault(require("./ElementWriter"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * An extended ElementWriter which can handle:
  * - page-breaks (it adds new pages when there's not enough space left),

package/js/PageSize.js

@@ -5,7 +5,7 @@ exports.normalizePageMargin = normalizePageMargin;
 exports.normalizePageSize = normalizePageSize;
 var _standardPageSizes = _interopRequireDefault(require("./standardPageSizes"));
 var _variableType = require("./helpers/variableType");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function normalizePageSize(pageSize, pageOrientation) {
   function isNeedSwapPageSizes(pageOrientation) {
     if ((0, _variableType.isString)(pageOrientation)) {

package/js/Printer.js

@@ -9,7 +9,7 @@ var _PageSize = require("./PageSize");
 var _tableLayouts = require("./tableLayouts");
 var _Renderer = _interopRequireDefault(require("./Renderer"));
 var _variableType = require("./helpers/variableType");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Printer which turns document definition into a pdf
  *

package/js/Renderer.js

@@ -6,7 +6,7 @@ var _TextDecorator = _interopRequireDefault(require("./TextDecorator"));
 var _TextInlines = _interopRequireDefault(require("./TextInlines"));
 var _variableType = require("./helpers/variableType");
 var _svgToPdfkit = _interopRequireDefault(require("./3rd-party/svg-to-pdfkit"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const findFont = (fonts, requiredFonts, defaultFont) => {
   for (let i = 0; i < requiredFonts.length; i++) {
     let requiredFont = requiredFonts[i].toLowerCase();

package/js/SVGMeasure.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _xmldoc = _interopRequireDefault(require("xmldoc"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Strip unit postfix, parse number, but return undefined instead of NaN for bad input
  *

package/js/StyleContextStack.js

@@ -75,26 +75,10 @@ class StyleContextStack {
     for (let i = 0, l = styleNames.length; i < l; i++) {
       this.push(styleNames[i]);
     }
-    let styleProperties = ['font', 'fontSize', 'fontFeatures', 'bold', 'italics', 'alignment', 'color', 'columnGap', 'fillColor', 'fillOpacity', 'decoration', 'decorationStyle', 'decorationColor', 'background', 'lineHeight', 'characterSpacing', 'noWrap', 'markerColor', 'leadingIndent', 'sup', 'sub'
-    //'tableCellPadding'
-    // 'cellBorder',
-    // 'headerCellBorder',
-    // 'oddRowCellBorder',
-    // 'evenRowCellBorder',
-    // 'tableBorder'
-    ];
-    let styleOverrideObject = {};
-    let pushStyleOverrideObject = false;
-    styleProperties.forEach(key => {
-      if ((0, _variableType.isValue)(item[key])) {
-        styleOverrideObject[key] = item[key];
-        pushStyleOverrideObject = true;
-      }
-    });
-    if (pushStyleOverrideObject) {
-      this.push(styleOverrideObject);
-    }
-    return styleNames.length + (pushStyleOverrideObject ? 1 : 0);
+
+    // rather than spend significant time making a styleOverrideObject, just add item
+    this.push(item);
+    return styleNames.length + 1;
   }
 
   /**

package/js/TableProcessor.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _columnCalculator = _interopRequireDefault(require("./columnCalculator"));
 var _variableType = require("./helpers/variableType");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class TableProcessor {
   constructor(tableNode) {
     this.tableNode = tableNode;
@@ -92,15 +92,26 @@ class TableProcessor {
     this.offsets = tableNode._offsets;
     this.layout = tableNode._layout;
     availableWidth = writer.context().availableWidth - this.offsets.total;
-    _columnCalculator.default.buildColumnWidths(tableNode.table.widths, availableWidth);
+    _columnCalculator.default.buildColumnWidths(tableNode.table.widths, availableWidth, this.offsets.total, tableNode);
     this.tableWidth = tableNode._offsets.total + getTableInnerContentWidth();
     this.rowSpanData = prepareRowSpanData();
     this.cleanUpRepeatables = false;
-    this.headerRows = tableNode.table.headerRows || 0;
-    if (this.headerRows > tableNode.table.body.length) {
-      throw new Error(`Too few rows in the table. Property headerRows requires at least ${this.headerRows}, contains only ${tableNode.table.body.length}`);
+
+    // headersRows and rowsWithoutPageBreak (headerRows + keepWithHeaderRows)
+    this.headerRows = 0;
+    this.rowsWithoutPageBreak = 0;
+    const headerRows = tableNode.table.headerRows;
+    if ((0, _variableType.isPositiveInteger)(headerRows)) {
+      this.headerRows = headerRows;
+      if (this.headerRows > tableNode.table.body.length) {
+        throw new Error(`Too few rows in the table. Property headerRows requires at least ${this.headerRows}, contains only ${tableNode.table.body.length}`);
+      }
+      this.rowsWithoutPageBreak = this.headerRows;
+      const keepWithHeaderRows = tableNode.table.keepWithHeaderRows;
+      if ((0, _variableType.isPositiveInteger)(keepWithHeaderRows)) {
+        this.rowsWithoutPageBreak += keepWithHeaderRows;
+      }
     }
-    this.rowsWithoutPageBreak = this.headerRows + (tableNode.table.keepWithHeaderRows || 0);
     this.dontBreakRows = tableNode.table.dontBreakRows || false;
     if (this.rowsWithoutPageBreak) {
       writer.beginUnbreakableBlock();

package/js/TextBreaker.js

@@ -5,7 +5,7 @@ exports.default = void 0;
 var _linebreak = _interopRequireDefault(require("@foliojs-fork/linebreak"));
 var _variableType = require("./helpers/variableType");
 var _StyleContextStack = _interopRequireDefault(require("./StyleContextStack"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @param {string} text
  * @param {boolean} noWrap

package/js/TextInlines.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _TextBreaker = _interopRequireDefault(require("./TextBreaker"));
 var _StyleContextStack = _interopRequireDefault(require("./StyleContextStack"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const LEADING = /^(\s)+/g;
 const TRAILING = /(\s)+$/g;
 

package/js/URLResolver.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _http = _interopRequireDefault(require("http"));
 var _https = _interopRequireDefault(require("https"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const fetchUrl = (url, headers = {}) => {
   return new Promise((resolve, reject) => {
     const parsedUrl = new URL(url);

package/js/base.js

@@ -5,7 +5,7 @@ exports.default = void 0;
 var _Printer = _interopRequireDefault(require("./Printer"));
 var _virtualFs = _interopRequireDefault(require("./virtual-fs"));
 var _tools = require("./helpers/tools");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class pdfmake {
   constructor() {
     this.virtualfs = _virtualFs.default;

package/js/browser-extensions/OutputDocumentBrowser.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _OutputDocument = _interopRequireDefault(require("../OutputDocument"));
 var _fileSaver = require("file-saver");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @returns {Window}
  */

package/js/browser-extensions/index.js

@@ -7,7 +7,7 @@ var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBro
 var _URLBrowserResolver = _interopRequireDefault(require("./URLBrowserResolver"));
 var _fs = _interopRequireDefault(require("fs"));
 var _configurator = _interopRequireDefault(require("core-js/configurator"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // core-js: Polyfills will be used only if natives completely unavailable.
 (0, _configurator.default)({
   useNative: ['Promise']

package/js/columnCalculator.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _variableType = require("./helpers/variableType");
-function buildColumnWidths(columns, availableWidth) {
+function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode) {
   let autoColumns = [];
   let autoMin = 0;
   let autoMax = 0;
@@ -25,10 +25,29 @@ function buildColumnWidths(columns, availableWidth) {
       fixedColumns.push(column);
     }
   });
-  fixedColumns.forEach(col => {
+  fixedColumns.forEach((col, colIndex) => {
     // width specified as %
     if ((0, _variableType.isString)(col.width) && /\d+%/.test(col.width)) {
-      col.width = parseFloat(col.width) * initial_availableWidth / 100;
+      // In tables we have to take into consideration the reserved width for paddings and borders
+      let reservedWidth = 0;
+      if (tableNode) {
+        const paddingLeft = tableNode._layout.paddingLeft(colIndex, tableNode);
+        const paddingRight = tableNode._layout.paddingRight(colIndex, tableNode);
+        const borderLeft = tableNode._layout.vLineWidth(colIndex, tableNode);
+        const borderRight = tableNode._layout.vLineWidth(colIndex + 1, tableNode);
+        if (colIndex === 0) {
+          // first column assumes whole borderLeft and half of border right
+          reservedWidth = paddingLeft + paddingRight + borderLeft + borderRight / 2;
+        } else if (colIndex === fixedColumns.length - 1) {
+          // last column assumes whole borderRight and half of border left
+          reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight;
+        } else {
+          // Columns in the middle assume half of each border
+          reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight / 2;
+        }
+      }
+      const totalAvailableWidth = initial_availableWidth + offsetTotal;
+      col.width = parseFloat(col.width) * totalAvailableWidth / 100 - reservedWidth;
     }
     if (col.width < col._minWidth && col.elasticWidth) {
       col._calcWidth = col._minWidth;

package/js/helpers/variableType.js

@@ -4,6 +4,7 @@ exports.__esModule = true;
 exports.isEmptyObject = isEmptyObject;
 exports.isNumber = isNumber;
 exports.isObject = isObject;
+exports.isPositiveInteger = isPositiveInteger;
 exports.isString = isString;
 exports.isValue = isValue;
 /**
@@ -22,6 +23,17 @@ function isNumber(variable) {
   return typeof variable === 'number' || variable instanceof Number;
 }
 
+/**
+ * @param {any} variable
+ * @returns {boolean}
+ */
+function isPositiveInteger(variable) {
+  if (!isNumber(variable) || !Number.isInteger(variable) || variable <= 0) {
+    return false;
+  }
+  return true;
+}
+
 /**
  * @param {any} variable
  * @returns {boolean}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.0-beta.7",
+  "version": "0.3.0-beta.9",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",

package/src/DocMeasure.js

@@ -433,16 +433,17 @@ class DocMeasure {
 				if (item.listMarker._inlines) {
 					node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
 				}
-			}  // TODO: else - nested lists numbering
+
+				if (node.reversed) {
+					counter--;
+				} else {
+					counter++;
+				}
+			}
 
 			node._minWidth = Math.max(node._minWidth, items[i]._minWidth);
 			node._maxWidth = Math.max(node._maxWidth, items[i]._maxWidth);
 
-			if (node.reversed) {
-				counter--;
-			} else {
-				counter++;
-			}
 		}
 
 		node._minWidth += node._gapSize.width;

package/src/DocumentContext.js

@@ -18,7 +18,6 @@ class DocumentContext extends EventEmitter {
 		this.page = -1;
 
 		this.snapshots = [];
-		this.endingCell = null;
 		this.backgroundLength = [];
 
 		this.addPage(pageSize);
@@ -38,7 +37,6 @@ class DocumentContext extends EventEmitter {
 				availableWidth: this.availableWidth,
 				page: this.page
 			},
-			endingCell: this.endingCell,
 			lastColumnWidth: this.lastColumnWidth
 		});
 
@@ -48,9 +46,8 @@ class DocumentContext extends EventEmitter {
 	beginColumn(width, offset, endingCell) {
 		let saved = this.snapshots[this.snapshots.length - 1];
 
-		this.calculateBottomMost(saved);
+		this.calculateBottomMost(saved, endingCell);
 
-		this.endingCell = endingCell;
 		this.page = saved.page;
 		this.x = this.x + this.lastColumnWidth + (offset || 0);
 		this.y = saved.y;
@@ -60,10 +57,9 @@ class DocumentContext extends EventEmitter {
 		this.lastColumnWidth = width;
 	}
 
-	calculateBottomMost(destContext) {
-		if (this.endingCell) {
-			this.saveContextInEndingCell(this.endingCell);
-			this.endingCell = null;
+	calculateBottomMost(destContext, endingCell) {
+		if (endingCell) {
+			this.saveContextInEndingCell(endingCell);
 		} else {
 			destContext.bottomMost = bottomMostContext(this, destContext.bottomMost);
 		}
@@ -89,12 +85,11 @@ class DocumentContext extends EventEmitter {
 		};
 	}
 
-	completeColumnGroup(height) {
+	completeColumnGroup(height, endingCell) {
 		let saved = this.snapshots.pop();
 
-		this.calculateBottomMost(saved);
+		this.calculateBottomMost(saved, endingCell);
 
-		this.endingCell = null;
 		this.x = saved.x;
 
 		let y = saved.bottomMost.y;
@@ -171,7 +166,6 @@ class DocumentContext extends EventEmitter {
 			availableHeight: this.availableHeight,
 			availableWidth: this.availableWidth,
 			page: this.page,
-			endingCell: this.endingCell,
 			lastColumnWidth: this.lastColumnWidth
 		});
 	}
@@ -184,7 +178,6 @@ class DocumentContext extends EventEmitter {
 		this.availableWidth = saved.availableWidth;
 		this.availableHeight = saved.availableHeight;
 		this.page = saved.page;
-		this.endingCell = saved.endingCell;
 		this.lastColumnWidth = saved.lastColumnWidth;
 	}
 

package/src/LayoutBuilder.js

@@ -495,6 +495,21 @@ class LayoutBuilder {
 		}
 	}
 
+	findStartingSpanCell(arr, i) {
+		let requiredColspan = 1;
+    for (let index = i - 1; index >= 0; index--) {
+        if (!arr[index]._span) {
+					if (arr[index].rowSpan > 1 && (arr[index].colSpan || 1) === requiredColspan) {
+            return arr[index];
+					} else {
+						return null;
+					}
+        }
+				requiredColspan++;
+    }
+    return null;
+	}
+
 	processRow(columns, widths, gaps, tableBody, tableRow, height) {
 		const storePageBreakData = data => {
 			let pageDesc;
@@ -535,17 +550,52 @@ class LayoutBuilder {
 				}
 			}
 
-			this.writer.context().beginColumn(width, leftOffset, getEndingCell(column, i));
+			// if rowspan starts in this cell, we retrieve the last cell affected by the rowspan
+			const endingCell = getEndingCell(column, i);
+			if (endingCell) {
+				// We store a reference of the ending cell in the first cell of the rowspan
+				column._endingCell = endingCell;
+			}
+
+			// Check if exists and retrieve the cell that started the rowspan in case we are in the cell just after
+			let startingSpanCell = this.findStartingSpanCell(columns, i);
+			let endingSpanCell = null;
+			if (startingSpanCell && startingSpanCell._endingCell) {
+				// Reference to the last cell of the rowspan
+				endingSpanCell = startingSpanCell._endingCell;
+			}
+
+			// We pass the endingSpanCell reference to store the context just after processing rowspan cell
+			this.writer.context().beginColumn(width, leftOffset, endingSpanCell);
 			if (!column._span) {
 				this.processNode(column);
 				addAll(positions, column.positions);
 			} else if (column._columnEndingContext) {
 				// row-span ending
+				// Recover the context after processing the rowspanned cell
 				this.writer.context().markEnding(column);
 			}
 		}
 
-		this.writer.context().completeColumnGroup(height);
+		// Check if last cell is part of a span
+		let endingSpanCell = null;
+		const lastColumn = columns.length > 0 ? columns[columns.length - 1] : null;
+		if (lastColumn) {
+			// Previous column cell has a rowspan
+			if (lastColumn._endingCell) {
+				endingSpanCell = lastColumn._endingCell;
+			// Previous column cell is part of a span
+			} else if (lastColumn._span === true) {
+				// We get the cell that started the span where we set a reference to the ending cell
+				const startingSpanCell = this.findStartingSpanCell(columns, columns.length);
+				if (startingSpanCell) {
+					// Context will be stored here (ending cell)
+					endingSpanCell = startingSpanCell._endingCell;
+				}
+			}
+		}
+
+		this.writer.context().completeColumnGroup(height, endingSpanCell);
 
 		this.writer.removeListener('pageChanged', storePageBreakData);