pdfmake 0.3.12 → 0.3.13

package/js/DocumentContext.js

@@ -458,7 +458,9 @@ class DocumentContext extends _events.EventEmitter {
     }
     let page = {
       items: [],
-      pageSize: pageSize,
+      pageSize: {
+        ...pageSize
+      },
       pageMargins: this.pageMargins,
       customProperties: customProperties
     };

package/js/ElementWriter.js

@@ -277,6 +277,7 @@ class ElementWriter extends _events.EventEmitter {
     if (!useBlockXOffset && block.height > ctx.availableHeight) {
       return false;
     }
+    let unbreakableFillsInserted = 0;
     block.items.forEach(item => {
       switch (item.type) {
         case 'line':
@@ -296,9 +297,11 @@ class ElementWriter extends _events.EventEmitter {
           (0, _tools.offsetVector)(v, useBlockXOffset ? block.xOffset || 0 : ctx.x, useBlockYOffset ? block.yOffset || 0 : ctx.y);
           if (v._isFillColorFromUnbreakable) {
             // If the item is a fillColor from an unbreakable block
-            // We have to add it at the beginning of the items body array of the page
+            // We have to add it at the beginning of the items body array of the page,
+            // after the fills already inserted from this block so that they keep their draw order
             delete v._isFillColorFromUnbreakable;
-            const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+            const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page] + unbreakableFillsInserted;
+            unbreakableFillsInserted++;
             page.items.splice(endOfBackgroundItemsIndex, 0, {
               type: 'vector',
               item: v

package/js/LayoutBuilder.js

@@ -490,8 +490,9 @@ class LayoutBuilder {
    * When in snaking columns, first tries moving to next column.
    * If no columns available, moves to next page and resets x to left margin.
    * @param {string} pageOrientation - Optional page orientation for the new page
+   * @param {TableProcessor} [tableProcessor] - Reapply table alignment in the new column
    */
-  snakingAwarePageBreak(pageOrientation) {
+  snakingAwarePageBreak(pageOrientation, tableProcessor) {
     let ctx = this.writer.context();
     let snakingSnapshot = ctx.getSnakingSnapshot();
     if (!snakingSnapshot) {
@@ -500,7 +501,7 @@ class LayoutBuilder {
 
     // Try flowing to next column first
     if (this.writer.canMoveToNextColumn()) {
-      this.writer.moveToNextColumn();
+      this.writer.moveToNextColumn(tableProcessor ? context => tableProcessor.alignTable(context) : undefined);
       return;
     }
 
@@ -514,6 +515,9 @@ class LayoutBuilder {
     let savedLastColumnWidth = ctx.lastColumnWidth;
     ctx.resetSnakingColumnsForNewPage();
     ctx.lastColumnWidth = savedLastColumnWidth;
+    if (tableProcessor) {
+      tableProcessor.alignTable(ctx);
+    }
   }
 
   // vertical container
@@ -964,7 +968,7 @@ class LayoutBuilder {
               let rowTopPageY = this.cell._leftEndingCell._startingRowSpanY + this.cell._leftEndingCell._rowTopPageYPadding;
               return this.cell._leftEndingCell._rowTopPageY - rowTopPageY + this.cell._leftEndingCell._bottomY;
             } else {
-              if (this.cell.positions[0].pageNumber !== this.cell._leftEndingCell._lastPageNumber) {
+              if (this.cell._lastPageNumber !== this.cell._leftEndingCell._lastPageNumber) {
                 return this.bottomY - this.cell._leftEndingCell._bottomY;
               }
               return this.viewHeight + this.cell._leftEndingCell._bottomY - this.bottomY;
@@ -1038,7 +1042,11 @@ class LayoutBuilder {
         // or fall back to a minimum of padding + line height + border
         let minRowHeight = lastRowHeight > 0 ? lastRowHeight : processor.rowPaddingTop + 14 + processor.rowPaddingBottom + processor.bottomLineWidth + processor.topLineWidth;
         if (this.writer.context().availableHeight < minRowHeight) {
-          this.snakingAwarePageBreak();
+          // Column selection needs the container origin, before table alignment.
+          if (processor.alignmentOffset) {
+            this.writer.context().addMargin(-processor.alignmentOffset, processor.alignmentOffset);
+          }
+          this.snakingAwarePageBreak(undefined, processor);
 
           // Skip border when headerRows present (header repeat includes it)
           if (processor.layout.hLineWhenBroken !== false && !processor.headerRows) {

package/js/OutputDocument.js

@@ -9,13 +9,25 @@ class OutputDocument {
   constructor(pdfDocumentPromise) {
     this.pdfDocumentPromise = pdfDocumentPromise;
     this.bufferPromise = null;
+    this.streamEnded = false;
+    this.streamEndListenerAttached = false;
   }
 
   /**
    * @returns {Promise<object>}
    */
-  getStream() {
-    return this.pdfDocumentPromise;
+  async getStream() {
+    const stream = await this.pdfDocumentPromise;
+    if (this.streamEnded) {
+      throw new Error('PDF stream has already been consumed.');
+    }
+    if (!this.streamEndListenerAttached) {
+      stream.once('end', () => {
+        this.streamEnded = true;
+      });
+      this.streamEndListenerAttached = true;
+    }
+    return stream;
   }
 
   /**
@@ -24,7 +36,7 @@ class OutputDocument {
   getBuffer() {
     const getBufferInternal = async () => {
       const stream = await this.getStream();
-      return new Promise(resolve => {
+      return new Promise((resolve, reject) => {
         let chunks = [];
         stream.on('data', chunk => {
           chunks.push(chunk);
@@ -32,6 +44,7 @@ class OutputDocument {
         stream.on('end', () => {
           resolve(Buffer.concat(chunks));
         });
+        stream.on('error', reject);
         stream.end();
       });
     };

package/js/OutputDocumentServer.js

@@ -11,6 +11,11 @@ class OutputDocumentServer extends _OutputDocument.default {
    * @returns {Promise}
    */
   async write(filename) {
+    await this.pdfDocumentPromise;
+    if (this.bufferPromise !== null) {
+      await _fs.default.promises.writeFile(filename, await this.getBuffer());
+      return;
+    }
     const stream = await this.getStream();
     const writeStream = _fs.default.createWriteStream(filename);
     const streamEnded = new Promise((resolve, reject) => {

package/js/PDFDocument.js

@@ -129,12 +129,12 @@ class PDFDocument extends _pdfkit.PDFDocument {
       }
       return obj;
     };
-    if (typeof src === 'object') {
-      return checkRequired(src);
-    }
-    let attachment = checkRequired(this.attachments[src]);
+    let attachment = checkRequired(typeof src === 'object' ? src : this.attachments[src]);
     if (this.virtualfs && this.virtualfs.existsSync(attachment.src)) {
-      return this.virtualfs.readFileSync(attachment.src);
+      return {
+        ...attachment,
+        src: this.virtualfs.readFileSync(attachment.src)
+      };
     }
     this.validateLocalFile(attachment.src);
     return attachment;

package/js/PageElementWriter.js

@@ -153,9 +153,13 @@ class PageElementWriter extends _ElementWriter.default {
   /**
    * Move to the next column in a column group (snaking columns).
    * Handles repeatables and emits columnChanged event.
+   * @param {Function} [updateContext] - Adjust the new column before inserting repeatables
    */
-  moveToNextColumn() {
+  moveToNextColumn(updateContext) {
     let nextColumn = this.context().moveToNextColumn();
+    if (updateContext) {
+      updateContext(this.context());
+    }
 
     // Handle repeatables (like table headers) for the new column
     this.repeatables.forEach(function (rep) {

package/js/TableProcessor.js

@@ -102,6 +102,7 @@ class TableProcessor {
     availableWidth = writer.context().availableWidth - this.offsets.total;
     _columnCalculator.default.buildColumnWidths(tableNode.table.widths, availableWidth, this.offsets.total, tableNode);
     this.tableWidth = tableNode._offsets.total + getTableInnerContentWidth();
+    this.alignTable(writer.context());
     this.rowSpanData = prepareRowSpanData();
     this.cleanUpRepeatables = false;
 
@@ -134,6 +135,15 @@ class TableProcessor {
     // update the border properties of all cells before drawing any lines
     prepareCellBorders(this.tableNode.table.body);
   }
+  alignTable(context) {
+    const freeWidth = Math.max(0, context.availableWidth - this.tableWidth);
+    this.alignmentOffset = this.tableNode.tableAlignment === 'center' ? freeWidth / 2 : this.tableNode.tableAlignment === 'right' ? freeWidth : 0;
+    if (this.alignmentOffset) {
+      // Keep the container width intact: column widths have already been resolved.
+      // Row snapshots preserve this origin across page breaks.
+      context.addMargin(this.alignmentOffset, -this.alignmentOffset);
+    }
+  }
   onRowBreak(rowIndex, writer) {
     return () => {
       let offset = this.rowPaddingTop + (!this.headerRows ? this.topLineWidth : 0);
@@ -340,6 +350,9 @@ class TableProcessor {
     if (this.cleanUpRepeatables) {
       writer.popFromRepeatables();
     }
+    if (this.alignmentOffset) {
+      writer.context().addMargin(-this.alignmentOffset, this.alignmentOffset);
+    }
   }
   endRow(rowIndex, writer, pageBreaks) {
     const getLineXs = () => {

package/js/TextDecorator.js

@@ -21,7 +21,7 @@ const groupDecorations = (line, pdfDocument) => {
     let thickness = (0, _variableType.isNumber)(inline.decorationThickness) ? inline.decorationThickness : null;
     for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
       let decorationItem = decoration[ii];
-      if (!currentGroup || decorationItem !== currentGroup.decoration || style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor) {
+      if (!currentGroup || decorationItem !== currentGroup.decoration || style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor || thickness !== currentGroup.decorationThickness) {
         currentGroup = {
           line: line,
           decoration: decorationItem,
@@ -69,7 +69,7 @@ class TextDecorator {
       let max = 0;
       for (let i = 0, l = group.inlines.length; i < l; i++) {
         let inline = group.inlines[i];
-        max = inline.fontSize > max ? i : max;
+        max = inline.fontSize > group.inlines[max].fontSize ? i : max;
       }
       return group.inlines[max];
     };
@@ -135,7 +135,7 @@ class TextDecorator {
         sv = 1;
       let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
       let rwx = x + firstInline.x - 1;
-      this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
+      this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, 2 * sv).clip();
       this.pdfDocument.lineWidth(lw / 3);
       this.pdfDocument.moveTo(rwx, y);
       for (let i = 0; i < nbWaves; i++) {

package/js/columnCalculator.js

@@ -12,7 +12,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
   let starMaxMax = 0;
   let fixedColumns = [];
   let initial_availableWidth = availableWidth;
-  columns.forEach(column => {
+  columns.forEach((column, colIndex) => {
     if (isAutoColumn(column)) {
       autoColumns.push(column);
       autoMin += column._minWidth;
@@ -22,10 +22,16 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
       starMaxMin = Math.max(starMaxMin, column._minWidth);
       starMaxMax = Math.max(starMaxMax, column._maxWidth);
     } else {
-      fixedColumns.push(column);
+      fixedColumns.push({
+        column,
+        colIndex
+      });
     }
   });
-  fixedColumns.forEach((col, colIndex) => {
+  fixedColumns.forEach(({
+    column: col,
+    colIndex
+  }) => {
     // width specified as %
     if ((0, _variableType.isString)(col.width) && /\d+%/.test(col.width)) {
       // In tables we have to take into consideration the reserved width for paddings and borders
@@ -38,7 +44,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, 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) {
+        } else if (colIndex === columns.length - 1) {
           // last column assumes whole borderRight and half of border left
           reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight;
         } else {

package/package.json

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

package/src/DocumentContext.js

@@ -493,7 +493,7 @@ class DocumentContext extends EventEmitter {
 			this.availableWidth = pageSize.width - pageMargin.left - pageMargin.right;
 		}
 
-		let page = { items: [], pageSize: pageSize, pageMargins: this.pageMargins, customProperties: customProperties };
+		let page = { items: [], pageSize: { ...pageSize }, pageMargins: this.pageMargins, customProperties: customProperties };
 		this.pages.push(page);
 		this.backgroundLength.push(0);
 		this.page = this.pages.length - 1;

package/src/ElementWriter.js

@@ -331,6 +331,8 @@ class ElementWriter extends EventEmitter {
 			return false;
 		}
 
+		let unbreakableFillsInserted = 0;
+
 		block.items.forEach(item => {
 			switch (item.type) {
 				case 'line':
@@ -354,9 +356,11 @@ class ElementWriter extends EventEmitter {
 					offsetVector(v, useBlockXOffset ? (block.xOffset || 0) : ctx.x, useBlockYOffset ? (block.yOffset || 0) : ctx.y);
 					if (v._isFillColorFromUnbreakable) {
 						// If the item is a fillColor from an unbreakable block
-						// We have to add it at the beginning of the items body array of the page
+						// We have to add it at the beginning of the items body array of the page,
+						// after the fills already inserted from this block so that they keep their draw order
 						delete v._isFillColorFromUnbreakable;
-						const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+						const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page] + unbreakableFillsInserted;
+						unbreakableFillsInserted++;
 						page.items.splice(endOfBackgroundItemsIndex, 0, {
 							type: 'vector',
 							item: v

package/src/LayoutBuilder.js

@@ -566,8 +566,9 @@ class LayoutBuilder {
 	 * When in snaking columns, first tries moving to next column.
 	 * If no columns available, moves to next page and resets x to left margin.
 	 * @param {string} pageOrientation - Optional page orientation for the new page
+	 * @param {TableProcessor} [tableProcessor] - Reapply table alignment in the new column
 	 */
-	snakingAwarePageBreak(pageOrientation) {
+	snakingAwarePageBreak(pageOrientation, tableProcessor) {
 		let ctx = this.writer.context();
 		let snakingSnapshot = ctx.getSnakingSnapshot();
 		if (!snakingSnapshot) {
@@ -576,7 +577,7 @@ class LayoutBuilder {
 
 		// Try flowing to next column first
 		if (this.writer.canMoveToNextColumn()) {
-			this.writer.moveToNextColumn();
+			this.writer.moveToNextColumn(tableProcessor ? context => tableProcessor.alignTable(context) : undefined);
 			return;
 		}
 
@@ -590,6 +591,9 @@ class LayoutBuilder {
 		let savedLastColumnWidth = ctx.lastColumnWidth;
 		ctx.resetSnakingColumnsForNewPage();
 		ctx.lastColumnWidth = savedLastColumnWidth;
+		if (tableProcessor) {
+			tableProcessor.alignTable(ctx);
+		}
 	}
 
 	// vertical container
@@ -1072,7 +1076,7 @@ class LayoutBuilder {
 							let rowTopPageY = this.cell._leftEndingCell._startingRowSpanY + this.cell._leftEndingCell._rowTopPageYPadding;
 							return this.cell._leftEndingCell._rowTopPageY - rowTopPageY + this.cell._leftEndingCell._bottomY;
 						} else {
-							if (this.cell.positions[0].pageNumber !== this.cell._leftEndingCell._lastPageNumber) {
+							if (this.cell._lastPageNumber !== this.cell._leftEndingCell._lastPageNumber) {
 								return this.bottomY - this.cell._leftEndingCell._bottomY;
 							}
 
@@ -1165,7 +1169,11 @@ class LayoutBuilder {
 					processor.bottomLineWidth + processor.topLineWidth
 				);
 				if (this.writer.context().availableHeight < minRowHeight) {
-					this.snakingAwarePageBreak();
+					// Column selection needs the container origin, before table alignment.
+					if (processor.alignmentOffset) {
+						this.writer.context().addMargin(-processor.alignmentOffset, processor.alignmentOffset);
+					}
+					this.snakingAwarePageBreak(undefined, processor);
 
 					// Skip border when headerRows present (header repeat includes it)
 					if (processor.layout.hLineWhenBroken !== false && !processor.headerRows) {

package/src/OutputDocument.js

@@ -6,13 +6,27 @@ class OutputDocument {
 	constructor(pdfDocumentPromise) {
 		this.pdfDocumentPromise = pdfDocumentPromise;
 		this.bufferPromise = null;
+		this.streamEnded = false;
+		this.streamEndListenerAttached = false;
 	}
 
 	/**
 	 * @returns {Promise<object>}
 	 */
-	getStream() {
-		return this.pdfDocumentPromise;
+	async getStream() {
+		const stream = await this.pdfDocumentPromise;
+		if (this.streamEnded) {
+			throw new Error('PDF stream has already been consumed.');
+		}
+
+		if (!this.streamEndListenerAttached) {
+			stream.once('end', () => {
+				this.streamEnded = true;
+			});
+			this.streamEndListenerAttached = true;
+		}
+
+		return stream;
 	}
 
 	/**
@@ -21,7 +35,7 @@ class OutputDocument {
 	getBuffer() {
 		const getBufferInternal = (async () => {
 			const stream = await this.getStream();
-			return new Promise((resolve) => {
+			return new Promise((resolve, reject) => {
 				let chunks = [];
 				stream.on('data', chunk => {
 					chunks.push(chunk);
@@ -29,6 +43,7 @@ class OutputDocument {
 				stream.on('end', () => {
 					resolve(Buffer.concat(chunks));
 				});
+				stream.on('error', reject);
 				stream.end();
 			});
 		});

package/src/OutputDocumentServer.js

@@ -8,6 +8,12 @@ class OutputDocumentServer extends OutputDocument {
 	 * @returns {Promise}
 	 */
 	async write(filename) {
+		await this.pdfDocumentPromise;
+		if (this.bufferPromise !== null) {
+			await fs.promises.writeFile(filename, await this.getBuffer());
+			return;
+		}
+
 		const stream = await this.getStream();
 		const writeStream = fs.createWriteStream(filename);
 

package/src/PDFDocument.js

@@ -154,14 +154,13 @@ class PDFDocument extends PDFKitDocument {
 			return obj;
 		};
 
-		if (typeof src === 'object') {
-			return checkRequired(src);
-		}
-
-		let attachment = checkRequired(this.attachments[src]);
+		let attachment = checkRequired(typeof src === 'object' ? src : this.attachments[src]);
 
 		if (this.virtualfs && this.virtualfs.existsSync(attachment.src)) {
-			return this.virtualfs.readFileSync(attachment.src);
+			return {
+				...attachment,
+				src: this.virtualfs.readFileSync(attachment.src)
+			};
 		}
 
 		this.validateLocalFile(attachment.src);

package/src/PageElementWriter.js

@@ -176,9 +176,13 @@ class PageElementWriter extends ElementWriter {
 	/**
 	 * Move to the next column in a column group (snaking columns).
 	 * Handles repeatables and emits columnChanged event.
+	 * @param {Function} [updateContext] - Adjust the new column before inserting repeatables
 	 */
-	moveToNextColumn() {
+	moveToNextColumn(updateContext) {
 		let nextColumn = this.context().moveToNextColumn();
+		if (updateContext) {
+			updateContext(this.context());
+		}
 
 		// Handle repeatables (like table headers) for the new column
 		this.repeatables.forEach(function (rep) {

package/src/TableProcessor.js

@@ -109,6 +109,7 @@ class TableProcessor {
 		ColumnCalculator.buildColumnWidths(tableNode.table.widths, availableWidth, this.offsets.total, tableNode);
 
 		this.tableWidth = tableNode._offsets.total + getTableInnerContentWidth();
+		this.alignTable(writer.context());
 		this.rowSpanData = prepareRowSpanData();
 		this.cleanUpRepeatables = false;
 
@@ -150,6 +151,17 @@ class TableProcessor {
 		prepareCellBorders(this.tableNode.table.body);
 	}
 
+	alignTable(context) {
+		const freeWidth = Math.max(0, context.availableWidth - this.tableWidth);
+		this.alignmentOffset = this.tableNode.tableAlignment === 'center' ? freeWidth / 2 :
+			(this.tableNode.tableAlignment === 'right' ? freeWidth : 0);
+		if (this.alignmentOffset) {
+			// Keep the container width intact: column widths have already been resolved.
+			// Row snapshots preserve this origin across page breaks.
+			context.addMargin(this.alignmentOffset, -this.alignmentOffset);
+		}
+	}
+
 	onRowBreak(rowIndex, writer) {
 		return () => {
 			let offset = this.rowPaddingTop + (!this.headerRows ? this.topLineWidth : 0);
@@ -376,6 +388,9 @@ class TableProcessor {
 		if (this.cleanUpRepeatables) {
 			writer.popFromRepeatables();
 		}
+		if (this.alignmentOffset) {
+			writer.context().addMargin(-this.alignmentOffset, this.alignmentOffset);
+		}
 	}
 
 	endRow(rowIndex, writer, pageBreaks) {

package/src/TextDecorator.js

@@ -19,7 +19,8 @@ const groupDecorations = (line, pdfDocument) => {
 		for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
 			let decorationItem = decoration[ii];
 			if (!currentGroup || decorationItem !== currentGroup.decoration ||
-				style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor) {
+				style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor ||
+				thickness !== currentGroup.decorationThickness) {
 
 				currentGroup = {
 					line: line,
@@ -79,7 +80,7 @@ class TextDecorator {
 			let max = 0;
 			for (let i = 0, l = group.inlines.length; i < l; i++) {
 				let inline = group.inlines[i];
-				max = inline.fontSize > max ? i : max;
+				max = inline.fontSize > group.inlines[max].fontSize ? i : max;
 			}
 			return group.inlines[max];
 		};
@@ -155,7 +156,7 @@ class TextDecorator {
 			let sh = 0.7, sv = 1;
 			let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
 			let rwx = x + firstInline.x - 1;
-			this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
+			this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, 2 * sv).clip();
 			this.pdfDocument.lineWidth(lw / 3);
 			this.pdfDocument.moveTo(rwx, y);
 			for (let i = 0; i < nbWaves; i++) {

package/src/columnCalculator.js

@@ -10,7 +10,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 	let fixedColumns = [];
 	let initial_availableWidth = availableWidth;
 
-	columns.forEach(column => {
+	columns.forEach((column, colIndex) => {
 		if (isAutoColumn(column)) {
 			autoColumns.push(column);
 			autoMin += column._minWidth;
@@ -20,11 +20,11 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 			starMaxMin = Math.max(starMaxMin, column._minWidth);
 			starMaxMax = Math.max(starMaxMax, column._maxWidth);
 		} else {
-			fixedColumns.push(column);
+			fixedColumns.push({ column, colIndex });
 		}
 	});
 
-	fixedColumns.forEach((col, colIndex) => {
+	fixedColumns.forEach(({ column: col, colIndex }) => {
 		// width specified as %
 		if (isString(col.width) && /\d+%/.test(col.width)) {
 			// In tables we have to take into consideration the reserved width for paddings and borders
@@ -38,7 +38,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 					// first column assumes whole borderLeft and half of border right
 					reservedWidth = paddingLeft + paddingRight + borderLeft + (borderRight / 2);
 
-				} else if (colIndex === fixedColumns.length - 1) {
+				} else if (colIndex === columns.length - 1) {
 					// last column assumes whole borderRight and half of border left
 					reservedWidth = paddingLeft + paddingRight + (borderLeft / 2) + borderRight;