@contrail/document-generation 2.0.9 → 2.0.11

package/lib/components/component-generator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentGenerator = void 0;
 const documents_1 = require("@contrail/documents");
 const nanoid_1 = require("nanoid");
-const util_1 = require("@contrail/util");
 const document_property_util_1 = require("../util/document-property-util");
 const component_util_1 = require("./component-util");
 class ComponentGenerator {
@@ -25,16 +24,8 @@ class ComponentGenerator {
         }
         let yPosition = 0;
         const imageDimension = template.imageDimension || {};
-        const imageHeight = imageDimension.height || imageDimension.width || 125;
         const imageWidth = imageDimension.width || 125;
-        const imageUrl = util_1.ObjectUtil.getByPath(data, `viewable.mediumViewableDownloadUrl`);
-        const elements = [{
-                type: "image",
-                size: { width: imageWidth, height: imageHeight },
-                propertyBindings: { url: 'viewable.mediumViewableDownloadUrl' },
-                url: imageUrl,
-            }];
-        yPosition += imageHeight;
+        const elements = [];
         const textOptions = {
             style: {
                 text: {
@@ -45,7 +36,7 @@ class ComponentGenerator {
                 width: imageWidth
             }
         };
-        elements.push(...document_property_util_1.DocumentPropertyUtil.generatePropertyTextElements(data, template.properties, textOptions, { y: yPosition }, true));
+        elements.push(...document_property_util_1.DocumentPropertyUtil.generatePropertyElements(data, template.properties, textOptions, { y: yPosition }, imageDimension, true));
         const modelBindings = component_util_1.ComponentUtil.generatedModelBindings(data);
         componentElement.elements = elements;
         componentElement.modelBindings = modelBindings;

package/lib/info-panel/info-panel-generator.js

@@ -44,7 +44,7 @@ class InfoPanelGenerator {
             },
             modelBindings,
         };
-        const textElements = document_property_util_1.DocumentPropertyUtil.generatePropertyTextElements(data, template.propertyTemplate.properties, textOptions, { x: panel.position.x, y: panel.position.y }, false);
+        const textElements = document_property_util_1.DocumentPropertyUtil.generatePropertyElements(data, template.propertyTemplate.properties, textOptions, { x: panel.position.x, y: panel.position.y }, {}, false);
         elements.push(...textElements);
         return elements;
     }

package/lib/interfaces.d.ts

@@ -53,4 +53,5 @@ export interface DocumentPropertyDefinition {
     slug: string;
     typeRootSlug: string;
     includeLabel?: boolean;
+    isHidden?: boolean;
 }

package/lib/util/document-property-util.d.ts

@@ -1,7 +1,8 @@
 import { DocumentPropertyDefinition } from "../interfaces";
-import { DocumentElement, PositionDefinition } from "@contrail/documents";
+import { DocumentElement, PositionDefinition, SizeDefinition } from "@contrail/documents";
 import { PropertyValueFormatter } from "@contrail/types";
 export declare class DocumentPropertyUtil {
-    static generatePropertyTextElements(data: any, properties: Array<DocumentPropertyDefinition>, options: DocumentElement, startingPosition: PositionDefinition, isComponent?: boolean): Array<DocumentElement>;
+    static generatePropertyElements(data: any, properties: Array<DocumentPropertyDefinition>, options: DocumentElement, startingPosition: PositionDefinition, imageDimension: SizeDefinition, isComponent?: boolean): Array<DocumentElement>;
     static generatePropertyTextElement(model: any, property: DocumentPropertyDefinition, options: DocumentElement, formatter: PropertyValueFormatter, position: PositionDefinition, isComponent?: boolean): DocumentElement;
+    static generatePropertyImageElement(data: any, property: DocumentPropertyDefinition, imageDimension: SizeDefinition, position: PositionDefinition): DocumentElement;
 }

package/lib/util/document-property-util.js

@@ -4,23 +4,33 @@ exports.DocumentPropertyUtil = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 const document_text_element_util_1 = require("./document-text-element-util");
+const text_util_1 = require("./text-util");
 class DocumentPropertyUtil {
-    static generatePropertyTextElements(data, properties, options, startingPosition, isComponent = false) {
+    static generatePropertyElements(data, properties, options, startingPosition, imageDimension, isComponent = false) {
         var _a, _b;
         let yPosition = startingPosition.y || 0;
         const xPosition = startingPosition.x || 0;
         const elements = [];
         const formatter = new types_1.PropertyValueFormatter();
         for (let property of properties) {
-            const fontSize = ((_b = (_a = property.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || 12;
-            const PT_TO_PX = 1.3;
-            const LINE_HEIGHT = 1.4;
-            const PADDING = 1.6;
-            let height = fontSize * PT_TO_PX * LINE_HEIGHT * PADDING;
-            options.size = options.size || {};
-            options.size.height = height;
-            let element = DocumentPropertyUtil.generatePropertyTextElement(data, property, options, formatter, { x: xPosition, y: yPosition }, isComponent);
-            yPosition += height;
+            let element;
+            if (property.propertyDefinition) {
+                const fontSize = ((_b = (_a = property.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || 12;
+                const PT_TO_PX = 1.3;
+                const LINE_HEIGHT = 1.4;
+                const PADDING = 1.6;
+                let height = fontSize * PT_TO_PX * LINE_HEIGHT * PADDING;
+                options.size = options.size || {};
+                options.size.height = height;
+                element = DocumentPropertyUtil.generatePropertyTextElement(data, property, options, formatter, { x: xPosition, y: yPosition }, isComponent);
+                yPosition += element.size.height - 10;
+            }
+            else {
+                const imageHeight = imageDimension.height || imageDimension.width || 125;
+                const imageWidth = imageDimension.width || 125;
+                element = DocumentPropertyUtil.generatePropertyImageElement(data, property, { width: imageWidth, height: imageHeight }, { x: xPosition, y: yPosition });
+                yPosition += imageHeight;
+            }
             elements.push(element);
         }
         return elements;
@@ -30,6 +40,10 @@ class DocumentPropertyUtil {
         const modelKey = `${util_1.StringUtil.convertToCamelCase(property.typeRootSlug)}.${property.propertyDefinition.slug}`;
         const value = util_1.ObjectUtil.getByPath(model, modelKey);
         let display = formatter.formatValueForProperty(value, property.propertyDefinition);
+        if (!isComponent) {
+            const height = text_util_1.TextUtil.getHeightByTextWidth(display, property, options.size.width);
+            options.size.height = height;
+        }
         if (!isComponent && property.includeLabel) {
             display = property.propertyDefinition.label + ': ' + display;
         }
@@ -43,5 +57,19 @@ class DocumentPropertyUtil {
         element.propertyBindings = { text: modelKey };
         return element;
     }
+    static generatePropertyImageElement(data, property, imageDimension, position) {
+        const imageUrl = util_1.ObjectUtil.getByPath(data, `viewable.mediumViewableDownloadUrl`);
+        const element = {
+            type: "image",
+            size: imageDimension,
+            propertyBindings: { url: 'viewable.mediumViewableDownloadUrl' },
+            url: imageUrl,
+            position
+        };
+        if (property.isHidden) {
+            element.isHidden = property.isHidden;
+        }
+        return element;
+    }
 }
 exports.DocumentPropertyUtil = DocumentPropertyUtil;

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

@@ -0,0 +1,4 @@
+import { DocumentPropertyDefinition } from "../interfaces";
+export declare class TextUtil {
+    static getHeightByTextWidth(text: string, property: DocumentPropertyDefinition, width: number): number;
+}

package/lib/util/text-util.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TextUtil = void 0;
+class TextUtil {
+    static getHeightByTextWidth(text, property, width) {
+        var _a, _b, _c, _d;
+        let height = 0;
+        let div = document.createElement('DIV');
+        div.id = '__textMeasure';
+        div.innerHTML = text;
+        div.style.position = 'absolute';
+        div.style.top = '-500px';
+        div.style.left = '0';
+        div.style.width = width + 'px';
+        div.style.lineHeight = 'normal';
+        div.style.fontFamily = ((_b = (_a = property.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.family) || 'Roboto';
+        div.style.fontWeight = property.style.font.weight ? 'bold' : 'normal';
+        div.style.fontSize = (((_d = (_c = property.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size) || 12) + 'pt';
+        div.style.padding = '11px';
+        document.body.appendChild(div);
+        height = div.offsetHeight + 5;
+        document.body.removeChild(div);
+        return height;
+    }
+}
+exports.TextUtil = TextUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-generation",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Utilities for automatic generation of documents.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@contrail/data-grouping": "^1.0.20",
-    "@contrail/documents": "^1.0.44",
+    "@contrail/documents": "^1.0.59",
     "@contrail/types": "^3.0.27",
     "@contrail/util": "^1.0.27"
   }