@contrail/documents 2.4.0-alpha.86639ad → 2.4.0-alpha.c01727c

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

@@ -35,12 +35,8 @@ class DocumentContainerIndex {
         return members;
     }
     containerPathAtPoint(point, elementType) {
-        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);
+        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);

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

@@ -23,6 +23,5 @@ export declare class DocumentContainerUtil {
     static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
     static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
     static isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
-    static chain(candidates: DocumentContainer[]): DocumentContainer[];
-    static topmost(containers: DocumentContainer[]): DocumentContainer[];
+    static topmostPerDepth(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -39,12 +39,19 @@ 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 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);
+        const size = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
+        let box = DocumentContainerUtil.toCoordinateBox(at.x, at.y, 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), 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);
+            box = DocumentContainerUtil.toCoordinateBox(measured.x, measured.y, measured.width, measured.height);
+        }
+        catch (_f) {
+        }
         return DocumentContainerUtil.anchorOf(documentElement, box);
     }
     static containsPoint(box, point) {
@@ -61,27 +68,15 @@ class DocumentContainerUtil {
     static isWiderAndTallerThan(box, other) {
         return box.width > other.width && box.height > other.height;
     }
-    static chain(candidates) {
-        if (!candidates.length) {
-            return [];
-        }
-        const innermostOf = (of) => of
-            .filter((container) => !of.some((other) => other !== container && this.encloses(container.box, other.box)))
-            .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
-        const path = [innermostOf(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;
+    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;
             }
-            path.unshift(innermostOf(enclosing));
         }
-    }
-    static topmost(containers) {
-        return containers.length
-            ? [containers.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost))]
-            : [];
+        return byDepth.filter(Boolean);
     }
 }
 exports.DocumentContainerUtil = DocumentContainerUtil;

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

@@ -4,10 +4,12 @@ import { DocumentContainerIndex } from './document-container-index';
 export declare class DocumentContainerService {
     static buildIndex(documentElements: readonly DocumentElement[], kinds?: ContainerKind[]): DocumentContainerIndex;
     static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
+    private static inherit;
     private static measureDocumentElements;
     private static measure;
     private static collectContainers;
-    private static resolvePath;
+    private static resolveDirectPath;
     private static enclosersOf;
+    private static chain;
     private static candidateContainers;
 }

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

@@ -9,7 +9,7 @@ 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, _c, _d;
+        var _a, _b, _c;
         const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
         const kindsByLayer = [...kinds].sort((first, second) => second.layer - first.layer);
         const containersByElementType = new Map(kindsByLayer.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
@@ -19,18 +19,18 @@ class DocumentContainerService {
             containerIdsByElementType.set(elementType, containers.map((container) => container.id));
             containers.forEach((container) => containersById.set(container.id, container));
         });
-        const pathsByMeasured = new Map();
+        const directPaths = new Map();
         for (const measured of measuredDocumentElements) {
             const byElementType = new Map();
             for (const kind of kindsByLayer) {
-                byElementType.set(kind.elementType, this.resolvePath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
+                byElementType.set(kind.elementType, this.resolveDirectPath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
             }
-            pathsByMeasured.set(measured, byElementType);
+            directPaths.set(measured, byElementType);
         }
         for (const measured of measuredDocumentElements) {
             const container = containersById.get(measured.documentElement.id);
             if (container && container.documentElement === measured.documentElement) {
-                container.depth = ((_c = (_b = pathsByMeasured.get(measured)) === null || _b === void 0 ? void 0 : _b.get(container.kind.elementType)) !== null && _c !== void 0 ? _c : []).length;
+                container.depth = ((_c = (_b = directPaths.get(measured)) === null || _b === void 0 ? void 0 : _b.get(container.kind.elementType)) !== null && _c !== void 0 ? _c : []).length;
             }
         }
         const measuredById = new Map();
@@ -43,8 +43,7 @@ class DocumentContainerService {
         const memberIdsByContainerId = new Map();
         for (const measured of measuredDocumentElements) {
             const documentElementId = measured.documentElement.id;
-            const pathsByElementType = new Map();
-            ((_d = pathsByMeasured.get(measured)) !== null && _d !== void 0 ? _d : new Map()).forEach((path, elementType) => pathsByElementType.set(elementType, path.map((container) => container.id)));
+            const pathsByElementType = this.inherit(measured, kindsByLayer, directPaths, measuredById, new Set());
             for (const path of pathsByElementType.values()) {
                 for (const containerId of path) {
                     const members = memberIdsByContainerId.get(containerId);
@@ -69,6 +68,28 @@ class DocumentContainerService {
     static isContainer(documentElement, kinds = container_kind_1.CONTAINER_KINDS) {
         return kinds.some((kind) => kind.elementType === (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type));
     }
+    static inherit(measured, kindsByLayer, directPaths, measuredById, resolving) {
+        var _a, _b, _c;
+        const direct = (_a = directPaths.get(measured)) !== null && _a !== void 0 ? _a : new Map();
+        const paths = new Map();
+        let inheritFromId = null;
+        for (const kind of kindsByLayer) {
+            if (inheritFromId && !resolving.has(inheritFromId)) {
+                const container = measuredById.get(inheritFromId);
+                const inherited = container
+                    ? this.inherit(container, kindsByLayer, directPaths, measuredById, new Set(resolving).add(inheritFromId))
+                    : null;
+                paths.set(kind.elementType, (_b = inherited === null || inherited === void 0 ? void 0 : inherited.get(kind.elementType)) !== null && _b !== void 0 ? _b : []);
+                continue;
+            }
+            const path = (_c = direct.get(kind.elementType)) !== null && _c !== void 0 ? _c : [];
+            paths.set(kind.elementType, path.map((container) => container.id));
+            if (path.length) {
+                inheritFromId = path[path.length - 1].id;
+            }
+        }
+        return paths;
+    }
     static measureDocumentElements(documentElements) {
         const documentElementsById = new Map(documentElements.map((documentElement) => [documentElement.id, documentElement]));
         return documentElements.map((documentElement, drawOrder) => ({
@@ -105,21 +126,20 @@ class DocumentContainerService {
             drawOrder: measured.drawOrder,
         }));
     }
-    static resolvePath(measured, kind, containers) {
+    static resolveDirectPath(measured, kind, containers) {
         if (!containers.length || !measured.box) {
             return [];
         }
         const ownKind = container_kind_1.CONTAINER_KINDS.find((candidate) => candidate.elementType === measured.documentElement.type);
         if (ownKind) {
             if (ownKind.elementType === kind.elementType) {
-                return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
+                return kind.nests ? this.chain(this.enclosersOf(measured, containers)) : [];
             }
             if (kind.layer > ownKind.layer) {
                 return [];
             }
         }
-        const candidates = this.candidateContainers(measured, containers);
-        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
+        return this.chain(this.candidateContainers(measured, containers));
     }
     static enclosersOf(measured, containers) {
         return containers.filter((container) => {
@@ -130,6 +150,23 @@ class DocumentContainerService {
                 !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
         });
     }
+    static chain(candidates) {
+        if (!candidates.length) {
+            return [];
+        }
+        const innermostOf = (of) => of
+            .filter((container) => !of.some((other) => other !== container && document_container_1.DocumentContainerUtil.encloses(container.box, other.box)))
+            .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
+        const path = [innermostOf(candidates)];
+        for (;;) {
+            const current = path[0];
+            const enclosing = candidates.filter((container) => !path.includes(container) && document_container_1.DocumentContainerUtil.encloses(container.box, current.box));
+            if (!enclosing.length) {
+                return path;
+            }
+            path.unshift(innermostOf(enclosing));
+        }
+    }
     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) &&

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

@@ -56,9 +56,8 @@ function isContainerBinding(bindingProperty) {
 }
 class DynamicTextUtil {
     static isDynamicText(documentElement) {
-        return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
-            !!documentElement.propertyBindings &&
-            !!documentElement.propertyBindingsMetaData);
+        var _a;
+        return (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' && !!((_a = documentElement.propertyBindings) === null || _a === void 0 ? void 0 : _a.text);
     }
     static takesValueFromContainer(bindingProperty) {
         if (!bindingProperty) {

package/package.json

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