publ-echo-test 0.0.388 → 0.0.390

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

@@ -16,4 +16,5 @@ type PlaceholderProps = {
 };
 export declare function GridBackgroundPlaceholder({ device, margin, rowHeight, colWidth, backgroundWidth, backgroundHeight, activeDrag, selectedBlockId, activeRows, totalCols, // 💡 새로 받은 totalCols 사용
 activeBlock, layout, }: PlaceholderProps): import("react/jsx-runtime").JSX.Element;
+export declare function getShowActiveRows(block: ComponentBlock | GroupBlock, layout: LayoutItem[]): boolean;
 export {};

package/dist/lib/GridLayoutEditor/Placeholder.js

@@ -44,7 +44,7 @@ export function GridBackgroundPlaceholder(_a) {
                                 }), _jsx("foreignObject", { x: gridContentWidth + textPadding, y: y_top, width: colWidth, height: rowHeight, style: { overflow: "visible" }, children: _jsx("div", { className: "grid-indicator-text" }) })] }, "active-row-".concat(row)));
                     })] }) }));
 }
-function getShowActiveRows(block, layout) {
+export function getShowActiveRows(block, layout) {
     if (block.type === "GROUP_BLOCK") {
         var hasFitContentCB = block.children.some(function (child) {
             if (child.type === "COMPONENT_BLOCK") {

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -41,7 +41,7 @@ import isEqual from "../../external-lib/lodash.isEqual";
 import { findAllChildrenCbIds, findBlockByBlockId, findDirectChildrenBlockIds, findDirectChildrenCbIds, findGroupBlocks, findParentGroupBlock, formatCbIdToBlockId, getBlockIdKind, getBlockSpecificType, zIndexMap, } from "./group";
 import GroupItem from "../GridItem/GroupItem";
 import OutsideClickHandler from "../GridItem/OutsideClickHandler";
-import { GridBackgroundPlaceholder } from "./Placeholder";
+import { getShowActiveRows, GridBackgroundPlaceholder } from "./Placeholder";
 var layoutClassName = "react-grid-layout";
 var ReactGridLayout = function (_a) {
     var children = _a.children, props = __rest(_a, ["children"]);
@@ -573,11 +573,19 @@ 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.cbId) === item.i) {
-                return false;
+            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 (!(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;
@@ -728,6 +736,7 @@ var ReactGridLayout = function (_a) {
         var parent = blockStructure
             ? findParentGroupBlock(blockStructure, block.blockId)
             : null;
+        console.log("active rows", activeRows);
         return (_jsx(OutsideClickHandler, { onOutsideClick: onDoubleClickOutsideGroup, children: _jsx(GroupItem, { heightFitContent: false, isheightVariable: device === "DESKTOP"
                     ? !!block.isHeightVariableDesktop
                     : !!block.isHeightVariableMobile, className: classNames({

package/package.json

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