@contrail/documents 2.1.0-alpha.eaedb29 → 2.2.0-alpha.4e7a026

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.
Files changed (33) hide show
  1. package/CHANGELOG.md +17 -24
  2. package/lib/components/item-component.service.d.ts +2 -0
  3. package/lib/components/item-component.service.js +29 -23
  4. package/lib/document-element-constants.d.ts +3 -3
  5. package/lib/document-element-constants.js +4 -22
  6. package/lib/document-element-factory.d.ts +2 -1
  7. package/lib/document-element-factory.js +28 -11
  8. package/lib/index.d.ts +1 -4
  9. package/lib/index.js +1 -4
  10. package/lib/types/common.d.ts +5 -0
  11. package/lib/types/document-change.d.ts +1 -0
  12. package/lib/types/document-element.d.ts +2 -1
  13. package/lib/util/dynamic-text/dynamic-text-util.d.ts +1 -1
  14. package/lib/util/dynamic-text/dynamic-text-util.js +22 -22
  15. package/lib/util/mask/index.d.ts +4 -0
  16. package/lib/util/mask/index.js +20 -0
  17. package/lib/util/mask/mask-bake-layout.d.ts +17 -0
  18. package/lib/util/mask/mask-bake-layout.js +56 -0
  19. package/lib/util/mask/mask-shape-geometry.d.ts +27 -0
  20. package/lib/util/mask/mask-shape-geometry.js +171 -0
  21. package/lib/util/mask/rotation-math.d.ts +2 -0
  22. package/lib/util/mask/rotation-math.js +14 -0
  23. package/lib/util/mask/shape-mask-element.d.ts +23 -0
  24. package/lib/util/mask/shape-mask-element.js +70 -0
  25. package/package.json +10 -7
  26. package/lib/containers/container-kind.d.ts +0 -10
  27. package/lib/containers/container-kind.js +0 -7
  28. package/lib/containers/document-container-index.d.ts +0 -24
  29. package/lib/containers/document-container-index.js +0 -63
  30. package/lib/containers/document-container.d.ts +0 -22
  31. package/lib/containers/document-container.js +0 -38
  32. package/lib/containers/document-container.service.d.ts +0 -14
  33. package/lib/containers/document-container.service.js +0 -145
package/CHANGELOG.md CHANGED
@@ -5,39 +5,32 @@ 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.1.0] - 2026-09-09
8
+ ## [2.2.0] - 2026-09-15
9
9
 
10
10
  ### Added
11
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 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.
12
+ - `ItemComponentService.isAnnotationRowEmpty(annotationElement, annotations)` — whether an item card's annotation row will render nothing, because the row is hidden or the item has no `category === 'property'` annotations. The single predicate behind the reservation, so the layout service and the canvas renderers cannot drift apart on the question. A missing row element is not treated as hidden: renderers supply a default row for item components that have none stored, so only the annotation data decides there.
13
+ - `ItemComponentService.getAnnotationRowHeight(annotationElement, annotations, width)` — the row's reserved height, wrapping onto further rows when the badges do not fit `width`, and `0` when the row is empty. Every creation path must size the row through here so a card laid out by the Item Chooser and one laid out by board generation agree.
22
14
 
23
- ### Changed (breaking)
15
+ ### Fixed
24
16
 
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.
17
+ - `updateSizeAndPosition` no longer reserves space above the thumbnail for an annotation row that renders nothing. `calculateAnnotationHeight` returned a flat `fontSize + ANNOTATION_PADDING_Y` minimum even when the row was hidden or the item had no annotations, pushing the thumbnail down ~8px on every such card (DESIGN-150). It now returns `0` in those cases and the thumbnail sits at the card origin. Cards whose row does show a badge are unchanged.
27
18
 
28
- ### Fixed
19
+ ## [1.19.0] - 2026-09-11
29
20
 
30
- - `min` and `max` rendered an infinity sign when every member value was empty. The early return
31
- checked the list length before the empty values were filtered out, so `Math.min` of nothing
32
- reached the formatter. Both now fall through to `n/a`.
33
- - `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on
34
- the server failed the read for the whole document. It now measures from a zero size instead.
21
+ ### Added
35
22
 
36
- ### Changed
23
+ - `MaskDefinition` and `MaskShapeKey` on `DocumentElement` — `maskDefinition` records that an image is masked into one of nine preset shapes, with an optional clockwise `rotation`. Its presence changes how `cropDefinition`'s percents are read: element-space (the mask window within the element) instead of the source-image crop they otherwise mean. Anything deriving image geometry must check `hasShapeMask` before treating a crop as a source crop — reading one as the other samples the wrong region of the bitmap.
24
+ - `@contrail/documents/util/mask` — the shared mask model, exported from the package root: the nine shapes as renderer-agnostic cubic path segments (`getMaskShapeSegments`), `rotatedRectAABB` for the bounds a tilted shape actually occupies, `rotatePoint`, and the mask-rect/percent conversions, so exporters and the canvas cannot drift apart. Segments are cubic-only because cubics survive affine maps exactly, letting each consumer render them however it draws — `Path2D` in a browser, an SVG composite in a service.
25
+ - `getMaskBakeGeometry`, `getMaskBakeLayout` and `maskShapeSegmentsToSvgPath` — the bake inputs a consumer needs to flatten a mask into a bitmap, and an SVG serializer for renderers that go through SVG rather than a canvas path. The layout scales to the source bitmap's own resolution rather than the element's on-board size, so a shrunk image does not bake at reduced detail, and re-bases a rotated mask onto its own bounding box. Only the rasterizer stays per-consumer: `Path2D` in a browser, an SVG composite in a service.
26
+ - `hasShapeMask` is a type guard and the complete discriminator: it requires a shape key the renderer knows and all four crop percents, so an origin of `0` passes while a missing origin (previously multiplied into `NaN` by `cropDefinitionToMaskRect`) and an unknown shape (previously thrown on by `getMaskShapeSegments`) are rejected up front. The true branch narrows the percents to numbers.
27
+
28
+ ## [1.18.0] - 2026-09-10
29
+
30
+ ### Added
37
31
 
38
- - `DocumentElementFactory.getBoundingClientRect` multiplies the measured size by the element's
39
- `scale`. Scale grows an element from its top-left, so it widens the box and moves the centre; a
40
- scaled element previously measured at its unscaled size and could resolve to the wrong container.
32
+ - `DocumentChange.gestureId?: string` — optional marker a producer sets to correlate the
33
+ actions of one user gesture across a batch.
41
34
 
42
35
  ## [1.17.0] - 2026-09-09
43
36
 
@@ -15,6 +15,8 @@ export interface ScaledItemCardResult {
15
15
  export declare class ItemComponentService {
16
16
  static isItemComponent(element: DocumentElement): boolean;
17
17
  static isThumbnailOnlyComponent(element: DocumentElement): boolean;
18
+ static isAnnotationRowEmpty(annotationElement: DocumentElement, annotations?: any[]): boolean;
19
+ static getAnnotationRowHeight(annotationElement: DocumentElement, annotations?: any[], width?: number): number;
18
20
  static updateSizeAndPosition(propertyElements: any[], componentElement: DocumentElement, annotatedElements?: any[]): any;
19
21
  private static getYMargin;
20
22
  private static calculateAnnotationHeight;
@@ -17,6 +17,30 @@ class ItemComponentService {
17
17
  const imageElement = element.elements.find((e) => e.type == 'image');
18
18
  return (!annotationElement || annotationElement.isHidden) && imageElement && !imageElement.isHidden;
19
19
  }
20
+ static isAnnotationRowEmpty(annotationElement, annotations = []) {
21
+ if (annotationElement === null || annotationElement === void 0 ? void 0 : annotationElement.isHidden) {
22
+ return true;
23
+ }
24
+ return !(annotations === null || annotations === void 0 ? void 0 : annotations.some((annotation) => (annotation === null || annotation === void 0 ? void 0 : annotation.category) === 'property'));
25
+ }
26
+ static getAnnotationRowHeight(annotationElement, annotations = [], width = exports.DEFAULT_THUMBNAIL_WIDTH) {
27
+ var _a, _b;
28
+ if (this.isAnnotationRowEmpty(annotationElement, annotations)) {
29
+ return 0;
30
+ }
31
+ const annotationSize = ((_b = (_a = annotationElement === null || annotationElement === void 0 ? void 0 : annotationElement.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || document_element_constants_1.ANNOTATION_IMG_SIZE;
32
+ const propertyAnnotations = annotations.filter((annotation) => (annotation === null || annotation === void 0 ? void 0 : annotation.category) === 'property');
33
+ let height = annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
34
+ let count = 0;
35
+ propertyAnnotations.forEach(() => {
36
+ if ((count + 1) * annotationSize * 1.25 > width) {
37
+ count = 0;
38
+ height = height + annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
39
+ }
40
+ count++;
41
+ });
42
+ return height;
43
+ }
20
44
  static updateSizeAndPosition(propertyElements, componentElement, annotatedElements = []) {
21
45
  var _a, _b, _c, _d;
22
46
  const newElements = [];
@@ -64,9 +88,11 @@ class ItemComponentService {
64
88
  lastYPosition = element.position.y;
65
89
  }
66
90
  const annotationHeight = this.calculateAnnotationHeight(element, componentElement, width, annotatedElements);
67
- lastYPosition = lastYPosition + annotationHeight;
68
91
  if (annotationHeight === 0 && index === 0) {
69
- lastYPosition = lastYPosition + document_element_constants_1.ANNOTATION_IMG_SIZE;
92
+ lastYPosition = 0;
93
+ }
94
+ else {
95
+ lastYPosition = lastYPosition + annotationHeight;
70
96
  }
71
97
  }
72
98
  element.size.width = width;
@@ -112,28 +138,8 @@ class ItemComponentService {
112
138
  return marginY;
113
139
  }
114
140
  static calculateAnnotationHeight(element, componentElement, width, annotatedElements = []) {
115
- var _a, _b;
116
- const annotationSize = ((_b = (_a = element.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || document_element_constants_1.ANNOTATION_IMG_SIZE;
117
- let height = annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
118
- let xPos = 0;
119
141
  const annotatedElement = annotatedElements.find((elem) => elem.id === componentElement.id);
120
- if (!annotatedElement || element.isHidden) {
121
- return height;
122
- }
123
- const annotations = annotatedElement.annotations.filter((annotation) => annotation.category === 'property');
124
- if (annotations.length > 0) {
125
- let count = 0;
126
- annotations === null || annotations === void 0 ? void 0 : annotations.forEach((annotation) => {
127
- if ((count + 1) * annotationSize * 1.25 > width) {
128
- count = 0;
129
- xPos = -width * 0.5;
130
- height = height + annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
131
- }
132
- xPos = xPos + annotationSize * 1.25;
133
- count++;
134
- });
135
- }
136
- return height;
142
+ return this.getAnnotationRowHeight(element, annotatedElement === null || annotatedElement === void 0 ? void 0 : annotatedElement.annotations, width);
137
143
  }
138
144
  static getImageElement(element) {
139
145
  var _a;
@@ -1,8 +1,8 @@
1
1
  export declare const ANNOTATION_IMG_SIZE = 15;
2
2
  export declare const ANNOTATION_PADDING_Y = 8;
3
+ export declare const COMPONENT_PADDING_X = 8;
4
+ export declare const COMPONENT_PADDING_T = 18;
5
+ export declare const COMPONENT_PADDING_B = 8;
3
6
  export declare const COLOR_PADDING = 5;
4
7
  export declare const COLOR_FONT_SIZE = 8;
5
8
  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,29 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
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;
3
+ exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.COMPONENT_PADDING_B = exports.COMPONENT_PADDING_T = exports.COMPONENT_PADDING_X = 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
+ exports.COMPONENT_PADDING_X = 8;
7
+ exports.COMPONENT_PADDING_T = 18;
8
+ exports.COMPONENT_PADDING_B = 8;
6
9
  exports.COLOR_PADDING = 5;
7
10
  exports.COLOR_FONT_SIZE = 8;
8
11
  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
- ];
@@ -16,7 +16,7 @@ export declare class DocumentElementFactory {
16
16
  newElements: DocumentElement[];
17
17
  };
18
18
  static isMask(element: DocumentElement): boolean;
19
- static getBoundingClientRect(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): {
19
+ static getBoundingClientRect(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement, annotations?: any[]): {
20
20
  x: any;
21
21
  y: any;
22
22
  width: any;
@@ -25,5 +25,6 @@ export declare class DocumentElementFactory {
25
25
  private static getPosition;
26
26
  private static getSize;
27
27
  private static getComponentSize;
28
+ private static getComponentPaddingTop;
28
29
  static getLineDefinition(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): LineDefinition;
29
30
  }
@@ -8,6 +8,7 @@ const components_1 = require("./components/components");
8
8
  const document_element_property_binding_handler_1 = require("./document-element-property-binding-handler");
9
9
  const document_table_1 = require("@contrail/document-table");
10
10
  const document_element_constants_1 = require("./document-element-constants");
11
+ const item_component_service_1 = require("./components/item-component.service");
11
12
  const callout_1 = require("./util/callout/callout");
12
13
  class DocumentElementFactory {
13
14
  static initNewElement(type) {
@@ -206,15 +207,14 @@ class DocumentElementFactory {
206
207
  var _a;
207
208
  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
209
  }
209
- static getBoundingClientRect(documentElement, startElement, endElement) {
210
- var _a, _b, _c, _d;
210
+ static getBoundingClientRect(documentElement, startElement, endElement, annotations) {
211
211
  const { x, y } = this.getPosition(documentElement, startElement, endElement);
212
- const { width, height } = this.getSize(documentElement, startElement, endElement);
212
+ const { width, height } = this.getSize(documentElement, startElement, endElement, annotations);
213
213
  return {
214
214
  x,
215
215
  y,
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),
216
+ width,
217
+ height,
218
218
  };
219
219
  }
220
220
  static getPosition(documentElement, startElement, endElement) {
@@ -236,7 +236,7 @@ class DocumentElementFactory {
236
236
  (documentElement.type === 'component' && ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _b === void 0 ? void 0 : _b.item) ? 18 : 0),
237
237
  };
238
238
  }
239
- static getSize(documentElement, startElement, endElement) {
239
+ static getSize(documentElement, startElement, endElement, annotations) {
240
240
  if (documentElement.type === 'line' || documentElement.type === 'callout') {
241
241
  const lineDefinition = this.getLineDefinition(documentElement, startElement, endElement);
242
242
  if (!lineDefinition) {
@@ -247,10 +247,12 @@ class DocumentElementFactory {
247
247
  height: Math.abs(lineDefinition.y1 - lineDefinition.y2),
248
248
  };
249
249
  }
250
- return documentElement.type === 'component' ? this.getComponentSize(documentElement) : documentElement.size;
250
+ return documentElement.type === 'component'
251
+ ? this.getComponentSize(documentElement, annotations)
252
+ : documentElement.size;
251
253
  }
252
- static getComponentSize(documentElement) {
253
- var _a, _b, _c, _d, _e, _f;
254
+ static getComponentSize(documentElement, annotations) {
255
+ var _a, _b, _c, _d, _e;
254
256
  let width = 0, height = 0, lastY = null;
255
257
  for (let i = 0; i < ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _a === void 0 ? void 0 : _a.length); i++) {
256
258
  const element = documentElement.elements[i];
@@ -264,11 +266,26 @@ class DocumentElementFactory {
264
266
  lastY = y + renderedHeight;
265
267
  }
266
268
  }
269
+ if (!((_e = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _e === void 0 ? void 0 : _e.item)) {
270
+ return { width, height };
271
+ }
267
272
  return {
268
- width: width + (((_e = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _e === void 0 ? void 0 : _e.item) ? 8 + 8 : 0),
269
- height: height + (((_f = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _f === void 0 ? void 0 : _f.item) ? 18 + 8 : 0),
273
+ width: width + document_element_constants_1.COMPONENT_PADDING_X * 2,
274
+ height: height + this.getComponentPaddingTop(documentElement, annotations) + document_element_constants_1.COMPONENT_PADDING_B,
270
275
  };
271
276
  }
277
+ static getComponentPaddingTop(documentElement, annotations) {
278
+ var _a, _b, _c, _d, _e;
279
+ if (!annotations) {
280
+ return document_element_constants_1.COMPONENT_PADDING_T;
281
+ }
282
+ const annotationElement = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _a === void 0 ? void 0 : _a.find((element) => element.type === 'annotation');
283
+ if (!item_component_service_1.ItemComponentService.isAnnotationRowEmpty(annotationElement, annotations)) {
284
+ return document_element_constants_1.COMPONENT_PADDING_T;
285
+ }
286
+ const contentOffsetY = (_e = (_d = (_c = (_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _b === void 0 ? void 0 : _b.find((element) => element.type === 'image')) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 0;
287
+ return -contentOffsetY;
288
+ }
272
289
  static getLineDefinition(documentElement, startElement, endElement) {
273
290
  var _a, _b;
274
291
  if (documentElement.type === 'line')
package/lib/index.d.ts CHANGED
@@ -12,8 +12,5 @@ export * from './document-element-constants';
12
12
  export * from './util/curved-line/point';
13
13
  export * from './util/curved-line/curved-line';
14
14
  export * from './util/callout/callout';
15
+ export * from './util/mask';
15
16
  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
@@ -28,8 +28,5 @@ __exportStar(require("./document-element-constants"), exports);
28
28
  __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
+ __exportStar(require("./util/mask"), exports);
31
32
  __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);
@@ -74,6 +74,11 @@ export interface LineDefinition {
74
74
  markerEnd?: string;
75
75
  lineType?: LineType;
76
76
  }
77
+ export type MaskShapeKey = 'circle' | 'square' | 'rounded' | 'triangle' | 'diamond' | 'parallelogram' | 'star' | 'heart' | 'cloud';
78
+ export interface MaskDefinition {
79
+ shape: MaskShapeKey;
80
+ rotation?: number;
81
+ }
77
82
  export interface CropDefinition {
78
83
  x1?: number;
79
84
  x2?: number;
@@ -18,4 +18,5 @@ export interface DocumentChange {
18
18
  backingAssortmentItemData?: any;
19
19
  targetSortIndex?: number;
20
20
  skipUndo?: boolean;
21
+ gestureId?: string;
21
22
  }
@@ -1,5 +1,5 @@
1
1
  import { PropertyLevel } from '@contrail/types';
2
- import { CropDefinition, LineDefinition, PositionDefinition, RotationDefinition, SizeDefinition } from './common';
2
+ import { CropDefinition, LineDefinition, MaskDefinition, PositionDefinition, RotationDefinition, SizeDefinition } from './common';
3
3
  import { Document } from './document';
4
4
  import { ScaleTransformation } from './element-transformation';
5
5
  export interface AlternateUrls {
@@ -32,6 +32,7 @@ export interface DocumentElement extends Document {
32
32
  annotations?: any;
33
33
  isLocked?: boolean;
34
34
  cropDefinition?: CropDefinition;
35
+ maskDefinition?: MaskDefinition;
35
36
  embedInfo?: any;
36
37
  isHidden?: boolean;
37
38
  elementIds?: Array<string>;
@@ -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;
51
52
  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,6 +1,7 @@
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;
4
5
  const types_1 = require("@contrail/types");
5
6
  const util_1 = require("@contrail/util");
6
7
  const document_util_1 = require("@contrail/document-util");
@@ -50,14 +51,14 @@ exports.HARD_CODED_TEXT = {
50
51
  };
51
52
  const CONTAINER_PROPERTY_SLUGS = ['name', 'count', 'itemFamilyCount', 'itemOptionCount', 'colorCount'];
52
53
  const CONTAINER_SOURCES = [DYNAMIC_TEXT_DATA_SOURCE.FRAME, DYNAMIC_TEXT_DATA_SOURCE.SECTION];
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);
54
+ function isContainerBinding(bindingProperty) {
55
+ if (!bindingProperty) {
56
+ return false;
60
57
  }
58
+ const [entityType, propertySlug] = bindingProperty.split('.');
59
+ return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
60
+ }
61
+ class DynamicTextUtil {
61
62
  static getDynamicTextValue(dynamicTextElement, property, propertyLevel, container, componentModels, ownerReferenceModel = null) {
62
63
  var _a, _b, _c, _d;
63
64
  if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {
@@ -149,12 +150,12 @@ class DynamicTextUtil {
149
150
  return text;
150
151
  }
151
152
  static calculateSize(dynamicTextElement, entityType, text) {
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;
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;
158
159
  const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
159
160
  const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
160
161
  const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
@@ -168,7 +169,7 @@ class DynamicTextUtil {
168
169
  italic,
169
170
  };
170
171
  if (!dynamicTextElement.isTextTool) {
171
- measureTextSettings.width = size.width - padding * 2;
172
+ measureTextSettings.width = dynamicTextElement.size.width - padding * 2;
172
173
  }
173
174
  try {
174
175
  const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);
@@ -211,14 +212,13 @@ class DynamicTextUtil {
211
212
  else if (displayFunction === DynamicTextDisplayFunction.LAST) {
212
213
  text = formatter.formatValueForProperty(memberValues[memberValues.length - 1], property);
213
214
  }
214
- else if (displayFunction === DynamicTextDisplayFunction.MIN ||
215
- displayFunction === DynamicTextDisplayFunction.MAX) {
216
- const present = memberValues.filter((e) => e !== null && e !== undefined);
217
- if (!present.length) {
218
- return '';
219
- }
220
- const extreme = displayFunction === DynamicTextDisplayFunction.MIN ? Math.min(...present) : Math.max(...present);
221
- text = formatter.formatValueForProperty(extreme, property);
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);
222
222
  }
223
223
  return text;
224
224
  }
@@ -0,0 +1,4 @@
1
+ export * from './mask-shape-geometry';
2
+ export * from './rotation-math';
3
+ export * from './shape-mask-element';
4
+ export * from './mask-bake-layout';
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./mask-shape-geometry"), exports);
18
+ __exportStar(require("./rotation-math"), exports);
19
+ __exportStar(require("./shape-mask-element"), exports);
20
+ __exportStar(require("./mask-bake-layout"), exports);
@@ -0,0 +1,17 @@
1
+ import { DocumentElement, SizeDefinition } from '../../types';
2
+ import { MaskRect, MaskShapeKey } from './mask-shape-geometry';
3
+ export declare const MASK_BAKE_MAX_SIDE = 4096;
4
+ export interface MaskBakeGeometry {
5
+ shape: MaskShapeKey;
6
+ rotation: number;
7
+ maskRect: MaskRect;
8
+ imageRect: MaskRect;
9
+ }
10
+ export interface MaskBakeLayout {
11
+ size: SizeDefinition;
12
+ scale: number;
13
+ maskRect: MaskRect;
14
+ imageRect: MaskRect;
15
+ }
16
+ export declare function getMaskBakeGeometry(element: DocumentElement): MaskBakeGeometry | null;
17
+ export declare function getMaskBakeLayout(geometry: MaskBakeGeometry, sourceImageSize: SizeDefinition): MaskBakeLayout | null;
@@ -0,0 +1,56 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MASK_BAKE_MAX_SIDE = void 0;
4
+ exports.getMaskBakeGeometry = getMaskBakeGeometry;
5
+ exports.getMaskBakeLayout = getMaskBakeLayout;
6
+ const mask_shape_geometry_1 = require("./mask-shape-geometry");
7
+ const shape_mask_element_1 = require("./shape-mask-element");
8
+ exports.MASK_BAKE_MAX_SIDE = 4096;
9
+ function getMaskBakeGeometry(element) {
10
+ var _a, _b;
11
+ const shape = (0, shape_mask_element_1.getShapeMaskKey)(element);
12
+ if (!shape || !(0, shape_mask_element_1.hasShapeMask)(element) || !((_a = element.size) === null || _a === void 0 ? void 0 : _a.width) || !((_b = element.size) === null || _b === void 0 ? void 0 : _b.height)) {
13
+ return null;
14
+ }
15
+ const imageRect = element.imageSize && element.imagePosition
16
+ ? {
17
+ x: element.imagePosition.x,
18
+ y: element.imagePosition.y,
19
+ width: element.imageSize.width,
20
+ height: element.imageSize.height,
21
+ }
22
+ : { x: 0, y: 0, width: element.size.width, height: element.size.height };
23
+ return {
24
+ shape,
25
+ rotation: (0, shape_mask_element_1.getShapeMaskRotation)(element),
26
+ maskRect: (0, shape_mask_element_1.cropDefinitionToMaskRect)(element.cropDefinition, element.size),
27
+ imageRect,
28
+ };
29
+ }
30
+ function scaleRect(rect, scale, originX, originY) {
31
+ return {
32
+ x: (rect.x - originX) * scale,
33
+ y: (rect.y - originY) * scale,
34
+ width: rect.width * scale,
35
+ height: rect.height * scale,
36
+ };
37
+ }
38
+ function getMaskBakeLayout(geometry, sourceImageSize) {
39
+ const { maskRect, imageRect, rotation } = geometry;
40
+ if (!imageRect.width || !imageRect.height || !(sourceImageSize === null || sourceImageSize === void 0 ? void 0 : sourceImageSize.width) || !maskRect.width || !maskRect.height) {
41
+ return null;
42
+ }
43
+ const extent = rotation ? (0, mask_shape_geometry_1.rotatedRectAABB)(maskRect, rotation) : Object.assign({}, maskRect);
44
+ const nativeScale = sourceImageSize.width / imageRect.width;
45
+ const longestSide = Math.max(extent.width, extent.height) * nativeScale;
46
+ const scale = longestSide > exports.MASK_BAKE_MAX_SIDE ? (exports.MASK_BAKE_MAX_SIDE / longestSide) * nativeScale : nativeScale;
47
+ return {
48
+ size: {
49
+ width: Math.ceil(extent.width * scale),
50
+ height: Math.ceil(extent.height * scale),
51
+ },
52
+ scale,
53
+ maskRect: scaleRect(maskRect, scale, extent.x, extent.y),
54
+ imageRect: scaleRect(imageRect, scale, extent.x, extent.y),
55
+ };
56
+ }
@@ -0,0 +1,27 @@
1
+ import { MaskShapeKey } from '../../types';
2
+ export { MaskShapeKey };
3
+ export declare const MASK_SHAPE_KEYS: readonly MaskShapeKey[];
4
+ export interface MaskRect {
5
+ x: number;
6
+ y: number;
7
+ width: number;
8
+ height: number;
9
+ }
10
+ export type PathSegment = {
11
+ op: 'move' | 'line';
12
+ x: number;
13
+ y: number;
14
+ } | {
15
+ op: 'cubic';
16
+ c1x: number;
17
+ c1y: number;
18
+ c2x: number;
19
+ c2y: number;
20
+ x: number;
21
+ y: number;
22
+ } | {
23
+ op: 'close';
24
+ };
25
+ export declare function getMaskShapeSegments(shape: MaskShapeKey, rect: MaskRect, rotationDeg?: number): PathSegment[];
26
+ export declare function rotatedRectAABB(rect: MaskRect, rotationDeg: number): MaskRect;
27
+ export declare function maskShapeSegmentsToSvgPath(segments: PathSegment[]): string;
@@ -0,0 +1,171 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MASK_SHAPE_KEYS = void 0;
4
+ exports.getMaskShapeSegments = getMaskShapeSegments;
5
+ exports.rotatedRectAABB = rotatedRectAABB;
6
+ exports.maskShapeSegmentsToSvgPath = maskShapeSegmentsToSvgPath;
7
+ const rotation_math_1 = require("./rotation-math");
8
+ exports.MASK_SHAPE_KEYS = [
9
+ 'circle',
10
+ 'square',
11
+ 'rounded',
12
+ 'triangle',
13
+ 'diamond',
14
+ 'parallelogram',
15
+ 'star',
16
+ 'heart',
17
+ 'cloud',
18
+ ];
19
+ const K = 0.5522847498;
20
+ function polygon(points) {
21
+ const [first, ...rest] = points;
22
+ return [
23
+ { op: 'move', x: first[0], y: first[1] },
24
+ ...rest.map(([x, y]) => ({ op: 'line', x, y })),
25
+ { op: 'close' },
26
+ ];
27
+ }
28
+ function ellipse(cx, cy, rx, ry) {
29
+ return [
30
+ { op: 'move', x: cx + rx, y: cy },
31
+ { op: 'cubic', c1x: cx + rx, c1y: cy + K * ry, c2x: cx + K * rx, c2y: cy + ry, x: cx, y: cy + ry },
32
+ { op: 'cubic', c1x: cx - K * rx, c1y: cy + ry, c2x: cx - rx, c2y: cy + K * ry, x: cx - rx, y: cy },
33
+ { op: 'cubic', c1x: cx - rx, c1y: cy - K * ry, c2x: cx - K * rx, c2y: cy - ry, x: cx, y: cy - ry },
34
+ { op: 'cubic', c1x: cx + K * rx, c1y: cy - ry, c2x: cx + rx, c2y: cy - K * ry, x: cx + rx, y: cy },
35
+ { op: 'close' },
36
+ ];
37
+ }
38
+ function roundedRect(x, y, w, h, r) {
39
+ const x2 = x + w;
40
+ const y2 = y + h;
41
+ return [
42
+ { op: 'move', x: x + r, y },
43
+ { op: 'line', x: x2 - r, y },
44
+ { op: 'cubic', c1x: x2 - r + K * r, c1y: y, c2x: x2, c2y: y + r - K * r, x: x2, y: y + r },
45
+ { op: 'line', x: x2, y: y2 - r },
46
+ { op: 'cubic', c1x: x2, c1y: y2 - r + K * r, c2x: x2 - r + K * r, c2y: y2, x: x2 - r, y: y2 },
47
+ { op: 'line', x: x + r, y: y2 },
48
+ { op: 'cubic', c1x: x + r - K * r, c1y: y2, c2x: x, c2y: y2 - r + K * r, x, y: y2 - r },
49
+ { op: 'line', x, y: y + r },
50
+ { op: 'cubic', c1x: x, c1y: y + r - K * r, c2x: x + r - K * r, c2y: y, x: x + r, y },
51
+ { op: 'close' },
52
+ ];
53
+ }
54
+ const UNIT_SEGMENTS = {
55
+ circle: ellipse(50, 50, 49, 49),
56
+ square: polygon([
57
+ [1, 1],
58
+ [99, 1],
59
+ [99, 99],
60
+ [1, 99],
61
+ ]),
62
+ rounded: roundedRect(1, 1, 98, 98, 16),
63
+ triangle: polygon([
64
+ [50, 3],
65
+ [97, 96],
66
+ [3, 96],
67
+ ]),
68
+ diamond: polygon([
69
+ [50, 2],
70
+ [98, 50],
71
+ [50, 98],
72
+ [2, 50],
73
+ ]),
74
+ parallelogram: polygon([
75
+ [27, 12],
76
+ [98, 12],
77
+ [73, 88],
78
+ [2, 88],
79
+ ]),
80
+ star: polygon([
81
+ [50, 3],
82
+ [61, 37],
83
+ [97, 37],
84
+ [68, 59],
85
+ [79, 95],
86
+ [50, 73],
87
+ [21, 95],
88
+ [32, 59],
89
+ [3, 37],
90
+ [39, 37],
91
+ ]),
92
+ heart: [
93
+ { op: 'move', x: 50, y: 90 },
94
+ { op: 'cubic', c1x: 6, c1y: 58, c2x: 10, c2y: 20, x: 32, y: 18 },
95
+ { op: 'cubic', c1x: 44, c1y: 17, c2x: 50, c2y: 27, x: 50, y: 34 },
96
+ { op: 'cubic', c1x: 50, c1y: 27, c2x: 56, c2y: 17, x: 68, y: 18 },
97
+ { op: 'cubic', c1x: 90, c1y: 20, c2x: 94, c2y: 58, x: 50, y: 90 },
98
+ { op: 'close' },
99
+ ],
100
+ cloud: [
101
+ { op: 'move', x: 30, y: 80 },
102
+ { op: 'cubic', c1x: 13, c1y: 80, c2x: 6, c2y: 66, x: 16, y: 56 },
103
+ { op: 'cubic', c1x: 11, c1y: 42, c2x: 27, c2y: 34, x: 37, y: 42 },
104
+ { op: 'cubic', c1x: 41, c1y: 24, c2x: 66, c2y: 24, x: 70, y: 42 },
105
+ { op: 'cubic', c1x: 86, c1y: 38, c2x: 96, c2y: 56, x: 84, y: 68 },
106
+ { op: 'cubic', c1x: 92, c1y: 78, c2x: 82, c2y: 88, x: 70, y: 84 },
107
+ { op: 'close' },
108
+ ],
109
+ };
110
+ function getMaskShapeSegments(shape, rect, rotationDeg = 0) {
111
+ const unit = UNIT_SEGMENTS[shape];
112
+ if (!unit) {
113
+ throw new Error(`Unknown mask shape: ${shape}`);
114
+ }
115
+ const sx = rect.width / 100;
116
+ const sy = rect.height / 100;
117
+ const tx = (x) => rect.x + x * sx;
118
+ const ty = (y) => rect.y + y * sy;
119
+ const cx = rect.x + rect.width * 0.5;
120
+ const cy = rect.y + rect.height * 0.5;
121
+ const rotate = (x, y) => rotationDeg ? (0, rotation_math_1.rotatePoint)({ x, y }, rotationDeg, { x: cx, y: cy }) : { x, y };
122
+ return unit.map((s) => {
123
+ if (s.op === 'close') {
124
+ return { op: 'close' };
125
+ }
126
+ if (s.op === 'cubic') {
127
+ const c1 = rotate(tx(s.c1x), ty(s.c1y));
128
+ const c2 = rotate(tx(s.c2x), ty(s.c2y));
129
+ const p = rotate(tx(s.x), ty(s.y));
130
+ return { op: 'cubic', c1x: c1.x, c1y: c1.y, c2x: c2.x, c2y: c2.y, x: p.x, y: p.y };
131
+ }
132
+ const p = rotate(tx(s.x), ty(s.y));
133
+ return { op: s.op, x: p.x, y: p.y };
134
+ });
135
+ }
136
+ function rotatedRectAABB(rect, rotationDeg) {
137
+ if (!rotationDeg) {
138
+ return Object.assign({}, rect);
139
+ }
140
+ const cx = rect.x + rect.width * 0.5;
141
+ const cy = rect.y + rect.height * 0.5;
142
+ const corners = [
143
+ { x: rect.x, y: rect.y },
144
+ { x: rect.x + rect.width, y: rect.y },
145
+ { x: rect.x + rect.width, y: rect.y + rect.height },
146
+ { x: rect.x, y: rect.y + rect.height },
147
+ ].map((p) => (0, rotation_math_1.rotatePoint)(p, rotationDeg, { x: cx, y: cy }));
148
+ const xs = corners.map((p) => p.x);
149
+ const ys = corners.map((p) => p.y);
150
+ const minX = Math.min(...xs);
151
+ const maxX = Math.max(...xs);
152
+ const minY = Math.min(...ys);
153
+ const maxY = Math.max(...ys);
154
+ return { x: minX, y: minY, width: maxX - minX, height: maxY - minY };
155
+ }
156
+ function maskShapeSegmentsToSvgPath(segments) {
157
+ return segments
158
+ .map((segment) => {
159
+ if (segment.op === 'move') {
160
+ return `M ${segment.x} ${segment.y}`;
161
+ }
162
+ if (segment.op === 'line') {
163
+ return `L ${segment.x} ${segment.y}`;
164
+ }
165
+ if (segment.op === 'cubic') {
166
+ return `C ${segment.c1x} ${segment.c1y} ${segment.c2x} ${segment.c2y} ${segment.x} ${segment.y}`;
167
+ }
168
+ return 'Z';
169
+ })
170
+ .join(' ');
171
+ }
@@ -0,0 +1,2 @@
1
+ import { PositionDefinition } from '../../types';
2
+ export declare function rotatePoint(point: PositionDefinition, angleDeg: number, pivot?: PositionDefinition): PositionDefinition;
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.rotatePoint = rotatePoint;
4
+ function rotatePoint(point, angleDeg, pivot = { x: 0, y: 0 }) {
5
+ const theta = (angleDeg * Math.PI) / 180;
6
+ const cos = Math.cos(theta);
7
+ const sin = Math.sin(theta);
8
+ const dx = point.x - pivot.x;
9
+ const dy = point.y - pivot.y;
10
+ return {
11
+ x: dx * cos - dy * sin + pivot.x,
12
+ y: dx * sin + dy * cos + pivot.y,
13
+ };
14
+ }
@@ -0,0 +1,23 @@
1
+ import { CropDefinition, DocumentElement, MaskDefinition, SizeDefinition } from '../../types';
2
+ import { MaskRect, MaskShapeKey } from './mask-shape-geometry';
3
+ export type MaskCropDefinition = CropDefinition & Required<Pick<CropDefinition, 'x1Percent' | 'y1Percent' | 'widthPercent' | 'heightPercent'>>;
4
+ export type ShapeMaskedElement = DocumentElement & {
5
+ maskDefinition: MaskDefinition & {
6
+ shape: MaskShapeKey;
7
+ };
8
+ cropDefinition: MaskCropDefinition;
9
+ };
10
+ export declare function hasShapeMask(element: DocumentElement): element is ShapeMaskedElement;
11
+ export declare function getShapeMaskKey(element: DocumentElement): MaskShapeKey | null;
12
+ export declare function getShapeMaskRotation(element: DocumentElement): number;
13
+ export declare function normalizeMaskRotation(rotation: number): number;
14
+ export declare function isShapeMaskable(element: DocumentElement): boolean;
15
+ export declare function getDefaultShapeMaskCrop(size: SizeDefinition): CropDefinition;
16
+ export declare function cropDefinitionToMaskRect(crop: CropDefinition, size: SizeDefinition): MaskRect;
17
+ export declare function maskRectToCropDefinition(rect: MaskRect, size: SizeDefinition): CropDefinition;
18
+ export declare const SHAPE_MASK_CLEAR_FIELDS: {
19
+ readonly maskDefinition: any;
20
+ readonly cropDefinition: any;
21
+ readonly imageSize: any;
22
+ readonly imagePosition: any;
23
+ };
@@ -0,0 +1,70 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.SHAPE_MASK_CLEAR_FIELDS = void 0;
4
+ exports.hasShapeMask = hasShapeMask;
5
+ exports.getShapeMaskKey = getShapeMaskKey;
6
+ exports.getShapeMaskRotation = getShapeMaskRotation;
7
+ exports.normalizeMaskRotation = normalizeMaskRotation;
8
+ exports.isShapeMaskable = isShapeMaskable;
9
+ exports.getDefaultShapeMaskCrop = getDefaultShapeMaskCrop;
10
+ exports.cropDefinitionToMaskRect = cropDefinitionToMaskRect;
11
+ exports.maskRectToCropDefinition = maskRectToCropDefinition;
12
+ const mask_shape_geometry_1 = require("./mask-shape-geometry");
13
+ const DEFAULT_MASK_FRACTION = 0.72;
14
+ function hasShapeMask(element) {
15
+ var _a;
16
+ const shape = (_a = element === null || element === void 0 ? void 0 : element.maskDefinition) === null || _a === void 0 ? void 0 : _a.shape;
17
+ if (!shape || !mask_shape_geometry_1.MASK_SHAPE_KEYS.includes(shape)) {
18
+ return false;
19
+ }
20
+ const crop = element === null || element === void 0 ? void 0 : element.cropDefinition;
21
+ return (Number.isFinite(crop === null || crop === void 0 ? void 0 : crop.x1Percent) &&
22
+ Number.isFinite(crop === null || crop === void 0 ? void 0 : crop.y1Percent) &&
23
+ crop.widthPercent > 0 &&
24
+ crop.heightPercent > 0);
25
+ }
26
+ function getShapeMaskKey(element) {
27
+ var _a, _b;
28
+ return (_b = (_a = element === null || element === void 0 ? void 0 : element.maskDefinition) === null || _a === void 0 ? void 0 : _a.shape) !== null && _b !== void 0 ? _b : null;
29
+ }
30
+ function getShapeMaskRotation(element) {
31
+ var _a, _b;
32
+ return (_b = (_a = element === null || element === void 0 ? void 0 : element.maskDefinition) === null || _a === void 0 ? void 0 : _a.rotation) !== null && _b !== void 0 ? _b : 0;
33
+ }
34
+ function normalizeMaskRotation(rotation) {
35
+ return ((rotation % 360) + 360) % 360;
36
+ }
37
+ function isShapeMaskable(element) {
38
+ return (element === null || element === void 0 ? void 0 : element.type) === 'image';
39
+ }
40
+ function getDefaultShapeMaskCrop(size) {
41
+ const side = Math.min(size.width, size.height) * DEFAULT_MASK_FRACTION;
42
+ return {
43
+ x1Percent: ((size.width - side) * 0.5) / size.width,
44
+ y1Percent: ((size.height - side) * 0.5) / size.height,
45
+ widthPercent: side / size.width,
46
+ heightPercent: side / size.height,
47
+ };
48
+ }
49
+ function cropDefinitionToMaskRect(crop, size) {
50
+ return {
51
+ x: crop.x1Percent * size.width,
52
+ y: crop.y1Percent * size.height,
53
+ width: crop.widthPercent * size.width,
54
+ height: crop.heightPercent * size.height,
55
+ };
56
+ }
57
+ function maskRectToCropDefinition(rect, size) {
58
+ return {
59
+ x1Percent: rect.x / size.width,
60
+ y1Percent: rect.y / size.height,
61
+ widthPercent: rect.width / size.width,
62
+ heightPercent: rect.height / size.height,
63
+ };
64
+ }
65
+ exports.SHAPE_MASK_CLEAR_FIELDS = {
66
+ maskDefinition: null,
67
+ cropDefinition: null,
68
+ imageSize: null,
69
+ imagePosition: null,
70
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contrail/documents",
3
- "version": "2.1.0-alpha.eaedb29",
3
+ "version": "2.2.0-alpha.4e7a026",
4
4
  "description": "Documents library for contrail platform",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
22
22
  "tslint": "^5.11.0",
23
23
  "tslint-config-prettier": "^1.18.0",
24
24
  "typescript": "^5.8.3",
25
- "@contrail/telemetry": "^2.0.0"
25
+ "@contrail/telemetry": "^3.0.0"
26
26
  },
27
27
  "jest": {
28
28
  "moduleFileExtensions": [
@@ -39,14 +39,17 @@
39
39
  "testEnvironment": "node"
40
40
  },
41
41
  "dependencies": {
42
- "@contrail/actions": "^1.0.18",
43
- "@contrail/document-table": "^1.2.3",
44
- "@contrail/document-util": "^1.2.0",
45
- "@contrail/types": "^3.4.0",
42
+ "@contrail/actions": "^2.0.0",
43
+ "@contrail/document-table": "^2.0.0",
44
+ "@contrail/document-util": "^2.0.0",
45
+ "@contrail/types": "^4.0.0",
46
46
  "fractional-indexing": "^2.1.0",
47
47
  "reflect-metadata": "^0.1.13"
48
48
  },
49
49
  "peerDependencies": {
50
- "@contrail/telemetry": "^2.0.0"
50
+ "@contrail/telemetry": "^3.0.0"
51
+ },
52
+ "engines": {
53
+ "node": ">=24"
51
54
  }
52
55
  }
@@ -1,10 +0,0 @@
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[];
@@ -1,7 +0,0 @@
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];
@@ -1,24 +0,0 @@
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
- }
@@ -1,63 +0,0 @@
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;
@@ -1,22 +0,0 @@
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[];
@@ -1,38 +0,0 @@
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
- }
@@ -1,14 +0,0 @@
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
- }
@@ -1,145 +0,0 @@
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;