publ-echo-test 0.0.383 → 0.0.385

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -573,7 +573,7 @@ var ReactGridLayout = function (_a) {
         var zIndex = editorMode === "EDIT" ? editorZIndex : z;
         // Check if a layout item overlaps any of the activeRows (vertical overlap)
         var isOverlappingActiveRows = function (item) {
-            if ((parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.id) === item.i) {
+            if ((parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.cbId) === item.i) {
                 return false;
             }
             if (!(activeDragItemOrSelectedItem === null || activeDragItemOrSelectedItem === void 0 ? void 0 : activeDragItemOrSelectedItem.heightFitContent)) {
@@ -765,19 +765,16 @@ var ReactGridLayout = function (_a) {
         return __assign({ i: groupblockId }, groupItem);
     }
     var selectedLayoutItem = (parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.type) === "CB"
-        ? getLayoutItem(layout, parsedSelectedBlockId.id)
+        ? getLayoutItem(layout, parsedSelectedBlockId.cbId)
         : (parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.type) === "GB"
-            ? generateGrouplayout(parsedSelectedBlockId.id)
+            ? generateGrouplayout(parsedSelectedBlockId.blockId)
             : null;
-    console.log("selectedLayoutItem", selectedLayoutItem);
     var activeDragItemOrSelectedItem = activeDrag || selectedLayoutItem;
-    console.log("activeDragItemOrSelectedItem", activeDragItemOrSelectedItem);
     var activeBlock = activeDragItemOrSelectedItem
         ? blockStructure
-            ? findBlockByBlockId(blockStructure, parsedSelectedBlockId.id)
+            ? findBlockByBlockId(blockStructure, parsedSelectedBlockId.blockId)
             : null
         : null;
-    console.log("activeBlock", activeBlock);
     var activeRows = activeDragItemOrSelectedItem &&
         Array.from({ length: activeDragItemOrSelectedItem.h }, function (_, i) { return activeDragItemOrSelectedItem.y + i; });
     var heightVariableRows = getRowsForHeightFitContentItems(layout);

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

@@ -64,10 +64,12 @@ export declare function formatBlockIdToCbId(blockId: string): number | null;
 export declare function formatCbIdToBlockId(cbId: number): string;
 export declare function getBlockIdKind(blockId: string): {
     type: "GB";
-    id: string;
+    blockId: string;
+    cbId: string | null;
 } | {
     type: "CB";
-    id: string;
+    blockId: string;
+    cbId: string;
 } | null;
 export declare function findParentGroupBlock(current: Block, targetBlockId: string): GroupBlock | null;
 export declare function findOneComponentBlock(current: Block, targetBlockId: string): number | null;

package/dist/lib/GridLayoutEditor/group.js

@@ -254,13 +254,15 @@ export function getBlockIdKind(blockId) {
     if (/^GB_.+$/i.test(blockId)) {
         return {
             type: "GB",
-            id: blockId,
+            cbId: null,
+            blockId: blockId,
         };
     }
     if (/^CB_\d+$/i.test(blockId)) {
         return {
             type: "CB",
-            id: formatBlockIdToCbId(blockId).toString(),
+            cbId: formatBlockIdToCbId(blockId).toString(),
+            blockId: blockId,
         };
     }
     return null;

package/package.json

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