publ-echo-test 0.0.63 → 0.0.65

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 { findAllChildrenButGroup, findAllChildrenIds, findChildrenIds, findGroupBlocks, getBlockSpecificType, zIndexMap } from "./group";
+import { findAllChildrenButGroup, findAllChildrenComponentIds, findChildrenIds, findGroupBlocks, getBlockSpecificType, zIndexMap } from "./group";
 import GroupItem from "../GridItem/GroupItem";
 import OutsideClickHandler from "../GridItem/OutsideClickHandler";
 var layoutClassName = "react-grid-layout";
@@ -582,7 +582,7 @@ var ReactGridLayout = function (_a) {
         if (!blockStructure) {
             return;
         }
-        var childrenIds = findAllChildrenIds(blockStructure, block.blockId);
+        var childrenIds = findAllChildrenComponentIds(blockStructure, block.blockId).map(function (i) { return i.toString(); });
         var groupItem = getBoundingArea(layout, childrenIds);
         // const draggable =
         //   typeof l.isDraggable === "boolean"
@@ -633,7 +633,9 @@ var ReactGridLayout = function (_a) {
                 isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: false, children: _jsx("div", { onClick: handleClick, onDoubleClick: handleDoubleClick }) }, block.blockId) }));
     };
     var currentGroupBlocks = blockStructure ? findGroupBlocks(blockStructure, editingGroupBlock) : [];
-    console.log(currentGroupBlocks);
+    console.log('currentBlocks: ', currentGroupBlocks);
+    console.log('blockStructure: ', blockStructure);
+    console.log('editingGroupBlock: ', editingGroupBlock);
     return (_jsxs("div", { ref: innerRef, className: mergedClassName, style: mergedStyle, onDrop: isDroppable ? onDropHandler : noop, onDragLeave: isDroppable ? onDragLeaveHandler : noop, onDragEnter: isDroppable ? onDragEnterHandler : noop, onDragOver: isDroppable ? onDragOverHandler : noop, children: [currentGroupBlocks.map(function (each) { return processGroup(each); }), React.Children.map(children, function (child) { return processGridItem(child); }), placeholder(), activeDrag && _jsx("div", { className: "grid-guide-line-center" }), activeDrag && (_jsx("div", { className: "grid-placeholder", style: {
                     marginTop: margin[1] + "px",
                     marginBottom: margin[1] + "px",

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

@@ -43,6 +43,7 @@ export type BulkBlockInternal = {
 export declare const findBlockById: (blocks: Block[], blockId: string) => Block | null;
 export declare const findChildrenIds: (blockStructure: Block[], targetId: string) => string[];
 export declare const findAllChildrenIds: (blockStructure: Block[], targetId: string) => string[];
+export declare const findAllChildrenComponentIds: (blockStructure: Block[], targetId: string) => number[];
 export declare const findAllParentGroups: (blockStructure: Block[], targetId: string) => GroupBlock[];
 export declare const findAllChildrenButGroup: (blockStructure: Block[], targetId: string) => string[];
 export declare const findGroupBlocks: (blockStructure: Block[], targetId: string) => GroupBlock[];

package/dist/lib/GridLayoutEditor/group.js

@@ -71,6 +71,23 @@ export var findAllChildrenIds = function (blockStructure, targetId) {
     var targetBlock = findBlockById(blockStructure, targetId);
     return targetBlock ? collectChildrenIds(targetBlock) : [];
 };
+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 = findBlockById(blockStructure, targetId);
+    return targetBlock ? collectComponentIds(targetBlock) : [];
+};
 export var findAllParentGroups = function (blockStructure, targetId) {
     var findParentGroups = function (blocks, id, parents) {
         if (parents === void 0) { parents = []; }

package/package.json

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