@contrail/documents 1.1.10 → 1.1.11

package/lib/document-element-sort-order.service.d.ts

@@ -11,7 +11,7 @@ export declare class DocumentElementSortOrderService {
     private static removeSortIdsFromSortOrder;
     static updateSortOrder(sortOrder: string[], { sortIds, targetSortIndex, addAfterElementId }: SortOrderChange): string[];
     static updateSortOrderByArray(sortOrder: string[], sorts: SortOrderChange[]): string[];
-    private static sortDocumentElementsBySortChange;
-    private static sortDocumentElementsByArray;
     static sortDocumentElements(elements: DocumentElement[], sorts?: SortOrderChange[], sort?: SortOrderChange): DocumentElement[];
+    private static addFrameMembersToSortArray;
+    private static addFrameMembersToSort;
 }

package/lib/document-element-sort-order.service.js

@@ -58,24 +58,6 @@ class DocumentElementSortOrderService {
         }
         return sortOrder;
     }
-    static sortDocumentElementsBySortChange(elements, sort) {
-        if (!(elements === null || elements === void 0 ? void 0 : elements.length))
-            return;
-        const newSortOrder = this.updateSortOrder(elements.map((element) => element.id), sort);
-    }
-    static sortDocumentElementsByArray(elements, sorts) {
-        if (!(elements === null || elements === void 0 ? void 0 : elements.length) || !(sorts === null || sorts === void 0 ? void 0 : sorts.length))
-            return elements;
-        const newSortOrder = this.updateSortOrderByArray(elements.map((element) => element.id), sorts);
-        const newSortOrderIndexMap = new Map(newSortOrder.map((id, index) => [id, index]));
-        const lastIndex = elements.length;
-        return elements.sort((a, b) => {
-            var _a, _b;
-            const aIdx = (_a = newSortOrderIndexMap.get(a.id)) !== null && _a !== void 0 ? _a : lastIndex;
-            const bIdx = (_b = newSortOrderIndexMap.get(b.id)) !== null && _b !== void 0 ? _b : lastIndex;
-            return aIdx - bIdx;
-        });
-    }
     static sortDocumentElements(elements, sorts, sort) {
         if (!(elements === null || elements === void 0 ? void 0 : elements.length) || (!(sorts === null || sorts === void 0 ? void 0 : sorts.length) && !sort))
             return elements;
@@ -95,5 +77,32 @@ class DocumentElementSortOrderService {
             return aIdx - bIdx;
         });
     }
+    static addFrameMembersToSortArray(elements, frames, sorts) {
+        for (const sort of sorts) {
+            sort.sortIds = this.addFrameMembersToSort(elements, frames, sort);
+        }
+        return sorts;
+    }
+    static addFrameMembersToSort(elements, frames, sort) {
+        var _a;
+        const sortIds = sort.sortIds;
+        if ((elements === null || elements === void 0 ? void 0 : elements.length) > 0 && (frames === null || frames === void 0 ? void 0 : frames.size) > 0) {
+            const elementsMap = new Map(elements.map((element) => [element.id, element]));
+            if (sort.targetSortIndex != null || sort.addAfterElementId != null) {
+                const frameIds = sortIds.filter((id) => { var _a; return ((_a = elementsMap.get(id)) === null || _a === void 0 ? void 0 : _a.type) === 'frame'; });
+                if ((frameIds === null || frameIds === void 0 ? void 0 : frameIds.length) > 0) {
+                    for (const frameId of frameIds) {
+                        const frame = frames.get(frameId);
+                        const frameMemberIds = (_a = frame === null || frame === void 0 ? void 0 : frame.elements) === null || _a === void 0 ? void 0 : _a.map((e) => e.id);
+                        if (frame && (frameMemberIds === null || frameMemberIds === void 0 ? void 0 : frameMemberIds.length) > 0) {
+                            this.removeSortIdsFromSortOrder(sortIds, frameMemberIds);
+                            sortIds.splice(sortIds.indexOf(frameId) + 1, 0, ...frameMemberIds);
+                        }
+                    }
+                }
+            }
+        }
+        return sortIds;
+    }
 }
 exports.DocumentElementSortOrderService = DocumentElementSortOrderService;

package/package.json

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