@contrail/documents 2.4.0-alpha.86639ad → 2.4.0-alpha.8be4908

package/CHANGELOG.md

@@ -13,18 +13,25 @@ Also shipped on the 1.x line as 1.21.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, 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.
+  section, described by a `ContainerKind` carrying `elementType` and `nests`. An element belongs to
+  the container whose box covers its anchor point and which is drawn below it, unless the element's
+  own box encloses that container or the element is a group holding it. `nests` decides the shape of
+  the answer: sections nest, so an element in a section inside another is in both, and the chain
+  requires the inner container to be drawn above the outer; frames do not, so an element covered by
+  two frames is in the topmost. A container of another kind is placed by the same rules as any
+  element, so a frame can be in a section and a section drawn above a frame is in that frame. The
+  rule is written out in `src/containers/DOCUMENT_CONTAINERS_SPEC.md`, which the code is measured
+  against.
+- `SECTION_ELEMENT_TYPE` and `FRAME_ELEMENT_TYPE` in `document-element-constants`, so the rule
+  above has one definition rather than one per app. `SHAPE_ELEMENT_TYPES` moved here with them; no
+  container rule reads it, and it is exported for the board's own shape handling.
+- `DocumentContainerUtil.resizeKeepingAnchor` — the size a value needs and the position that keeps
+  the element's anchor where it is, returned together. Applying one without the other drags the
+  drawn corner that membership reads, and `calculateSize` alone let a caller do exactly that.
 - `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
+  before a resize. Prefer `resizeKeepingAnchor` above, which pairs it with the size. 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.
@@ -51,10 +58,17 @@ Also shipped on the 1.x line as 1.21.0.
 - 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.
+- An element covering a container is not inside it, whatever its type. This replaces a rule that
+  excluded only shapes wider and taller than the container, which let a background image join the
+  frame it covered and needed an exemption for dynamic text, whose size the container decides. An
+  unrotated dynamic text cannot be excluded by enclosure, since its anchor is the corner of the box
+  it would have to cover with.
+- `isDynamicText` requires a `propertyBindings.text` binding, which is the one the value is read
+  from. The text tool creates an element with empty `propertyBindings` and `propertyBindingsMetaData`
+  and both are truthy, so an unconfigured text was anchored at its corner while the canvas centred
+  it.
+- A line or callout is measured from the elements it connects even with no stored `position` of its
+  own, where it was previously left out of the index entirely.
 - `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`.
@@ -71,9 +85,12 @@ Also shipped on the 1.x line as 1.21.0.
   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.
+- A container path is a containment chain, walked outward from the container the element sits on.
+  Two containers that merely cross are not a chain, so the later-drawn one takes the element rather
+  than both claiming it. `containerPathAtPoint` walks the same chain, so a drop preview agrees with
+  the drop; it applies only the anchor rule, having no element to compare against a container.
+- `buildIndex` scans element types before measuring anything, so a document holding no containers
+  of the kinds asked for returns an empty index without a geometry pass.
 
 ## [2.3.0] - 2026-09-21
 

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

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

package/lib/containers/container-kind.js

@@ -2,6 +2,6 @@
 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 };
+exports.FRAME_KIND = { elementType: document_element_constants_1.FRAME_ELEMENT_TYPE, nests: false };
 exports.CONTAINER_KINDS = [exports.SECTION_KIND, exports.FRAME_KIND];

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

@@ -10,6 +10,7 @@ export declare class DocumentContainerIndex {
         memberIdsByContainerId: Map<string, string[]>;
         containerIdsByElementType: Map<string, string[]>;
     });
+    static empty(): DocumentContainerIndex;
     getContainer(containerId: string): DocumentContainer | null;
     containersOf(documentElementId: string, elementType: ContainerElementType): DocumentContainer[];
     containerIdsOf(documentElementId: string, elementType: ContainerElementType): readonly string[];
@@ -17,8 +18,8 @@ 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;
+    private containerPathCopy;
 }

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

@@ -6,6 +6,15 @@ class DocumentContainerIndex {
     constructor(data) {
         this.data = data;
     }
+    static empty() {
+        return new DocumentContainerIndex({
+            documentElementsById: new Map(),
+            containersById: new Map(),
+            containerPathsByDocumentElementId: new Map(),
+            memberIdsByContainerId: new Map(),
+            containerIdsByElementType: new Map(),
+        });
+    }
     getContainer(containerId) {
         var _a;
         return (_a = this.data.containersById.get(containerId)) !== null && _a !== void 0 ? _a : null;
@@ -14,7 +23,7 @@ class DocumentContainerIndex {
         return this.resolveAll(this.containerIdsOf(documentElementId, elementType));
     }
     containerIdsOf(documentElementId, elementType) {
-        return this.containerPath(documentElementId, elementType);
+        return this.containerPathCopy(documentElementId, elementType);
     }
     innermostContainerIdOf(documentElementId, elementType) {
         const path = this.containerPath(documentElementId, elementType);
@@ -22,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 = [];
@@ -42,9 +51,6 @@ class DocumentContainerIndex {
         const path = nests ? document_container_1.DocumentContainerUtil.chain(covering) : document_container_1.DocumentContainerUtil.topmost(covering);
         return path.map((container) => container.id);
     }
-    maxDepth(elementType) {
-        return this.containersOfType(elementType).reduce((max, container) => Math.max(max, container.depth + 1), 0);
-    }
     containersOfType(elementType) {
         var _a;
         return this.resolveAll((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : []);
@@ -63,5 +69,8 @@ class DocumentContainerIndex {
         var _a, _b;
         return (_b = (_a = this.data.containerPathsByDocumentElementId.get(documentElementId)) === null || _a === void 0 ? void 0 : _a.get(elementType)) !== null && _b !== void 0 ? _b : [];
     }
+    containerPathCopy(documentElementId, elementType) {
+        return [...this.containerPath(documentElementId, elementType)];
+    }
 }
 exports.DocumentContainerIndex = DocumentContainerIndex;

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 {
@@ -19,10 +17,13 @@ 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 isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
     static chain(candidates: DocumentContainer[]): DocumentContainer[];
     static topmost(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -38,14 +38,23 @@ class DocumentContainerUtil {
         const after = cornerOffset(newSize);
         return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
+    static resizeKeepingAnchor(dynamicTextElement, entityType, text) {
+        const size = dynamic_text_util_1.DynamicTextUtil.calculateSize(dynamicTextElement, entityType, text);
+        return { size, position: DocumentContainerUtil.positionKeepingAnchor(dynamicTextElement, size) };
+    }
     static anchorFor(documentElement, position, startElement, endElement) {
         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);
-        return DocumentContainerUtil.anchorOf(documentElement, box);
+        try {
+            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);
+        }
+        catch (_a) {
+            return null;
+        }
     }
     static containsPoint(box, point) {
         return point.x >= box.left && point.x <= box.right && point.y >= box.top && point.y <= box.bottom;
@@ -58,24 +67,19 @@ class DocumentContainerUtil {
             outer.bottom === inner.bottom;
         return covers && !identical;
     }
-    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)];
+        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(innermostOf(enclosing));
+            path.unshift(topmostOf(enclosing));
         }
     }
     static topmost(containers) {

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

@@ -2,17 +2,20 @@
 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, _c, _d;
-        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)]));
+        var _a, _b;
+        const elements = (documentElements !== null && documentElements !== void 0 ? documentElements : []).filter((element) => !!element);
+        const containerElementTypes = new Set(kinds.map((kind) => kind.elementType));
+        if (!elements.some((element) => containerElementTypes.has(element.type))) {
+            return document_container_index_1.DocumentContainerIndex.empty();
+        }
+        const documentElementsById = new Map(elements.map((element) => [element.id, element]));
+        const measuredDocumentElements = this.measureDocumentElements(elements, documentElementsById);
+        const containersByElementType = new Map(kinds.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
         const containersById = new Map();
         const containerIdsByElementType = new Map();
         containersByElementType.forEach((containers, elementType) => {
@@ -22,29 +25,17 @@ class DocumentContainerService {
         const pathsByMeasured = new Map();
         for (const measured of measuredDocumentElements) {
             const byElementType = new Map();
-            for (const kind of kindsByLayer) {
+            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);
         }
-        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;
-            }
-        }
-        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();
-            ((_d = pathsByMeasured.get(measured)) !== null && _d !== void 0 ? _d : new Map()).forEach((path, elementType) => pathsByElementType.set(elementType, path.map((container) => container.id)));
+            ((_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);
@@ -59,7 +50,7 @@ class DocumentContainerService {
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
         return new document_container_index_1.DocumentContainerIndex({
-            documentElementsById: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
+            documentElementsById,
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -69,8 +60,7 @@ 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 measureDocumentElements(documentElements) {
-        const documentElementsById = new Map(documentElements.map((documentElement) => [documentElement.id, documentElement]));
+    static measureDocumentElements(documentElements, documentElementsById) {
         return documentElements.map((documentElement, drawOrder) => ({
             documentElement,
             drawOrder,
@@ -79,12 +69,9 @@ class DocumentContainerService {
     }
     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 start = ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
+            const end = ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
             const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
             return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
         }
@@ -98,10 +85,8 @@ class DocumentContainerService {
             .map((measured) => ({
             id: measured.documentElement.id,
             kind,
-            name: measured.documentElement.name,
             documentElement: measured.documentElement,
             box: measured.box,
-            depth: 0,
             drawOrder: measured.drawOrder,
         }));
     }
@@ -109,14 +94,8 @@ class DocumentContainerService {
         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)) : [];
-            }
-            if (kind.layer > ownKind.layer) {
-                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);
@@ -132,8 +111,6 @@ class DocumentContainerService {
     }
     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.documentElement === measured.documentElement || measured.drawOrder <= container.drawOrder) {
@@ -142,7 +119,7 @@ class DocumentContainerService {
             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

@@ -56,8 +56,9 @@ function isContainerBinding(bindingProperty) {
 }
 class DynamicTextUtil {
     static isDynamicText(documentElement) {
+        var _a;
         return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
-            !!documentElement.propertyBindings &&
+            !!((_a = documentElement.propertyBindings) === null || _a === void 0 ? void 0 : _a.text) &&
             !!documentElement.propertyBindingsMetaData);
     }
     static takesValueFromContainer(bindingProperty) {
@@ -208,7 +209,7 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.UNIQUE_ARRAY) {
             text = Array.from(new Set(memberValues
-                .filter((e) => e !== null && e !== undefined)
+                .filter((e) => e !== null && e !== undefined && e !== '')
                 .flat()
                 .map((e) => formatter.formatValueForProperty(e, property))))
                 .sort()

package/package.json

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