@contrail/documents 2.3.0 → 2.4.0-alpha.7e4b381

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -5,6 +5,66 @@ All notable changes to `@contrail/documents` are documented here.
5
5
  Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
6
6
  Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ ## [2.4.0] - 2026-09-24
9
+
10
+ ### Added
11
+
12
+ - `DocumentContainerService.buildIndex` and `DocumentContainerIndex` — which containers hold which
13
+ elements, for one document, resolved once and read back by lookup. A container is a frame or a
14
+ section, described by a `ContainerKind` carrying `elementType`, `nests` and `layer`. An element
15
+ belongs to the container whose box covers its anchor point and which is drawn below it. Nesting
16
+ gives a path with one container per depth, the later-drawn one winning where two cross. A
17
+ container is only ever content of a kind layered behind it, so a frame belongs to a section and a
18
+ section never to a frame. Shapes wider and taller than the container, and groups holding it, are
19
+ excluded.
20
+ - `SECTION_ELEMENT_TYPE`, `FRAME_ELEMENT_TYPE` and `SHAPE_ELEMENT_TYPES` in
21
+ `document-element-constants`, so the rule above has one definition rather than one per app.
22
+ - `DocumentContainerUtil` — the container geometry as statics, with `anchorFor` for a caller
23
+ holding an element rather than a measured box.
24
+ - `positionKeepingAnchor` — where an element has to sit for its drawn corner to land where it did
25
+ before a resize. Rotation turns about the centre and the centre moves with the size, so a rotated
26
+ element resized about its stored position drags its corner along with it. The board already makes
27
+ this move; a server recomputing a dynamic text has to make the same one, or the corner is not the
28
+ fixed point the anchor rule needs.
29
+ - `DocumentElementFactory.getBoundingClientRectScaled` — the space an element covers on the canvas,
30
+ with `scale` applied. `getBoundingClientRect` keeps returning the element's own box before scale,
31
+ which is what layout works in: `@contrail/document-table` places table members from it, and
32
+ scaling it moves a scaled member into a different cell. Anything deciding what an element overlaps
33
+ or sits on wants the scaled one.
34
+
35
+ ### Deprecated
36
+
37
+ - `isContainerBinding()` in favour of `DynamicTextUtil.takesValueFromContainer()`. Same rule, named
38
+ for what it decides: whether the binding's value comes from the container rather than a type
39
+ property. The old name still works and delegates to the new one.
40
+
41
+ ### Fixed
42
+
43
+ - A dynamic text is now anchored at its drawn top-left corner rather than its centre when deciding
44
+ which container it belongs to, and `DynamicTextUtil.isDynamicText` is the shared test for one. Its
45
+ size comes from the value it resolves to, and that value depends on the container, so letting its
46
+ width feed membership meant its own text could choose its container: near an edge the two answers
47
+ disagreed indefinitely, flipping between a value and "Move to a frame" on every read. Everything
48
+ else still resolves on its centre.
49
+ - The corner is the rotated one (VIBE-9567). A 200x20 text turned on its side draws as a 20x200
50
+ column, and its unrotated `position` can sit well clear of the frame it is visibly on, which
51
+ reported "Move to a frame" for a vertical text the user could see was placed correctly.
52
+ - A dynamic text is also exempt from the oversized-shape exclusion, which keeps a shape wider and
53
+ taller than a container off it. That rule reads size too, so a dynamic text larger than its frame
54
+ in both directions had two self-consistent answers and kept whichever it started from. The rule
55
+ exists to keep a backdrop shape off a frame it covers, which is not what a dynamic text is doing.
56
+ - `min` and `max` rendered an infinity sign when every member value was empty. The early return
57
+ checked the list length before the empty values were filtered out, so `Math.min` of nothing
58
+ reached the formatter. Both now fall through to `n/a`.
59
+ - `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on
60
+ the server failed the read for the whole document. It now measures from a zero size instead.
61
+
62
+ ### Changed
63
+
64
+ - Container membership measures a scaled element from its scaled box, through the new
65
+ `getBoundingClientRectScaled` above. A scaled element previously measured at its unscaled size
66
+ and could resolve to the wrong container.
67
+
8
68
  ## [2.3.0] - 2026-09-21
9
69
 
10
70
  ### Added
@@ -0,0 +1,10 @@
1
+ import { FRAME_ELEMENT_TYPE, SECTION_ELEMENT_TYPE } from '../document-element-constants';
2
+ export type ContainerElementType = typeof FRAME_ELEMENT_TYPE | typeof SECTION_ELEMENT_TYPE;
3
+ export interface ContainerKind {
4
+ elementType: ContainerElementType;
5
+ nests: boolean;
6
+ layer: number;
7
+ }
8
+ export declare const SECTION_KIND: ContainerKind;
9
+ export declare const FRAME_KIND: ContainerKind;
10
+ export declare const CONTAINER_KINDS: ContainerKind[];
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CONTAINER_KINDS = exports.FRAME_KIND = exports.SECTION_KIND = void 0;
4
+ const document_element_constants_1 = require("../document-element-constants");
5
+ exports.SECTION_KIND = { elementType: document_element_constants_1.SECTION_ELEMENT_TYPE, nests: true, layer: 0 };
6
+ exports.FRAME_KIND = { elementType: document_element_constants_1.FRAME_ELEMENT_TYPE, nests: false, layer: 1 };
7
+ exports.CONTAINER_KINDS = [exports.SECTION_KIND, exports.FRAME_KIND];
@@ -0,0 +1,24 @@
1
+ import { DocumentElement, PositionDefinition } from '../types';
2
+ import { ContainerElementType } from './container-kind';
3
+ import { DocumentContainer } from './document-container';
4
+ export declare class DocumentContainerIndex {
5
+ private readonly data;
6
+ constructor(data: {
7
+ documentElementsById: Map<string, DocumentElement>;
8
+ containersById: Map<string, DocumentContainer>;
9
+ containerPathsByDocumentElementId: Map<string, Map<string, string[]>>;
10
+ memberIdsByContainerId: Map<string, string[]>;
11
+ containerIdsByElementType: Map<string, string[]>;
12
+ });
13
+ getContainer(containerId: string): DocumentContainer | null;
14
+ containersOf(documentElementId: string, elementType: ContainerElementType): DocumentContainer[];
15
+ containerIdsOf(documentElementId: string, elementType: ContainerElementType): readonly string[];
16
+ innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
17
+ memberIdsOf(containerId: string): readonly string[];
18
+ memberDocumentElementsOf(containerId: string): DocumentElement[];
19
+ containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
20
+ maxDepth(elementType: ContainerElementType): number;
21
+ private containersOfType;
22
+ private resolveAll;
23
+ private containerPath;
24
+ }
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DocumentContainerIndex = void 0;
4
+ const document_container_1 = require("./document-container");
5
+ class DocumentContainerIndex {
6
+ constructor(data) {
7
+ this.data = data;
8
+ }
9
+ getContainer(containerId) {
10
+ var _a;
11
+ return (_a = this.data.containersById.get(containerId)) !== null && _a !== void 0 ? _a : null;
12
+ }
13
+ containersOf(documentElementId, elementType) {
14
+ return this.resolveAll(this.containerIdsOf(documentElementId, elementType));
15
+ }
16
+ containerIdsOf(documentElementId, elementType) {
17
+ return this.containerPath(documentElementId, elementType);
18
+ }
19
+ innermostContainerIdOf(documentElementId, elementType) {
20
+ const path = this.containerPath(documentElementId, elementType);
21
+ return path.length ? path[path.length - 1] : null;
22
+ }
23
+ memberIdsOf(containerId) {
24
+ var _a;
25
+ return (_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [];
26
+ }
27
+ memberDocumentElementsOf(containerId) {
28
+ const members = [];
29
+ for (const memberId of this.memberIdsOf(containerId)) {
30
+ const member = this.data.documentElementsById.get(memberId);
31
+ if (member) {
32
+ members.push(member);
33
+ }
34
+ }
35
+ return members;
36
+ }
37
+ containerPathAtPoint(point, elementType) {
38
+ const covering = this.containersOfType(elementType).filter((container) => document_container_1.DocumentContainerUtil.containsPoint(container.box, point));
39
+ return document_container_1.DocumentContainerUtil.topmostPerDepth(covering).map((container) => container.id);
40
+ }
41
+ maxDepth(elementType) {
42
+ return this.containersOfType(elementType).reduce((max, container) => Math.max(max, container.depth + 1), 0);
43
+ }
44
+ containersOfType(elementType) {
45
+ var _a;
46
+ return this.resolveAll((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : []);
47
+ }
48
+ resolveAll(containerIds) {
49
+ const containers = [];
50
+ for (const containerId of containerIds) {
51
+ const container = this.data.containersById.get(containerId);
52
+ if (container) {
53
+ containers.push(container);
54
+ }
55
+ }
56
+ return containers;
57
+ }
58
+ containerPath(documentElementId, elementType) {
59
+ var _a, _b;
60
+ return (_b = (_a = this.data.containerPathsByDocumentElementId.get(documentElementId)) === null || _a === void 0 ? void 0 : _a.get(elementType)) !== null && _b !== void 0 ? _b : [];
61
+ }
62
+ }
63
+ exports.DocumentContainerIndex = DocumentContainerIndex;
@@ -0,0 +1,27 @@
1
+ import { CoordinateBox, DocumentElement, PositionDefinition, SizeDefinition } from '../types';
2
+ import { ContainerKind } from './container-kind';
3
+ export interface DocumentContainer {
4
+ id: string;
5
+ kind: ContainerKind;
6
+ name: string;
7
+ documentElement: DocumentElement;
8
+ box: CoordinateBox;
9
+ depth: number;
10
+ drawOrder: number;
11
+ }
12
+ export interface MeasuredDocumentElement {
13
+ documentElement: DocumentElement;
14
+ box: CoordinateBox | null;
15
+ drawOrder: number;
16
+ }
17
+ export declare class DocumentContainerUtil {
18
+ static toCoordinateBox(x: number, y: number, width: number, height: number): CoordinateBox;
19
+ static centerOf(box: CoordinateBox): PositionDefinition;
20
+ static anchorOf(documentElement: DocumentElement, box: CoordinateBox): PositionDefinition;
21
+ static positionKeepingAnchor(documentElement: DocumentElement, newSize: SizeDefinition): PositionDefinition;
22
+ static anchorFor(documentElement: DocumentElement, position?: PositionDefinition): PositionDefinition;
23
+ static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
24
+ static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
25
+ static isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
26
+ static topmostPerDepth(containers: DocumentContainer[]): DocumentContainer[];
27
+ }
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DocumentContainerUtil = void 0;
4
+ const rotation_math_1 = require("../util/mask/rotation-math");
5
+ const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
6
+ class DocumentContainerUtil {
7
+ static toCoordinateBox(x, y, width, height) {
8
+ return { x, y, width, height, left: x, right: x + width, top: y, bottom: y + height };
9
+ }
10
+ static centerOf(box) {
11
+ return { x: box.left + box.width / 2, y: box.top + box.height / 2 };
12
+ }
13
+ static anchorOf(documentElement, box) {
14
+ var _a;
15
+ if (!dynamic_text_util_1.DynamicTextUtil.isDynamicText(documentElement)) {
16
+ return DocumentContainerUtil.centerOf(box);
17
+ }
18
+ const angle = (_a = documentElement.rotate) === null || _a === void 0 ? void 0 : _a.angle;
19
+ const corner = { x: box.left, y: box.top };
20
+ return angle ? (0, rotation_math_1.rotatePoint)(corner, angle, DocumentContainerUtil.centerOf(box)) : corner;
21
+ }
22
+ static positionKeepingAnchor(documentElement, newSize) {
23
+ var _a, _b, _c, _d, _e;
24
+ const position = documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
25
+ const angle = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.rotate) === null || _a === void 0 ? void 0 : _a.angle;
26
+ if (!position || !angle || !newSize || !documentElement.size) {
27
+ return position;
28
+ }
29
+ const scaleX = (_c = (_b = documentElement.scale) === null || _b === void 0 ? void 0 : _b.x) !== null && _c !== void 0 ? _c : 1;
30
+ const scaleY = (_e = (_d = documentElement.scale) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 1;
31
+ const cornerOffset = (size) => {
32
+ const half = { x: (size.width * scaleX) / 2, y: (size.height * scaleY) / 2 };
33
+ const turned = (0, rotation_math_1.rotatePoint)(half, angle);
34
+ return { x: half.x - turned.x, y: half.y - turned.y };
35
+ };
36
+ const before = cornerOffset(documentElement.size);
37
+ const after = cornerOffset(newSize);
38
+ return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
39
+ }
40
+ static anchorFor(documentElement, position) {
41
+ var _a, _b, _c, _d, _e;
42
+ const at = position !== null && position !== void 0 ? position : documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
43
+ if (!at) {
44
+ return null;
45
+ }
46
+ const size = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
47
+ const box = DocumentContainerUtil.toCoordinateBox(at.x, at.y, size.width * ((_c = (_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.scale) === null || _b === void 0 ? void 0 : _b.x) !== null && _c !== void 0 ? _c : 1), size.height * ((_e = (_d = documentElement === null || documentElement === void 0 ? void 0 : documentElement.scale) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 1));
48
+ return DocumentContainerUtil.anchorOf(documentElement, box);
49
+ }
50
+ static containsPoint(box, point) {
51
+ return point.x >= box.left && point.x <= box.right && point.y >= box.top && point.y <= box.bottom;
52
+ }
53
+ static encloses(outer, inner) {
54
+ const covers = outer.left <= inner.left && outer.right >= inner.right && outer.top <= inner.top && outer.bottom >= inner.bottom;
55
+ const identical = outer.left === inner.left &&
56
+ outer.right === inner.right &&
57
+ outer.top === inner.top &&
58
+ outer.bottom === inner.bottom;
59
+ return covers && !identical;
60
+ }
61
+ static isWiderAndTallerThan(box, other) {
62
+ return box.width > other.width && box.height > other.height;
63
+ }
64
+ static topmostPerDepth(containers) {
65
+ const byDepth = [];
66
+ for (const container of containers) {
67
+ const existing = byDepth[container.depth];
68
+ if (!existing || container.drawOrder > existing.drawOrder) {
69
+ byDepth[container.depth] = container;
70
+ }
71
+ }
72
+ return byDepth.filter(Boolean);
73
+ }
74
+ }
75
+ exports.DocumentContainerUtil = DocumentContainerUtil;
@@ -0,0 +1,14 @@
1
+ import { DocumentElement } from '../types';
2
+ import { ContainerKind } from './container-kind';
3
+ import { DocumentContainerIndex } from './document-container-index';
4
+ export declare class DocumentContainerService {
5
+ static buildIndex(documentElements: readonly DocumentElement[], kinds?: ContainerKind[]): DocumentContainerIndex;
6
+ static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
7
+ private static measureDocumentElements;
8
+ private static measure;
9
+ private static buildNesting;
10
+ private static resolveContainerPath;
11
+ private static resolveInnermostOnTop;
12
+ private static toContainerPath;
13
+ private static candidateContainers;
14
+ }
@@ -0,0 +1,147 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DocumentContainerService = void 0;
4
+ const document_element_factory_1 = require("../document-element-factory");
5
+ const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
6
+ const document_element_constants_1 = require("../document-element-constants");
7
+ const container_kind_1 = require("./container-kind");
8
+ const document_container_index_1 = require("./document-container-index");
9
+ const document_container_1 = require("./document-container");
10
+ class DocumentContainerService {
11
+ static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
12
+ const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
13
+ const nestingByElementType = new Map(kinds.map((kind) => [kind.elementType, this.buildNesting(measuredDocumentElements, kind)]));
14
+ const containersById = new Map();
15
+ const containerIdsByElementType = new Map();
16
+ nestingByElementType.forEach((nesting, elementType) => {
17
+ containerIdsByElementType.set(elementType, nesting.containers.map((container) => container.id));
18
+ nesting.containers.forEach((container) => containersById.set(container.id, container));
19
+ });
20
+ const containerPathsByDocumentElementId = new Map();
21
+ const memberIdsByContainerId = new Map();
22
+ for (const measured of measuredDocumentElements) {
23
+ const documentElementId = measured.documentElement.id;
24
+ const pathsByElementType = new Map();
25
+ for (const kind of kinds) {
26
+ const path = this.resolveContainerPath(measured, kind, kinds, nestingByElementType.get(kind.elementType));
27
+ pathsByElementType.set(kind.elementType, path);
28
+ for (const containerId of path) {
29
+ const members = memberIdsByContainerId.get(containerId);
30
+ if (members) {
31
+ members.push(documentElementId);
32
+ }
33
+ else {
34
+ memberIdsByContainerId.set(containerId, [documentElementId]);
35
+ }
36
+ }
37
+ }
38
+ containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
39
+ }
40
+ return new document_container_index_1.DocumentContainerIndex({
41
+ documentElementsById: new Map(measuredDocumentElements.map((measured) => [measured.documentElement.id, measured.documentElement])),
42
+ containersById,
43
+ containerPathsByDocumentElementId,
44
+ memberIdsByContainerId,
45
+ containerIdsByElementType,
46
+ });
47
+ }
48
+ static isContainer(documentElement, kinds = container_kind_1.CONTAINER_KINDS) {
49
+ return kinds.some((kind) => kind.elementType === (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type));
50
+ }
51
+ static measureDocumentElements(documentElements) {
52
+ const documentElementsById = new Map(documentElements.map((documentElement) => [documentElement.id, documentElement]));
53
+ return documentElements.map((documentElement, drawOrder) => ({
54
+ documentElement,
55
+ drawOrder,
56
+ box: this.measure(documentElement, documentElementsById),
57
+ }));
58
+ }
59
+ static measure(documentElement, documentElementsById) {
60
+ var _a, _b;
61
+ if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position)) {
62
+ return null;
63
+ }
64
+ try {
65
+ const start = ((_a = documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
66
+ const end = ((_b = documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
67
+ const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
68
+ return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
69
+ }
70
+ catch (_c) {
71
+ return null;
72
+ }
73
+ }
74
+ static buildNesting(measuredDocumentElements, kind) {
75
+ const containers = measuredDocumentElements
76
+ .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
77
+ .map((measured) => ({
78
+ id: measured.documentElement.id,
79
+ kind,
80
+ name: measured.documentElement.name,
81
+ documentElement: measured.documentElement,
82
+ box: measured.box,
83
+ depth: 0,
84
+ drawOrder: measured.drawOrder,
85
+ }));
86
+ const ancestorsById = new Map();
87
+ for (const container of containers) {
88
+ const ancestors = kind.nests
89
+ ? containers.filter((other) => other !== container && document_container_1.DocumentContainerUtil.encloses(other.box, container.box))
90
+ : [];
91
+ ancestorsById.set(container.id, ancestors);
92
+ container.depth = ancestors.length;
93
+ }
94
+ return { containers, ancestorsById };
95
+ }
96
+ static resolveContainerPath(measured, kind, kinds, nesting) {
97
+ var _a, _b;
98
+ if (!(nesting === null || nesting === void 0 ? void 0 : nesting.containers.length) || !measured.box) {
99
+ return [];
100
+ }
101
+ const ownKind = kinds.find((candidate) => candidate.elementType === measured.documentElement.type);
102
+ if (ownKind) {
103
+ if (ownKind.elementType === kind.elementType) {
104
+ return kind.nests ? this.toContainerPath((_a = nesting.ancestorsById.get(measured.documentElement.id)) !== null && _a !== void 0 ? _a : []) : [];
105
+ }
106
+ if (kind.layer > ownKind.layer) {
107
+ return [];
108
+ }
109
+ }
110
+ const candidates = this.candidateContainers(measured, nesting.containers);
111
+ if (!candidates.length) {
112
+ return [];
113
+ }
114
+ const innermostOnTop = this.resolveInnermostOnTop(candidates, nesting);
115
+ const candidateIds = new Set(candidates.map((container) => container.id));
116
+ const ancestors = ((_b = nesting.ancestorsById.get(innermostOnTop.id)) !== null && _b !== void 0 ? _b : []).filter((container) => candidateIds.has(container.id));
117
+ return this.toContainerPath([...ancestors, innermostOnTop]);
118
+ }
119
+ static resolveInnermostOnTop(candidates, nesting) {
120
+ 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));
121
+ return candidates
122
+ .filter((container) => !enclosingIds.has(container.id))
123
+ .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
124
+ }
125
+ static toContainerPath(containers) {
126
+ return document_container_1.DocumentContainerUtil.topmostPerDepth(containers).map((container) => container.id);
127
+ }
128
+ static candidateContainers(measured, containers) {
129
+ const anchor = document_container_1.DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
130
+ const isShape = document_element_constants_1.SHAPE_ELEMENT_TYPES.includes(measured.documentElement.type) &&
131
+ !dynamic_text_util_1.DynamicTextUtil.isDynamicText(measured.documentElement);
132
+ return containers.filter((container) => {
133
+ var _a;
134
+ if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
135
+ return false;
136
+ }
137
+ if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
138
+ return false;
139
+ }
140
+ if (isShape && document_container_1.DocumentContainerUtil.isWiderAndTallerThan(measured.box, container.box)) {
141
+ return false;
142
+ }
143
+ return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
144
+ });
145
+ }
146
+ }
147
+ exports.DocumentContainerService = DocumentContainerService;
@@ -3,3 +3,6 @@ export declare const ANNOTATION_PADDING_Y = 8;
3
3
  export declare const COLOR_PADDING = 5;
4
4
  export declare const COLOR_FONT_SIZE = 8;
5
5
  export declare const COLOR_WIDTH = 140;
6
+ export declare const SECTION_ELEMENT_TYPE = "section";
7
+ export declare const FRAME_ELEMENT_TYPE = "frame";
8
+ export declare const SHAPE_ELEMENT_TYPES: string[];
@@ -1,8 +1,29 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.ANNOTATION_PADDING_Y = exports.ANNOTATION_IMG_SIZE = void 0;
3
+ 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;
4
4
  exports.ANNOTATION_IMG_SIZE = 15;
5
5
  exports.ANNOTATION_PADDING_Y = 8;
6
6
  exports.COLOR_PADDING = 5;
7
7
  exports.COLOR_FONT_SIZE = 8;
8
8
  exports.COLOR_WIDTH = 140;
9
+ exports.SECTION_ELEMENT_TYPE = 'section';
10
+ exports.FRAME_ELEMENT_TYPE = 'frame';
11
+ exports.SHAPE_ELEMENT_TYPES = [
12
+ 'text',
13
+ 'line',
14
+ 'arrow',
15
+ 'circle',
16
+ 'rectangle',
17
+ 'round_rectangle',
18
+ 'triangle',
19
+ 'diamond',
20
+ 'star',
21
+ 'heart',
22
+ 'double_arrow',
23
+ 'right_arrow',
24
+ 'rhombus',
25
+ 'cloud',
26
+ 'callout',
27
+ 'draw_frame',
28
+ 'draw_section',
29
+ ];
@@ -22,6 +22,12 @@ export declare class DocumentElementFactory {
22
22
  width: any;
23
23
  height: any;
24
24
  };
25
+ static getBoundingClientRectScaled(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): {
26
+ x: any;
27
+ y: any;
28
+ width: any;
29
+ height: any;
30
+ };
25
31
  private static getPosition;
26
32
  private static getSize;
27
33
  private static getComponentSize;
@@ -216,6 +216,16 @@ class DocumentElementFactory {
216
216
  height,
217
217
  };
218
218
  }
219
+ static getBoundingClientRectScaled(documentElement, startElement, endElement) {
220
+ var _a, _b, _c, _d;
221
+ const { x, y, width, height } = this.getBoundingClientRect(documentElement, startElement, endElement);
222
+ return {
223
+ x,
224
+ y,
225
+ width: width * ((_b = (_a = documentElement.scale) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 1),
226
+ height: height * ((_d = (_c = documentElement.scale) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 1),
227
+ };
228
+ }
219
229
  static getPosition(documentElement, startElement, endElement) {
220
230
  var _a, _b;
221
231
  if (documentElement.type === 'line' || documentElement.type === 'callout') {
package/lib/index.d.ts CHANGED
@@ -14,3 +14,7 @@ export * from './util/curved-line/curved-line';
14
14
  export * from './util/callout/callout';
15
15
  export * from './util/mask';
16
16
  export * from './document-frame.service';
17
+ export * from './containers/container-kind';
18
+ export * from './containers/document-container';
19
+ export * from './containers/document-container-index';
20
+ export * from './containers/document-container.service';
package/lib/index.js CHANGED
@@ -30,3 +30,7 @@ __exportStar(require("./util/curved-line/curved-line"), exports);
30
30
  __exportStar(require("./util/callout/callout"), exports);
31
31
  __exportStar(require("./util/mask"), exports);
32
32
  __exportStar(require("./document-frame.service"), exports);
33
+ __exportStar(require("./containers/container-kind"), exports);
34
+ __exportStar(require("./containers/document-container"), exports);
35
+ __exportStar(require("./containers/document-container-index"), exports);
36
+ __exportStar(require("./containers/document-container.service"), exports);
@@ -48,8 +48,9 @@ export declare const HARD_CODED_TEXT: {
48
48
  'section.itemOptionCount': string;
49
49
  'section.colorCount': string;
50
50
  };
51
- export declare function isContainerBinding(bindingProperty: string | null | undefined): boolean;
52
51
  export declare class DynamicTextUtil {
52
+ static isDynamicText(documentElement: DocumentElement): boolean;
53
+ static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
53
54
  static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
54
55
  static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
55
56
  static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  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;
4
- exports.isContainerBinding = isContainerBinding;
5
4
  const types_1 = require("@contrail/types");
6
5
  const util_1 = require("@contrail/util");
7
6
  const document_util_1 = require("@contrail/document-util");
@@ -51,14 +50,19 @@ exports.HARD_CODED_TEXT = {
51
50
  };
52
51
  const CONTAINER_PROPERTY_SLUGS = ['name', 'count', 'itemFamilyCount', 'itemOptionCount', 'colorCount'];
53
52
  const CONTAINER_SOURCES = [DYNAMIC_TEXT_DATA_SOURCE.FRAME, DYNAMIC_TEXT_DATA_SOURCE.SECTION];
54
- function isContainerBinding(bindingProperty) {
55
- if (!bindingProperty) {
56
- return false;
57
- }
58
- const [entityType, propertySlug] = bindingProperty.split('.');
59
- return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
60
- }
61
53
  class DynamicTextUtil {
54
+ static isDynamicText(documentElement) {
55
+ return ((documentElement === null || documentElement === void 0 ? void 0 : documentElement.type) === 'text' &&
56
+ !!documentElement.propertyBindings &&
57
+ !!documentElement.propertyBindingsMetaData);
58
+ }
59
+ static takesValueFromContainer(bindingProperty) {
60
+ if (!bindingProperty) {
61
+ return false;
62
+ }
63
+ const [entityType, propertySlug] = bindingProperty.split('.');
64
+ return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
65
+ }
62
66
  static getDynamicTextValue(dynamicTextElement, property, propertyLevel, container, componentModels, ownerReferenceModel = null) {
63
67
  var _a, _b, _c, _d;
64
68
  if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {
@@ -150,12 +154,12 @@ class DynamicTextUtil {
150
154
  return text;
151
155
  }
152
156
  static calculateSize(dynamicTextElement, entityType, text) {
153
- var _a, _b, _c, _d;
154
- let size = dynamicTextElement.size;
155
- 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;
156
- const fontSize = (_d = (dynamicTextElement.isTextTool
157
- ? (_c = (_b = dynamicTextElement.style) === null || _b === void 0 ? void 0 : _b.font) === null || _c === void 0 ? void 0 : _c.size
158
- : 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;
157
+ var _a, _b, _c, _d, _e;
158
+ let size = (_a = dynamicTextElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
159
+ 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;
160
+ const fontSize = (_e = (dynamicTextElement.isTextTool
161
+ ? (_d = (_c = dynamicTextElement.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size
162
+ : 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;
159
163
  const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
160
164
  const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
161
165
  const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
@@ -169,7 +173,7 @@ class DynamicTextUtil {
169
173
  italic,
170
174
  };
171
175
  if (!dynamicTextElement.isTextTool) {
172
- measureTextSettings.width = dynamicTextElement.size.width - padding * 2;
176
+ measureTextSettings.width = size.width - padding * 2;
173
177
  }
174
178
  try {
175
179
  const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
@@ -212,13 +216,14 @@ class DynamicTextUtil {
212
216
  else if (displayFunction === DynamicTextDisplayFunction.LAST) {
213
217
  text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
214
218
  }
215
- else if (displayFunction === DynamicTextDisplayFunction.MIN) {
216
- memberValues = memberValues.filter((e) => e !== null && e !== undefined);
217
- text = formatter.formatValueForProperty(Math.min(...memberValues), property);
218
- }
219
- else if (displayFunction === DynamicTextDisplayFunction.MAX) {
220
- memberValues = memberValues.filter((e) => e !== null && e !== undefined);
221
- text = formatter.formatValueForProperty(Math.max(...memberValues), property);
219
+ else if (displayFunction === DynamicTextDisplayFunction.MIN ||
220
+ displayFunction === DynamicTextDisplayFunction.MAX) {
221
+ const present = memberValues.filter((e) => e !== null && e !== undefined);
222
+ if (!present.length) {
223
+ return '';
224
+ }
225
+ const extreme = displayFunction === DynamicTextDisplayFunction.MIN ? Math.min(...present) : Math.max(...present);
226
+ text = formatter.formatValueForProperty(extreme, property);
222
227
  }
223
228
  return text;
224
229
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contrail/documents",
3
- "version": "2.3.0",
3
+ "version": "2.4.0-alpha.7e4b381",
4
4
  "description": "Documents library for contrail platform",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",