publ-echo-test 0.0.108 → 0.0.110

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

@@ -40,21 +40,19 @@ 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[]) => {
+export declare const findBlockByBlockId: (block: RootBlock, blockId: string) => Block | null;
+export declare const findChildrenComponentIds: (block: RootBlock, targetId: string) => string[];
+export declare const findAllChildrenIds: (block: RootBlock, targetId: string, depth?: 'current' | 'deep') => string[];
+export declare const findAllChildrenComponentIds: (block: RootBlock, targetId: string) => number[];
+export declare const findAllParentGroups: (block: RootBlock, targetId: string) => GroupBlock[];
+export declare const findGroupBlocks: (block: RootBlock, targetId: string) => GroupBlock[];
+export declare const findAllComponentBlockIds: (block: RootBlock) => number[];
+export declare const findParentGroupByGroupId: (block: RootBlock, targetId: string) => string | null;
+export declare const addBlockToRoot: (block: RootBlock, newBlock: Block) => RootBlock;
+export declare const getBlockWorkDirPath: (blockStructure: RootBlock, blockId: string) => string | null;
+export declare const mapComponentBlockIdsToBlockIds: (blockStructure: RootBlock) => {
     CB_ID: Record<number, string>;
     BLOCK_ID: Record<string, number>;
 };
-export declare const findAccessibleChildrenBlocks: (blockStructure: Block[], targetGroupId: string, blockIds: string[]) => string[];
+export declare const getBlockIdByComponentId: (block: RootBlock, componentId: number) => string | null;
+export declare const addBulkToTarget: (block: RootBlock, targetId: string, bulkIds: string[]) => RootBlock;

package/dist/lib/GridLayoutEditor/group.js

@@ -34,15 +34,15 @@ 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 deepClone = function (block) { return JSON.parse(JSON.stringify(block)); };
+export var findBlockByBlockId = function (block, blockId) {
+    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({ blockId: "ROOT", type: "GROUP_BLOCK", zOrderDesktopInternal: null, zOrderMobileInternal: null, children: child.children }, blockId);
             if (found) {
                 return found;
             }
@@ -50,15 +50,15 @@ export var findBlockByBlockId = function (blocks, blockId) {
     }
     return null;
 };
-export var findChildrenComponentIds = function (blockStructure, targetId) {
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
+export var findChildrenComponentIds = 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(); });
 };
-export var findAllChildrenIds = function (blockStructure, targetId, depth) {
+export var findAllChildrenIds = function (block, targetId, depth) {
     if (depth === void 0) { depth = 'deep'; }
     var collectChildrenIds = function (block) {
         var ids = [];
@@ -73,10 +73,10 @@ export var findAllChildrenIds = function (blockStructure, targetId, depth) {
         }
         return ids;
     };
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
+    var targetBlock = findBlockByBlockId(block, targetId);
     return targetBlock ? collectChildrenIds(targetBlock) : [];
 };
-export var findAllChildrenComponentIds = function (blockStructure, targetId) {
+export var findAllChildrenComponentIds = function (block, targetId) {
     var collectComponentIds = function (block) {
         var ids = [];
         if ('children' in block && block.children) {
@@ -90,19 +90,19 @@ export var findAllChildrenComponentIds = function (blockStructure, targetId) {
         }
         return ids;
     };
-    var targetBlock = findBlockByBlockId(blockStructure, targetId);
+    var targetBlock = findBlockByBlockId(block, targetId);
     return targetBlock ? collectComponentIds(targetBlock) : [];
 };
-export var findAllParentGroups = function (blockStructure, targetId) {
+export var findAllParentGroups = function (block, 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') {
+        for (var _i = 0, blocks_1 = blocks; _i < blocks_1.length; _i++) {
+            var block_1 = blocks_1[_i];
+            if (block_1.blockId === id && block_1.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 ('children' in block_1 && block_1.children) {
+                var result = findParentGroups(block_1.children, id, block_1.type === 'GROUP_BLOCK' ? __spreadArray(__spreadArray([], parents, true), [block_1], false) : parents);
                 if (result) {
                     return result;
                 }
@@ -110,26 +110,10 @@ export var findAllParentGroups = function (blockStructure, targetId) {
         }
         return null;
     };
-    return findParentGroups(blockStructure, targetId) || [];
+    return findParentGroups(block.children, targetId) || [];
 };
-// 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);
+export var findGroupBlocks = function (block, targetId) {
+    var targetBlock = findBlockByBlockId(block, targetId);
     var groupBlocks = [];
     if (targetBlock && targetBlock.blockId === 'ROOT') {
         if ('children' in targetBlock) {
@@ -159,32 +143,32 @@ export var findGroupBlocks = function (blockStructure, targetId) {
     }
     return groupBlocks;
 };
-export var findAllComponentBlockIds = function (blockStructure) {
+export var findAllComponentBlockIds = function (block) {
     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);
+        for (var _i = 0, blocks_2 = blocks; _i < blocks_2.length; _i++) {
+            var block_2 = blocks_2[_i];
+            if (block_2.type === 'COMPONENT_BLOCK') {
+                ids.push(block_2.componentBlockId);
             }
-            if ('children' in block && block.children) {
-                ids = ids.concat(collectComponentBlockIds(block.children));
+            if ('children' in block_2 && block_2.children) {
+                ids = ids.concat(collectComponentBlockIds(block_2.children));
             }
         }
         return ids;
     };
-    return collectComponentBlockIds(blockStructure);
+    return collectComponentBlockIds(block.children);
 };
-export var findParentGroupByGroupId = function (blockStructure, targetId) {
+export var findParentGroupByGroupId = function (block, 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') {
+        for (var _i = 0, blocks_3 = blocks; _i < blocks_3.length; _i++) {
+            var block_3 = blocks_3[_i];
+            if (block_3.blockId === id && block_3.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 ('children' in block_3 && block_3.children) {
+                var result = findParentGroup(block_3.children, id, block_3.type === 'GROUP_BLOCK' ? block_3 : parent);
                 if (result) {
                     return result;
                 }
@@ -192,59 +176,15 @@ export var findParentGroupByGroupId = function (blockStructure, targetId) {
         }
         return null;
     };
-    return findParentGroup(blockStructure, targetId);
+    return findParentGroup(block.children, 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);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
-        return blockStructure;
-    }
-    var bulkBlocks = targetBlock.children.filter(function (child) {
-        if (child.type === 'COMPONENT_BLOCK' && bulkIds.includes(child.blockId.toString())) {
-            return true;
-        }
-        if (child.type === 'GROUP_BLOCK' && bulkIds.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 === 0) {
-        return blockStructure;
-    }
-    // Remove bulk blocks from target's children
-    targetBlock.children = targetBlock.children.filter(function (child) { return !bulkIds.includes(child.blockId); });
-    // Create the new bulkBlock
-    var bulkBlock = {
-        blockId: 'BULK',
-        type: 'GROUP_BLOCK',
-        zOrderDesktopInternal: zIndexMap.BULK,
-        zOrderMobileInternal: zIndexMap.BULK,
-        children: bulkBlocks,
-    };
-    // Add the bulkBlock to the target's children
-    targetBlock.children.push(bulkBlock);
-    return structure;
+export var addBlockToRoot = function (block, newBlock) {
+    return __assign(__assign({}, block), { children: __spreadArray(__spreadArray([], block.children, true), [newBlock], false) });
 };
 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];
+        for (var _i = 0, blocks_4 = blocks; _i < blocks_4.length; _i++) {
+            var block = blocks_4[_i];
             var currentPath = __spreadArray(__spreadArray([], path, true), [block.blockId], false);
             if (block.blockId === id) {
                 return currentPath;
@@ -258,182 +198,15 @@ export var getBlockWorkDirPath = function (blockStructure, blockId) {
         }
         return null;
     };
-    var path = findPath(blockStructure, blockId, ['']);
+    var path = findPath(blockStructure.children, blockId, ['']);
     return path ? path.join('/') : null;
 };
-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;
-                }
-            }
-        }
-        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];
+        for (var _i = 0, blocks_5 = blocks; _i < blocks_5.length; _i++) {
+            var block = blocks_5[_i];
             if (block.type === 'COMPONENT_BLOCK') {
                 cbToBlockMap[block.componentBlockId] = block.blockId;
                 blockToCbMap[block.blockId] = block.componentBlockId;
@@ -443,39 +216,63 @@ export var mapComponentBlockIdsToBlockIds = function (blockStructure) {
             }
         }
     };
-    traverse(blockStructure);
+    traverse(blockStructure.children);
     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
+export var getBlockIdByComponentId = function (block, componentId) {
+    var findBlock = function (blocks) {
+        for (var _i = 0, blocks_6 = blocks; _i < blocks_6.length; _i++) {
+            var block_4 = blocks_6[_i];
+            if (block_4.type === 'COMPONENT_BLOCK' && block_4.componentBlockId === componentId) {
+                return block_4.blockId;
+            }
+            if ('children' in block_4 && block_4.children) {
+                var result = findBlock(block_4.children);
+                if (result) {
+                    return result;
                 }
             }
         }
-        return false;
+        return null;
     };
-    for (var _i = 0, _a = targetBlock.children; _i < _a.length; _i++) {
-        var child = _a[_i];
-        if (blockIds.includes(child.blockId)) {
-            result.add(child.blockId);
+    return findBlock(block.children);
+};
+export var addBulkToTarget = function (block, targetId, bulkIds // componentBlockId
+) {
+    var structure = deepClone(block);
+    var targetBlock = findBlockByBlockId(structure, targetId);
+    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK' || !targetBlock.children) {
+        return block;
+    }
+    var bulkBlocks = targetBlock.children.filter(function (child) {
+        if (child.type === 'COMPONENT_BLOCK' && bulkIds.includes(child.blockId)) {
+            return true;
         }
-        else {
-            traverse(child, child.blockId);
+        if (child.type === 'GROUP_BLOCK' && bulkIds.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 block;
+    }
+    if (bulkBlocks.length === 0) {
+        return block;
     }
-    return Array.from(result);
+    // Remove bulk blocks from target's children
+    targetBlock.children = targetBlock.children.filter(function (child) { return !bulkIds.includes(child.blockId); });
+    // Create the new bulkBlock
+    var bulkBlock = {
+        blockId: 'BULK',
+        type: 'GROUP_BLOCK',
+        zOrderDesktopInternal: zIndexMap.BULK,
+        zOrderMobileInternal: zIndexMap.BULK,
+        children: bulkBlocks,
+    };
+    // Add the bulkBlock to the target's children
+    targetBlock.children.push(bulkBlock);
+    return structure;
 };

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

@@ -1,7 +1,7 @@
 import { DragEvent, ReactElement, RefObject } from "react";
 import { ResizeHandleAxis, ResizeHandleType } from "../Resizable/types";
 import { ResizeEventType } from "../GridItem/types";
-import { Block } from "./group";
+import { RootBlock } from "./group";
 export type CompactType = "vertical" | "horizontal";
 export type LayoutItem = {
     w: number;
@@ -79,7 +79,7 @@ export type ReactGridLayoutProps = {
     minNbRow?: number;
     customColWidth?: number;
     onFitToContent?: OnFitContentCallBack;
-    blockStructure?: Block[];
+    blockStructure?: RootBlock;
     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.108",
+  "version": "0.0.110",
   "private": false,
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.js",