publ-echo 0.0.127 → 0.0.129

package/dist/lib/GridItem/OutsideClickHandler.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from "react";
-import { zIndexMap } from "../GridLayoutEditor/group";
 var OutsideClickHandler = function (_a) {
     var children = _a.children, onOutsideClick = _a.onOutsideClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave;
     var wrapperRef = useRef(null);
@@ -87,7 +86,7 @@ var OutsideClickHandler = function (_a) {
                             marginLeft: "".concat(width + shadowOffset - borderThickness, "px"),
                             marginTop: "-".concat(shadowOffset, "px"),
                             pointerEvents: "none",
-                            zIndex: zIndexMap.EDITING_GROUP + zIndex,
+                            zIndex: 0,
                         } }), _jsx("div", { className: "border-bottom", style: {
                             position: "absolute",
                             transform: childDimensions.transform,
@@ -97,7 +96,7 @@ var OutsideClickHandler = function (_a) {
                             marginLeft: "-".concat(shadowOffset, "px"),
                             marginTop: "".concat(height + shadowOffset - borderThickness, "px"),
                             pointerEvents: "none",
-                            zIndex: zIndexMap.EDITING_GROUP + zIndex,
+                            zIndex: 0,
                         } }), _jsx("div", { className: "border-left", style: {
                             position: "absolute",
                             transform: childDimensions.transform,
@@ -107,7 +106,7 @@ var OutsideClickHandler = function (_a) {
                             marginLeft: "-".concat(shadowOffset, "px"),
                             marginTop: "-".concat(shadowOffset, "px"),
                             pointerEvents: "none",
-                            zIndex: zIndexMap.EDITING_GROUP + zIndex,
+                            zIndex: 0,
                         } })] }))] }));
 };
 export default OutsideClickHandler;

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -555,29 +555,22 @@ var ReactGridLayout = function (_a) {
         }
         var zOrder = (_a = block[device === "DESKTOP" ? "zOrderDesktopInternal" : "zOrderMobileInternal"]) !== null && _a !== void 0 ? _a : 0;
         var isInsideOfEditingGroup = editingGroupAllChildren.includes(l.i);
-        console.log("id", block.blockId, "isRoot", isRoot, "isBulk", isInBulk, "isInGroup", isInGroup, "isInsideOfEditingGroup", isInsideOfEditingGroup, "editable", editable);
         var editorZIndex = (function () {
             if (isRoot && isInBulk) {
-                console.log("1 : ", block.blockId);
                 return zIndexMap.ROOT + z;
             }
             if (!isRoot && isInsideOfEditingGroup) {
-                console.log("2 : ", block.blockId);
                 return zIndexMap.CB_IN_EDITING_GROUP + z;
             }
             if (isRoot && editable) {
-                console.log("3 : ", block.blockId);
                 return zIndexMap.ROOT + z;
             }
             if (isRoot && !editable) {
-                console.log("4 : ", block.blockId);
                 return zIndexMap.ROOT + z;
             }
             if (!editable) {
-                console.log("5 : ", block.blockId);
                 return z;
             }
-            console.log("6 : ", block.blockId);
             return z;
         })();
         var zIndex = editorMode === "EDIT" ? editorZIndex : z;
@@ -749,6 +742,41 @@ var ReactGridLayout = function (_a) {
         var parent = blockStructure
             ? findParentGroupBlock(blockStructure, block.blockId)
             : null;
+        // Check if a layout item overlaps any of the activeRows (vertical overlap)
+        var isOverlappingActiveRows = function (item) {
+            if ((activeBlock === null || activeBlock === void 0 ? void 0 : activeBlock.type) === "COMPONENT_BLOCK") {
+                if ((parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.cbId) === item.i) {
+                    return false;
+                }
+                if (!(activeDragItemOrSelectedItem === null || activeDragItemOrSelectedItem === void 0 ? void 0 : activeDragItemOrSelectedItem.heightFitContent)) {
+                    return false;
+                }
+            }
+            if ((activeBlock === null || activeBlock === void 0 ? void 0 : activeBlock.type) === "GROUP_BLOCK") {
+                var hasFitContentCB = getShowActiveRows(activeBlock, layout);
+                if (!hasFitContentCB) {
+                    return false;
+                }
+            }
+            if (!activeRows || activeRows.length === 0) {
+                return false;
+            }
+            var minActive = Math.min.apply(Math, activeRows);
+            var maxActive = Math.max.apply(Math, activeRows);
+            var itemTop = item.y;
+            var itemBottom = item.y + item.h - 1;
+            // overlap if ranges [itemTop, itemBottom] and [minActive, maxActive] intersect
+            return !(itemBottom < minActive || itemTop > maxActive);
+        };
+        var overlapsActiveRows = isOverlappingActiveRows({
+            w: groupItem.w,
+            h: groupItem.h,
+            x: groupItem.x,
+            y: groupItem.y,
+            i: block.blockId,
+        });
+        var editable = editableBlockIds.includes(Number(block.blockId));
+        var showBlockData = editable && !isInBulk && overlapsActiveRows;
         return (_jsx(OutsideClickHandler, { onOutsideClick: onDoubleClickOutsideGroup, onMouseEnter: function () {
                 setHoveredGroupId(block.blockId);
             }, onMouseLeave: function () {
@@ -760,6 +788,7 @@ var ReactGridLayout = function (_a) {
                     "grid-bulk-block": block.blockId === "BULK",
                     editing: editingGroupBlock === block.blockId,
                     selected: selectedGroupBlock === block.blockId,
+                    "show-block-data": showBlockData,
                 }), z: zIndex, minZ: groupItem.minZ, zOrder: internalZOrder, zOrderInternal: parent
                     ? "".concat(parent[device === "DESKTOP"
                         ? "zOrderDesktopInternal"

package/package.json

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