@contrail/documents 1.21.0-alpha.68c9ba7 → 1.21.0-alpha.7411393

package/CHANGELOG.md

@@ -13,54 +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.
+  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.
+- 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/container-kind.d.ts

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

package/lib/containers/container-kind.js

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

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

@@ -10,7 +10,6 @@ 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[];

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

@@ -6,15 +6,6 @@ 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;
@@ -23,7 +14,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);
@@ -31,7 +22,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 = [];

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

@@ -17,10 +17,6 @@ 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;

package/lib/containers/document-container.js

@@ -38,23 +38,14 @@ 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;
         }
-        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;
-        }
+        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;

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

@@ -8,13 +8,7 @@ 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 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 measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
         const containersByElementType = new Map(kinds.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
         const containersById = new Map();
         const containerIdsByElementType = new Map();
@@ -30,6 +24,12 @@ class DocumentContainerService {
             }
             pathsByMeasured.set(measured, byElementType);
         }
+        const measuredById = new Map();
+        for (const measured of measuredDocumentElements) {
+            if (!measuredById.has(measured.documentElement.id)) {
+                measuredById.set(measured.documentElement.id, measured);
+            }
+        }
         const containerPathsByDocumentElementId = new Map();
         const memberIdsByContainerId = new Map();
         for (const measured of measuredDocumentElements) {
@@ -50,7 +50,7 @@ class DocumentContainerService {
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
         return new document_container_index_1.DocumentContainerIndex({
-            documentElementsById,
+            documentElementsById: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -60,7 +60,8 @@ 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, documentElementsById) {
+    static measureDocumentElements(documentElements) {
+        const documentElementsById = new Map(documentElements.map((documentElement) => [documentElement.id, documentElement]));
         return documentElements.map((documentElement, drawOrder) => ({
             documentElement,
             drawOrder,
@@ -69,9 +70,12 @@ 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 === 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 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);
         }
@@ -94,8 +98,14 @@ class DocumentContainerService {
         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 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 (!ownKind.canBeContentOf.includes(kind.elementType)) {
+                return [];
+            }
         }
         const candidates = this.candidateContainers(measured, containers);
         return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);

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

@@ -56,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) {
@@ -209,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.68c9ba7",
+  "version": "1.21.0-alpha.7411393",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",