@contrail/documents 2.4.0-alpha.9ac43de → 2.4.0-alpha.a27dfea

package/CHANGELOG.md

@@ -13,12 +13,15 @@ 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, 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`, `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
@@ -51,10 +54,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 +81,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;
-    canBeContentOf: readonly ContainerElementType[];
 }
 export declare const SECTION_KIND: ContainerKind;
 export declare const FRAME_KIND: ContainerKind;

package/lib/containers/container-kind.js

@@ -2,14 +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,
-    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.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[];

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;

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

@@ -8,7 +8,13 @@ const document_container_1 = require("./document-container");
 class DocumentContainerService {
     static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
         var _a, _b;
-        const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
+        const elements = documentElements !== null && documentElements !== void 0 ? documentElements : [];
+        const containerElementTypes = new Set(kinds.map((kind) => kind.elementType));
+        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]));
+        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();
@@ -24,12 +30,6 @@ 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: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
+            documentElementsById,
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -60,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,
@@ -70,7 +69,8 @@ class DocumentContainerService {
     }
     static measure(documentElement, documentElementsById) {
         var _a, _b;
-        if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position)) {
+        const isDerivedFromEndpoints = (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'line' || (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'callout';
+        if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position) && !isDerivedFromEndpoints) {
             return null;
         }
         try {
@@ -98,14 +98,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 (!ownKind.canBeContentOf.includes(kind.elementType)) {
-                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);

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.9ac43de",
+  "version": "2.4.0-alpha.a27dfea",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",