@contrail/documents 1.21.0-alpha.913fd20 → 1.21.0-alpha.ea78326

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

@@ -3,7 +3,7 @@ export type ContainerElementType = typeof FRAME_ELEMENT_TYPE | typeof SECTION_EL
 export interface ContainerKind {
     elementType: ContainerElementType;
     nests: boolean;
-    layer: number;
+    canBeContentOf: readonly ContainerElementType[];
 }
 export declare const SECTION_KIND: ContainerKind;
 export declare const FRAME_KIND: ContainerKind;

package/lib/containers/container-kind.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONTAINER_KINDS = exports.FRAME_KIND = exports.SECTION_KIND = void 0;
 const document_element_constants_1 = require("../document-element-constants");
-exports.SECTION_KIND = { elementType: document_element_constants_1.SECTION_ELEMENT_TYPE, nests: true, layer: 0 };
-exports.FRAME_KIND = { elementType: document_element_constants_1.FRAME_ELEMENT_TYPE, nests: false, layer: 1 };
+exports.SECTION_KIND = {
+    elementType: document_element_constants_1.SECTION_ELEMENT_TYPE,
+    nests: true,
+    canBeContentOf: [document_element_constants_1.SECTION_ELEMENT_TYPE],
+};
+exports.FRAME_KIND = {
+    elementType: document_element_constants_1.FRAME_ELEMENT_TYPE,
+    nests: false,
+    canBeContentOf: [document_element_constants_1.SECTION_ELEMENT_TYPE],
+};
 exports.CONTAINER_KINDS = [exports.SECTION_KIND, exports.FRAME_KIND];

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

@@ -17,7 +17,6 @@ export declare class DocumentContainerIndex {
     memberIdsOf(containerId: string): readonly string[];
     memberDocumentElementsOf(containerId: string): DocumentElement[];
     containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
-    maxDepth(elementType: ContainerElementType): number;
     private containersOfType;
     private resolveAll;
     private containerPath;

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

@@ -35,11 +35,12 @@ class DocumentContainerIndex {
         return members;
     }
     containerPathAtPoint(point, elementType) {
-        const covering = this.containersOfType(elementType).filter((container) => document_container_1.DocumentContainerUtil.containsPoint(container.box, point));
-        return document_container_1.DocumentContainerUtil.topmostPerDepth(covering).map((container) => container.id);
-    }
-    maxDepth(elementType) {
-        return this.containersOfType(elementType).reduce((max, container) => Math.max(max, container.depth + 1), 0);
+        var _a, _b;
+        const containers = this.containersOfType(elementType);
+        const covering = containers.filter((container) => document_container_1.DocumentContainerUtil.containsPoint(container.box, point));
+        const nests = (_b = (_a = containers[0]) === null || _a === void 0 ? void 0 : _a.kind.nests) !== null && _b !== void 0 ? _b : true;
+        const path = nests ? document_container_1.DocumentContainerUtil.chain(covering) : document_container_1.DocumentContainerUtil.topmost(covering);
+        return path.map((container) => container.id);
     }
     containersOfType(elementType) {
         var _a;

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

@@ -3,10 +3,8 @@ import { ContainerKind } from './container-kind';
 export interface DocumentContainer {
     id: string;
     kind: ContainerKind;
-    name: string;
     documentElement: DocumentElement;
     box: CoordinateBox;
-    depth: number;
     drawOrder: number;
 }
 export interface MeasuredDocumentElement {
@@ -22,6 +20,6 @@ export declare class DocumentContainerUtil {
     static anchorFor(documentElement: DocumentElement, position?: PositionDefinition, startElement?: DocumentElement, endElement?: DocumentElement): PositionDefinition;
     static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
     static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
-    static isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
-    static topmostPerDepth(containers: DocumentContainer[]): DocumentContainer[];
+    static chain(candidates: DocumentContainer[]): DocumentContainer[];
+    static topmost(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -39,22 +39,12 @@ class DocumentContainerUtil {
         return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
     static anchorFor(documentElement, position, startElement, endElement) {
-        var _a, _b, _c, _d, _e;
         const at = position !== null && position !== void 0 ? position : documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
         if (!at) {
             return null;
         }
-        const size = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
-        let width = size.width * ((_c = (_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.scale) === null || _b === void 0 ? void 0 : _b.x) !== null && _c !== void 0 ? _c : 1);
-        let height = size.height * ((_e = (_d = documentElement === null || documentElement === void 0 ? void 0 : documentElement.scale) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 1);
-        try {
-            const measured = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(Object.assign(Object.assign({}, documentElement), { position: at }), startElement, endElement);
-            width = measured.width;
-            height = measured.height;
-        }
-        catch (_f) {
-        }
-        const box = DocumentContainerUtil.toCoordinateBox(at.x, at.y, width, height);
+        const measured = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(Object.assign(Object.assign({}, documentElement), { position: at }), startElement, endElement);
+        const box = DocumentContainerUtil.toCoordinateBox(measured.x, measured.y, measured.width, measured.height);
         return DocumentContainerUtil.anchorOf(documentElement, box);
     }
     static containsPoint(box, point) {
@@ -68,18 +58,25 @@ class DocumentContainerUtil {
             outer.bottom === inner.bottom;
         return covers && !identical;
     }
-    static isWiderAndTallerThan(box, other) {
-        return box.width > other.width && box.height > other.height;
-    }
-    static topmostPerDepth(containers) {
-        const byDepth = [];
-        for (const container of containers) {
-            const existing = byDepth[container.depth];
-            if (!existing || container.drawOrder > existing.drawOrder) {
-                byDepth[container.depth] = container;
+    static chain(candidates) {
+        if (!candidates.length) {
+            return [];
+        }
+        const topmostOf = (of) => of.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
+        const path = [topmostOf(candidates)];
+        for (;;) {
+            const current = path[0];
+            const enclosing = candidates.filter((container) => !path.includes(container) && this.encloses(container.box, current.box));
+            if (!enclosing.length) {
+                return path;
             }
+            path.unshift(topmostOf(enclosing));
         }
-        return byDepth.filter(Boolean);
+    }
+    static topmost(containers) {
+        return containers.length
+            ? [containers.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost))]
+            : [];
     }
 }
 exports.DocumentContainerUtil = DocumentContainerUtil;

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

@@ -6,9 +6,8 @@ export declare class DocumentContainerService {
     static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
     private static measureDocumentElements;
     private static measure;
-    private static buildNesting;
-    private static resolveContainerPath;
-    private static resolveInnermostOnTop;
-    private static toContainerPath;
+    private static collectContainers;
+    private static resolvePath;
+    private static enclosersOf;
     private static candidateContainers;
 }

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

@@ -2,29 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContainerService = void 0;
 const document_element_factory_1 = require("../document-element-factory");
-const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
-const document_element_constants_1 = require("../document-element-constants");
 const container_kind_1 = require("./container-kind");
 const document_container_index_1 = require("./document-container-index");
 const document_container_1 = require("./document-container");
 class DocumentContainerService {
     static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
+        var _a, _b;
         const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
-        const nestingByElementType = new Map(kinds.map((kind) => [kind.elementType, this.buildNesting(measuredDocumentElements, kind)]));
+        const containersByElementType = new Map(kinds.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
         const containersById = new Map();
         const containerIdsByElementType = new Map();
-        nestingByElementType.forEach((nesting, elementType) => {
-            containerIdsByElementType.set(elementType, nesting.containers.map((container) => container.id));
-            nesting.containers.forEach((container) => containersById.set(container.id, container));
+        containersByElementType.forEach((containers, elementType) => {
+            containerIdsByElementType.set(elementType, containers.map((container) => container.id));
+            containers.forEach((container) => containersById.set(container.id, container));
         });
+        const pathsByMeasured = new Map();
+        for (const measured of measuredDocumentElements) {
+            const byElementType = new Map();
+            for (const kind of kinds) {
+                byElementType.set(kind.elementType, this.resolvePath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
+            }
+            pathsByMeasured.set(measured, byElementType);
+        }
+        const measuredById = new Map();
+        for (const measured of measuredDocumentElements) {
+            if (!measuredById.has(measured.documentElement.id)) {
+                measuredById.set(measured.documentElement.id, measured);
+            }
+        }
         const containerPathsByDocumentElementId = new Map();
         const memberIdsByContainerId = new Map();
         for (const measured of measuredDocumentElements) {
             const documentElementId = measured.documentElement.id;
             const pathsByElementType = new Map();
-            for (const kind of kinds) {
-                const path = this.resolveContainerPath(measured, kind, kinds, nestingByElementType.get(kind.elementType));
-                pathsByElementType.set(kind.elementType, path);
+            ((_b = pathsByMeasured.get(measured)) !== null && _b !== void 0 ? _b : new Map()).forEach((path, elementType) => pathsByElementType.set(elementType, path.map((container) => container.id)));
+            for (const path of pathsByElementType.values()) {
                 for (const containerId of path) {
                     const members = memberIdsByContainerId.get(containerId);
                     if (members) {
@@ -38,7 +50,7 @@ class DocumentContainerService {
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
         return new document_container_index_1.DocumentContainerIndex({
-            documentElementsById: new Map(measuredDocumentElements.map((measured) => [measured.documentElement.id, measured.documentElement])),
+            documentElementsById: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -71,87 +83,53 @@ class DocumentContainerService {
             return null;
         }
     }
-    static buildNesting(measuredDocumentElements, kind) {
-        const containers = measuredDocumentElements
+    static collectContainers(measuredDocumentElements, kind) {
+        return measuredDocumentElements
             .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
             .map((measured) => ({
             id: measured.documentElement.id,
             kind,
-            name: measured.documentElement.name,
             documentElement: measured.documentElement,
             box: measured.box,
-            depth: 0,
             drawOrder: measured.drawOrder,
         }));
-        const ancestorsById = new Map();
-        for (const container of containers) {
-            const ancestors = kind.nests
-                ? containers.filter((other) => other !== container && document_container_1.DocumentContainerUtil.encloses(other.box, container.box))
-                : [];
-            ancestorsById.set(container.id, ancestors);
-        }
-        const depths = new Map();
-        const depthOf = (container) => {
-            var _a;
-            const cached = depths.get(container.id);
-            if (cached !== undefined) {
-                return cached;
-            }
-            const ancestors = (_a = ancestorsById.get(container.id)) !== null && _a !== void 0 ? _a : [];
-            const depth = ancestors.length ? 1 + Math.max(...ancestors.map(depthOf)) : 0;
-            depths.set(container.id, depth);
-            return depth;
-        };
-        for (const container of containers) {
-            container.depth = depthOf(container);
-        }
-        return { containers, ancestorsById };
     }
-    static resolveContainerPath(measured, kind, kinds, nesting) {
-        var _a, _b;
-        if (!(nesting === null || nesting === void 0 ? void 0 : nesting.containers.length) || !measured.box) {
+    static resolvePath(measured, kind, containers) {
+        if (!containers.length || !measured.box) {
             return [];
         }
-        const ownKind = kinds.find((candidate) => candidate.elementType === measured.documentElement.type);
+        const ownKind = container_kind_1.CONTAINER_KINDS.find((candidate) => candidate.elementType === measured.documentElement.type);
         if (ownKind) {
             if (ownKind.elementType === kind.elementType) {
-                return kind.nests ? this.toContainerPath((_a = nesting.ancestorsById.get(measured.documentElement.id)) !== null && _a !== void 0 ? _a : []) : [];
+                return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
             }
-            if (kind.layer > ownKind.layer) {
+            if (!ownKind.canBeContentOf.includes(kind.elementType)) {
                 return [];
             }
         }
-        const candidates = this.candidateContainers(measured, nesting.containers);
-        if (!candidates.length) {
-            return [];
-        }
-        const innermostOnTop = this.resolveInnermostOnTop(candidates, nesting);
-        const candidateIds = new Set(candidates.map((container) => container.id));
-        const ancestors = ((_b = nesting.ancestorsById.get(innermostOnTop.id)) !== null && _b !== void 0 ? _b : []).filter((container) => candidateIds.has(container.id));
-        return this.toContainerPath([...ancestors, innermostOnTop]);
-    }
-    static resolveInnermostOnTop(candidates, nesting) {
-        const enclosingIds = new Set(candidates.flatMap((container) => { var _a; return (_a = nesting.ancestorsById.get(container.id)) !== null && _a !== void 0 ? _a : []; }).map((ancestor) => ancestor.id));
-        return candidates
-            .filter((container) => !enclosingIds.has(container.id))
-            .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
+        const candidates = this.candidateContainers(measured, containers);
+        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
     }
-    static toContainerPath(containers) {
-        return document_container_1.DocumentContainerUtil.topmostPerDepth(containers).map((container) => container.id);
+    static enclosersOf(measured, containers) {
+        return containers.filter((container) => {
+            var _a;
+            return container.documentElement !== measured.documentElement &&
+                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);
-        const isShape = document_element_constants_1.SHAPE_ELEMENT_TYPES.includes(measured.documentElement.type) &&
-            !dynamic_text_util_1.DynamicTextUtil.isDynamicText(measured.documentElement);
         return containers.filter((container) => {
             var _a;
-            if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
+            if (container.documentElement === measured.documentElement || measured.drawOrder <= container.drawOrder) {
                 return false;
             }
             if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
                 return false;
             }
-            if (isShape && document_container_1.DocumentContainerUtil.isWiderAndTallerThan(measured.box, container.box)) {
+            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));

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

@@ -176,8 +176,9 @@ class DynamicTextUtil {
             bold,
             italic,
         };
-        if (!dynamicTextElement.isTextTool) {
-            measureTextSettings.width = size.width - padding * 2;
+        const fixedWidth = size.width - padding * 2;
+        if (!dynamicTextElement.isTextTool && fixedWidth > 0) {
+            measureTextSettings.width = fixedWidth;
         }
         try {
             const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
@@ -222,7 +223,10 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN ||
             displayFunction === DynamicTextDisplayFunction.MAX) {
-            const present = memberValues.filter((e) => e !== null && e !== undefined);
+            const present = memberValues
+                .filter((e) => e !== null && e !== undefined && e !== '')
+                .map(Number)
+                .filter((e) => !Number.isNaN(e));
             if (!present.length) {
                 return '';
             }

package/package.json

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