@contrail/document-generation 2.1.22 → 2.1.24

package/lib/frames/frame-generator.js

@@ -132,7 +132,7 @@ class FrameGenerator {
                 documentElement.text = documentElement.text.replace('{{dataGroup.name}}', dataGroup.name);
             }
             if (document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.isDynamicText(documentElement)) {
-                document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.handleDynamicText(documentElement, dataGroup, frameTitle);
+                document_dynamic_text_element_util_1.DocumentDynamicTextElementUtil.handleDynamicText(documentElement, dataGroup, frameTitle, element);
             }
             if (documentElement.elementIds) {
                 documentElement.elementIds = [elementMapping[documentElement.elementIds[0]]];

package/lib/util/document-dynamic-text-element-util.d.ts

@@ -4,6 +4,6 @@ export declare class DocumentDynamicTextElementUtil {
     static typeMap: any;
     static propertyMapByType: any;
     static isDynamicText(element: any): any;
-    static handleDynamicText(element: DocumentElement, dataGroup: DataGroup, frameTitle?: any): void;
+    static handleDynamicText(element: DocumentElement, dataGroup: DataGroup, frameTitle: any, templateElement: DocumentElement): void;
     static setTypeMap(typeMap: any): void;
 }

package/lib/util/document-dynamic-text-element-util.js

@@ -8,7 +8,7 @@ class DocumentDynamicTextElementUtil {
     static isDynamicText(element) {
         return element.type === 'text' && element.propertyBindings && element.propertyBindingsMetaData;
     }
-    static handleDynamicText(element, dataGroup, frameTitle = null) {
+    static handleDynamicText(element, dataGroup, frameTitle = null, templateElement) {
         var _a, _b, _c;
         const propertyBindingsText = element.propertyBindings.text;
         let propertyLevel = (_a = element.propertyBindingsMetaData) === null || _a === void 0 ? void 0 : _a.propertyLevel;
@@ -41,8 +41,8 @@ class DocumentDynamicTextElementUtil {
             }
         }
         let text = documents_1.DynamicTextUtil.getDynamicTextValue(element, property, propertyLevel, frame, componentModels);
-        if (((_c = element.text) === null || _c === void 0 ? void 0 : _c.toString().indexOf('</')) > -1) {
-            const styleDefinition = document_text_element_util_1.DocumentTextElementUtil.extractStyleFromInline(element.text);
+        if (((_c = templateElement.text) === null || _c === void 0 ? void 0 : _c.toString().indexOf('</')) > -1) {
+            const styleDefinition = document_text_element_util_1.DocumentTextElementUtil.extractStyleFromInline(templateElement.text);
             text = document_text_element_util_1.DocumentTextElementUtil.applyInLineStyling(text, styleDefinition);
         }
         element.text = text;

package/lib/util/document-text-element-util.d.ts

@@ -9,4 +9,5 @@ export declare class DocumentTextElementUtil {
     static extractFontFromHTML(text: any): any;
     static extractTextStyleItalicFromHTML(text: any): string;
     static extractTextStyleStrikethroughFromHTML(text: any): string;
+    static extractTextAlignFromHTML(text: any): string;
 }

package/lib/util/document-text-element-util.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentTextElementUtil = void 0;
 const documents_1 = require("@contrail/documents");
 const util_1 = require("@contrail/util");
-const document_util_1 = require("./document-util");
+const document_util_1 = require("@contrail/document-util");
+const document_util_2 = require("./document-util");
 class DocumentTextElementUtil {
     static generateTextElement(textValue, options, applyInlineFormatting = true, sanitizeHTML = true) {
         var _a;
@@ -24,7 +25,7 @@ class DocumentTextElementUtil {
         size.height = size.height || 25;
         size.width = size.width || 125;
         const defaultedOptions = util_1.ObjectUtil.mergeDeep(util_1.ObjectUtil.cloneDeep(options), { position, size, style });
-        let textVal = sanitizeHTML ? document_util_1.DocumentUtil.sanitizeHTML(textValue) : textValue;
+        let textVal = sanitizeHTML ? document_util_2.DocumentUtil.sanitizeHTML(textValue) : textValue;
         if (textVal === undefined || textVal === null) {
             textVal = '';
         }
@@ -36,7 +37,7 @@ class DocumentTextElementUtil {
         return element;
     }
     static applyInLineStyling(text, style) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let formattedText = text;
         if ((style === null || style === void 0 ? void 0 : style.font.weight) === 'bold') {
             formattedText = `<strong>${formattedText}</strong>`;
@@ -63,7 +64,12 @@ class DocumentTextElementUtil {
         if ((_e = style === null || style === void 0 ? void 0 : style.font) === null || _e === void 0 ? void 0 : _e.italic) {
             formattedText = `<em>${formattedText}</em>`;
         }
-        formattedText = `<p>${formattedText}</p>`;
+        if ((_f = style === null || style === void 0 ? void 0 : style.text) === null || _f === void 0 ? void 0 : _f.align) {
+            formattedText = `<p style="text-align: ${style.text.align};">${formattedText}</p>`;
+        }
+        else {
+            formattedText = `<p>${formattedText}</p>`;
+        }
         return formattedText;
     }
     static extractStyleFromInline(text) {
@@ -98,6 +104,10 @@ class DocumentTextElementUtil {
         if (font) {
             style.font.family = font;
         }
+        const textAlign = document_util_1.DocumentStyleUtil.getFirstInlineStyleValue(text, 'text-align');
+        if (textAlign && ['left', 'right', 'center'].includes(textAlign)) {
+            style.text.align = textAlign;
+        }
         return style;
     }
     static extractFontSizeFromHTML(text) {
@@ -144,5 +154,14 @@ class DocumentTextElementUtil {
             return 'strikethrough';
         }
     }
+    static extractTextAlignFromHTML(text) {
+        let regex = /text-align:\s*(.*?);/;
+        let match = text.match(regex);
+        if (match === null || match === void 0 ? void 0 : match.length) {
+            let textAlign = match[1];
+            textAlign = textAlign.replace(/['"]+/g, '');
+            return textAlign;
+        }
+    }
 }
 exports.DocumentTextElementUtil = DocumentTextElementUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-generation",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "description": "Utilities for automatic generation of documents.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -15,6 +15,7 @@
   "license": "ISC",
   "devDependencies": {
     "@contrail/aggregates": "^1.2.3",
+    "@contrail/document-util": "^1.0.7",
     "@contrail/sdk": "^1.4.3",
     "@types/jest": "^29.5.2",
     "@types/node": "^18.16.0",