@contrail/documents 2.3.0 → 2.4.0-alpha.86639ad

package/CHANGELOG.md

@@ -5,6 +5,76 @@ 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).
 
+## [2.4.0] - 2026-09-26
+
+Also shipped on the 1.x line as 1.21.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 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
+  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: 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 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
+
+- 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.
+
 ## [2.3.0] - 2026-09-21
 
 ### Added

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

@@ -0,0 +1,10 @@
+import { FRAME_ELEMENT_TYPE, SECTION_ELEMENT_TYPE } from '../document-element-constants';
+export type ContainerElementType = typeof FRAME_ELEMENT_TYPE | typeof SECTION_ELEMENT_TYPE;
+export interface ContainerKind {
+    elementType: ContainerElementType;
+    nests: boolean;
+    layer: number;
+}
+export declare const SECTION_KIND: ContainerKind;
+export declare const FRAME_KIND: ContainerKind;
+export declare const CONTAINER_KINDS: ContainerKind[];

package/lib/containers/container-kind.js

@@ -0,0 +1,7 @@
+"use strict";
+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.CONTAINER_KINDS = [exports.SECTION_KIND, exports.FRAME_KIND];

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

@@ -0,0 +1,24 @@
+import { DocumentElement, PositionDefinition } from '../types';
+import { ContainerElementType } from './container-kind';
+import { DocumentContainer } from './document-container';
+export declare class DocumentContainerIndex {
+    private readonly data;
+    constructor(data: {
+        documentElementsById: Map<string, DocumentElement>;
+        containersById: Map<string, DocumentContainer>;
+        containerPathsByDocumentElementId: Map<string, Map<string, string[]>>;
+        memberIdsByContainerId: Map<string, string[]>;
+        containerIdsByElementType: Map<string, string[]>;
+    });
+    getContainer(containerId: string): DocumentContainer | null;
+    containersOf(documentElementId: string, elementType: ContainerElementType): DocumentContainer[];
+    containerIdsOf(documentElementId: string, elementType: ContainerElementType): readonly string[];
+    innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
+    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;
+}

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

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentContainerIndex = void 0;
+const document_container_1 = require("./document-container");
+class DocumentContainerIndex {
+    constructor(data) {
+        this.data = data;
+    }
+    getContainer(containerId) {
+        var _a;
+        return (_a = this.data.containersById.get(containerId)) !== null && _a !== void 0 ? _a : null;
+    }
+    containersOf(documentElementId, elementType) {
+        return this.resolveAll(this.containerIdsOf(documentElementId, elementType));
+    }
+    containerIdsOf(documentElementId, elementType) {
+        return this.containerPath(documentElementId, elementType);
+    }
+    innermostContainerIdOf(documentElementId, elementType) {
+        const path = this.containerPath(documentElementId, elementType);
+        return path.length ? path[path.length - 1] : null;
+    }
+    memberIdsOf(containerId) {
+        var _a;
+        return (_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [];
+    }
+    memberDocumentElementsOf(containerId) {
+        const members = [];
+        for (const memberId of this.memberIdsOf(containerId)) {
+            const member = this.data.documentElementsById.get(memberId);
+            if (member) {
+                members.push(member);
+            }
+        }
+        return members;
+    }
+    containerPathAtPoint(point, elementType) {
+        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);
+    }
+    containersOfType(elementType) {
+        var _a;
+        return this.resolveAll((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : []);
+    }
+    resolveAll(containerIds) {
+        const containers = [];
+        for (const containerId of containerIds) {
+            const container = this.data.containersById.get(containerId);
+            if (container) {
+                containers.push(container);
+            }
+        }
+        return containers;
+    }
+    containerPath(documentElementId, elementType) {
+        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 : [];
+    }
+}
+exports.DocumentContainerIndex = DocumentContainerIndex;

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

@@ -0,0 +1,28 @@
+import { CoordinateBox, DocumentElement, PositionDefinition, SizeDefinition } from '../types';
+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 {
+    documentElement: DocumentElement;
+    box: CoordinateBox | null;
+    drawOrder: number;
+}
+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

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+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))]
+            : [];
+    }
+}
+exports.DocumentContainerUtil = DocumentContainerUtil;

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

@@ -0,0 +1,13 @@
+import { DocumentElement } from '../types';
+import { ContainerKind } from './container-kind';
+import { DocumentContainerIndex } from './document-container-index';
+export declare class DocumentContainerService {
+    static buildIndex(documentElements: readonly DocumentElement[], kinds?: ContainerKind[]): DocumentContainerIndex;
+    static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
+    private static measureDocumentElements;
+    private static measure;
+    private static collectContainers;
+    private static resolvePath;
+    private static enclosersOf;
+    private static candidateContainers;
+}

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

@@ -0,0 +1,152 @@
+"use strict";
+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)]));
+        const containersById = new Map();
+        const containerIdsByElementType = new Map();
+        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();
+            ((_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) {
+                        members.push(documentElementId);
+                    }
+                    else {
+                        memberIdsByContainerId.set(containerId, [documentElementId]);
+                    }
+                }
+            }
+            containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
+        }
+        return new document_container_index_1.DocumentContainerIndex({
+            documentElementsById: new Map([...measuredById].map(([id, measured]) => [id, measured.documentElement])),
+            containersById,
+            containerPathsByDocumentElementId,
+            memberIdsByContainerId,
+            containerIdsByElementType,
+        });
+    }
+    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]));
+        return documentElements.map((documentElement, drawOrder) => ({
+            documentElement,
+            drawOrder,
+            box: this.measure(documentElement, documentElementsById),
+        }));
+    }
+    static measure(documentElement, documentElementsById) {
+        var _a, _b;
+        if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position)) {
+            return null;
+        }
+        try {
+            const start = ((_a = documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
+            const end = ((_b = documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
+            const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
+            return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
+        }
+        catch (_c) {
+            return null;
+        }
+    }
+    static collectContainers(measuredDocumentElements, kind) {
+        return measuredDocumentElements
+            .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
+            .map((measured) => ({
+            id: measured.documentElement.id,
+            kind,
+            name: measured.documentElement.name,
+            documentElement: measured.documentElement,
+            box: measured.box,
+            depth: 0,
+            drawOrder: measured.drawOrder,
+        }));
+    }
+    static resolvePath(measured, kind, containers) {
+        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 [];
+            }
+        }
+        const candidates = this.candidateContainers(measured, containers);
+        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
+    }
+    static enclosersOf(measured, containers) {
+        return containers.filter((container) => {
+            var _a;
+            return container.documentElement !== measured.documentElement &&
+                document_container_1.DocumentContainerUtil.encloses(container.box, measured.box) &&
+                measured.drawOrder > container.drawOrder &&
+                !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
+        });
+    }
+    static candidateContainers(measured, containers) {
+        const anchor = document_container_1.DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
+        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) {
+                return false;
+            }
+            if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
+                return false;
+            }
+            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));
+        });
+    }
+}
+exports.DocumentContainerService = DocumentContainerService;

package/lib/document-element-constants.d.ts

@@ -3,3 +3,6 @@ export declare const ANNOTATION_PADDING_Y = 8;
 export declare const COLOR_PADDING = 5;
 export declare const COLOR_FONT_SIZE = 8;
 export declare const COLOR_WIDTH = 140;
+export declare const SECTION_ELEMENT_TYPE = "section";
+export declare const FRAME_ELEMENT_TYPE = "frame";
+export declare const SHAPE_ELEMENT_TYPES: string[];

package/lib/document-element-constants.js

@@ -1,8 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.ANNOTATION_PADDING_Y = exports.ANNOTATION_IMG_SIZE = void 0;
+exports.SHAPE_ELEMENT_TYPES = exports.FRAME_ELEMENT_TYPE = exports.SECTION_ELEMENT_TYPE = exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.ANNOTATION_PADDING_Y = exports.ANNOTATION_IMG_SIZE = void 0;
 exports.ANNOTATION_IMG_SIZE = 15;
 exports.ANNOTATION_PADDING_Y = 8;
 exports.COLOR_PADDING = 5;
 exports.COLOR_FONT_SIZE = 8;
 exports.COLOR_WIDTH = 140;
+exports.SECTION_ELEMENT_TYPE = 'section';
+exports.FRAME_ELEMENT_TYPE = 'frame';
+exports.SHAPE_ELEMENT_TYPES = [
+    'text',
+    'line',
+    'arrow',
+    'circle',
+    'rectangle',
+    'round_rectangle',
+    'triangle',
+    'diamond',
+    'star',
+    'heart',
+    'double_arrow',
+    'right_arrow',
+    'rhombus',
+    'cloud',
+    'callout',
+    'draw_frame',
+    'draw_section',
+];

package/lib/document-element-factory.d.ts

@@ -22,6 +22,12 @@ export declare class DocumentElementFactory {
         width: any;
         height: any;
     };
+    static getBoundingClientRectScaled(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): {
+        x: any;
+        y: any;
+        width: any;
+        height: any;
+    };
     private static getPosition;
     private static getSize;
     private static getComponentSize;

package/lib/document-element-factory.js

@@ -216,6 +216,16 @@ class DocumentElementFactory {
             height,
         };
     }
+    static getBoundingClientRectScaled(documentElement, startElement, endElement) {
+        var _a, _b, _c, _d;
+        const { x, y, width, height } = this.getBoundingClientRect(documentElement, startElement, endElement);
+        return {
+            x,
+            y,
+            width: width * ((_b = (_a = documentElement.scale) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 1),
+            height: height * ((_d = (_c = documentElement.scale) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 1),
+        };
+    }
     static getPosition(documentElement, startElement, endElement) {
         var _a, _b;
         if (documentElement.type === 'line' || documentElement.type === 'callout') {

package/lib/index.d.ts

@@ -14,3 +14,7 @@ export * from './util/curved-line/curved-line';
 export * from './util/callout/callout';
 export * from './util/mask';
 export * from './document-frame.service';
+export * from './containers/container-kind';
+export * from './containers/document-container';
+export * from './containers/document-container-index';
+export * from './containers/document-container.service';

package/lib/index.js

@@ -30,3 +30,7 @@ __exportStar(require("./util/curved-line/curved-line"), exports);
 __exportStar(require("./util/callout/callout"), exports);
 __exportStar(require("./util/mask"), exports);
 __exportStar(require("./document-frame.service"), exports);
+__exportStar(require("./containers/container-kind"), exports);
+__exportStar(require("./containers/document-container"), exports);
+__exportStar(require("./containers/document-container-index"), exports);
+__exportStar(require("./containers/document-container.service"), exports);

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

@@ -50,6 +50,8 @@ export declare const HARD_CODED_TEXT: {
 };
 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;
     static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
     static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
     static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;

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

@@ -52,13 +52,21 @@ 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) {
-    if (!bindingProperty) {
-        return false;
-    }
-    const [entityType, propertySlug] = bindingProperty.split('.');
-    return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
+    return DynamicTextUtil.takesValueFromContainer(bindingProperty);
 }
 class DynamicTextUtil {
+    static isDynamicText(documentElement) {
+        return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
+            !!documentElement.propertyBindings &&
+            !!documentElement.propertyBindingsMetaData);
+    }
+    static takesValueFromContainer(bindingProperty) {
+        if (!bindingProperty) {
+            return false;
+        }
+        const [entityType, propertySlug] = bindingProperty.split('.');
+        return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
+    }
     static getDynamicTextValue(dynamicTextElement, property, propertyLevel, container, componentModels, ownerReferenceModel = null) {
         var _a, _b, _c, _d;
         if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {
@@ -150,12 +158,12 @@ class DynamicTextUtil {
         return text;
     }
     static calculateSize(dynamicTextElement, entityType, text) {
-        var _a, _b, _c, _d;
-        let size = dynamicTextElement.size;
-        const fontFamily = (_a = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _a !== void 0 ? _a : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
-        const fontSize = (_d = (dynamicTextElement.isTextTool
-            ? (_c = (_b = dynamicTextElement.style) === null || _b === void 0 ? void 0 : _b.font) === null || _c === void 0 ? void 0 : _c.size
-            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _d !== void 0 ? _d : document_util_1.DEFAULT_TEXT_FONT_SIZE;
+        var _a, _b, _c, _d, _e;
+        let size = (_a = dynamicTextElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
+        const fontFamily = (_b = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _b !== void 0 ? _b : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
+        const fontSize = (_e = (dynamicTextElement.isTextTool
+            ? (_d = (_c = dynamicTextElement.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size
+            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _e !== void 0 ? _e : document_util_1.DEFAULT_TEXT_FONT_SIZE;
         const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
         const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
         const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
@@ -168,8 +176,9 @@ class DynamicTextUtil {
             bold,
             italic,
         };
-        if (!dynamicTextElement.isTextTool) {
-            measureTextSettings.width = dynamicTextElement.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);
@@ -212,13 +221,17 @@ class DynamicTextUtil {
         else if (displayFunction === DynamicTextDisplayFunction.LAST) {
             text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
         }
-        else if (displayFunction === DynamicTextDisplayFunction.MIN) {
-            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
-            text = formatter.formatValueForProperty(Math.min(...memberValues), property);
-        }
-        else if (displayFunction === DynamicTextDisplayFunction.MAX) {
-            memberValues = memberValues.filter((e) => e !== null && e !== undefined);
-            text = formatter.formatValueForProperty(Math.max(...memberValues), property);
+        else if (displayFunction === DynamicTextDisplayFunction.MIN ||
+            displayFunction === DynamicTextDisplayFunction.MAX) {
+            const present = memberValues
+                .filter((e) => e !== null && e !== undefined && e !== '')
+                .map(Number)
+                .filter((e) => !Number.isNaN(e));
+            if (!present.length) {
+                return '';
+            }
+            const extreme = displayFunction === DynamicTextDisplayFunction.MIN ? Math.min(...present) : Math.max(...present);
+            text = formatter.formatValueForProperty(extreme, property);
         }
         return text;
     }

package/package.json

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