@contrail/documents 2.1.0-alpha.afeb3fa → 2.1.0-alpha.c922865

package/CHANGELOG.md

@@ -20,6 +20,11 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - `SECTION_ELEMENT_TYPE`, `FRAME_ELEMENT_TYPE` and `SHAPE_ELEMENT_TYPES` in
   `document-element-constants`, so the rule above has one definition rather than one per app.
 
+### Fixed
+
+- `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on
+  the server failed the read for the whole document. It now measures from a zero size instead.
+
 ### Changed
 
 - `DocumentElementFactory.getBoundingClientRect` multiplies the measured size by the element's

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

@@ -1,9 +1,10 @@
-import { PositionDefinition } from '../types';
+import { DocumentElement, PositionDefinition } from '../types';
 import { ContainerElementType } from './container-kind';
 import { DocumentContainer } from './document-container';
 export declare class DocumentContainerIndex {
     private readonly data;
     constructor(data: {
+        documentElementsById: Map<string, DocumentElement>;
         containersById: Map<string, DocumentContainer>;
         containerPathsByDocumentElementId: Map<string, Map<string, string[]>>;
         memberIdsByContainerId: Map<string, string[]>;
@@ -14,6 +15,7 @@ export declare class DocumentContainerIndex {
     containerIdsOf(documentElementId: string, elementType: ContainerElementType): string[];
     innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
     memberIdsOf(containerId: string): string[];
+    memberDocumentElementsOf(containerId: string): DocumentElement[];
     containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): string[];
     maxDepth(elementType: ContainerElementType): number;
     private containersOfType;

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

@@ -26,6 +26,11 @@ class DocumentContainerIndex {
         var _a;
         return (_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [];
     }
+    memberDocumentElementsOf(containerId) {
+        return this.memberIdsOf(containerId)
+            .map((memberId) => this.data.documentElementsById.get(memberId))
+            .filter(Boolean);
+    }
     containerPathAtPoint(point, elementType) {
         const covering = this.containersOfType(elementType).filter((container) => (0, document_container_1.containsPoint)(container.box, point));
         return (0, document_container_1.topmostPerDepth)(covering).map((container) => container.id);

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

@@ -37,6 +37,7 @@ class DocumentContainerService {
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
         return new document_container_index_1.DocumentContainerIndex({
+            documentElementsById: new Map(measuredDocumentElements.map((measured) => [measured.documentElement.id, measured.documentElement])),
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,

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

@@ -150,12 +150,12 @@ class DynamicTextUtil {
         return text;
     }
     static calculateSize(dynamicTextElement, entityType, text) {
-        var _a, _b, _c, _d;
-        let size = dynamicTextElement.size;
-        const fontFamily = (_a = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _a !== void 0 ? _a : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
-        const fontSize = (_d = (dynamicTextElement.isTextTool
-            ? (_c = (_b = dynamicTextElement.style) === null || _b === void 0 ? void 0 : _b.font) === null || _c === void 0 ? void 0 : _c.size
-            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _d !== void 0 ? _d : document_util_1.DEFAULT_TEXT_FONT_SIZE;
+        var _a, _b, _c, _d, _e;
+        let size = (_a = dynamicTextElement.size) !== null && _a !== void 0 ? _a : { width: 0, height: 0 };
+        const fontFamily = (_b = document_util_1.DocumentStyleUtil.getFirstFontFamily(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text)) !== null && _b !== void 0 ? _b : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
+        const fontSize = (_e = (dynamicTextElement.isTextTool
+            ? (_d = (_c = dynamicTextElement.style) === null || _c === void 0 ? void 0 : _c.font) === null || _d === void 0 ? void 0 : _d.size
+            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _e !== void 0 ? _e : document_util_1.DEFAULT_TEXT_FONT_SIZE;
         const fontSizePx = document_util_1.DocumentStyleUtil.toPx(fontSize, 4);
         const padding = dynamicTextElement.isTextTool ? document_util_1.TEXT_TOOL_PADDING : document_util_1.TEXT_BOX_PADDING;
         const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
@@ -169,7 +169,7 @@ class DynamicTextUtil {
             italic,
         };
         if (!dynamicTextElement.isTextTool) {
-            measureTextSettings.width = dynamicTextElement.size.width - padding * 2;
+            measureTextSettings.width = size.width - padding * 2;
         }
         try {
             const dimensions = document_util_1.DocumentTextUtil.measureText(text, measureTextSettings);

package/package.json

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