@contrail/documents 1.21.0-alpha.fb2b49f → 1.21.0-alpha.fb70961

package/lib/containers/document-container-index.d.ts

@@ -1,11 +1,10 @@
 import { DocumentElement, PositionDefinition } from '../types';
-import { ContainerElementType, ContainerKind } from './container-kind';
-import { DocumentContainer, MeasuredDocumentElement } from './document-container';
+import { ContainerElementType } from './container-kind';
+import { DocumentContainer } from './document-container';
 export declare class DocumentContainerIndex {
     private readonly data;
     constructor(data: {
         documentElementsById: Map<string, DocumentElement>;
-        measuredById: Map<string, MeasuredDocumentElement>;
         containersById: Map<string, DocumentContainer>;
         containerPathsByDocumentElementId: Map<string, Map<string, string[]>>;
         memberIdsByContainerId: Map<string, string[]>;
@@ -18,7 +17,6 @@ export declare class DocumentContainerIndex {
     innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
     memberIdsOf(containerId: string): readonly string[];
     memberDocumentElementsOf(containerId: string): DocumentElement[];
-    containerPathFor(documentElement: DocumentElement, kind: ContainerKind, at?: PositionDefinition): readonly string[];
     containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
     private containersOfType;
     private resolveAll;

package/lib/containers/document-container-index.js

@@ -9,7 +9,6 @@ class DocumentContainerIndex {
     static empty() {
         return new DocumentContainerIndex({
             documentElementsById: new Map(),
-            measuredById: new Map(),
             containersById: new Map(),
             containerPathsByDocumentElementId: new Map(),
             memberIdsByContainerId: new Map(),
@@ -44,20 +43,6 @@ class DocumentContainerIndex {
         }
         return members;
     }
-    containerPathFor(documentElement, kind, at) {
-        var _a;
-        if (!documentElement) {
-            return [];
-        }
-        const known = this.data.measuredById.get(documentElement.id);
-        const positioned = at ? Object.assign(Object.assign({}, documentElement), { position: at }) : documentElement;
-        const measured = {
-            documentElement: positioned,
-            box: at || !known ? document_container_1.DocumentContainerUtil.measureBox(positioned, this.data.documentElementsById) : known.box,
-            drawOrder: (_a = known === null || known === void 0 ? void 0 : known.drawOrder) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER,
-        };
-        return document_container_1.DocumentContainerUtil.pathFor(measured, kind, this.containersOfType(kind.elementType)).map((container) => container.id);
-    }
     containerPathAtPoint(point, elementType) {
         var _a, _b;
         const containers = this.containersOfType(elementType);

package/lib/containers/document-container.d.ts

@@ -25,9 +25,5 @@ export declare class DocumentContainerUtil {
     static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
     static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
     static chain(candidates: DocumentContainer[]): DocumentContainer[];
-    static measureBox(documentElement: DocumentElement, documentElementsById: Map<string, DocumentElement>): CoordinateBox | null;
-    static pathFor(measured: MeasuredDocumentElement, kind: ContainerKind, containers: DocumentContainer[]): DocumentContainer[];
-    static enclosersOf(measured: MeasuredDocumentElement, containers: DocumentContainer[]): DocumentContainer[];
-    static candidatesFor(measured: MeasuredDocumentElement, containers: DocumentContainer[]): DocumentContainer[];
     static topmost(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -24,12 +24,9 @@ class DocumentContainerUtil {
         var _a, _b, _c, _d, _e;
         const position = documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
         const angle = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.rotate) === null || _a === void 0 ? void 0 : _a.angle;
-        if (!position) {
+        if (!position || !angle || !newSize || !documentElement.size) {
             return position;
         }
-        if (!angle || !newSize || !documentElement.size) {
-            return Object.assign({}, position);
-        }
         const scaleX = (_c = (_b = documentElement.scale) === null || _b === void 0 ? void 0 : _b.x) !== null && _c !== void 0 ? _c : 1;
         const scaleY = (_e = (_d = documentElement.scale) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 1;
         const cornerOffset = (size) => {
@@ -39,8 +36,7 @@ class DocumentContainerUtil {
         };
         const before = cornerOffset(documentElement.size);
         const after = cornerOffset(newSize);
-        const moved = { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
-        return Number.isFinite(moved.x) && Number.isFinite(moved.y) ? moved : Object.assign({}, position);
+        return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
     static resizeKeepingAnchor(dynamicTextElement, entityType, text) {
         const size = dynamic_text_util_1.DynamicTextUtil.calculateSize(dynamicTextElement, entityType, text);
@@ -83,56 +79,6 @@ class DocumentContainerUtil {
             path.unshift(topmostOf(enclosing));
         }
     }
-    static measureBox(documentElement, documentElementsById) {
-        var _a, _b;
-        try {
-            const start = ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
-            const end = ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
-            const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
-            if (!width && !height && !documentElement.position) {
-                return null;
-            }
-            return DocumentContainerUtil.toCoordinateBox(x, y, width, height);
-        }
-        catch (_c) {
-            return null;
-        }
-    }
-    static pathFor(measured, kind, containers) {
-        if (!containers.length || !measured.box) {
-            return [];
-        }
-        if (measured.documentElement.type === kind.elementType) {
-            return kind.nests ? DocumentContainerUtil.chain(DocumentContainerUtil.enclosersOf(measured, containers)) : [];
-        }
-        const candidates = DocumentContainerUtil.candidatesFor(measured, containers);
-        return kind.nests ? DocumentContainerUtil.chain(candidates) : DocumentContainerUtil.topmost(candidates);
-    }
-    static enclosersOf(measured, containers) {
-        return containers.filter((container) => {
-            var _a;
-            return container.id !== measured.documentElement.id &&
-                DocumentContainerUtil.encloses(container.box, measured.box) &&
-                measured.drawOrder > container.drawOrder &&
-                !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
-        });
-    }
-    static candidatesFor(measured, containers) {
-        const anchor = DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
-        return containers.filter((container) => {
-            var _a;
-            if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
-                return false;
-            }
-            if (!DocumentContainerUtil.containsPoint(container.box, anchor)) {
-                return false;
-            }
-            if (DocumentContainerUtil.encloses(measured.box, container.box)) {
-                return false;
-            }
-            return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
-        });
-    }
     static topmost(containers) {
         return containers.length
             ? [containers.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost))]

package/lib/containers/document-container.service.d.ts

@@ -5,5 +5,9 @@ export declare class DocumentContainerService {
     static buildIndex(documentElements: readonly DocumentElement[], kinds?: ContainerKind[]): DocumentContainerIndex;
     static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
     private static measureDocumentElements;
+    private static measure;
     private static collectContainers;
+    private static resolvePath;
+    private static enclosersOf;
+    private static candidateContainers;
 }

package/lib/containers/document-container.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContainerService = void 0;
+const document_element_factory_1 = require("../document-element-factory");
 const container_kind_1 = require("./container-kind");
 const document_container_index_1 = require("./document-container-index");
 const document_container_1 = require("./document-container");
@@ -25,7 +26,7 @@ class DocumentContainerService {
         for (const measured of measuredDocumentElements) {
             const byElementType = new Map();
             for (const kind of kinds) {
-                byElementType.set(kind.elementType, document_container_1.DocumentContainerUtil.pathFor(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
+                byElementType.set(kind.elementType, this.resolvePath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
             }
             pathsByMeasured.set(measured, byElementType);
         }
@@ -51,13 +52,8 @@ class DocumentContainerService {
             }
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
-        const measuredById = new Map();
-        for (const measured of measuredDocumentElements) {
-            measuredById.set(measured.documentElement.id, measured);
-        }
         return new document_container_index_1.DocumentContainerIndex({
             documentElementsById,
-            measuredById,
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -71,9 +67,21 @@ class DocumentContainerService {
         return documentElements.map((documentElement, drawOrder) => ({
             documentElement,
             drawOrder,
-            box: document_container_1.DocumentContainerUtil.measureBox(documentElement, documentElementsById),
+            box: this.measure(documentElement, documentElementsById),
         }));
     }
+    static measure(documentElement, documentElementsById) {
+        var _a, _b;
+        try {
+            const start = ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
+            const end = ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
+            const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
+            return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
+        }
+        catch (_c) {
+            return null;
+        }
+    }
     static collectContainers(measuredDocumentElements, kind) {
         return measuredDocumentElements
             .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
@@ -85,5 +93,40 @@ class DocumentContainerService {
             drawOrder: measured.drawOrder,
         }));
     }
+    static resolvePath(measured, kind, containers) {
+        if (!containers.length || !measured.box) {
+            return [];
+        }
+        if (measured.documentElement.type === kind.elementType) {
+            return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
+        }
+        const candidates = this.candidateContainers(measured, containers);
+        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
+    }
+    static enclosersOf(measured, containers) {
+        return containers.filter((container) => {
+            var _a;
+            return container.id !== measured.documentElement.id &&
+                document_container_1.DocumentContainerUtil.encloses(container.box, measured.box) &&
+                measured.drawOrder > container.drawOrder &&
+                !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
+        });
+    }
+    static candidateContainers(measured, containers) {
+        const anchor = document_container_1.DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
+        return containers.filter((container) => {
+            var _a;
+            if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
+                return false;
+            }
+            if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
+                return false;
+            }
+            if (document_container_1.DocumentContainerUtil.encloses(measured.box, container.box)) {
+                return false;
+            }
+            return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
+        });
+    }
 }
 exports.DocumentContainerService = DocumentContainerService;

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

@@ -55,10 +55,7 @@ export declare class DynamicTextUtil {
     static isDynamicText(documentElement: DocumentElement): boolean;
     static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
     static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
-    static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): {
-        width: number;
-        height: number;
-    };
+    static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
     static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;
     private static getItemCount;
 }

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

@@ -167,19 +167,16 @@ class DynamicTextUtil {
         return text;
     }
     static calculateSize(dynamicTextElement, entityType, text) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        let size = {
-            width: (_b = (_a = dynamicTextElement.size) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 0,
-            height: (_d = (_c = dynamicTextElement.size) === null || _c === void 0 ? void 0 : _c.height) !== null && _d !== void 0 ? _d : 0,
-        };
-        const fontFamily = (_f = document_util_1.DocumentStyleUtil.getFirstFontFamily((_e = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _e !== void 0 ? _e : '')) !== null && _f !== void 0 ? _f : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
-        const fontSize = (_j = (dynamicTextElement.isTextTool
-            ? (_h = (_g = dynamicTextElement.style) === null || _g === void 0 ? void 0 : _g.font) === null || _h === void 0 ? void 0 : _h.size
-            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _j !== void 0 ? _j : document_util_1.DEFAULT_TEXT_FONT_SIZE;
+        var _a, _b, _c, _d, _e;
+        let size = (_a = dynamicTextElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
+        const fontFamily = (_b = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _b !== void 0 ? _b : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
+        const fontSize = (_e = (dynamicTextElement.isTextTool
+            ? (_d = (_c = dynamicTextElement.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size
+            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _e !== void 0 ? _e : document_util_1.DEFAULT_TEXT_FONT_SIZE;
         const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
         const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
-        const bold = document_util_1.DocumentStyleUtil.isBold((_k = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _k !== void 0 ? _k : '', fontFamily);
-        const italic = document_util_1.DocumentStyleUtil.isItalic((_l = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _l !== void 0 ? _l : '');
+        const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
+        const italic = document_util_1.DocumentStyleUtil.isItalic(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text);
         const measureTextSettings = {
             fontFamily,
             fontSize: fontSizePx,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "1.21.0-alpha.fb2b49f",
+  "version": "1.21.0-alpha.fb70961",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",