bpampuch · Kran67 · May 17, 2022 · May 17, 2022 · May 17, 2022 · May 17, 2022
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+@SirFull:registry=https://npm.pkg.github.com
diff --git a/build/pdfmake.js b/build/pdfmake.js
diff --git a/build/pdfmake.js.map b/build/pdfmake.js.map
diff --git a/build/pdfmake.min.js b/build/pdfmake.min.js
diff --git a/build/pdfmake.min.js.map b/build/pdfmake.min.js.map
diff --git a/build/vfs_fonts.js b/build/vfs_fonts.js
diff --git a/examples/pdfs/absolute.pdf b/examples/pdfs/absolute.pdf
diff --git a/examples/pdfs/attachments.pdf b/examples/pdfs/attachments.pdf
diff --git a/examples/pdfs/background.pdf b/examples/pdfs/background.pdf
diff --git a/examples/pdfs/basics.pdf b/examples/pdfs/basics.pdf
diff --git a/examples/pdfs/columns_simple.pdf b/examples/pdfs/columns_simple.pdf
diff --git a/examples/pdfs/images.pdf b/examples/pdfs/images.pdf
diff --git a/examples/pdfs/links.pdf b/examples/pdfs/links.pdf
diff --git a/examples/pdfs/lists.pdf b/examples/pdfs/lists.pdf
diff --git a/examples/pdfs/margins.pdf b/examples/pdfs/margins.pdf
diff --git a/examples/pdfs/named_styles.pdf b/examples/pdfs/named_styles.pdf
diff --git a/examples/pdfs/named_styles_with_overrides.pdf b/examples/pdfs/named_styles_with_overrides.pdf
diff --git a/examples/pdfs/pageReference.pdf b/examples/pdfs/pageReference.pdf
diff --git a/examples/pdfs/qrCode.pdf b/examples/pdfs/qrCode.pdf
diff --git a/examples/pdfs/relative.pdf b/examples/pdfs/relative.pdf
diff --git a/examples/pdfs/security.pdf b/examples/pdfs/security.pdf
diff --git a/examples/pdfs/standardfonts.pdf b/examples/pdfs/standardfonts.pdf
diff --git a/examples/pdfs/styling_inlines.pdf b/examples/pdfs/styling_inlines.pdf
diff --git a/examples/pdfs/styling_properties.pdf b/examples/pdfs/styling_properties.pdf
diff --git a/examples/pdfs/svgs.pdf b/examples/pdfs/svgs.pdf
diff --git a/examples/pdfs/tables.pdf b/examples/pdfs/tables.pdf
diff --git a/examples/pdfs/textDecorations.pdf b/examples/pdfs/textDecorations.pdf
diff --git a/examples/pdfs/toc.pdf b/examples/pdfs/toc.pdf
diff --git a/examples/pdfs/vectors.pdf b/examples/pdfs/vectors.pdf
diff --git a/examples/pdfs/verticalAlignment.pdf b/examples/pdfs/verticalAlignment.pdf
diff --git a/examples/pdfs/watermark.pdf b/examples/pdfs/watermark.pdf
diff --git a/examples/test.html b/examples/test.html
diff --git a/examples/verticalAlignment.js b/examples/verticalAlignment.js
diff --git a/package.json b/package.json
@@ -90,4 +90,4 @@
       ]
     }
   }
-}
+}
diff --git a/src/DocPreprocessor.js b/src/DocPreprocessor.js
@@ -1,5 +1,5 @@
-import { isString, isNumber, isValue, isEmptyObject } from './helpers/variableType';
 import { stringifyNode } from './helpers/node';
+import { isEmptyObject, isNumber, isString, isValue } from './helpers/variableType';
 
 const convertValueToString = value => {
 	if (isString(value)) {
@@ -23,7 +23,7 @@ class DocPreprocessor {
 		return this.preprocessNode(docStructure);
 	}
 
-	preprocessNode(node) {
+	checkNode(node) {
 		// expand shortcuts and casting values
 		if (Array.isArray(node)) {
 			node = { stack: node };
@@ -32,6 +32,12 @@ class DocPreprocessor {
 		} else if ('text' in node) { // cast value in text property
 			node.text = convertValueToString(node.text);
 		}
+		return node;
+	};
+
+	preprocessNode(node) {
+		//vertical alignment
+		node = this.checkNode(node);
 
 		if (node.columns) {
 			return this.preprocessColumns(node);
@@ -68,6 +74,10 @@ class DocPreprocessor {
 		let columns = node.columns;
 
 		for (let i = 0, l = columns.length; i < l; i++) {
+			//vertical alignment
+			columns[i] = this.checkNode(columns[i]);
+			columns[i].nodeRef = node.nodeRef ? columns[i].nodeRef = node.nodeRef: node;
+
 			columns[i] = this.preprocessNode(columns[i]);
 		}
 
@@ -78,6 +88,9 @@ class DocPreprocessor {
 		let items = node.stack;
 
 		for (let i = 0, l = items.length; i < l; i++) {
+			//vertical alignment
+			items[i] = this.checkNode(items[i]);
+			items[i].nodeRef = node.nodeRef ? node.nodeRef : node;
 			items[i] = this.preprocessNode(items[i]);
 		}
 
@@ -88,6 +101,10 @@ class DocPreprocessor {
 		let items = node.ul || node.ol;
 
 		for (let i = 0, l = items.length; i < l; i++) {
+			//vertical alignment
+			items[i] = this.checkNode(items[i]);
+			items[i].nodeRef = node.nodeRef ? node.nodeRef : node;
+
 			items[i] = this.preprocessNode(items[i]);
 		}
 

diff --git a/src/ElementWriter.js b/src/ElementWriter.js
@@ -1,7 +1,7 @@
-import { isNumber } from './helpers/variableType';
-import { pack, offsetVector } from './helpers/tools';
-import DocumentContext from './DocumentContext';
 import { EventEmitter } from 'events';
+import DocumentContext from './DocumentContext';
+import { offsetVector, pack } from './helpers/tools';
+import { isNumber } from './helpers/variableType';
 
 /**
  * A line/vector writer, which adds elements to current page and sets
@@ -125,6 +125,9 @@ class ElementWriter extends EventEmitter {
 		this.alignCanvas(node);
 
 		node.canvas.forEach(function (vector) {
+			//vertical alignment
+			vector.nodeRef = node.nodeRef ? node.nodeRef : node;
+
 			let position = this.addVector(vector, false, false, index);
 			positions.push(position);
 			if (index !== undefined) {
@@ -188,6 +191,10 @@ class ElementWriter extends EventEmitter {
 			let vector = qr._canvas[i];
 			vector.x += qr.x;
 			vector.y += qr.y;
+
+			//vertical alignment
+			vector.nodeRef = qr.nodeRef ? qr.nodeRef: qr;
+
 			this.addVector(vector, true, true, index);
 		}