@contrail/documents 1.21.0-alpha.55b073f → 1.21.0-alpha.b884945

package/CHANGELOG.md

@@ -64,8 +64,16 @@ Maintenance release on the 1.x line; the same change ships on 2.x as 2.4.0.
 ### Changed
 
 - Container membership measures a scaled element from its scaled box, through the new
-  `getBoundingClientRectScaled` above. A scaled element previously measured at its unscaled size
-  and could resolve to the wrong container.
+  `getBoundingClientRectScaled` above. Only a sticky note, a regular iframe, a text-tool text or a
+  table carries `scale` at all; for this work the one that matters is a text-tool dynamic text,
+  which previously measured at its unscaled size and could resolve to the wrong container.
+- `DocumentContainerUtil.anchorFor` measures through the same factory call the index uses, so a
+  caller holding an element gets the answer the index would give it. Reading `size` directly
+  disagreed for the types whose box is not position plus size: a component's box is built from the
+  rows it draws, and a line's comes from its `lineDefinition`.
+- Container depth counts nesting levels rather than enclosing boxes. Two containers that merely
+  cross both enclose anything inside the overlap, so counting ancestors put that inner container a
+  level too deep and made `maxDepth` report a level no path could reach.
 
 ## [1.20.0] - 2026-09-25
 

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

@@ -19,7 +19,7 @@ export declare class DocumentContainerUtil {
     static centerOf(box: CoordinateBox): PositionDefinition;
     static anchorOf(documentElement: DocumentElement, box: CoordinateBox): PositionDefinition;
     static positionKeepingAnchor(documentElement: DocumentElement, newSize: SizeDefinition): PositionDefinition;
-    static anchorFor(documentElement: DocumentElement, position?: PositionDefinition): PositionDefinition;
+    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;

package/lib/containers/document-container.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContainerUtil = void 0;
 const rotation_math_1 = require("../util/mask/rotation-math");
 const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
+const document_element_factory_1 = require("../document-element-factory");
 class DocumentContainerUtil {
     static toCoordinateBox(x, y, width, height) {
         return { x, y, width, height, left: x, right: x + width, top: y, bottom: y + height };
@@ -37,14 +38,20 @@ class DocumentContainerUtil {
         const after = cornerOffset(newSize);
         return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
-    static anchorFor(documentElement, position) {
+    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 };
-        const 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));
+        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) {

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

@@ -4,11 +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 buildNesting;
-    private static resolveContainerPath;
-    private static resolveInnermostOnTop;
-    private static toContainerPath;
+    private static collectContainers;
+    private static resolveDirectPath;
+    private static enclosersOf;
+    private static chain;
     private static candidateContainers;
 }

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

@@ -9,22 +9,42 @@ 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;
         const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
-        const nestingByElementType = new Map(kinds.map((kind) => [kind.elementType, this.buildNesting(measuredDocumentElements, kind)]));
+        const kindsByLayer = [...kinds].sort((first, second) => second.layer - first.layer);
+        const containersByElementType = new Map(kindsByLayer.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 directPaths = new Map();
+        for (const measured of measuredDocumentElements) {
+            const byElementType = new Map();
+            for (const kind of kindsByLayer) {
+                byElementType.set(kind.elementType, this.resolveDirectPath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
+            }
+            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 = directPaths.get(measured)) === null || _b === void 0 ? void 0 : _b.get(container.kind.elementType)) !== null && _c !== void 0 ? _c : []).length;
+            }
+        }
+        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);
+            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);
                     if (members) {
@@ -38,7 +58,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,
@@ -48,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) => ({
@@ -71,8 +113,8 @@ 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,
@@ -83,47 +125,47 @@ class DocumentContainerService {
             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);
-            container.depth = ancestors.length;
-        }
-        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 resolveDirectPath(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 ? this.chain(this.enclosersOf(measured, containers)) : [];
             }
             if (kind.layer > ownKind.layer) {
                 return [];
             }
         }
-        const candidates = this.candidateContainers(measured, nesting.containers);
+        return this.chain(this.candidateContainers(measured, containers));
+    }
+    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 chain(candidates) {
         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))
+        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));
-    }
-    static toContainerPath(containers) {
-        return document_container_1.DocumentContainerUtil.topmostPerDepth(containers).map((container) => container.id);
+        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);
@@ -131,7 +173,7 @@ class DocumentContainerService {
             !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)) {

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

@@ -48,6 +48,7 @@ export declare const HARD_CODED_TEXT: {
     'section.itemOptionCount': string;
     'section.colorCount': string;
 };
+export declare function isContainerBinding(bindingProperty: string | null | undefined): boolean;
 export declare class DynamicTextUtil {
     static isDynamicText(documentElement: DocumentElement): boolean;
     static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicTextUtil = exports.HARD_CODED_TEXT = exports.CLICK_TO_CONFIGURE = exports.MOVE_TO_SECTION_TEXT = exports.MOVE_TO_FRAME_TEXT = exports.DynamicTextDisplayFunction = exports.DYNAMIC_TEXT_DATA_SOURCE = void 0;
+exports.isContainerBinding = isContainerBinding;
 const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
 const document_util_1 = require("@contrail/document-util");
@@ -50,11 +51,13 @@ exports.HARD_CODED_TEXT = {
 };
 const CONTAINER_PROPERTY_SLUGS = ['name', 'count', 'itemFamilyCount', 'itemOptionCount', 'colorCount'];
 const CONTAINER_SOURCES = [DYNAMIC_TEXT_DATA_SOURCE.FRAME, DYNAMIC_TEXT_DATA_SOURCE.SECTION];
+function isContainerBinding(bindingProperty) {
+    return DynamicTextUtil.takesValueFromContainer(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) {
@@ -172,8 +175,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);
@@ -218,7 +222,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.55b073f",
+  "version": "1.21.0-alpha.b884945",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",