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

package/src/StyleContextStack.js

@@ -79,50 +79,9 @@ class StyleContextStack {
 			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 (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/src/TableProcessor.js

@@ -1,5 +1,5 @@
 import ColumnCalculator from './columnCalculator';
-import { isNumber } from './helpers/variableType';
+import { isNumber, isPositiveInteger } from './helpers/variableType';
 
 class TableProcessor {
 	constructor(tableNode) {
@@ -95,18 +95,34 @@ class TableProcessor {
 		this.layout = tableNode._layout;
 
 		availableWidth = writer.context().availableWidth - this.offsets.total;
-		ColumnCalculator.buildColumnWidths(tableNode.table.widths, availableWidth);
+		ColumnCalculator.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 (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 (isPositiveInteger(keepWithHeaderRows)) {
+					this.rowsWithoutPageBreak += keepWithHeaderRows;
+			}
 		}
 
-		this.rowsWithoutPageBreak = this.headerRows + (tableNode.table.keepWithHeaderRows || 0);
 		this.dontBreakRows = tableNode.table.dontBreakRows || false;
 
 		if (this.rowsWithoutPageBreak) {

package/src/columnCalculator.js

@@ -1,6 +1,6 @@
 import { isString } from './helpers/variableType';
 
-function buildColumnWidths(columns, availableWidth) {
+function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode) {
 	let autoColumns = [];
 	let autoMin = 0;
 	let autoMax = 0;
@@ -24,10 +24,31 @@ function buildColumnWidths(columns, availableWidth) {
 		}
 	});
 
-	fixedColumns.forEach(col => {
+	fixedColumns.forEach((col, colIndex) => {
 		// width specified as %
 		if (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/src/helpers/variableType.js

@@ -14,6 +14,17 @@ export function isNumber(variable) {
 	return (typeof variable === 'number') || (variable instanceof Number);
 }
 
+/**
+ * @param {any} variable
+ * @returns {boolean}
+ */
+export function isPositiveInteger(variable) {
+	if (!isNumber(variable) || !Number.isInteger(variable) || variable <= 0) {
+			return false;
+	}
+	return true;
+}
+
 /**
  * @param {any} variable
  * @returns {boolean}