@flowaccount/pdfmake 1.0.3 → 1.0.4-staging.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowaccount/pdfmake",
-  "version": "1.0.3",
+  "version": "1.0.4-staging.2",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",

package/src/layoutBuilder.js

@@ -1441,27 +1441,6 @@ LayoutBuilder.prototype.buildNextLine = function (textNode) {
 		return newInline;
 	}
 
-	function findMaxFitLength(text, maxWidth, measureFn) {
-		let low = 1;
-		let high = text.length;
-		let bestFit = 1;
-
-		while (low <= high) {
-			const mid = Math.floor((low + high) / 2);
-			const part = text.substring(0, mid);
-			const width = measureFn(part);
-
-			if (width <= maxWidth) {
-				bestFit = mid;
-				low = mid + 1;
-			} else {
-				high = mid - 1;
-			}
-		}
-
-		return bestFit;
-	}
-
 	if (!textNode._inlines || textNode._inlines.length === 0) {
 		return null;
 	}
@@ -1469,34 +1448,29 @@ LayoutBuilder.prototype.buildNextLine = function (textNode) {
 	var line = new Line(this.writer.context().availableWidth);
 	var textTools = new TextTools(null);
 
-	var isForceContinue = false;
-	while (textNode._inlines && textNode._inlines.length > 0 &&
-		(line.hasEnoughSpaceForInline(textNode._inlines[0], textNode._inlines.slice(1)) || isForceContinue)) {
-		var isHardWrap = false;
+	while (textNode._inlines && textNode._inlines.length > 0 && line.hasEnoughSpaceForInline(textNode._inlines[0])) {
 		var inline = textNode._inlines.shift();
-		isForceContinue = false;
 
-		if (!inline.noWrap && inline.text.length > 1 && inline.width > line.getAvailableWidth()) {
-			var maxChars = findMaxFitLength(inline.text, line.getAvailableWidth(), function (txt) {
-				return textTools.widthOfString(txt, inline.font, inline.fontSize, inline.characterSpacing, inline.fontFeatures);
-			});
+		if (!inline.noWrap && inline.text.length > 1 && inline.width > line.maxWidth) {
+			var widthPerChar = inline.width / inline.text.length;
+			var maxChars = Math.floor(line.maxWidth / widthPerChar);
+			if (maxChars < 1) {
+				maxChars = 1;
+			}
 			if (maxChars < inline.text.length) {
 				var newInline = cloneInline(inline);
 
 				newInline.text = inline.text.substr(maxChars);
 				inline.text = inline.text.substr(0, maxChars);
 
-				newInline.width = textTools.widthOfString(newInline.text, newInline.font, newInline.fontSize, newInline.characterSpacing, newInline.fontFeatures);
-				inline.width = textTools.widthOfString(inline.text, inline.font, inline.fontSize, inline.characterSpacing, inline.fontFeatures);
+				newInline.width = textTools.widthOfString(newInline.text, newInline.font, newInline.fontSize, newInline.characterSpacing);
+				inline.width = textTools.widthOfString(inline.text, inline.font, inline.fontSize, inline.characterSpacing);
 
 				textNode._inlines.unshift(newInline);
-				isHardWrap = true;
 			}
 		}
 
 		line.addInline(inline);
-
-		isForceContinue = inline.noNewLine && !isHardWrap;
 	}
 
 	line.lastLineInParagraph = textNode._inlines.length === 0;

package/src/pageElementWriter.js

@@ -241,6 +241,13 @@ PageElementWriter.prototype.endVerticalAlign = function (verticalAlign) {
 
 PageElementWriter.prototype.moveToNextPage = function (pageOrientation) {
 
+	var currentPage = this.writer.context.pages[this.writer.context.page];
+	this.writer.tracker.emit('beforePageChanged', {
+		prevPage: currentPage.prevPage,
+		prevY: currentPage.prevY,
+		y: currentPage.y
+	});
+
 	var nextPage = this.writer.context.moveToNextPage(pageOrientation);
 
 	// moveToNextPage is called multiple times for table, because is called for each column

package/src/tableProcessor.js

@@ -177,6 +177,14 @@ TableProcessor.prototype.beginRow = function (rowIndex, writer) {
 	this.rowPaddingBottom = this.layout.paddingBottom(rowIndex, this.tableNode);
 
 	this.rowCallback = this.onRowBreak(rowIndex, writer);
+	
+	if(this.tableNode.eventHandle && this.tableNode.eventHandle.beforePageChanged)
+	{
+
+		this.beforePageChanged = this.tableNode.eventHandle.beforePageChanged(this, rowIndex, writer);
+		writer.tracker.startTracking('beforePageChanged', this.beforePageChanged);
+	}
+
 	writer.tracker.startTracking('pageChanged', this.rowCallback);
 	if (rowIndex == 0 && !this.dontBreakRows && !this.rowsWithoutPageBreak) {
 		// We store the 'y' to draw later and if necessary the top border of the table