@contrail/documents 2.4.0-alpha.86639ad → 2.4.0-alpha.9ac43de

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

@@ -3,7 +3,7 @@ export type ContainerElementType = typeof FRAME_ELEMENT_TYPE | typeof SECTION_EL
 export interface ContainerKind {
     elementType: ContainerElementType;
     nests: boolean;
-    layer: number;
+    canBeContentOf: readonly ContainerElementType[];
 }
 export declare const SECTION_KIND: ContainerKind;
 export declare const FRAME_KIND: ContainerKind;

package/lib/containers/container-kind.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONTAINER_KINDS = exports.FRAME_KIND = exports.SECTION_KIND = void 0;
 const document_element_constants_1 = require("../document-element-constants");
-exports.SECTION_KIND = { elementType: document_element_constants_1.SECTION_ELEMENT_TYPE, nests: true, layer: 0 };
-exports.FRAME_KIND = { elementType: document_element_constants_1.FRAME_ELEMENT_TYPE, nests: false, layer: 1 };
+exports.SECTION_KIND = {
+    elementType: document_element_constants_1.SECTION_ELEMENT_TYPE,
+    nests: true,
+    canBeContentOf: [document_element_constants_1.SECTION_ELEMENT_TYPE],
+};
+exports.FRAME_KIND = {
+    elementType: document_element_constants_1.FRAME_ELEMENT_TYPE,
+    nests: false,
+    canBeContentOf: [document_element_constants_1.SECTION_ELEMENT_TYPE],
+};
 exports.CONTAINER_KINDS = [exports.SECTION_KIND, exports.FRAME_KIND];

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

@@ -17,7 +17,6 @@ export declare class DocumentContainerIndex {
     memberIdsOf(containerId: string): readonly string[];
     memberDocumentElementsOf(containerId: string): DocumentElement[];
     containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
-    maxDepth(elementType: ContainerElementType): number;
     private containersOfType;
     private resolveAll;
     private containerPath;

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

@@ -42,9 +42,6 @@ class DocumentContainerIndex {
         const path = nests ? document_container_1.DocumentContainerUtil.chain(covering) : document_container_1.DocumentContainerUtil.topmost(covering);
         return path.map((container) => container.id);
     }
-    maxDepth(elementType) {
-        return this.containersOfType(elementType).reduce((max, container) => Math.max(max, container.depth + 1), 0);
-    }
     containersOfType(elementType) {
         var _a;
         return this.resolveAll((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : []);

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

@@ -3,10 +3,8 @@ import { ContainerKind } from './container-kind';
 export interface DocumentContainer {
     id: string;
     kind: ContainerKind;
-    name: string;
     documentElement: DocumentElement;
     box: CoordinateBox;
-    depth: number;
     drawOrder: number;
 }
 export interface MeasuredDocumentElement {
@@ -22,7 +20,6 @@ export declare class DocumentContainerUtil {
     static anchorFor(documentElement: DocumentElement, position?: PositionDefinition, startElement?: DocumentElement, endElement?: DocumentElement): PositionDefinition;
     static containsPoint(box: CoordinateBox, point: PositionDefinition): boolean;
     static encloses(outer: CoordinateBox, inner: CoordinateBox): boolean;
-    static isWiderAndTallerThan(box: CoordinateBox, other: CoordinateBox): boolean;
     static chain(candidates: DocumentContainer[]): DocumentContainer[];
     static topmost(containers: DocumentContainer[]): DocumentContainer[];
 }

package/lib/containers/document-container.js

@@ -58,24 +58,19 @@ class DocumentContainerUtil {
             outer.bottom === inner.bottom;
         return covers && !identical;
     }
-    static isWiderAndTallerThan(box, other) {
-        return box.width > other.width && box.height > other.height;
-    }
     static chain(candidates) {
         if (!candidates.length) {
             return [];
         }
-        const innermostOf = (of) => of
-            .filter((container) => !of.some((other) => other !== container && this.encloses(container.box, other.box)))
-            .reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
-        const path = [innermostOf(candidates)];
+        const topmostOf = (of) => of.reduce((topmost, container) => (container.drawOrder > topmost.drawOrder ? container : topmost));
+        const path = [topmostOf(candidates)];
         for (;;) {
             const current = path[0];
             const enclosing = candidates.filter((container) => !path.includes(container) && this.encloses(container.box, current.box));
             if (!enclosing.length) {
                 return path;
             }
-            path.unshift(innermostOf(enclosing));
+            path.unshift(topmostOf(enclosing));
         }
     }
     static topmost(containers) {

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

@@ -2,17 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContainerService = void 0;
 const document_element_factory_1 = require("../document-element-factory");
-const dynamic_text_util_1 = require("../util/dynamic-text/dynamic-text-util");
-const document_element_constants_1 = require("../document-element-constants");
 const container_kind_1 = require("./container-kind");
 const document_container_index_1 = require("./document-container-index");
 const document_container_1 = require("./document-container");
 class DocumentContainerService {
     static buildIndex(documentElements, kinds = container_kind_1.CONTAINER_KINDS) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const measuredDocumentElements = this.measureDocumentElements(documentElements !== null && documentElements !== void 0 ? documentElements : []);
-        const kindsByLayer = [...kinds].sort((first, second) => second.layer - first.layer);
-        const containersByElementType = new Map(kindsByLayer.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
+        const containersByElementType = new Map(kinds.map((kind) => [kind.elementType, this.collectContainers(measuredDocumentElements, kind)]));
         const containersById = new Map();
         const containerIdsByElementType = new Map();
         containersByElementType.forEach((containers, elementType) => {
@@ -22,17 +19,11 @@ class DocumentContainerService {
         const pathsByMeasured = new Map();
         for (const measured of measuredDocumentElements) {
             const byElementType = new Map();
-            for (const kind of kindsByLayer) {
+            for (const kind of kinds) {
                 byElementType.set(kind.elementType, this.resolvePath(measured, kind, (_a = containersByElementType.get(kind.elementType)) !== null && _a !== void 0 ? _a : []));
             }
             pathsByMeasured.set(measured, byElementType);
         }
-        for (const measured of measuredDocumentElements) {
-            const container = containersById.get(measured.documentElement.id);
-            if (container && container.documentElement === measured.documentElement) {
-                container.depth = ((_c = (_b = pathsByMeasured.get(measured)) === null || _b === void 0 ? void 0 : _b.get(container.kind.elementType)) !== null && _c !== void 0 ? _c : []).length;
-            }
-        }
         const measuredById = new Map();
         for (const measured of measuredDocumentElements) {
             if (!measuredById.has(measured.documentElement.id)) {
@@ -44,7 +35,7 @@ class DocumentContainerService {
         for (const measured of measuredDocumentElements) {
             const documentElementId = measured.documentElement.id;
             const pathsByElementType = new Map();
-            ((_d = pathsByMeasured.get(measured)) !== null && _d !== void 0 ? _d : new Map()).forEach((path, elementType) => pathsByElementType.set(elementType, path.map((container) => container.id)));
+            ((_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 members = memberIdsByContainerId.get(containerId);
@@ -98,10 +89,8 @@ class DocumentContainerService {
             .map((measured) => ({
             id: measured.documentElement.id,
             kind,
-            name: measured.documentElement.name,
             documentElement: measured.documentElement,
             box: measured.box,
-            depth: 0,
             drawOrder: measured.drawOrder,
         }));
     }
@@ -114,7 +103,7 @@ class DocumentContainerService {
             if (ownKind.elementType === kind.elementType) {
                 return kind.nests ? document_container_1.DocumentContainerUtil.chain(this.enclosersOf(measured, containers)) : [];
             }
-            if (kind.layer > ownKind.layer) {
+            if (!ownKind.canBeContentOf.includes(kind.elementType)) {
                 return [];
             }
         }
@@ -132,8 +121,6 @@ class DocumentContainerService {
     }
     static candidateContainers(measured, containers) {
         const anchor = document_container_1.DocumentContainerUtil.anchorOf(measured.documentElement, measured.box);
-        const isShape = document_element_constants_1.SHAPE_ELEMENT_TYPES.includes(measured.documentElement.type) &&
-            !dynamic_text_util_1.DynamicTextUtil.isDynamicText(measured.documentElement);
         return containers.filter((container) => {
             var _a;
             if (container.documentElement === measured.documentElement || measured.drawOrder <= container.drawOrder) {
@@ -142,7 +129,7 @@ class DocumentContainerService {
             if (!document_container_1.DocumentContainerUtil.containsPoint(container.box, anchor)) {
                 return false;
             }
-            if (isShape && document_container_1.DocumentContainerUtil.isWiderAndTallerThan(measured.box, container.box)) {
+            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));

package/package.json

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