@contrail/documents 1.21.0-alpha.a727550 → 1.21.0-alpha.adaec42

package/CHANGELOG.md

@@ -13,75 +13,67 @@ Maintenance release on the 1.x line; the same change ships on 2.x as 2.4.0.
 
 - `DocumentContainerService.buildIndex` and `DocumentContainerIndex` — which containers hold which
   elements, for one document, resolved once and read back by lookup. A container is a frame or a
-  section; membership is geometry, draw order and kind, with nothing inherited and nothing stored.
-  The rule is written out in `src/containers/DOCUMENT_CONTAINERS_SPEC.md`, which the code is
-  measured against.
-- `DocumentContainerUtil` — the container geometry as statics. `anchorFor` answers "which point is
-  this element placed by" for a caller holding an element rather than a measured box, and
-  `resizeKeepingAnchor` returns the size a new value needs with the position that keeps that point
-  still. Applying one without the other drags the corner membership reads.
-- `SECTION_ELEMENT_TYPE` and `FRAME_ELEMENT_TYPE` in `document-element-constants`, alongside
-  `SHAPE_ELEMENT_TYPES`, which moved here for the board's shape handling.
+  section, described by a `ContainerKind` carrying `elementType`, `nests` and `layer`. An element
+  belongs to the container whose box covers its anchor point and which is drawn below it. Nesting
+  gives a path with one container per depth, the later-drawn one winning where two cross. A
+  container is only ever content of a kind layered behind it, so a frame belongs to a section and a
+  section never to a frame. Shapes wider and taller than the container, and groups holding it, are
+  excluded.
+- `SECTION_ELEMENT_TYPE`, `FRAME_ELEMENT_TYPE` and `SHAPE_ELEMENT_TYPES` in
+  `document-element-constants`, so the rule above has one definition rather than one per app.
+- `DocumentContainerUtil` — the container geometry as statics, with `anchorFor` for a caller
+  holding an element rather than a measured box.
+- `positionKeepingAnchor` — where an element has to sit for its drawn corner to land where it did
+  before a resize. Rotation turns about the centre and the centre moves with the size, so a rotated
+  element resized about its stored position drags its corner along with it. The board already makes
+  this move; a server recomputing a dynamic text has to make the same one, or the corner is not the
+  fixed point the anchor rule needs.
 - `DocumentElementFactory.getBoundingClientRectScaled` — the space an element covers on the canvas,
-  with `scale` applied. `getBoundingClientRect` still returns the unscaled box, which is what layout
-  works in: `@contrail/document-table` places table members from it, and scaling it moves a scaled
-  member into a different cell. Anything deciding what an element overlaps or sits on wants the
-  scaled one.
-
-### Removed
-
-- `DocumentContainerIndex.containerPathAtPoint`. It applied the anchor rule alone, because a bare
-  point has nothing to compare against a container, and returned the same shape as `containerIdsOf`,
-  so it read as a second way to ask one question. `containerPathFor(element, kind)` replaces it and
-  applies every rule. Callers that hold a position pass the element with that position on it. This
-  is the one removal a consumer has to act on.
-- `ContainerKind.layer`, `DocumentContainer.name` and `DocumentContainer.depth`, and
-  `DocumentContainerIndex.maxDepth`. The container API has not shipped in a released version, so
-  nothing outside this repository can be holding them. Read a container's name from
-  `documentElement.name`.
+  with `scale` applied. `getBoundingClientRect` keeps returning the element's own box before scale,
+  which is what layout works in: `@contrail/document-table` places table members from it, and
+  scaling it moves a scaled member into a different cell. Anything deciding what an element overlaps
+  or sits on wants the scaled one.
 
 ### Deprecated
 
 - `isContainerBinding()` in favour of `DynamicTextUtil.takesValueFromContainer()`. Same rule, named
-  for what it decides. The old name still works and delegates to the new one.
+  for what it decides: whether the binding's value comes from the container rather than a type
+  property. The old name still works and delegates to the new one.
 
 ### Fixed
 
-- A dynamic text is anchored at its drawn top-left corner rather than its centre. Its size comes
-  from the value it resolves to and that value comes from its container, so an anchor that moved
-  with the size let the two choose each other: near an edge they never settled, flipping between a
-  value and "Move to a frame" on every read. The corner is the rotated one, so a text turned on its
-  side anchors where it appears (VIBE-9567).
-- `isDynamicText` requires a `propertyBindings.text` binding, the one the value is read from. The
-  text tool creates an element with empty bindings and empty metadata, both truthy, so an
-  unconfigured text was anchored at its corner while the canvas centred it.
-- An element covering a container is not inside it, whatever its type. The rule it replaces looked
-  only at shapes wider and taller than the container, so a background image joined the frame it
-  covered.
-- A line or callout is measured from the elements it connects even with no stored `position`, where
-  it was previously left out of the index entirely.
-- `min` and `max` rendered an infinity sign when every member value was empty; both fall through to
-  `n/a`. `calculateSize` no longer throws on an element that reaches it without a `size`, which on
-  the server failed the read for the whole document.
+- A dynamic text is now anchored at its drawn top-left corner rather than its centre when deciding
+  which container it belongs to, and `DynamicTextUtil.isDynamicText` is the shared test for one. Its
+  size comes from the value it resolves to, and that value depends on the container, so letting its
+  width feed membership meant its own text could choose its container: near an edge the two answers
+  disagreed indefinitely, flipping between a value and "Move to a frame" on every read. Everything
+  else still resolves on its centre.
+- The corner is the rotated one (VIBE-9567). A 200x20 text turned on its side draws as a 20x200
+  column, and its unrotated `position` can sit well clear of the frame it is visibly on, which
+  reported "Move to a frame" for a vertical text the user could see was placed correctly.
+- A dynamic text is also exempt from the oversized-shape exclusion, which keeps a shape wider and
+  taller than a container off it. That rule reads size too, so a dynamic text larger than its frame
+  in both directions had two self-consistent answers and kept whichever it started from. The rule
+  exists to keep a backdrop shape off a frame it covers, which is not what a dynamic text is doing.
+- `min` and `max` rendered an infinity sign when every member value was empty. The early return
+  checked the list length before the empty values were filtered out, so `Math.min` of nothing
+  reached the formatter. Both now fall through to `n/a`.
+- `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on
+  the server failed the read for the whole document. It now measures from a zero size instead.
 
 ### Changed
 
-- `anchorFor` and the index measure through the same factory call, 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 container path is a containment chain, walked outward from the container the element sits on, so
-  two containers that merely cross no longer both claim it.
-- `buildIndex` scans element types before measuring, so a document with no containers of the kinds
-  asked for returns an empty index without a geometry pass.
-- **A section nests inside another only when it is drawn above it.** A section drawn over one it
-  encloses hides it, so the hidden section holds nothing and a `section.count` on it reads zero.
-  This changes existing boards wherever the outer section was drawn last.
-- `containerIdsOf` and `memberIdsOf` return copies. `readonly` is erased at runtime, and a caller
-  sorting what it got back reordered the index's own list for every later read.
-- A member list is a set of ids, so two elements sharing an id count once.
-- `min` and `max` no longer read an empty member as zero, and `uniqueArray` no longer emits one as
-  a blank entry. A text box narrower than its own padding measures without a fixed width.
-- A nullish entry in the element list is dropped rather than throwing.
+- Container membership measures a scaled element from its scaled box, through the new
+  `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-index.d.ts

@@ -1,11 +1,10 @@
-import { DocumentElement } from '../types';
-import { ContainerElementType, ContainerKind } from './container-kind';
-import { DocumentContainer, MeasuredDocumentElement } from './document-container';
+import { DocumentElement, PositionDefinition } from '../types';
+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,7 @@ 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): readonly string[];
+    containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
     private containersOfType;
     private resolveAll;
     private containerPath;

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(),
@@ -24,7 +23,7 @@ class DocumentContainerIndex {
         return this.resolveAll(this.containerIdsOf(documentElementId, elementType));
     }
     containerIdsOf(documentElementId, elementType) {
-        return [...this.containerPath(documentElementId, elementType)];
+        return this.containerPath(documentElementId, elementType);
     }
     innermostContainerIdOf(documentElementId, elementType) {
         const path = this.containerPath(documentElementId, elementType);
@@ -32,7 +31,7 @@ class DocumentContainerIndex {
     }
     memberIdsOf(containerId) {
         var _a;
-        return [...((_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [])];
+        return (_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [];
     }
     memberDocumentElementsOf(containerId) {
         const members = [];
@@ -44,17 +43,13 @@ class DocumentContainerIndex {
         }
         return members;
     }
-    containerPathFor(documentElement, kind) {
+    containerPathAtPoint(point, elementType) {
         var _a, _b;
-        if (!documentElement) {
-            return [];
-        }
-        const measured = {
-            documentElement,
-            box: document_container_1.DocumentContainerUtil.measureBox(documentElement, this.data.documentElementsById),
-            drawOrder: (_b = (_a = this.data.measuredById.get(documentElement.id)) === null || _a === void 0 ? void 0 : _a.drawOrder) !== null && _b !== void 0 ? _b : Number.MAX_SAFE_INTEGER,
-        };
-        return document_container_1.DocumentContainerUtil.pathFor(measured, kind, this.containersOfType(kind.elementType)).map((container) => container.id);
+        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

@@ -17,17 +17,9 @@ export declare class DocumentContainerUtil {
     static centerOf(box: CoordinateBox): PositionDefinition;
     static anchorOf(documentElement: DocumentElement, box: CoordinateBox): PositionDefinition;
     static positionKeepingAnchor(documentElement: DocumentElement, newSize: SizeDefinition): PositionDefinition;
-    static resizeKeepingAnchor(dynamicTextElement: DocumentElement, entityType: any, text: string): {
-        size: SizeDefinition;
-        position: 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 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,23 +36,16 @@ 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);
-    }
-    static resizeKeepingAnchor(dynamicTextElement, entityType, text) {
-        const size = dynamic_text_util_1.DynamicTextUtil.calculateSize(dynamicTextElement, entityType, text);
-        return { size, position: DocumentContainerUtil.positionKeepingAnchor(dynamicTextElement, size) };
+        return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
     static anchorFor(documentElement, position, startElement, endElement) {
         const at = position !== null && position !== void 0 ? position : documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
-        try {
-            const measured = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(at ? Object.assign(Object.assign({}, documentElement), { position: at }) : documentElement, startElement, endElement);
-            const box = DocumentContainerUtil.toCoordinateBox(measured.x, measured.y, measured.width, measured.height);
-            return DocumentContainerUtil.anchorOf(documentElement, box);
-        }
-        catch (_a) {
+        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);
+        return DocumentContainerUtil.anchorOf(documentElement, box);
     }
     static containsPoint(box, point) {
         return point.x >= box.left && point.x <= box.right && point.y >= box.top && point.y <= box.bottom;
@@ -83,56 +73,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 && !x && !y) {
-                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,15 +1,16 @@
 "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");
 class DocumentContainerService {
     static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
         var _a, _b;
-        const elements = (documentElements !== null && documentElements !== void 0 ? documentElements : []).filter((element) => !!element);
+        const elements = documentElements !== null && documentElements !== void 0 ? documentElements : [];
         const containerElementTypes = new Set(kinds.map((kind) => kind.elementType));
-        if (!elements.some((element) => containerElementTypes.has(element.type))) {
+        if (!elements.some((element) => containerElementTypes.has(element === null || element === void 0 ? void 0 : element.type))) {
             return document_container_index_1.DocumentContainerIndex.empty();
         }
         const documentElementsById = new Map(elements.map((element) => [element.id, element]));
@@ -25,39 +26,31 @@ 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);
         }
         const containerPathsByDocumentElementId = new Map();
         const memberIdsByContainerId = new Map();
-        const memberIdsSeen = new Map();
         for (const measured of measuredDocumentElements) {
             const documentElementId = measured.documentElement.id;
             const pathsByElementType = new Map();
             ((_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 seen = memberIdsSeen.get(containerId);
-                    if (!seen) {
-                        memberIdsSeen.set(containerId, new Set([documentElementId]));
-                        memberIdsByContainerId.set(containerId, [documentElementId]);
+                    const members = memberIdsByContainerId.get(containerId);
+                    if (members) {
+                        members.push(documentElementId);
                     }
-                    else if (!seen.has(documentElementId)) {
-                        seen.add(documentElementId);
-                        memberIdsByContainerId.get(containerId).push(documentElementId);
+                    else {
+                        memberIdsByContainerId.set(containerId, [documentElementId]);
                     }
                 }
             }
             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 +64,24 @@ 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;
+        if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position)) {
+            return null;
+        }
+        try {
+            const start = ((_a = documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
+            const end = ((_b = 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.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);
+        return containers.filter((container) => {
+            var _a;
+            if (container.documentElement === measured.documentElement || 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

@@ -27,8 +27,6 @@ export declare enum DynamicTextDisplayFunction {
 export declare const MOVE_TO_FRAME_TEXT = "Move to a frame";
 export declare const MOVE_TO_SECTION_TEXT = "Move to a section";
 export declare const CLICK_TO_CONFIGURE = "Click to configure";
-export declare function placeholderForMissingContainer(entityType: string): string;
-export declare function isPlaceholderText(text: string): boolean;
 export declare const HARD_CODED_TEXT: {
     'project.name': string;
     'project.createdBy.email': string;
@@ -55,10 +53,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

@@ -1,8 +1,6 @@
 "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.placeholderForMissingContainer = placeholderForMissingContainer;
-exports.isPlaceholderText = isPlaceholderText;
 exports.isContainerBinding = isContainerBinding;
 const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
@@ -30,12 +28,6 @@ var DynamicTextDisplayFunction;
 exports.MOVE_TO_FRAME_TEXT = 'Move to a frame';
 exports.MOVE_TO_SECTION_TEXT = 'Move to a section';
 exports.CLICK_TO_CONFIGURE = 'Click to configure';
-function placeholderForMissingContainer(entityType) {
-    return entityType === DYNAMIC_TEXT_DATA_SOURCE.SECTION ? exports.MOVE_TO_SECTION_TEXT : exports.MOVE_TO_FRAME_TEXT;
-}
-function isPlaceholderText(text) {
-    return text === exports.MOVE_TO_FRAME_TEXT || text === exports.MOVE_TO_SECTION_TEXT || text === exports.CLICK_TO_CONFIGURE;
-}
 exports.HARD_CODED_TEXT = {
     'project.name': 'Project name',
     'project.createdBy.email': 'Project created by',
@@ -64,9 +56,8 @@ function isContainerBinding(bindingProperty) {
 }
 class DynamicTextUtil {
     static isDynamicText(documentElement) {
-        var _a;
         return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
-            !!((_a = documentElement.propertyBindings) === null || _a === void 0 ? void 0 : _a.text) &&
+            !!documentElement.propertyBindings &&
             !!documentElement.propertyBindingsMetaData);
     }
     static takesValueFromContainer(bindingProperty) {
@@ -106,7 +97,7 @@ class DynamicTextUtil {
         }
         else {
             if (!container && !isSpecRelated) {
-                text = placeholderForMissingContainer(entityType);
+                text = entityType === DYNAMIC_TEXT_DATA_SOURCE.SECTION ? exports.MOVE_TO_SECTION_TEXT : exports.MOVE_TO_FRAME_TEXT;
             }
             else {
                 if (CONTAINER_SOURCES.includes(entityType)) {
@@ -149,7 +140,7 @@ class DynamicTextUtil {
                 text = exports.HARD_CODED_TEXT[bindingProperty] || (property === null || property === void 0 ? void 0 : property.label);
             }
             else if (!container) {
-                text = placeholderForMissingContainer(entityType);
+                text = exports.MOVE_TO_FRAME_TEXT;
             }
             else {
                 text = property === null || property === void 0 ? void 0 : property.label;
@@ -159,7 +150,7 @@ class DynamicTextUtil {
             text = 'n/a';
         }
         if (displayLabel &&
-            !isPlaceholderText(text) &&
+            ![exports.MOVE_TO_FRAME_TEXT, exports.CLICK_TO_CONFIGURE].includes(text) &&
             displayFunction !== DynamicTextDisplayFunction.LABEL &&
             text !== bindingProperty) {
             text = `${exports.HARD_CODED_TEXT[bindingProperty] || (property === null || property === void 0 ? void 0 : property.label) || ''}: ${text}`;
@@ -167,19 +158,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,
@@ -220,7 +208,7 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.UNIQUE_ARRAY) {
             text = Array.from(new Set(memberValues
-                .filter((e) => e !== null && e !== undefined && e !== '')
+                .filter((e) => e !== null && e !== undefined)
                 .flat()
                 .map((e) => formatter.formatValueForProperty(e, property))))
                 .sort()

package/package.json

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