@contrail/documents 2.1.0-alpha.a3f056f → 2.1.0-alpha.ab97680
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 +24 -6
- package/lib/containers/container-kind.d.ts +10 -0
- package/lib/containers/container-kind.js +7 -0
- package/lib/containers/document-container-index.d.ts +24 -0
- package/lib/containers/document-container-index.js +63 -0
- package/lib/containers/document-container.d.ts +22 -0
- package/lib/containers/document-container.js +38 -0
- package/lib/containers/document-container.service.d.ts +14 -0
- package/lib/containers/document-container.service.js +145 -0
- package/lib/document-element-constants.d.ts +3 -0
- package/lib/document-element-constants.js +22 -1
- package/lib/document-element-factory.js +3 -2
- package/lib/index.d.ts +4 -0
- package/lib/index.js +4 -0
- package/lib/types/document-change.d.ts +0 -1
- package/lib/util/dynamic-text/dynamic-text-util.d.ts +1 -1
- package/lib/util/dynamic-text/dynamic-text-util.js +14 -15
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -9,14 +9,32 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
|
9
9
|
|
|
10
10
|
### Added
|
|
11
11
|
|
|
12
|
-
- `
|
|
13
|
-
|
|
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 measured centre and which is drawn below it.
|
|
16
|
+
Nesting gives a path with one container per depth, the later-drawn one winning where two cross.
|
|
17
|
+
A container is only ever content of a kind layered behind it, so a frame belongs to a section and
|
|
18
|
+
a section never to a frame. Shapes wider and taller than the container, and groups holding it,
|
|
19
|
+
are 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
|
+
|
|
23
|
+
### Changed (breaking)
|
|
24
|
+
|
|
25
|
+
- `isContainerBinding()` becomes `DynamicTextUtil.takesValueFromContainer()`. Same rule, named for
|
|
26
|
+
what it decides: whether the binding's value comes from the container rather than a type property.
|
|
14
27
|
|
|
15
|
-
###
|
|
28
|
+
### Fixed
|
|
29
|
+
|
|
30
|
+
- `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on
|
|
31
|
+
the server failed the read for the whole document. It now measures from a zero size instead.
|
|
32
|
+
|
|
33
|
+
### Changed
|
|
16
34
|
|
|
17
|
-
-
|
|
18
|
-
|
|
19
|
-
|
|
35
|
+
- `DocumentElementFactory.getBoundingClientRect` multiplies the measured size by the element's
|
|
36
|
+
`scale`. Scale grows an element from its top-left, so it widens the box and moves the centre; a
|
|
37
|
+
scaled element previously measured at its unscaled size and could resolve to the wrong container.
|
|
20
38
|
|
|
21
39
|
## [1.17.0] - 2026-09-09
|
|
22
40
|
|
|
@@ -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) => (0, document_container_1.containsPoint)(container.box, point));
|
|
39
|
+
return (0, document_container_1.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,22 @@
|
|
|
1
|
+
import { CoordinateBox, DocumentElement, PositionDefinition } 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 function toCoordinateBox(x: number, y: number, width: number, height: number): CoordinateBox;
|
|
18
|
+
export declare function centerOf(box: CoordinateBox): PositionDefinition;
|
|
19
|
+
export declare function containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
|
|
20
|
+
export declare function encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
|
|
21
|
+
export declare function isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
|
|
22
|
+
export declare function topmostPerDepth(containers: DocumentContainer[]): DocumentContainer[];
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toCoordinateBox = toCoordinateBox;
|
|
4
|
+
exports.centerOf = centerOf;
|
|
5
|
+
exports.containsPoint = containsPoint;
|
|
6
|
+
exports.encloses = encloses;
|
|
7
|
+
exports.isWiderAndTallerThan = isWiderAndTallerThan;
|
|
8
|
+
exports.topmostPerDepth = topmostPerDepth;
|
|
9
|
+
function toCoordinateBox(x, y, width, height) {
|
|
10
|
+
return { x, y, width, height, left: x, right: x + width, top: y, bottom: y + height };
|
|
11
|
+
}
|
|
12
|
+
function centerOf(box) {
|
|
13
|
+
return { x: box.left + box.width / 2, y: box.top + box.height / 2 };
|
|
14
|
+
}
|
|
15
|
+
function containsPoint(box, point) {
|
|
16
|
+
return point.x >= box.left && point.x <= box.right && point.y >= box.top && point.y <= box.bottom;
|
|
17
|
+
}
|
|
18
|
+
function encloses(outer, inner) {
|
|
19
|
+
const covers = outer.left <= inner.left && outer.right >= inner.right && outer.top <= inner.top && outer.bottom >= inner.bottom;
|
|
20
|
+
const identical = outer.left === inner.left &&
|
|
21
|
+
outer.right === inner.right &&
|
|
22
|
+
outer.top === inner.top &&
|
|
23
|
+
outer.bottom === inner.bottom;
|
|
24
|
+
return covers && !identical;
|
|
25
|
+
}
|
|
26
|
+
function isWiderAndTallerThan(box, other) {
|
|
27
|
+
return box.width > other.width && box.height > other.height;
|
|
28
|
+
}
|
|
29
|
+
function topmostPerDepth(containers) {
|
|
30
|
+
const byDepth = [];
|
|
31
|
+
for (const container of containers) {
|
|
32
|
+
const existing = byDepth[container.depth];
|
|
33
|
+
if (!existing || container.drawOrder > existing.drawOrder) {
|
|
34
|
+
byDepth[container.depth] = container;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return byDepth.filter(Boolean);
|
|
38
|
+
}
|
|
@@ -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,145 @@
|
|
|
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 document_element_constants_1 = require("../document-element-constants");
|
|
6
|
+
const container_kind_1 = require("./container-kind");
|
|
7
|
+
const document_container_index_1 = require("./document-container-index");
|
|
8
|
+
const document_container_1 = require("./document-container");
|
|
9
|
+
class DocumentContainerService {
|
|
10
|
+
static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
|
|
11
|
+
const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
|
|
12
|
+
const nestingByElementType = new Map(kinds.map((kind) => [kind.elementType, this.buildNesting(measuredDocumentElements, kind)]));
|
|
13
|
+
const containersById = new Map();
|
|
14
|
+
const containerIdsByElementType = new Map();
|
|
15
|
+
nestingByElementType.forEach((nesting, elementType) => {
|
|
16
|
+
containerIdsByElementType.set(elementType, nesting.containers.map((container) => container.id));
|
|
17
|
+
nesting.containers.forEach((container) => containersById.set(container.id, container));
|
|
18
|
+
});
|
|
19
|
+
const containerPathsByDocumentElementId = new Map();
|
|
20
|
+
const memberIdsByContainerId = new Map();
|
|
21
|
+
for (const measured of measuredDocumentElements) {
|
|
22
|
+
const documentElementId = measured.documentElement.id;
|
|
23
|
+
const pathsByElementType = new Map();
|
|
24
|
+
for (const kind of kinds) {
|
|
25
|
+
const path = this.resolveContainerPath(measured, kind, kinds, nestingByElementType.get(kind.elementType));
|
|
26
|
+
pathsByElementType.set(kind.elementType, path);
|
|
27
|
+
for (const containerId of path) {
|
|
28
|
+
const members = memberIdsByContainerId.get(containerId);
|
|
29
|
+
if (members) {
|
|
30
|
+
members.push(documentElementId);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
memberIdsByContainerId.set(containerId, [documentElementId]);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
|
|
38
|
+
}
|
|
39
|
+
return new document_container_index_1.DocumentContainerIndex({
|
|
40
|
+
documentElementsById: new Map(measuredDocumentElements.map((measured) => [measured.documentElement.id, measured.documentElement])),
|
|
41
|
+
containersById,
|
|
42
|
+
containerPathsByDocumentElementId,
|
|
43
|
+
memberIdsByContainerId,
|
|
44
|
+
containerIdsByElementType,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
static isContainer(documentElement, kinds = container_kind_1.CONTAINER_KINDS) {
|
|
48
|
+
return kinds.some((kind) => kind.elementType === (documentElement === null || documentElement === void 0 ? void 0 : documentElement.type));
|
|
49
|
+
}
|
|
50
|
+
static measureDocumentElements(documentElements) {
|
|
51
|
+
const documentElementsById = new Map(documentElements.map((documentElement) => [documentElement.id, documentElement]));
|
|
52
|
+
return documentElements.map((documentElement, drawOrder) => ({
|
|
53
|
+
documentElement,
|
|
54
|
+
drawOrder,
|
|
55
|
+
box: this.measure(documentElement, documentElementsById),
|
|
56
|
+
}));
|
|
57
|
+
}
|
|
58
|
+
static measure(documentElement, documentElementsById) {
|
|
59
|
+
var _a, _b;
|
|
60
|
+
if (!(documentElement === null || documentElement === void 0 ? void 0 : documentElement.position)) {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
try {
|
|
64
|
+
const start = ((_a = documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
|
|
65
|
+
const end = ((_b = documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
|
|
66
|
+
const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRect(documentElement, start, end);
|
|
67
|
+
return (0, document_container_1.toCoordinateBox)(x, y, width, height);
|
|
68
|
+
}
|
|
69
|
+
catch (_c) {
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
static buildNesting(measuredDocumentElements, kind) {
|
|
74
|
+
const containers = measuredDocumentElements
|
|
75
|
+
.filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
|
|
76
|
+
.map((measured) => ({
|
|
77
|
+
id: measured.documentElement.id,
|
|
78
|
+
kind,
|
|
79
|
+
name: measured.documentElement.name,
|
|
80
|
+
documentElement: measured.documentElement,
|
|
81
|
+
box: measured.box,
|
|
82
|
+
depth: 0,
|
|
83
|
+
drawOrder: measured.drawOrder,
|
|
84
|
+
}));
|
|
85
|
+
const ancestorsById = new Map();
|
|
86
|
+
for (const container of containers) {
|
|
87
|
+
const ancestors = kind.nests
|
|
88
|
+
? containers.filter((other) => other !== container && (0, document_container_1.encloses)(other.box, container.box))
|
|
89
|
+
: [];
|
|
90
|
+
ancestorsById.set(container.id, ancestors);
|
|
91
|
+
container.depth = ancestors.length;
|
|
92
|
+
}
|
|
93
|
+
return { containers, ancestorsById };
|
|
94
|
+
}
|
|
95
|
+
static resolveContainerPath(measured, kind, kinds, nesting) {
|
|
96
|
+
var _a, _b;
|
|
97
|
+
if (!(nesting === null || nesting === void 0 ? void 0 : nesting.containers.length) || !measured.box) {
|
|
98
|
+
return [];
|
|
99
|
+
}
|
|
100
|
+
const ownKind = kinds.find((candidate) => candidate.elementType === measured.documentElement.type);
|
|
101
|
+
if (ownKind) {
|
|
102
|
+
if (ownKind.elementType === kind.elementType) {
|
|
103
|
+
return kind.nests ? this.toContainerPath((_a = nesting.ancestorsById.get(measured.documentElement.id)) !== null && _a !== void 0 ? _a : []) : [];
|
|
104
|
+
}
|
|
105
|
+
if (kind.layer > ownKind.layer) {
|
|
106
|
+
return [];
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
const candidates = this.candidateContainers(measured, nesting.containers);
|
|
110
|
+
if (!candidates.length) {
|
|
111
|
+
return [];
|
|
112
|
+
}
|
|
113
|
+
const innermostOnTop = this.resolveInnermostOnTop(candidates, nesting);
|
|
114
|
+
const candidateIds = new Set(candidates.map((container) => container.id));
|
|
115
|
+
const ancestors = ((_b = nesting.ancestorsById.get(innermostOnTop.id)) !== null && _b !== void 0 ? _b : []).filter((container) => candidateIds.has(container.id));
|
|
116
|
+
return this.toContainerPath([...ancestors, innermostOnTop]);
|
|
117
|
+
}
|
|
118
|
+
static resolveInnermostOnTop(candidates, nesting) {
|
|
119
|
+
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));
|
|
120
|
+
return candidates
|
|
121
|
+
.filter((container) => !enclosingIds.has(container.id))
|
|
122
|
+
.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
|
|
123
|
+
}
|
|
124
|
+
static toContainerPath(containers) {
|
|
125
|
+
return (0, document_container_1.topmostPerDepth)(containers).map((container) => container.id);
|
|
126
|
+
}
|
|
127
|
+
static candidateContainers(measured, containers) {
|
|
128
|
+
const center = (0, document_container_1.centerOf)(measured.box);
|
|
129
|
+
const isShape = document_element_constants_1.SHAPE_ELEMENT_TYPES.includes(measured.documentElement.type);
|
|
130
|
+
return containers.filter((container) => {
|
|
131
|
+
var _a;
|
|
132
|
+
if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
if (!(0, document_container_1.containsPoint)(container.box, center)) {
|
|
136
|
+
return false;
|
|
137
|
+
}
|
|
138
|
+
if (isShape && (0, document_container_1.isWiderAndTallerThan)(measured.box, container.box)) {
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
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
|
+
];
|
|
@@ -207,13 +207,14 @@ class DocumentElementFactory {
|
|
|
207
207
|
return ['rectangle', 'circle'].indexOf(element === null || element === void 0 ? void 0 : element.type) !== -1 && ((_a = element === null || element === void 0 ? void 0 : element.elementIds) === null || _a === void 0 ? void 0 : _a.length) > 0;
|
|
208
208
|
}
|
|
209
209
|
static getBoundingClientRect(documentElement, startElement, endElement) {
|
|
210
|
+
var _a, _b, _c, _d;
|
|
210
211
|
const { x, y } = this.getPosition(documentElement, startElement, endElement);
|
|
211
212
|
const { width, height } = this.getSize(documentElement, startElement, endElement);
|
|
212
213
|
return {
|
|
213
214
|
x,
|
|
214
215
|
y,
|
|
215
|
-
width,
|
|
216
|
-
height,
|
|
216
|
+
width: width * ((_b = (_a = documentElement.scale) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 1),
|
|
217
|
+
height: height * ((_d = (_c = documentElement.scale) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 1),
|
|
217
218
|
};
|
|
218
219
|
}
|
|
219
220
|
static getPosition(documentElement, startElement, endElement) {
|
package/lib/index.d.ts
CHANGED
|
@@ -13,3 +13,7 @@ export * from './util/curved-line/point';
|
|
|
13
13
|
export * from './util/curved-line/curved-line';
|
|
14
14
|
export * from './util/callout/callout';
|
|
15
15
|
export * from './document-frame.service';
|
|
16
|
+
export * from './containers/container-kind';
|
|
17
|
+
export * from './containers/document-container';
|
|
18
|
+
export * from './containers/document-container-index';
|
|
19
|
+
export * from './containers/document-container.service';
|
package/lib/index.js
CHANGED
|
@@ -29,3 +29,7 @@ __exportStar(require("./util/curved-line/point"), exports);
|
|
|
29
29
|
__exportStar(require("./util/curved-line/curved-line"), exports);
|
|
30
30
|
__exportStar(require("./util/callout/callout"), exports);
|
|
31
31
|
__exportStar(require("./document-frame.service"), exports);
|
|
32
|
+
__exportStar(require("./containers/container-kind"), exports);
|
|
33
|
+
__exportStar(require("./containers/document-container"), exports);
|
|
34
|
+
__exportStar(require("./containers/document-container-index"), exports);
|
|
35
|
+
__exportStar(require("./containers/document-container.service"), exports);
|
|
@@ -48,8 +48,8 @@ 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 takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
|
|
53
53
|
static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
|
|
54
54
|
static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
|
|
55
55
|
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,14 @@ 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 takesValueFromContainer(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
|
+
}
|
|
62
61
|
static getDynamicTextValue(dynamicTextElement, property, propertyLevel, container, componentModels, ownerReferenceModel = null) {
|
|
63
62
|
var _a, _b, _c, _d;
|
|
64
63
|
if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {
|
|
@@ -150,12 +149,12 @@ class DynamicTextUtil {
|
|
|
150
149
|
return text;
|
|
151
150
|
}
|
|
152
151
|
static calculateSize(dynamicTextElement, entityType, text) {
|
|
153
|
-
var _a, _b, _c, _d;
|
|
154
|
-
let size = dynamicTextElement.size;
|
|
155
|
-
const fontFamily = (
|
|
156
|
-
const fontSize = (
|
|
157
|
-
? (
|
|
158
|
-
: document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null &&
|
|
152
|
+
var _a, _b, _c, _d, _e;
|
|
153
|
+
let size = (_a = dynamicTextElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
|
|
154
|
+
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;
|
|
155
|
+
const fontSize = (_e = (dynamicTextElement.isTextTool
|
|
156
|
+
? (_d = (_c = dynamicTextElement.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size
|
|
157
|
+
: 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
158
|
const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
|
|
160
159
|
const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
|
|
161
160
|
const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
|
|
@@ -169,7 +168,7 @@ class DynamicTextUtil {
|
|
|
169
168
|
italic,
|
|
170
169
|
};
|
|
171
170
|
if (!dynamicTextElement.isTextTool) {
|
|
172
|
-
measureTextSettings.width =
|
|
171
|
+
measureTextSettings.width = size.width - padding * 2;
|
|
173
172
|
}
|
|
174
173
|
try {
|
|
175
174
|
const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
|