@contrail/documents 2.4.0-alpha.a4d67e4 → 2.4.0-alpha.a5c4d62

package/lib/containers/document-container.js

@@ -44,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]);
                     }
                 }
             }
@@ -106,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));
@@ -116,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;

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}`;

package/package.json

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