publ-echo-test 0.0.114 → 0.0.116

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -37,7 +37,7 @@ import { bottom, cloneLayoutItem, compact, getAllCollisions, getBoundingArea, ge
 import { calcGridColWidth, calcXY, resolveRowHeight, } from "../GridItem/utils/calculateUtils";
 import GridItem from "../GridItem/GridItem";
 import isEqual from "../../external-lib/lodash.isEqual";
-import { findAllChildrenComponentIds, findChildrenComponentIds, findGroupBlocks, getBlockIdByComponentId, getBlockSpecificType, zIndexMap } from "./group";
+import { findAllChildrenCbIds, findDirectChildrenBlockIds, findGroupBlocks, formatBlockIdToCbId, getBlockSpecificType, zIndexMap } from "./group";
 import GroupItem from "../GridItem/GroupItem";
 import OutsideClickHandler from "../GridItem/OutsideClickHandler";
 var layoutClassName = "react-grid-layout";
@@ -57,8 +57,8 @@ var ReactGridLayout = function (_a) {
     var _6 = useState(), droppingDOMNode = _6[0], setDroppingDOMNode = _6[1];
     var _7 = useState(), droppingPosition = _7[0], setDroppingPosition = _7[1];
     var _8 = useState(false), isMounted = _8[0], setIsMounted = _8[1];
-    var editableItems = blockStructure ? findChildrenComponentIds(blockStructure, editingGroupBlock) : [];
-    var editingGroupAllChildren = (blockStructure && editingGroupBlock) ? findAllChildrenComponentIds(blockStructure, editingGroupBlock).map(function (i) { return i.toString(); }) : [];
+    var editableItems = blockStructure ? findDirectChildrenBlockIds(blockStructure, editingGroupBlock) : [];
+    var editingGroupAllChildren = (blockStructure && editingGroupBlock) ? findAllChildrenCbIds(blockStructure, editingGroupBlock).map(function (i) { return i.toString(); }) : [];
     var _9 = useState([]), oldGroupChildren = _9[0], setOldGroupChildren = _9[1];
     var _10 = useState(function () {
         return synchronizeLayoutWithChildren(props.layout || [], children, cols, compactType, allowOverlap);
@@ -147,7 +147,7 @@ var ReactGridLayout = function (_a) {
             if (!blockStructure) {
                 return;
             }
-            var childrenIds = findAllChildrenComponentIds(blockStructure, i).map(function (i) { return i.toString(); });
+            var childrenIds = findAllChildrenCbIds(blockStructure, i).map(function (i) { return i.toString(); });
             var children_1 = childrenIds.map(function (id) {
                 var item = getLayoutItem(layout, id);
                 return cloneLayoutItem(item);
@@ -174,7 +174,7 @@ var ReactGridLayout = function (_a) {
             if (!blockStructure) {
                 return;
             }
-            var children_2 = findChildrenComponentIds(blockStructure, i).map(function (id) {
+            var children_2 = findDirectChildrenBlockIds(blockStructure, i).map(function (id) {
                 var item = getLayoutItem(layout, id);
                 return cloneLayoutItem(item);
             });
@@ -515,7 +515,7 @@ var ReactGridLayout = function (_a) {
             var originalKey = String(child.key).split(".$");
             return originalKey[1] === l.i;
         });
-        var isInBulk = blockStructure && (bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(getBlockIdByComponentId(blockStructure, Number(activeDrag.i))));
+        var isInBulk = blockStructure && (bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(formatBlockIdToCbId(Number(activeDrag.i))));
         if (!item) {
             return null;
         }
@@ -544,7 +544,7 @@ var ReactGridLayout = function (_a) {
         var bounded = draggable && isBounded && l.isBounded !== false;
         var editable = editableItems.includes(l.i);
         var z = l.z || 0;
-        var isInBulk = blockStructure && (bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(getBlockIdByComponentId(blockStructure, Number(l.i))));
+        var isInBulk = blockStructure && (bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(formatBlockIdToCbId(Number(activeDrag === null || activeDrag === void 0 ? void 0 : activeDrag.i))));
         var isRoot = editingGroupBlock === 'ROOT';
         var baseZ = function () {
             if (isInBulk) {
@@ -639,7 +639,7 @@ var ReactGridLayout = function (_a) {
         if (!blockStructure) {
             return;
         }
-        var childrenIds = findAllChildrenComponentIds(blockStructure, block.blockId).map(function (i) { return i.toString(); });
+        var childrenIds = findAllChildrenCbIds(blockStructure, block.blockId).map(function (i) { return i.toString(); });
         var groupItem = getBoundingArea(layout, childrenIds);
         // const draggable =
         //   typeof l.isDraggable === "boolean"

package/dist/lib/GridLayoutEditor/group.d.ts

@@ -6,6 +6,7 @@ export declare const zIndexMap: {
     ROOT: number;
 };
 export declare function getBlockSpecificType(block: Block): "ROOT" | "BULK" | "COMPONENT_BLOCK" | "GROUP_BLOCK";
+export type SectionPedigree = RootBlock;
 export type Block = ComponentBlock | GroupBlock | RootBlock;
 export type ZOrder = {
     [platform in "mobile" | "desktop"]: {
@@ -40,21 +41,13 @@ export type BulkBlockInternal = {
     zOrderMobileInternal: number;
     children: (ComponentBlock | GroupBlock)[];
 };
-export declare const findBlockByBlockId: (blocks: Block[], blockId: string) => Block | null;
-export declare const findChildrenComponentIds: (blockStructure: Block[], targetId: string) => string[];
-export declare const findAllChildrenIds: (blockStructure: Block[], targetId: string, depth?: 'current' | 'deep') => string[];
-export declare const findAllChildrenComponentIds: (blockStructure: Block[], targetId: string) => number[];
-export declare const findAllParentGroups: (blockStructure: Block[], targetId: string) => GroupBlock[];
-export declare const findGroupBlocks: (blockStructure: Block[], targetId: string) => GroupBlock[];
-export declare const findAllComponentBlockIds: (blockStructure: Block[]) => number[];
-export declare const findParentGroupByGroupId: (blockStructure: Block[], targetId: string) => string | null;
-export declare const addBlockToRoot: (blockStructure: Block[], newBlock: Block) => Block[];
-export declare const addBulkToTarget: (blockStructure: Block[], targetId: string, bulkIds: string[]) => Block[];
-export declare const getBlockWorkDirPath: (blockStructure: Block[], blockId: string) => string | null;
-export declare const getBlockIdByComponentId: (blockStructure: Block[], componentId: number) => string | null;
-export declare const blockStructure: Block[];
-export declare const mapComponentBlockIdsToBlockIds: (blockStructure: Block[]) => {
-    CB_ID: Record<number, string>;
-    BLOCK_ID: Record<string, number>;
-};
-export declare const findAccessibleChildrenBlocks: (blockStructure: Block[], targetGroupId: string, blockIds: string[]) => string[];
+export declare const findBlockByBlockId: (block: Block, blockId: string) => Block | null;
+export declare const findDirectChildrenCbIds: (block: Block, targetId: string) => number[];
+export declare const findAllChildrenCbIds: (block: Block, targetId: string) => number[];
+export declare const findAllChildrenBlockIds: (block: Block, targetId: string) => string[];
+export declare const findDirectChildrenBlockIds: (block: Block, targetId: string) => string[];
+export declare const findGroupBlocks: (blockStructure: Block, targetId: string) => GroupBlock[];
+export declare const addBulkToTarget: (block: Block, targetId: string, bulkBlockIds: string[]) => Block;
+export declare const getBlockWorkDirPath: (block: Block, blockId: string) => string | null;
+export declare function formatBlockIdToCbId(cbId: number): string;
+export declare function formatCbIdToBlockId(cbId: number): string | null;

package/dist/lib/GridLayoutEditor/group.js

@@ -1,14 +1,3 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -35,14 +24,45 @@ export function getBlockSpecificType(block) {
     return block.type;
 }
 var deepClone = function (blocks) { return JSON.parse(JSON.stringify(blocks)); };
-export var findBlockByBlockId = function (blocks, blockId) {
-    for (var _i = 0, blocks_1 = blocks; _i < blocks_1.length; _i++) {
-        var block = blocks_1[_i];
-        if (block.blockId === blockId) {
-            return block;
+var collectChildrenCbIds = function (block, depth) {
+    var ids = [];
+    if ('children' in block && block.children) {
+        for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
+            var child = _a[_i];
+            if (child.type === 'COMPONENT_BLOCK') {
+                ids.push(child.componentBlockId);
+            }
+            if (depth === 'deep' && child.type === 'GROUP_BLOCK') {
+                ids = ids.concat(collectChildrenCbIds(child, depth));
+            }
+        }
+    }
+    return ids;
+};
+var collectChildrenBlockIds = function (block, depth) {
+    var ids = [];
+    if ('children' in block && block.children) {
+        for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
+            var child = _a[_i];
+            ids.push(child.blockId);
+            if (depth === 'deep') {
+                ids = ids.concat(collectChildrenBlockIds(child, depth));
+            }
+        }
+    }
+    return ids;
+};
+export var findBlockByBlockId = function (block, blockId) {
+    if (block.type !== 'GROUP_BLOCK' || block.children.length === 0) {
+        return null;
+    }
+    for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
+        var child = _a[_i];
+        if (child.blockId === blockId) {
+            return child;
         }
-        if (block.type === 'GROUP_BLOCK' && block.children) {
-            var found = findBlockByBlockId(block.children, blockId);
+        if (child.type === 'GROUP_BLOCK' && child.children) {
+            var found = findBlockByBlockId(child, blockId);
             if (found) {
                 return found;
             }
@@ -50,84 +70,34 @@ export var findBlockByBlockId = function (blocks, blockId) {
     }
     return null;
 };
-export var findChildrenComponentIds = function (blockStructure, targetId) {
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
+export var findDirectChildrenCbIds = function (block, targetId) {
+    var targetBlock = findBlockByBlockId(block, targetId);
     if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
         return [];
     }
-    var blockCBChildren = targetBlock.children.filter(function (child) { return child.type === 'COMPONENT_BLOCK'; });
-    return blockCBChildren.map(function (cb) { return cb.componentBlockId.toString(); });
+    return collectChildrenCbIds(targetBlock, 'current');
 };
-export var findAllChildrenIds = function (blockStructure, targetId, depth) {
-    if (depth === void 0) { depth = 'deep'; }
-    var collectChildrenIds = function (block) {
-        var ids = [];
-        if ('children' in block && block.children) {
-            for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                ids.push(child.blockId);
-                if (depth === 'deep') {
-                    ids = ids.concat(collectChildrenIds(child));
-                }
-            }
-        }
-        return ids;
-    };
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
-    return targetBlock ? collectChildrenIds(targetBlock) : [];
+export var findAllChildrenCbIds = function (block, targetId) {
+    var targetBlock = findBlockByBlockId(block, targetId);
+    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+        return [];
+    }
+    return collectChildrenCbIds(targetBlock, 'deep');
 };
-export var findAllChildrenComponentIds = function (blockStructure, targetId) {
-    var collectComponentIds = function (block) {
-        var ids = [];
-        if ('children' in block && block.children) {
-            for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                if (child.type === 'COMPONENT_BLOCK') {
-                    ids.push(child.componentBlockId);
-                }
-                ids = ids.concat(collectComponentIds(child));
-            }
-        }
-        return ids;
-    };
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
-    return targetBlock ? collectComponentIds(targetBlock) : [];
+export var findAllChildrenBlockIds = function (block, targetId) {
+    var targetBlock = findBlockByBlockId(block, targetId);
+    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+        return [];
+    }
+    return collectChildrenBlockIds(targetBlock, 'deep');
 };
-export var findAllParentGroups = function (blockStructure, targetId) {
-    var findParentGroups = function (blocks, id, parents) {
-        if (parents === void 0) { parents = []; }
-        for (var _i = 0, blocks_2 = blocks; _i < blocks_2.length; _i++) {
-            var block = blocks_2[_i];
-            if (block.blockId === id && block.type === 'GROUP_BLOCK') {
-                return parents;
-            }
-            if ('children' in block && block.children) {
-                var result = findParentGroups(block.children, id, block.type === 'GROUP_BLOCK' ? __spreadArray(__spreadArray([], parents, true), [block], false) : parents);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    };
-    return findParentGroups(blockStructure, targetId) || [];
+export var findDirectChildrenBlockIds = function (block, targetId) {
+    var targetBlock = findBlockByBlockId(block, targetId);
+    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+        return [];
+    }
+    return collectChildrenBlockIds(targetBlock, 'current');
 };
-// export const findAllChildrenButGroup = (blockStructure: Block[], targetId: string): string[] => {
-//   const collectChildrenIds = (block: Block): string[] => {
-//     let ids: string[] = [];
-//     if ('children' in block && block.children) {
-//       for (const child of block.children) {
-//         if (child.type !== 'GROUP_BLOCK') {
-//           ids.push(child.blockId);
-//         }
-//         ids = ids.concat(collectChildrenIds(child));
-//       }
-//     }
-//     return ids;
-//   };
-//   const targetBlock = findBlockById(blockStructure, targetId);
-//   return targetBlock ? collectChildrenIds(targetBlock) : [];
-// };
 export var findGroupBlocks = function (blockStructure, targetId) {
     var targetBlock = findBlockByBlockId(blockStructure, targetId);
     var groupBlocks = [];
@@ -159,76 +129,76 @@ export var findGroupBlocks = function (blockStructure, targetId) {
     }
     return groupBlocks;
 };
-export var findAllComponentBlockIds = function (blockStructure) {
-    var collectComponentBlockIds = function (blocks) {
-        var ids = [];
-        for (var _i = 0, blocks_3 = blocks; _i < blocks_3.length; _i++) {
-            var block = blocks_3[_i];
-            if (block.type === 'COMPONENT_BLOCK') {
-                ids.push(block.componentBlockId);
-            }
-            if ('children' in block && block.children) {
-                ids = ids.concat(collectComponentBlockIds(block.children));
-            }
-        }
-        return ids;
-    };
-    return collectComponentBlockIds(blockStructure);
-};
-export var findParentGroupByGroupId = function (blockStructure, targetId) {
-    var findParentGroup = function (blocks, id, parent) {
-        if (parent === void 0) { parent = null; }
-        for (var _i = 0, blocks_4 = blocks; _i < blocks_4.length; _i++) {
-            var block = blocks_4[_i];
-            if (block.blockId === id && block.type === 'GROUP_BLOCK') {
-                return parent ? parent.blockId : null;
-            }
-            if ('children' in block && block.children) {
-                var result = findParentGroup(block.children, id, block.type === 'GROUP_BLOCK' ? block : parent);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    };
-    return findParentGroup(blockStructure, targetId);
-};
-export var addBlockToRoot = function (blockStructure, newBlock) {
-    return blockStructure.map(function (block) {
-        if (block.blockId === 'ROOT' && block.type === 'GROUP_BLOCK') {
-            return __assign(__assign({}, block), { children: block.children ? __spreadArray(__spreadArray([], block.children, true), [newBlock], false) : [newBlock] });
-        }
-        return block;
-    });
-};
-export var addBulkToTarget = function (blockStructure, targetId, bulkIds // componentBlockId
-) {
-    var structure = deepClone(blockStructure);
-    var targetBlock = findBlockByBlockId(structure, targetId);
+// export const findAllComponentBlockIds = (blockStructure: Block[]): number[] => {
+//   const collectComponentBlockIds = (blocks: Block[]): number[] => {
+//     let ids: number[] = [];
+//     for (const block of blocks) {
+//       if (block.type === 'COMPONENT_BLOCK') {
+//         ids.push(block.componentBlockId);
+//       }
+//       if ('children' in block && block.children) {
+//         ids = ids.concat(collectComponentBlockIds(block.children));
+//       }
+//     }
+//     return ids;
+//   };
+//   return collectComponentBlockIds(blockStructure);
+// };
+// export const findParentGroupByGroupId = (blockStructure: Block[], targetId: string): string | null => {
+//   const findParentGroup = (
+//     blocks: Block[],
+//     id: string,
+//     parent: GroupBlock | null = null
+//   ): string | null => {
+//     for (const block of blocks) {
+//       if (block.blockId === id && block.type === 'GROUP_BLOCK') {
+//         return parent ? parent.blockId : null;
+//       }
+//       if ('children' in block && block.children) {
+//         const result = findParentGroup(block.children, id, block.type === 'GROUP_BLOCK' ? block : parent);
+//         if (result) {
+//           return result;
+//         }
+//       }
+//     }
+//     return null;
+//   };
+//   return findParentGroup(blockStructure, targetId);
+// };
+// export const addBlockToRoot = (block: RootBlock, newBlock: Block): Block[] => {
+//   return block.map(block => {
+//     if (block.blockId === 'ROOT' && block.type === 'GROUP_BLOCK') {
+//       return {
+//         ...block,
+//         children: block.children ? [...block.children, newBlock] : [newBlock]
+//       };
+//     }
+//     return block;
+//   });
+// };
+export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
+    var blockCopy = deepClone(block);
+    var targetBlock = findBlockByBlockId(blockCopy, targetId);
     if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
-        return blockStructure;
+        return block;
     }
     var bulkBlocks = targetBlock.children.filter(function (child) {
-        if (child.type === 'COMPONENT_BLOCK' && bulkIds.includes(child.blockId.toString())) {
+        if (child.type === 'COMPONENT_BLOCK' && bulkBlockIds.includes(child.blockId.toString())) {
             return true;
         }
-        if (child.type === 'GROUP_BLOCK' && bulkIds.includes(child.blockId)) {
+        if (child.type === 'GROUP_BLOCK' && bulkBlockIds.includes(child.blockId)) {
             return true;
         }
         return false;
     });
-    if (bulkBlocks.length !== bulkIds.length) {
-        window.alert('Some bulkIds do not exist as children of the target block.');
-        console.log('bulkBLocks: ', bulkBlocks);
-        console.log('bulkIds: ', bulkIds);
-        return blockStructure;
+    if (bulkBlocks.length !== bulkBlockIds.length) {
+        return block;
     }
     if (bulkBlocks.length === 0) {
-        return blockStructure;
+        return block;
     }
     // Remove bulk blocks from target's children
-    targetBlock.children = targetBlock.children.filter(function (child) { return !bulkIds.includes(child.blockId); });
+    targetBlock.children = targetBlock.children.filter(function (child) { return !bulkBlockIds.includes(child.blockId); });
     // Create the new bulkBlock
     var bulkBlock = {
         blockId: 'BULK',
@@ -239,243 +209,69 @@ export var addBulkToTarget = function (blockStructure, targetId, bulkIds // comp
     };
     // Add the bulkBlock to the target's children
     targetBlock.children.push(bulkBlock);
-    return structure;
-};
-export var getBlockWorkDirPath = function (blockStructure, blockId) {
-    var findPath = function (blocks, id, path) {
-        for (var _i = 0, blocks_5 = blocks; _i < blocks_5.length; _i++) {
-            var block = blocks_5[_i];
-            var currentPath = __spreadArray(__spreadArray([], path, true), [block.blockId], false);
-            if (block.blockId === id) {
-                return currentPath;
-            }
-            if ('children' in block && block.children) {
-                var result = findPath(block.children, id, currentPath);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    };
-    var path = findPath(blockStructure, blockId, ['']);
-    return path ? path.join('/') : null;
+    return blockCopy;
 };
-export var getBlockIdByComponentId = function (blockStructure, componentId) {
-    var findBlock = function (blocks) {
-        for (var _i = 0, blocks_6 = blocks; _i < blocks_6.length; _i++) {
-            var block = blocks_6[_i];
-            if (block.type === 'COMPONENT_BLOCK' && block.componentBlockId === componentId) {
-                return block.blockId;
-            }
-            if ('children' in block && block.children) {
-                var result = findBlock(block.children);
-                if (result) {
-                    return result;
-                }
-            }
-        }
+var findPath = function (block, id, path) {
+    if (block.type === 'COMPONENT_BLOCK') {
         return null;
-    };
-    return findBlock(blockStructure);
-};
-export var blockStructure = [
-    {
-        blockId: 'ROOT',
-        type: 'GROUP_BLOCK',
-        zOrderDesktopInternal: null,
-        zOrderMobileInternal: null,
-        children: [
-            {
-                blockId: 'GB_2',
-                type: 'GROUP_BLOCK',
-                zOrderDesktopInternal: null,
-                zOrderMobileInternal: null,
-                children: [
-                    {
-                        blockId: 'GB_3',
-                        type: 'GROUP_BLOCK',
-                        zOrderDesktopInternal: null,
-                        zOrderMobileInternal: null,
-                        children: [
-                            {
-                                blockId: 'CB_4',
-                                type: 'COMPONENT_BLOCK',
-                                zOrderDesktopInternal: null,
-                                zOrderMobileInternal: null,
-                                componentBlockId: 4
-                            },
-                            {
-                                blockId: 'CB_5',
-                                type: 'COMPONENT_BLOCK',
-                                zOrderDesktopInternal: null,
-                                zOrderMobileInternal: null,
-                                componentBlockId: 5
-                            },
-                            {
-                                blockId: 'GB_6',
-                                type: 'GROUP_BLOCK',
-                                zOrderDesktopInternal: null,
-                                zOrderMobileInternal: null,
-                                children: [
-                                    {
-                                        blockId: 'CB_7',
-                                        type: 'COMPONENT_BLOCK',
-                                        zOrderDesktopInternal: null,
-                                        zOrderMobileInternal: null,
-                                        componentBlockId: 7
-                                    },
-                                    {
-                                        blockId: 'CB_8',
-                                        type: 'COMPONENT_BLOCK',
-                                        zOrderDesktopInternal: null,
-                                        zOrderMobileInternal: null,
-                                        componentBlockId: 8
-                                    },
-                                    {
-                                        blockId: 'GB_9',
-                                        type: 'GROUP_BLOCK',
-                                        zOrderDesktopInternal: null,
-                                        zOrderMobileInternal: null,
-                                        children: [
-                                            {
-                                                blockId: 'CB_10',
-                                                type: 'COMPONENT_BLOCK',
-                                                zOrderDesktopInternal: null,
-                                                zOrderMobileInternal: null,
-                                                componentBlockId: 10
-                                            },
-                                            {
-                                                blockId: 'CB_11',
-                                                type: 'COMPONENT_BLOCK',
-                                                zOrderDesktopInternal: null,
-                                                zOrderMobileInternal: null,
-                                                componentBlockId: 11
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        blockId: 'GB_12',
-                        type: 'GROUP_BLOCK',
-                        zOrderDesktopInternal: null,
-                        zOrderMobileInternal: null,
-                        children: [
-                            {
-                                blockId: 'CB_13',
-                                type: 'COMPONENT_BLOCK',
-                                zOrderDesktopInternal: null,
-                                zOrderMobileInternal: null,
-                                componentBlockId: 13
-                            },
-                            {
-                                blockId: 'CB_14',
-                                type: 'COMPONENT_BLOCK',
-                                zOrderDesktopInternal: null,
-                                zOrderMobileInternal: null,
-                                componentBlockId: 14
-                            }
-                        ]
-                    },
-                    {
-                        blockId: 'CB_15',
-                        type: 'COMPONENT_BLOCK',
-                        zOrderDesktopInternal: null,
-                        zOrderMobileInternal: null,
-                        componentBlockId: 15
-                    },
-                    {
-                        blockId: 'CB_16',
-                        type: 'COMPONENT_BLOCK',
-                        zOrderDesktopInternal: null,
-                        zOrderMobileInternal: null,
-                        componentBlockId: 16
-                    }
-                ]
-            },
-            {
-                blockId: 'GB_17',
-                type: 'GROUP_BLOCK',
-                zOrderDesktopInternal: null,
-                zOrderMobileInternal: null,
-                children: [
-                    {
-                        blockId: 'CB_18',
-                        type: 'COMPONENT_BLOCK',
-                        zOrderDesktopInternal: null,
-                        zOrderMobileInternal: null,
-                        componentBlockId: 18
-                    }
-                ]
-            },
-            {
-                blockId: 'CB_19',
-                type: 'COMPONENT_BLOCK',
-                zOrderDesktopInternal: null,
-                zOrderMobileInternal: null,
-                componentBlockId: 19
-            },
-            {
-                blockId: 'CB_20',
-                type: 'COMPONENT_BLOCK',
-                zOrderDesktopInternal: null,
-                zOrderMobileInternal: null,
-                componentBlockId: 20
-            }
-        ]
     }
-];
-export var mapComponentBlockIdsToBlockIds = function (blockStructure) {
-    var cbToBlockMap = {};
-    var blockToCbMap = {};
-    var traverse = function (blocks) {
-        for (var _i = 0, blocks_7 = blocks; _i < blocks_7.length; _i++) {
-            var block = blocks_7[_i];
-            if (block.type === 'COMPONENT_BLOCK') {
-                cbToBlockMap[block.componentBlockId] = block.blockId;
-                blockToCbMap[block.blockId] = block.componentBlockId;
-            }
-            if ('children' in block && block.children) {
-                traverse(block.children);
-            }
+    for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
+        var child = _a[_i];
+        var currentPath = __spreadArray(__spreadArray([], path, true), [child.blockId], false);
+        if (child.blockId === id) {
+            return currentPath;
         }
-    };
-    traverse(blockStructure);
-    return { CB_ID: cbToBlockMap, BLOCK_ID: blockToCbMap };
-};
-export var findAccessibleChildrenBlocks = function (blockStructure, targetGroupId, blockIds) {
-    var targetBlock = findBlockByBlockId(blockStructure, targetGroupId);
-    if (!targetBlock || !('children' in targetBlock) || !targetBlock.children) {
-        return [];
-    }
-    var result = new Set();
-    var traverse = function (block, rootId) {
         if ('children' in block && block.children) {
-            for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                if (blockIds.includes(child.blockId)) {
-                    result.add(rootId);
-                    return true; // Stop traversal for this branch
-                }
-                if (traverse(child, rootId)) {
-                    result.add(rootId);
-                    return true; // Stop traversal for this branch
-                }
+            var result = findPath(block, id, currentPath);
+            if (result) {
+                return result;
             }
         }
-        return false;
-    };
-    for (var _i = 0, _a = targetBlock.children; _i < _a.length; _i++) {
-        var child = _a[_i];
-        if (blockIds.includes(child.blockId)) {
-            result.add(child.blockId);
-        }
-        else {
-            traverse(child, child.blockId);
-        }
     }
-    return Array.from(result);
+    return null;
+};
+export var getBlockWorkDirPath = function (block, blockId) {
+    var path = findPath(block, blockId, ['']);
+    return path ? path.join('/') : null;
 };
+export function formatBlockIdToCbId(cbId) {
+    return "CB_".concat(cbId);
+}
+export function formatCbIdToBlockId(cbId) {
+    var match = cbId.toString().match(/^CB_(\d+)$/);
+    return match ? parseInt(match[1], 10).toString() : null;
+}
+// export const findAccessibleChildrenBlocks = (
+//   block: Block,
+//   targetGroupId: string,
+//   blockIds: string[]
+// ): string[] => {
+//   const targetBlock = findBlockByBlockId(block, targetGroupId);
+//   if (!targetBlock || !('children' in targetBlock) || !targetBlock.children) {
+//     return [];
+//   }
+//   const result = new Set<string>();
+//   const traverse = (block: Block, rootId: string): boolean => {
+//     if ('children' in block && block.children) {
+//       for (const child of block.children) {
+//         if (blockIds.includes(child.blockId)) {
+//           result.add(rootId);
+//           return true; // Stop traversal for this branch
+//         }
+//         if (traverse(child, rootId)) {
+//           result.add(rootId);
+//           return true; // Stop traversal for this branch
+//         }
+//       }
+//     }
+//     return false;
+//   };
+//   for (const child of targetBlock.children) {
+//     if (blockIds.includes(child.blockId)) {
+//       result.add(child.blockId);
+//     } else {
+//       traverse(child, child.blockId);
+//     }
+//   }
+//   return Array.from(result);
+// };

package/dist/lib/GridLayoutEditor/types.d.ts

@@ -79,7 +79,7 @@ export type ReactGridLayoutProps = {
     minNbRow?: number;
     customColWidth?: number;
     onFitToContent?: OnFitContentCallBack;
-    blockStructure?: Block[];
+    blockStructure?: Block;
     onDoubleClickGroup?: (e: React.MouseEvent, id: string, type: string) => void;
     selectedGroupBlock?: 'ROOT' | string;
     editingGroupBlock?: 'ROOT' | string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "publ-echo-test",
-  "version": "0.0.114",
+  "version": "0.0.116",
   "private": false,
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.js",