@contrail/documents 1.20.0-alpha.d734088 → 1.21.0-alpha.0a5e682

package/CHANGELOG.md

@@ -5,20 +5,29 @@ All notable changes to `@contrail/documents` are documented here.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.20.0] - 2026-09-20
+## [1.21.0] - 2026-09-26
+
+Maintenance release on the 1.x line; the same change ships on 2.x as 2.4.0.
 
 ### Added
 
 - `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 measured centre 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.
+  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` keeps returning the element's own box before scale,
   which is what layout works in: `@contrail/document-table` places table members from it, and
@@ -33,12 +42,15 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Fixed
 
-- A dynamic text is now anchored at its position 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
+- 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
@@ -52,29 +64,29 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
 
 - Container membership measures a scaled element from its scaled box, through the new
-  `getBoundingClientRectScaled` above. A scaled element previously measured at its unscaled size
-  and could resolve to the wrong container.
-
-## [2.2.1] - 2026-09-15
+  `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.
 
-### Changed
+## [1.20.0] - 2026-09-25
 
-- The DESIGN-150 annotation-row collapse is reverted, to go out in a later release alongside the rest of the change. `calculateAnnotationHeight` returns its flat `fontSize + ANNOTATION_PADDING_Y` minimum again whether or not the row draws anything, and `getComponentSize` reserves a flat 18px row in every item card's height.
-
-### Removed
-
-- `ItemComponentService.isAnnotationRowEmpty` and `ItemComponentService.getAnnotationRowHeight`, both added in 2.2.0, and the optional `annotations` parameter they were reached through on `DocumentElementFactory.getBoundingClientRect` and `getSize`. Removed under a patch because 2.2.0 published hours earlier and nothing had consumed them: the canvas renderer mirrors the predicate privately rather than importing it, and every `contrail-apps` app pins this package on its 1.x range.
-
-## [2.2.0] - 2026-09-15
+Maintenance release on the 1.x line; the same change ships on 2.x as 2.3.0.
 
 ### Added
 
-- `ItemComponentService.isAnnotationRowEmpty(annotationElement, annotations)` — whether an item card's annotation row will render nothing, because the row is hidden or the item has no `category === 'property'` annotations. The single predicate behind the reservation, so the layout service and the canvas renderers cannot drift apart on the question. A missing row element is not treated as hidden: renderers supply a default row for item components that have none stored, so only the annotation data decides there.
-- `ItemComponentService.getAnnotationRowHeight(annotationElement, annotations, width)` — the row's reserved height, wrapping onto further rows when the badges do not fit `width`, and `0` when the row is empty. Every creation path must size the row through here so a card laid out by the Item Chooser and one laid out by board generation agree.
+- `isValidSortIndex(sortIndex)` — whether a value is a key `fractional-indexing` could have produced, so every client writing a sort index is held to one definition of valid rather than each caller inventing its own. `fractional-indexing` keeps its `validateOrderKey` private, so the check asks the generator to mint a key after the candidate: that path validates its bound first and cannot fail for any other reason. The generator's own grammar check ignores the digit alphabet, and accepts `a0!` or `a0 `, so the candidate is screened against the exported `BASE_62_DIGITS` first. Costs ~130ns for a short key and ~350ns for a 387-character one.
 
-### Fixed
+### Changed
 
-- `updateSizeAndPosition` no longer reserves space above the thumbnail for an annotation row that renders nothing. `calculateAnnotationHeight` returned a flat `fontSize + ANNOTATION_PADDING_Y` minimum even when the row was hidden or the item had no annotations, pushing the thumbnail down ~8px on every such card (DESIGN-150). It now returns `0` in those cases and the thumbnail sits at the card origin. Cards whose row does show a badge are unchanged.
+- `allElementsHaveSortIndex` now requires each element's key to be valid, not merely a non-empty string. Callers that treat an unkeyed collection as needing fresh keys — board snapshot restore is the one today — now also re-key a collection whose keys are present but malformed, instead of restoring ordering that cannot sort.
+- `SortOrderErrorMessage.SORT_INDEX_NOT_USABLE` describes the real rule ("sortIndex must be a valid fractional index") rather than "must be a non-empty string". The `SORT_INDEX_NOT_USABLE` code is unchanged.
 
 ## [1.19.0] - 2026-09-11
 

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

@@ -35,8 +35,12 @@ class DocumentContainerIndex {
         return members;
     }
     containerPathAtPoint(point, elementType) {
-        const covering = this.containersOfType(elementType).filter((container) => (0, document_container_1.containsPoint)(container.box, point));
-        return (0, document_container_1.topmostPerDepth)(covering).map((container) => container.id);
+        var _a, _b;
+        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);
     }
     maxDepth(elementType) {
         return this.containersOfType(elementType).reduce((max, container) => Math.max(max, container.depth + 1), 0);

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

@@ -1,4 +1,4 @@
-import { CoordinateBox, DocumentElement, PositionDefinition } from '../types';
+import { CoordinateBox, DocumentElement, PositionDefinition, SizeDefinition } from '../types';
 import { ContainerKind } from './container-kind';
 export interface DocumentContainer {
     id: string;
@@ -14,10 +14,15 @@ export interface MeasuredDocumentElement {
     box: CoordinateBox | null;
     drawOrder: number;
 }
-export declare function toCoordinateBox(x: number, y: number, width: number, height: number): CoordinateBox;
-export declare function centerOf(box: CoordinateBox): PositionDefinition;
-export declare function anchorOf(documentElement: DocumentElement, box: CoordinateBox): PositionDefinition;
-export declare function containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
-export declare function encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
-export declare function isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
-export declare function topmostPerDepth(containers: DocumentContainer[]): DocumentContainer[];
+export declare class DocumentContainerUtil {
+    static toCoordinateBox(x: number, y: number, width: number, height: number): CoordinateBox;
+    static centerOf(box: CoordinateBox): PositionDefinition;
+    static anchorOf(documentElement: DocumentElement, box: CoordinateBox): PositionDefinition;
+    static positionKeepingAnchor(documentElement: DocumentElement, newSize: SizeDefinition): PositionDefinition;
+    static anchorFor(documentElement: DocumentElement, position?: PositionDefinition, 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

@@ -1,43 +1,87 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCoordinateBox = toCoordinateBox;
-exports.centerOf = centerOf;
-exports.anchorOf = anchorOf;
-exports.containsPoint = containsPoint;
-exports.encloses = encloses;
-exports.isWiderAndTallerThan = isWiderAndTallerThan;
-exports.topmostPerDepth = topmostPerDepth;
+exports.DocumentContainerUtil = void 0;
+const rotation_math_1 = require("../util/mask/rotation-math");
 const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
-function toCoordinateBox(x, y, width, height) {
-    return { x, y, width, height, left: x, right: x + width, top: y, bottom: y + height };
-}
-function centerOf(box) {
-    return { x: box.left + box.width / 2, y: box.top + box.height / 2 };
-}
-function anchorOf(documentElement, box) {
-    return dynamic_text_util_1.DynamicTextUtil.isDynamicText(documentElement) ? { x: box.left, y: box.top } : centerOf(box);
-}
-function containsPoint(box, point) {
-    return point.x >= box.left && point.x <= box.right && point.y >= box.top && point.y <= box.bottom;
-}
-function encloses(outer, inner) {
-    const covers = outer.left <= inner.left && outer.right >= inner.right && outer.top <= inner.top && outer.bottom >= inner.bottom;
-    const identical = outer.left === inner.left &&
-        outer.right === inner.right &&
-        outer.top === inner.top &&
-        outer.bottom === inner.bottom;
-    return covers && !identical;
-}
-function isWiderAndTallerThan(box, other) {
-    return box.width > other.width && box.height > other.height;
-}
-function topmostPerDepth(containers) {
-    const byDepth = [];
-    for (const container of containers) {
-        const existing = byDepth[container.depth];
-        if (!existing || container.drawOrder > existing.drawOrder) {
-            byDepth[container.depth] = container;
+const document_element_factory_1 = require("../document-element-factory");
+class DocumentContainerUtil {
+    static toCoordinateBox(x, y, width, height) {
+        return { x, y, width, height, left: x, right: x + width, top: y, bottom: y + height };
+    }
+    static centerOf(box) {
+        return { x: box.left + box.width / 2, y: box.top + box.height / 2 };
+    }
+    static anchorOf(documentElement, box) {
+        var _a;
+        if (!dynamic_text_util_1.DynamicTextUtil.isDynamicText(documentElement)) {
+            return DocumentContainerUtil.centerOf(box);
+        }
+        const angle = (_a = documentElement.rotate) === null || _a === void 0 ? void 0 : _a.angle;
+        const corner = { x: box.left, y: box.top };
+        return angle ? (0, rotation_math_1.rotatePoint)(corner, angle, DocumentContainerUtil.centerOf(box)) : corner;
+    }
+    static positionKeepingAnchor(documentElement, newSize) {
+        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 || !angle || !newSize || !documentElement.size) {
+            return 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) => {
+            const half = { x: (size.width * scaleX) / 2, y: (size.height * scaleY) / 2 };
+            const turned = (0, rotation_math_1.rotatePoint)(half, angle);
+            return { x: half.x - turned.x, y: half.y - turned.y };
+        };
+        const before = cornerOffset(documentElement.size);
+        const after = cornerOffset(newSize);
+        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;
+        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;
+    }
+    static encloses(outer, inner) {
+        const covers = outer.left <= inner.left && outer.right >= inner.right && outer.top <= inner.top && outer.bottom >= inner.bottom;
+        const identical = outer.left === inner.left &&
+            outer.right === inner.right &&
+            outer.top === inner.top &&
+            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)];
+        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));
+        }
+    }
+    static topmost(containers) {
+        return containers.length
+            ? [containers.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost))]
+            : [];
     }
-    return byDepth.filter(Boolean);
 }
+exports.DocumentContainerUtil = DocumentContainerUtil;

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

@@ -6,9 +6,8 @@ export declare class DocumentContainerService {
     static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
     private static measureDocumentElements;
     private static measure;
-    private static buildNesting;
-    private static resolveContainerPath;
-    private static resolveInnermostOnTop;
-    private static toContainerPath;
+    private static collectContainers;
+    private static resolvePath;
+    private static enclosersOf;
     private static candidateContainers;
 }

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

@@ -9,22 +9,43 @@ 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 nestingByElementType = new Map(kinds.map((kind) => [kind.elementType, this.buildNesting(measuredDocumentElements, kind)]));
+        const kindsByLayer = [...kinds].sort((first, second) => second.layer - first.layer);
+        const containersByElementType = new Map(kindsByLayer.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
         const containersById = new Map();
         const containerIdsByElementType = new Map();
-        nestingByElementType.forEach((nesting, elementType) => {
-            containerIdsByElementType.set(elementType, nesting.containers.map((container) => container.id));
-            nesting.containers.forEach((container) => containersById.set(container.id, container));
+        containersByElementType.forEach((containers, elementType) => {
+            containerIdsByElementType.set(elementType, containers.map((container) => container.id));
+            containers.forEach((container) => containersById.set(container.id, container));
         });
+        const pathsByMeasured = new Map();
+        for (const measured of measuredDocumentElements) {
+            const byElementType = new Map();
+            for (const kind of kindsByLayer) {
+                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();
-            for (const kind of kinds) {
-                const path = this.resolveContainerPath(measured, kind, kinds, nestingByElementType.get(kind.elementType));
-                pathsByElementType.set(kind.elementType, path);
+            ((_d = pathsByMeasured.get(measured)) !== null && _d !== void 0 ? _d : 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);
                     if (members) {
@@ -38,7 +59,7 @@ class DocumentContainerService {
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
         return new document_container_index_1.DocumentContainerIndex({
-            documentElementsById: new Map(measuredDocumentElements.map((measured) => [measured.documentElement.id, measured.documentElement])),
+            documentElementsById: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -65,14 +86,14 @@ class DocumentContainerService {
             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 (0, document_container_1.toCoordinateBox)(x, y, width, height);
+            return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
         }
         catch (_c) {
             return null;
         }
     }
-    static buildNesting(measuredDocumentElements, kind) {
-        const containers = measuredDocumentElements
+    static collectContainers(measuredDocumentElements, kind) {
+        return measuredDocumentElements
             .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
             .map((measured) => ({
             id: measured.documentElement.id,
@@ -83,61 +104,45 @@ class DocumentContainerService {
             depth: 0,
             drawOrder: measured.drawOrder,
         }));
-        const ancestorsById = new Map();
-        for (const container of containers) {
-            const ancestors = kind.nests
-                ? containers.filter((other) => other !== container && (0, document_container_1.encloses)(other.box, container.box))
-                : [];
-            ancestorsById.set(container.id, ancestors);
-            container.depth = ancestors.length;
-        }
-        return { containers, ancestorsById };
     }
-    static resolveContainerPath(measured, kind, kinds, nesting) {
-        var _a, _b;
-        if (!(nesting === null || nesting === void 0 ? void 0 : nesting.containers.length) || !measured.box) {
+    static resolvePath(measured, kind, containers) {
+        if (!containers.length || !measured.box) {
             return [];
         }
-        const ownKind = kinds.find((candidate) => candidate.elementType === measured.documentElement.type);
+        const ownKind = container_kind_1.CONTAINER_KINDS.find((candidate) => candidate.elementType === measured.documentElement.type);
         if (ownKind) {
             if (ownKind.elementType === kind.elementType) {
-                return kind.nests ? this.toContainerPath((_a = nesting.ancestorsById.get(measured.documentElement.id)) !== null && _a !== void 0 ? _a : []) : [];
+                return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
             }
             if (kind.layer > ownKind.layer) {
                 return [];
             }
         }
-        const candidates = this.candidateContainers(measured, nesting.containers);
-        if (!candidates.length) {
-            return [];
-        }
-        const innermostOnTop = this.resolveInnermostOnTop(candidates, nesting);
-        const candidateIds = new Set(candidates.map((container) => container.id));
-        const ancestors = ((_b = nesting.ancestorsById.get(innermostOnTop.id)) !== null && _b !== void 0 ? _b : []).filter((container) => candidateIds.has(container.id));
-        return this.toContainerPath([...ancestors, innermostOnTop]);
+        const candidates = this.candidateContainers(measured, containers);
+        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
     }
-    static resolveInnermostOnTop(candidates, nesting) {
-        const enclosingIds = new Set(candidates.flatMap((container) => { var _a; return (_a = nesting.ancestorsById.get(container.id)) !== null && _a !== void 0 ? _a : []; }).map((ancestor) => ancestor.id));
-        return candidates
-            .filter((container) => !enclosingIds.has(container.id))
-            .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
-    }
-    static toContainerPath(containers) {
-        return (0, document_container_1.topmostPerDepth)(containers).map((container) => container.id);
+    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 = (0, document_container_1.anchorOf)(measured.documentElement, measured.box);
+        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.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
+            if (container.documentElement === measured.documentElement || measured.drawOrder <= container.drawOrder) {
                 return false;
             }
-            if (!(0, document_container_1.containsPoint)(container.box, anchor)) {
+            if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
                 return false;
             }
-            if (isShape && (0, document_container_1.isWiderAndTallerThan)(measured.box, container.box)) {
+            if (isShape && document_container_1.DocumentContainerUtil.isWiderAndTallerThan(measured.box, container.box)) {
                 return false;
             }
             return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));

package/lib/sort-index.d.ts

@@ -1,4 +1,5 @@
 import { DocumentElement } from './types';
+export declare function isValidSortIndex(sortIndex: unknown): sortIndex is string;
 export declare function allElementsHaveSortIndex(elements: unknown[]): boolean;
 export declare function buildKeyBetween(a: string | null, b: string | null): string;
 export declare function buildNKeysBetween(a: string | null, b: string | null, n: number): string[];

package/lib/sort-index.js

@@ -1,13 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidSortIndex = isValidSortIndex;
 exports.allElementsHaveSortIndex = allElementsHaveSortIndex;
 exports.buildKeyBetween = buildKeyBetween;
 exports.buildNKeysBetween = buildNKeysBetween;
 exports.compareSortIndex = compareSortIndex;
 const fractional_indexing_1 = require("fractional-indexing");
+const SORT_INDEX_DIGITS = new RegExp(`^[${fractional_indexing_1.BASE_62_DIGITS.replace(/[\\\]^-]/g, (digit) => `\\${digit}`)}]+$`);
+function isValidSortIndex(sortIndex) {
+    if (typeof sortIndex !== 'string' || !SORT_INDEX_DIGITS.test(sortIndex)) {
+        return false;
+    }
+    try {
+        (0, fractional_indexing_1.generateKeyBetween)(sortIndex, null);
+    }
+    catch (_a) {
+        return false;
+    }
+    return true;
+}
 function allElementsHaveSortIndex(elements) {
-    return elements.every((element) => typeof element.sortIndex === 'string' &&
-        element.sortIndex.length > 0);
+    return elements.every((element) => isValidSortIndex(element.sortIndex));
 }
 function buildKeyBetween(a, b) {
     return (0, fractional_indexing_1.generateKeyBetween)(a, b);

package/lib/sort-order-errors.d.ts

@@ -6,5 +6,5 @@ export declare enum SortOrderErrorCode {
 export declare enum SortOrderErrorMessage {
     SORT_MIGRATION_IN_PROGRESS = "Sort order is being migrated for this document; editing is briefly locked",
     SORT_MODE_MISMATCH = "Ordering write does not match the document's sort mode",
-    SORT_INDEX_NOT_USABLE = "sortIndex must be a non-empty string"
+    SORT_INDEX_NOT_USABLE = "sortIndex must be a valid fractional index"
 }

package/lib/sort-order-errors.js

@@ -11,5 +11,5 @@ var SortOrderErrorMessage;
 (function (SortOrderErrorMessage) {
     SortOrderErrorMessage["SORT_MIGRATION_IN_PROGRESS"] = "Sort order is being migrated for this document; editing is briefly locked";
     SortOrderErrorMessage["SORT_MODE_MISMATCH"] = "Ordering write does not match the document's sort mode";
-    SortOrderErrorMessage["SORT_INDEX_NOT_USABLE"] = "sortIndex must be a non-empty string";
+    SortOrderErrorMessage["SORT_INDEX_NOT_USABLE"] = "sortIndex must be a valid fractional index";
 })(SortOrderErrorMessage || (exports.SortOrderErrorMessage = SortOrderErrorMessage = {}));

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

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

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicTextUtil = exports.HARD_CODED_TEXT = exports.CLICK_TO_CONFIGURE = exports.MOVE_TO_SECTION_TEXT = exports.MOVE_TO_FRAME_TEXT = exports.DynamicTextDisplayFunction = exports.DYNAMIC_TEXT_DATA_SOURCE = void 0;
+exports.isContainerBinding = isContainerBinding;
 const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
 const document_util_1 = require("@contrail/document-util");
@@ -50,6 +51,9 @@ exports.HARD_CODED_TEXT = {
 };
 const CONTAINER_PROPERTY_SLUGS = ['name', 'count', 'itemFamilyCount', 'itemOptionCount', 'colorCount'];
 const CONTAINER_SOURCES = [DYNAMIC_TEXT_DATA_SOURCE.FRAME, DYNAMIC_TEXT_DATA_SOURCE.SECTION];
+function isContainerBinding(bindingProperty) {
+    return DynamicTextUtil.takesValueFromContainer(bindingProperty);
+}
 class DynamicTextUtil {
     static isDynamicText(documentElement) {
         return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
@@ -172,8 +176,9 @@ class DynamicTextUtil {
             bold,
             italic,
         };
-        if (!dynamicTextElement.isTextTool) {
-            measureTextSettings.width = size.width - padding * 2;
+        const fixedWidth = size.width - padding * 2;
+        if (!dynamicTextElement.isTextTool && fixedWidth > 0) {
+            measureTextSettings.width = fixedWidth;
         }
         try {
             const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
@@ -218,7 +223,10 @@ class DynamicTextUtil {
         }
         else if (displayFunction === DynamicTextDisplayFunction.MIN ||
             displayFunction === DynamicTextDisplayFunction.MAX) {
-            const present = memberValues.filter((e) => e !== null && e !== undefined);
+            const present = memberValues
+                .filter((e) => e !== null && e !== undefined && e !== '')
+                .map(Number)
+                .filter((e) => !Number.isNaN(e));
             if (!present.length) {
                 return '';
             }

package/package.json

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