@contrail/documents 1.21.0-alpha.0c990fd → 1.21.0-alpha.11da477

package/lib/containers/document-container.js

@@ -24,12 +24,9 @@ class DocumentContainerUtil {
         var _a, _b, _c, _d, _e;
         const position = documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
         const angle = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.rotate) === null || _a === void 0 ? void 0 : _a.angle;
-        if (!position) {
+        if (!position || !angle || !newSize || !documentElement.size) {
             return position;
         }
-        if (!angle || !newSize || !documentElement.size) {
-            return Object.assign({}, position);
-        }
         const scaleX = (_c = (_b = documentElement.scale) === null || _b === void 0 ? void 0 : _b.x) !== null && _c !== void 0 ? _c : 1;
         const scaleY = (_e = (_d = documentElement.scale) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 1;
         const cornerOffset = (size) => {
@@ -39,8 +36,7 @@ class DocumentContainerUtil {
         };
         const before = cornerOffset(documentElement.size);
         const after = cornerOffset(newSize);
-        const moved = { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
-        return Number.isFinite(moved.x) && Number.isFinite(moved.y) ? moved : Object.assign({}, position);
+        return { x: position.x + before.x - after.x, y: position.y + before.y - after.y };
     }
     static resizeKeepingAnchor(dynamicTextElement, entityType, text) {
         const size = dynamic_text_util_1.DynamicTextUtil.calculateSize(dynamicTextElement, entityType, text);
@@ -48,8 +44,11 @@ class DocumentContainerUtil {
     }
     static anchorFor(documentElement, position, startElement, endElement) {
         const at = position !== null && position !== void 0 ? position : documentElement === null || documentElement === void 0 ? void 0 : documentElement.position;
+        if (!at) {
+            return null;
+        }
         try {
-            const measured = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(at ? Object.assign(Object.assign({}, documentElement), { position: at }) : documentElement, startElement, endElement);
+            const measured = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(Object.assign(Object.assign({}, documentElement), { position: at }), startElement, endElement);
             const box = DocumentContainerUtil.toCoordinateBox(measured.x, measured.y, measured.width, measured.height);
             return DocumentContainerUtil.anchorOf(documentElement, box);
         }

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

@@ -32,21 +32,18 @@ class DocumentContainerService {
         }
         const containerPathsByDocumentElementId = new Map();
         const memberIdsByContainerId = new Map();
-        const memberIdsSeen = new Map();
         for (const measured of measuredDocumentElements) {
             const documentElementId = measured.documentElement.id;
             const pathsByElementType = new Map();
             ((_b = pathsByMeasured.get(measured)) !== null && _b !== void 0 ? _b : new Map()).forEach((path, elementType) => pathsByElementType.set(elementType, path.map((container) => container.id)));
             for (const path of pathsByElementType.values()) {
                 for (const containerId of path) {
-                    const seen = memberIdsSeen.get(containerId);
-                    if (!seen) {
-                        memberIdsSeen.set(containerId, new Set([documentElementId]));
-                        memberIdsByContainerId.set(containerId, [documentElementId]);
+                    const members = memberIdsByContainerId.get(containerId);
+                    if (members) {
+                        members.push(documentElementId);
                     }
-                    else if (!seen.has(documentElementId)) {
-                        seen.add(documentElementId);
-                        memberIdsByContainerId.get(containerId).push(documentElementId);
+                    else {
+                        memberIdsByContainerId.set(containerId, [documentElementId]);
                     }
                 }
             }
@@ -76,9 +73,6 @@ class DocumentContainerService {
             const start = ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.start) === null || _a === void 0 ? void 0 : _a.id) ? documentElementsById.get(documentElement.start.id) : undefined;
             const end = ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.end) === null || _b === void 0 ? void 0 : _b.id) ? documentElementsById.get(documentElement.end.id) : undefined;
             const { x, y, width, height } = document_element_factory_1.DocumentElementFactory.getBoundingClientRectScaled(documentElement, start, end);
-            if (!width && !height && !documentElement.position) {
-                return null;
-            }
             return document_container_1.DocumentContainerUtil.toCoordinateBox(x, y, width, height);
         }
         catch (_c) {
@@ -109,7 +103,7 @@ class DocumentContainerService {
     static enclosersOf(measured, containers) {
         return containers.filter((container) => {
             var _a;
-            return container.id !== measured.documentElement.id &&
+            return container.documentElement !== measured.documentElement &&
                 document_container_1.DocumentContainerUtil.encloses(container.box, measured.box) &&
                 measured.drawOrder > container.drawOrder &&
                 !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
@@ -119,7 +113,7 @@ class DocumentContainerService {
         const anchor = document_container_1.DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
         return containers.filter((container) => {
             var _a;
-            if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
+            if (container.documentElement === measured.documentElement || measured.drawOrder <= container.drawOrder) {
                 return false;
             }
             if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {

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

@@ -27,8 +27,6 @@ export declare enum DynamicTextDisplayFunction {
 export declare const MOVE_TO_FRAME_TEXT = "Move to a frame";
 export declare const MOVE_TO_SECTION_TEXT = "Move to a section";
 export declare const CLICK_TO_CONFIGURE = "Click to configure";
-export declare function placeholderForMissingContainer(entityType: string): string;
-export declare function isPlaceholderText(text: string): boolean;
 export declare const HARD_CODED_TEXT: {
     'project.name': string;
     'project.createdBy.email': string;
@@ -55,10 +53,7 @@ export declare class DynamicTextUtil {
     static isDynamicText(documentElement: DocumentElement): boolean;
     static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
     static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
-    static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): {
-        width: number;
-        height: number;
-    };
+    static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
     static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;
     private static getItemCount;
 }

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
-exports.placeholderForMissingContainer = placeholderForMissingContainer;
-exports.isPlaceholderText = isPlaceholderText;
 exports.isContainerBinding = isContainerBinding;
 const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
@@ -30,12 +28,6 @@ var DynamicTextDisplayFunction;
 exports.MOVE_TO_FRAME_TEXT = 'Move to a frame';
 exports.MOVE_TO_SECTION_TEXT = 'Move to a section';
 exports.CLICK_TO_CONFIGURE = 'Click to configure';
-function placeholderForMissingContainer(entityType) {
-    return entityType === DYNAMIC_TEXT_DATA_SOURCE.SECTION ? exports.MOVE_TO_SECTION_TEXT : exports.MOVE_TO_FRAME_TEXT;
-}
-function isPlaceholderText(text) {
-    return text === exports.MOVE_TO_FRAME_TEXT || text === exports.MOVE_TO_SECTION_TEXT || text === exports.CLICK_TO_CONFIGURE;
-}
 exports.HARD_CODED_TEXT = {
     'project.name': 'Project name',
     'project.createdBy.email': 'Project created by',
@@ -106,7 +98,7 @@ class DynamicTextUtil {
         }
         else {
             if (!container && !isSpecRelated) {
-                text = placeholderForMissingContainer(entityType);
+                text = entityType === DYNAMIC_TEXT_DATA_SOURCE.SECTION ? exports.MOVE_TO_SECTION_TEXT : exports.MOVE_TO_FRAME_TEXT;
             }
             else {
                 if (CONTAINER_SOURCES.includes(entityType)) {
@@ -149,7 +141,7 @@ class DynamicTextUtil {
                 text = exports.HARD_CODED_TEXT[bindingProperty] || (property === null || property === void 0 ? void 0 : property.label);
             }
             else if (!container) {
-                text = placeholderForMissingContainer(entityType);
+                text = exports.MOVE_TO_FRAME_TEXT;
             }
             else {
                 text = property === null || property === void 0 ? void 0 : property.label;
@@ -159,7 +151,7 @@ class DynamicTextUtil {
             text = 'n/a';
         }
         if (displayLabel &&
-            !isPlaceholderText(text) &&
+            ![exports.MOVE_TO_FRAME_TEXT, exports.CLICK_TO_CONFIGURE].includes(text) &&
             displayFunction !== DynamicTextDisplayFunction.LABEL &&
             text !== bindingProperty) {
             text = `${exports.HARD_CODED_TEXT[bindingProperty] || (property === null || property === void 0 ? void 0 : property.label) || ''}: ${text}`;
@@ -167,19 +159,16 @@ class DynamicTextUtil {
         return text;
     }
     static calculateSize(dynamicTextElement, entityType, text) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        let size = {
-            width: (_b = (_a = dynamicTextElement.size) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : 0,
-            height: (_d = (_c = dynamicTextElement.size) === null || _c === void 0 ? void 0 : _c.height) !== null && _d !== void 0 ? _d : 0,
-        };
-        const fontFamily = (_f = document_util_1.DocumentStyleUtil.getFirstFontFamily((_e = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _e !== void 0 ? _e : '')) !== null && _f !== void 0 ? _f : document_util_1.DEFAULT_TEXT_FONT_FAMILY;
-        const fontSize = (_j = (dynamicTextElement.isTextTool
-            ? (_h = (_g = dynamicTextElement.style) === null || _g === void 0 ? void 0 : _g.font) === null || _h === void 0 ? void 0 : _h.size
-            : document_util_1.DocumentStyleUtil.getFirstFontSize(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, true))) !== null && _j !== void 0 ? _j : 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((_k = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _k !== void 0 ? _k : '', fontFamily);
-        const italic = document_util_1.DocumentStyleUtil.isItalic((_l = dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text) !== null && _l !== void 0 ? _l : '');
+        const bold = document_util_1.DocumentStyleUtil.isBold(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text, fontFamily);
+        const italic = document_util_1.DocumentStyleUtil.isItalic(dynamicTextElement === null || dynamicTextElement === void 0 ? void 0 : dynamicTextElement.text);
         const measureTextSettings = {
             fontFamily,
             fontSize: fontSizePx,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "1.21.0-alpha.0c990fd",
+  "version": "1.21.0-alpha.11da477",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",