publ-echo-test 0.0.359 → 0.0.361

package/dist/lib/GridItem/utils/calculateUtils.d.ts

@@ -1,5 +1,5 @@
 import { ResizeHandleAxis } from "../../Resizable/types";
-import { Position, PositionParams } from "../../GridLayoutEditor/types";
+import { Layout, Position, PositionParams } from "../../GridLayoutEditor/types";
 export type RowHeight = number | ((width: number) => number);
 export declare function calcGridColWidth(positionParams: PositionParams): number;
 export declare function calcGridItemWHPx(gridUnits: number, colOrRowSize: number, marginPx: number): number;
@@ -28,3 +28,11 @@ export declare function calcWH(positionParams: PositionParams, { width, height }
     h: number;
 };
 export declare function clamp(num: number, lowerBound: number, upperBound: number): number;
+/**
+ * layout 배열을 분석하여 'heightFitContent'가 true인 모든 아이템이
+ * 차지하고 있는 Row 인덱스 배열을 반환합니다.
+ *
+ * @param layout - 현재 그리드 레이아웃 (LayoutItem 배열)
+ * @returns 중복이 제거되고 정렬된 Row 인덱스 배열 (예: [0, 1, 2, 5, 6])
+ */
+export declare const getRowsForHeightFitContentItems: (layout: Layout) => number[];

package/dist/lib/GridItem/utils/calculateUtils.js

@@ -113,3 +113,30 @@ function roundToOneDecimal(num) {
 function truncateToOneDecimal(num) {
     return Math.floor(num * 10) / 10;
 }
+// ReactGridLayout.tsx 파일 상단이나, 임포트하는 유틸리티 파일에
+/**
+ * layout 배열을 분석하여 'heightFitContent'가 true인 모든 아이템이
+ * 차지하고 있는 Row 인덱스 배열을 반환합니다.
+ *
+ * @param layout - 현재 그리드 레이아웃 (LayoutItem 배열)
+ * @returns 중복이 제거되고 정렬된 Row 인덱스 배열 (예: [0, 1, 2, 5, 6])
+ */
+export var getRowsForHeightFitContentItems = function (layout) {
+    // Set을 사용하여 Row 인덱스의 중복을 자동으로 처리합니다.
+    var activeRows = new Set();
+    // 1. heightFitContent가 true인 아이템들만 필터링합니다.
+    var fitContentItems = layout.filter(function (item) { return item.heightFitContent === true; });
+    // 2. 필터링된 각 아이템을 순회합니다.
+    for (var _i = 0, fitContentItems_1 = fitContentItems; _i < fitContentItems_1.length; _i++) {
+        var item = fitContentItems_1[_i];
+        // 3. 아이템이 차지하는 모든 Row를 Set에 추가합니다.
+        // (예: y=2, h=3 이면 2, 3, 4 행을 추가)
+        var startRow = item.y;
+        var endRow = item.y + item.h;
+        for (var row = startRow; row < endRow; row++) {
+            activeRows.add(row);
+        }
+    }
+    // 4. Set을 배열로 변환하고 오름차순으로 정렬하여 반환합니다.
+    return Array.from(activeRows).sort(function (a, b) { return a - b; });
+};

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

@@ -8,6 +8,7 @@ type PlaceholderProps = {
     activeDrag: LayoutItem;
     selectedBlockId: string | null;
     totalCols: number;
+    activeRows: number[];
 };
-export declare function GridBackgroundPlaceholder({ margin, rowHeight, colWidth, backgroundWidth, backgroundHeight, activeDrag, selectedBlockId, totalCols, }: PlaceholderProps): import("react/jsx-runtime").JSX.Element;
+export declare function GridBackgroundPlaceholder({ margin, rowHeight, colWidth, backgroundWidth, backgroundHeight, activeDrag, selectedBlockId, activeRows, totalCols, }: PlaceholderProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/lib/GridLayoutEditor/Placeholder.js

@@ -1,10 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export function GridBackgroundPlaceholder(_a) {
+    // 활성화된 행(row) 인덱스 배열
+    // const activeRows = Array.from(
+    //   { length: activeDrag.h },
+    //   (_, i) => activeDrag.y + i
+    // );
     var margin = _a.margin, 
     // width, // 🚨 제거
-    rowHeight = _a.rowHeight, colWidth = _a.colWidth, backgroundWidth = _a.backgroundWidth, backgroundHeight = _a.backgroundHeight, activeDrag = _a.activeDrag, selectedBlockId = _a.selectedBlockId, totalCols = _a.totalCols;
-    // 활성화된 행(row) 인덱스 배열
-    var activeRows = Array.from({ length: activeDrag.h }, function (_, i) { return activeDrag.y + i; });
+    rowHeight = _a.rowHeight, colWidth = _a.colWidth, backgroundWidth = _a.backgroundWidth, backgroundHeight = _a.backgroundHeight, activeDrag = _a.activeDrag, selectedBlockId = _a.selectedBlockId, activeRows = _a.activeRows, totalCols = _a.totalCols;
     // 🚨 activeCols도 totalCols prop으로 받아서 사용
     // const activeCols = Array.from({ length: 24 }, (_, i) => 0 + i);
     var activeCols = Array.from({ length: totalCols }, function (_, i) { return 0 + i; });

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -34,7 +34,7 @@ import * as React from "react";
 import { useState, useRef, useLayoutEffect } from "react";
 import classNames from "../../external-lib/classnames";
 import { bottom, cloneLayoutItem, compact, getAllCollisions, getBoundingArea, getLayoutItem, moveElement, noop, synchronizeLayoutWithChildren, withLayoutItem, } from "./utils/renderHelpers";
-import { calcGridColWidth, calcXY, resolveRowHeight, } from "../GridItem/utils/calculateUtils";
+import { calcGridColWidth, calcXY, getRowsForHeightFitContentItems, resolveRowHeight, } from "../GridItem/utils/calculateUtils";
 // NOTE: 필수 변경하기
 import GridItem from "../GridItem/GridItem";
 import isEqual from "../../external-lib/lodash.isEqual";
@@ -64,9 +64,6 @@ var ReactGridLayout = function (_a) {
     var editableBlockIds = blockStructure
         ? findDirectChildrenCbIds(blockStructure, editingGroupBlock)
         : [];
-    var selectedBlock = blockStructure && selectedBlockId
-        ? findBlockByBlockId(blockStructure, selectedBlockId)
-        : null;
     var editingGroupAllChildren = blockStructure && editingGroupBlock
         ? findAllChildrenCbIds(blockStructure, editingGroupBlock).map(function (i) {
             return i.toString();
@@ -231,6 +228,7 @@ var ReactGridLayout = function (_a) {
             placeholder: true,
             i: i,
             heightFitContent: l.heightFitContent,
+            isHeightVariable: l.isHeightVariable,
         };
         var isUserAction = true;
         var newLayout = isGroup
@@ -442,6 +440,7 @@ var ReactGridLayout = function (_a) {
             static: true,
             i: i,
             heightFitContent: l.heightFitContent,
+            isHeightVariable: l.isHeightVariable,
         };
         props.onResize &&
             props.onResize({
@@ -778,10 +777,22 @@ var ReactGridLayout = function (_a) {
         ? getLayoutItem(layout, selectedBlockId)
         : null;
     var activeDragItemOrSelectedItem = activeDrag || selectedLayoutItem;
+    var activeBlock = activeDragItemOrSelectedItem
+        ? blockStructure
+            ? findBlockByBlockId(blockStructure, formatCbIdToBlockId(Number(activeDragItemOrSelectedItem.i)))
+            : null
+        : null;
     var activeRows = activeDragItemOrSelectedItem &&
         Array.from({ length: activeDragItemOrSelectedItem.h }, function (_, i) { return activeDragItemOrSelectedItem.y + i; });
+    var heightVariableRows = getRowsForHeightFitContentItems(layout);
+    var shouldShowAllHeightVariableRows = device === "DESKTOP"
+        ? activeBlock === null || activeBlock === void 0 ? void 0 : activeBlock.isHeightVariableDesktop
+        : activeBlock === null || activeBlock === void 0 ? void 0 : activeBlock.isHeightVariableMobile;
+    var activeRowsFiltered = shouldShowAllHeightVariableRows
+        ? heightVariableRows
+        : activeRows;
     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, "data-grid-row-height": rowHeight, "data-grid-cols": cols, "data-section-id": sectionId, 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" }), activeDragItemOrSelectedItem && (_jsx(GridBackgroundPlaceholder, { backgroundWidth: getBackgroundWidth(), backgroundHeight: getBackgroundHeight(), margin: margin, 
                 // width={width}
-                rowHeight: rowHeight, colWidth: colWidth, activeDrag: activeDragItemOrSelectedItem, selectedBlockId: selectedBlockId, totalCols: cols }))] }));
+                rowHeight: rowHeight, activeRows: activeRowsFiltered !== null && activeRowsFiltered !== void 0 ? activeRowsFiltered : [], colWidth: colWidth, activeDrag: activeDragItemOrSelectedItem, selectedBlockId: selectedBlockId, totalCols: cols }))] }));
 };
 export default ReactGridLayout;

package/package.json

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