@contrail/documents 1.21.0-alpha.0c990fd → 1.21.0-alpha.1378239

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

@@ -1,10 +1,11 @@
-import { DocumentElement, PositionDefinition } from '../types';
-import { ContainerElementType } from './container-kind';
-import { DocumentContainer } from './document-container';
+import { DocumentElement } from '../types';
+import { ContainerElementType, ContainerKind } from './container-kind';
+import { DocumentContainer, MeasuredDocumentElement } from './document-container';
 export declare class DocumentContainerIndex {
     private readonly data;
     constructor(data: {
         documentElementsById: Map<string, DocumentElement>;
+        measuredById: Map<string, MeasuredDocumentElement>;
         containersById: Map<string, DocumentContainer>;
         containerPathsByDocumentElementId: Map<string, Map<string, string[]>>;
         memberIdsByContainerId: Map<string, string[]>;
@@ -17,7 +18,7 @@ export declare class DocumentContainerIndex {
     innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
     memberIdsOf(containerId: string): readonly string[];
     memberDocumentElementsOf(containerId: string): DocumentElement[];
-    containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
+    containerPathFor(documentElement: DocumentElement, kind: ContainerKind): readonly string[];
     private containersOfType;
     private resolveAll;
     private containerPath;

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

@@ -9,6 +9,7 @@ class DocumentContainerIndex {
     static empty() {
         return new DocumentContainerIndex({
             documentElementsById: new Map(),
+            measuredById: new Map(),
             containersById: new Map(),
             containerPathsByDocumentElementId: new Map(),
             memberIdsByContainerId: new Map(),
@@ -43,13 +44,17 @@ class DocumentContainerIndex {
         }
         return members;
     }
-    containerPathAtPoint(point, elementType) {
+    containerPathFor(documentElement, kind) {
         var _a, _b;
-        const containers = this.containersOfType(elementType);
-        const covering = containers.filter((container) => document_container_1.DocumentContainerUtil.containsPoint(container.box, point));
-        const nests = (_b = (_a = containers[0]) === null || _a === void 0 ? void 0 : _a.kind.nests) !== null && _b !== void 0 ? _b : true;
-        const path = nests ? document_container_1.DocumentContainerUtil.chain(covering) : document_container_1.DocumentContainerUtil.topmost(covering);
-        return path.map((container) => container.id);
+        if (!documentElement) {
+            return [];
+        }
+        const measured = {
+            documentElement,
+            box: document_container_1.DocumentContainerUtil.measureBox(documentElement, this.data.documentElementsById),
+            drawOrder: (_b = (_a = this.data.measuredById.get(documentElement.id)) === null || _a === void 0 ? void 0 : _a.drawOrder) !== null && _b !== void 0 ? _b : Number.MAX_SAFE_INTEGER,
+        };
+        return document_container_1.DocumentContainerUtil.pathFor(measured, kind, this.containersOfType(kind.elementType)).map((container) => container.id);
     }
     containersOfType(elementType) {
         var _a;

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

@@ -25,5 +25,9 @@ export declare class DocumentContainerUtil {
     static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
     static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
     static chain(candidates: DocumentContainer[]): DocumentContainer[];
+    static measureBox(documentElement: DocumentElement, documentElementsById: Map<string, DocumentElement>): CoordinateBox | null;
+    static pathFor(measured: MeasuredDocumentElement, kind: ContainerKind, containers: DocumentContainer[]): DocumentContainer[];
+    static enclosersOf(measured: MeasuredDocumentElement, containers: DocumentContainer[]): DocumentContainer[];
+    static candidatesFor(measured: MeasuredDocumentElement, containers: DocumentContainer[]): DocumentContainer[];
     static topmost(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -83,6 +83,56 @@ class DocumentContainerUtil {
             path.unshift(topmostOf(enclosing));
         }
     }
+    static measureBox(documentElement, documentElementsById) {
+        var _a, _b;
+        try {
+            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 DocumentContainerUtil.toCoordinateBox(x, y, width, height);
+        }
+        catch (_c) {
+            return null;
+        }
+    }
+    static pathFor(measured, kind, containers) {
+        if (!containers.length || !measured.box) {
+            return [];
+        }
+        if (measured.documentElement.type === kind.elementType) {
+            return kind.nests ? DocumentContainerUtil.chain(DocumentContainerUtil.enclosersOf(measured, containers)) : [];
+        }
+        const candidates = DocumentContainerUtil.candidatesFor(measured, containers);
+        return kind.nests ? DocumentContainerUtil.chain(candidates) : DocumentContainerUtil.topmost(candidates);
+    }
+    static enclosersOf(measured, containers) {
+        return containers.filter((container) => {
+            var _a;
+            return container.id !== measured.documentElement.id &&
+                DocumentContainerUtil.encloses(container.box, measured.box) &&
+                measured.drawOrder > container.drawOrder &&
+                !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
+        });
+    }
+    static candidatesFor(measured, containers) {
+        const anchor = DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
+        return containers.filter((container) => {
+            var _a;
+            if (container.id === measured.documentElement.id || measured.drawOrder <= container.drawOrder) {
+                return false;
+            }
+            if (!DocumentContainerUtil.containsPoint(container.box, anchor)) {
+                return false;
+            }
+            if (DocumentContainerUtil.encloses(measured.box, container.box)) {
+                return false;
+            }
+            return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
+        });
+    }
     static topmost(containers) {
         return containers.length
             ? [containers.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost))]

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

@@ -5,9 +5,5 @@ export declare class DocumentContainerService {
     static buildIndex(documentElements: readonly DocumentElement[], kinds?: ContainerKind[]): DocumentContainerIndex;
     static isContainer(documentElement: DocumentElement, kinds?: ContainerKind[]): boolean;
     private static measureDocumentElements;
-    private static measure;
     private static collectContainers;
-    private static resolvePath;
-    private static enclosersOf;
-    private static candidateContainers;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContainerService = void 0;
-const document_element_factory_1 = require("../document-element-factory");
 const container_kind_1 = require("./container-kind");
 const document_container_index_1 = require("./document-container-index");
 const document_container_1 = require("./document-container");
@@ -26,7 +25,7 @@ class DocumentContainerService {
         for (const measured of measuredDocumentElements) {
             const byElementType = new Map();
             for (const kind of kinds) {
-                byElementType.set(kind.elementType, this.resolvePath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
+                byElementType.set(kind.elementType, document_container_1.DocumentContainerUtil.pathFor(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
             }
             pathsByMeasured.set(measured, byElementType);
         }
@@ -52,8 +51,13 @@ class DocumentContainerService {
             }
             containerPathsByDocumentElementId.set(documentElementId, pathsByElementType);
         }
+        const measuredById = new Map();
+        for (const measured of measuredDocumentElements) {
+            measuredById.set(measured.documentElement.id, measured);
+        }
         return new document_container_index_1.DocumentContainerIndex({
             documentElementsById,
+            measuredById,
             containersById,
             containerPathsByDocumentElementId,
             memberIdsByContainerId,
@@ -67,24 +71,9 @@ class DocumentContainerService {
         return documentElements.map((documentElement, drawOrder) => ({
             documentElement,
             drawOrder,
-            box: this.measure(documentElement, documentElementsById),
+            box: document_container_1.DocumentContainerUtil.measureBox(documentElement, documentElementsById),
         }));
     }
-    static measure(documentElement, documentElementsById) {
-        var _a, _b;
-        try {
-            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) {
-            return null;
-        }
-    }
     static collectContainers(measuredDocumentElements, kind) {
         return measuredDocumentElements
             .filter((measured) => measured.documentElement.type === kind.elementType && measured.box)
@@ -96,40 +85,5 @@ class DocumentContainerService {
             drawOrder: measured.drawOrder,
         }));
     }
-    static resolvePath(measured, kind, containers) {
-        if (!containers.length || !measured.box) {
-            return [];
-        }
-        if (measured.documentElement.type === kind.elementType) {
-            return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
-        }
-        const candidates = this.candidateContainers(measured, containers);
-        return kind.nests ? document_container_1.DocumentContainerUtil.chain(candidates) : document_container_1.DocumentContainerUtil.topmost(candidates);
-    }
-    static enclosersOf(measured, containers) {
-        return containers.filter((container) => {
-            var _a;
-            return container.id !== measured.documentElement.id &&
-                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));
-        });
-    }
-    static candidateContainers(measured, containers) {
-        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) {
-                return false;
-            }
-            if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
-                return false;
-            }
-            if (document_container_1.DocumentContainerUtil.encloses(measured.box, container.box)) {
-                return false;
-            }
-            return !((_a = measured.documentElement.elementIds) === null || _a === void 0 ? void 0 : _a.includes(container.id));
-        });
-    }
 }
 exports.DocumentContainerService = DocumentContainerService;

package/package.json

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