pds-dev-kit-web-test 2.7.97 → 2.7.99

package/dist/src/sub/DynamicLayout/GridAutoRowEditor/GridAutoRowEditor.js

@@ -265,7 +265,7 @@ var GridAutoRowEditor = (0, react_1.forwardRef)(function CustomSection(props, re
                                                 backgroundColor: '#e8e1e189',
                                                 border: '1px solid #6b666688'
                                             }, "data-row": rIdx + 1, "data-col": cIdx + 1 }, "bg-grid-item-".concat(rIdx + 1, "-").concat(cIdx + 1))); }) }), "bg-grid-row-".concat(rIdx + 1)));
-                                }), pedigree.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(groupUtils_1.default, { block: child, layoutItems: layouts[device === 'DESKTOP' ? 'lg' : 'sm'], cbs: props.componentBlocks }, child.blockId)); })] })) })) })) }) })) }));
+                                }), pedigree.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(groupUtils_1.default, { block: child, rowHeight: rowHeight, layoutItems: layouts[device === 'DESKTOP' ? 'lg' : 'sm'], cbs: props.componentBlocks }, child.blockId)); })] })) })) })) }) })) }));
 });
 function GroupBlockRender(_a) {
     var block = _a.block, layouts = _a.layouts, pedigree = _a.pedigree, isEditing = _a.isEditing, isPinned = _a.isPinned, componentBlocks = _a.componentBlocks, onTogglePinned = _a.onTogglePinned, onDoubleClick = _a.onDoubleClick, onDoubleClickOutside = _a.onDoubleClickOutside;

package/dist/src/sub/DynamicLayout/utils/groupUtils.d.ts

@@ -3,10 +3,11 @@ import type { ComponentBlock } from '../sections/CustomSection/types';
 import type { LayoutItem } from 'publ-echo/dist/lib';
 import type { Block } from 'publ-echo/dist/lib/GridLayoutEditor/group';
 export declare function findAllChildrenCbIds(block: Block, targetGroupId: string): number[];
-export default function RenderPedigreeRecursively({ block, layoutItems, cbs, parentGroupArea }: {
+export default function RenderPedigreeRecursively({ block, layoutItems, cbs, parentGroupArea, rowHeight }: {
     block: Block;
     layoutItems: LayoutItem[];
     cbs: ComponentBlock[];
+    rowHeight: number;
     parentGroupArea?: {
         rowStart: number;
         colStart: number;

package/dist/src/sub/DynamicLayout/utils/groupUtils.js

@@ -54,7 +54,7 @@ function findAllChildrenCbIds(block, targetGroupId) {
 }
 exports.findAllChildrenCbIds = findAllChildrenCbIds;
 function RenderPedigreeRecursively(_a) {
-    var block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea;
+    var block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea, rowHeight = _a.rowHeight;
     var type = block.type;
     if (type === 'GROUP_BLOCK') {
         var childrenIds = findAllChildrenCbIds(block, block.blockId).map(function (i) { return i.toString(); });
@@ -68,7 +68,7 @@ function RenderPedigreeRecursively(_a) {
             cols: bounding.w,
             rows: bounding.h
         });
-        return ((0, jsx_runtime_1.jsxs)(S_GridItem, __assign({ style: {
+        return ((0, jsx_runtime_1.jsxs)(S_GroupItem, __assign({ cols: bounding.w, sectionRow: bounding.h, rowHeight: rowHeight, selectedRows: [], style: {
                 gridArea: gridAreaObjToString(gridArea_1),
                 border: '1px solid red',
                 display: 'grid'
@@ -83,7 +83,7 @@ function RenderPedigreeRecursively(_a) {
                         fontSize: '12px',
                         zIndex: 1,
                         pointerEvents: 'none'
-                    } }, { children: block.blockId })), block.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(RenderPedigreeRecursively, { block: child, layoutItems: layoutItems, cbs: cbs, parentGroupArea: gridArea_1 }, child.blockId)); })] })));
+                    } }, { children: block.blockId })), block.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(RenderPedigreeRecursively, { rowHeight: rowHeight, block: child, layoutItems: layoutItems, cbs: cbs, parentGroupArea: gridArea_1 }, child.blockId)); })] })));
     }
     // default: TYPE === 'COMPONENT_BLOCK'
     var cb = cbs.find(function (c) { return c.blockId === block.blockId; });
@@ -96,7 +96,7 @@ function RenderPedigreeRecursively(_a) {
     return ((0, jsx_runtime_1.jsx)(S_GridItem, __assign({ style: {
             gridArea: gridAreaObjToString(relativeGridArea),
             border: '1px solid blue'
-        } }, { children: block.blockId })));
+        }, "data-og-grid-area": originalGridAreaString, "data-rel-grid-area": gridAreaObjToString(relativeGridArea) }, { children: block.blockId })));
 }
 exports.default = RenderPedigreeRecursively;
 function clamp(num, min, max) {
@@ -145,12 +145,24 @@ function parseGridArea(gridArea) {
 function calculateRelativeGridArea(componentArea, parentArea) {
     return {
         // 컴포넌트의 시작 위치에서 부모의 시작 위치를 빼서 상대적 위치 계산
-        rowStart: componentArea.rowStart - parentArea.rowStart,
-        colStart: componentArea.colStart - parentArea.colStart,
+        rowStart: componentArea.rowStart - parentArea.rowStart + 1,
+        colStart: componentArea.colStart - parentArea.colStart + 1,
         // 상대적 끝 위치도 같은 방식으로 계산
-        rowEnd: componentArea.rowEnd - parentArea.rowStart,
-        colEnd: componentArea.colEnd - parentArea.colStart
+        rowEnd: componentArea.rowEnd - parentArea.rowStart + 1,
+        colEnd: componentArea.colEnd - parentArea.colStart + 1
     };
 }
 var S_GridItem = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  height: 100%;\n  position: relative;\n  width: 100%;\n"], ["\n  height: 100%;\n  position: relative;\n  width: 100%;\n"])));
-var templateObject_1;
+var S_GroupItem = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  gap: 10px;\n  grid-template-columns: repeat(", ", 1fr);\n  grid-template-rows: ", ";\n  position: relative; /* \uBC30\uC5F4\uC744 \uACF5\uBC31\uC73C\uB85C \uAD6C\uBD84\uB41C \uBB38\uC790\uC5F4\uB85C \uD569\uCE69\uB2C8\uB2E4. */\n"], ["\n  gap: 10px;\n  grid-template-columns: repeat(", ", 1fr);\n  grid-template-rows: ", ";\n  position: relative; /* \uBC30\uC5F4\uC744 \uACF5\uBC31\uC73C\uB85C \uAD6C\uBD84\uB41C \uBB38\uC790\uC5F4\uB85C \uD569\uCE69\uB2C8\uB2E4. */\n"])), function (props) { return props.cols; }, function (props) {
+    //     // 전체 행 개수만큼 배열을 생성하여 각 행의 CSS 값을 정의합니다.
+    return Array.from({ length: props.sectionRow })
+        .map(function (_, index) {
+        // props로 받은 selectedRows 배열에 현재 행(index)이 포함되어 있는지 확인합니다.
+        return props.selectedRows.includes(index)
+            ? "minmax(".concat(props.rowHeight, "px, auto)") // 포함되어 있다면 minmax 사용
+            : "".concat(props.rowHeight, "px");
+    } // 포함되어 있지 않다면 고정 높이 사용
+    )
+        .join(' ');
+});
+var templateObject_1, templateObject_2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web-test",
-  "version": "2.7.97",
+  "version": "2.7.99",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",