pds-dev-kit-web-test 2.7.104 → 2.7.108

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

@@ -219,6 +219,14 @@ var GridAutoRowEditor = (0, react_1.forwardRef)(function CustomSection(props, re
     var currentDepthCbs = (_b = props.componentBlocks) === null || _b === void 0 ? void 0 : _b.filter(function (cb) {
         return editableCBIds.includes(cb.id);
     });
+    var onToggleGBPinned = function (gbId) {
+        setPinnedGBs(function (prev) {
+            if (prev.includes(gbId)) {
+                return prev.filter(function (id) { return id !== gbId; });
+            }
+            return __spreadArray(__spreadArray([], prev, true), [gbId], false);
+        });
+    };
     return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(dynamicLayoutContext_1.dynamicLayoutContext.Provider, __assign({ value: {
                 device: device,
                 mode: mode,
@@ -265,7 +273,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, rowHeight: rowHeight, layoutItems: layouts[device === 'DESKTOP' ? 'lg' : 'sm'], cbs: props.componentBlocks, device: device }, 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, device: device, selectedRows: selectedRows, pinnedGBs: pinnedGBs, onToggleGBPinned: onToggleGBPinned }, 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

@@ -4,12 +4,15 @@ import type { Device } from '../sections/CustomSection/util/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, rowHeight, device }: {
+export default function RenderPedigreeRecursively({ block, layoutItems, cbs, parentGroupArea, rowHeight, device, selectedRows, pinnedGBs, onToggleGBPinned }: {
     block: Block;
     layoutItems: LayoutItem[];
     cbs: ComponentBlock[];
     rowHeight: number;
     device: Device;
+    selectedRows: number[];
+    pinnedGBs: string[];
+    onToggleGBPinned: (gbId: string) => void;
     parentGroupArea?: {
         rowStart: number;
         colStart: number;

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

@@ -78,30 +78,37 @@ function findAllChildrenCbIds(block, targetGroupId) {
 }
 exports.findAllChildrenCbIds = findAllChildrenCbIds;
 function RenderPedigreeRecursively(_a) {
-    var block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea, rowHeight = _a.rowHeight, device = _a.device;
+    var block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea, rowHeight = _a.rowHeight, device = _a.device, selectedRows = _a.selectedRows, pinnedGBs = _a.pinnedGBs, onToggleGBPinned = _a.onToggleGBPinned;
     var type = block.type;
     if (type === 'GROUP_BLOCK') {
         var childrenIds = findAllChildrenCbIds(block, block.blockId).map(function (i) { return i.toString(); });
-        var bounding = (0, renderHelpers_1.getBoundingArea)(layoutItems, childrenIds);
-        if (!bounding) {
+        var bounding_1 = (0, renderHelpers_1.getBoundingArea)(layoutItems, childrenIds);
+        if (!bounding_1) {
             return (0, jsx_runtime_1.jsx)("div", { children: "GROUP: NO BOUNDING AREA" });
         }
         var gridArea_1 = getGridAreaFromGroup({
-            x: bounding.x,
-            y: bounding.y,
-            cols: bounding.w,
-            rows: bounding.h
+            x: bounding_1.x,
+            y: bounding_1.y,
+            cols: bounding_1.w,
+            rows: bounding_1.h
         });
         var relativeGridArea_1 = parentGroupArea
             ? calculateRelativeGridArea(gridArea_1, parentGroupArea)
             : gridArea_1;
-        return ((0, jsx_runtime_1.jsx)(S_GroupItem, __assign({ cols: bounding.w, sectionRow: bounding.h, rowHeight: rowHeight, selectedRows: [], style: {
+        // 그룹의 시작 행을 기준으로 상대적인 selectedRows 계산
+        var relativeSelectedRows_1 = selectedRows
+            .map(function (row) { return row - gridArea_1.rowStart + 1; })
+            .filter(function (row) { return row >= 0 && row <= bounding_1.h; });
+        var isGBPinned = pinnedGBs.includes(block.blockId);
+        var defaultHeight = getMaxHeight({ cols: bounding_1.w, rows: bounding_1.h, x: bounding_1.x, y: bounding_1.y }, rowHeight);
+        return ((0, jsx_runtime_1.jsxs)(S_GroupItem, __assign({ cols: bounding_1.w, sectionRow: bounding_1.h, rowHeight: rowHeight, selectedRows: relativeSelectedRows_1, style: {
                 gridArea: gridAreaObjToString(relativeGridArea_1),
                 display: 'grid',
                 zIndex: device === 'DESKTOP'
                     ? block.zOrderDesktopInternal
-                    : block.zOrderMobileInternal
-            } }, { children: block.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(RenderPedigreeRecursively, { rowHeight: rowHeight, block: child, layoutItems: layoutItems, cbs: cbs, parentGroupArea: gridArea_1, device: device }, child.blockId)); }) })));
+                    : block.zOrderMobileInternal,
+                maxHeight: isGBPinned ? defaultHeight : 'none'
+            } }, { children: [(0, jsx_runtime_1.jsx)(S_Pinned, { children: isGBPinned ? ((0, jsx_runtime_1.jsx)("button", __assign({ type: "button", onClick: function () { return onToggleGBPinned(block.blockId); } }, { children: "H\uACE0\uC815\uB428 \uD83D\uDCCC" }))) : ((0, jsx_runtime_1.jsx)("button", __assign({ type: "button", onClick: function () { return onToggleGBPinned(block.blockId); } }, { children: "H\uB298\uC5B4\uB0A8 \uD83E\uDEB1" }))) }), block.children.map(function (child) { return ((0, jsx_runtime_1.jsx)(RenderPedigreeRecursively, { rowHeight: rowHeight, block: child, layoutItems: layoutItems, cbs: cbs, parentGroupArea: gridArea_1, device: device, selectedRows: relativeSelectedRows_1, pinnedGBs: pinnedGBs, onToggleGBPinned: onToggleGBPinned }, child.blockId)); })] })));
     }
     // default: TYPE === 'COMPONENT_BLOCK'
     var cbIndex = cbs.findIndex(function (c) { return c.blockId === block.blockId; });
@@ -125,18 +132,19 @@ function RenderPedigreeRecursively(_a) {
     //   data-og-grid-area={originalGridAreaString}
     //   data-rel-grid-area={gridAreaObjToString(relativeGridArea)}
     // >
-    (0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: cbIndex, device: device, rowHeight: 50, zIndex: device === 'DESKTOP'
+    (0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: cbIndex, device: device, rowHeight: rowHeight, zIndex: device === 'DESKTOP'
                 ? block.zOrderDesktopInternal
                 : block.zOrderMobileInternal, style: {
                 pointerEvents: 'none',
                 gridArea: gridAreaObjToString(relativeGridArea),
                 boxShadow: '0 0 0 2px red'
                 // opacity: isEditing ? 1 : 0.3
-            }, showPinned: isEditing, isParentGroupPinned: isPinned }) }, cb.id)
+            }, showPinned: parentGroupArea ? false : true, isParentGroupPinned: isPinned }) }, cb.id)
     // </S_GridItem>
     );
 }
 exports.default = RenderPedigreeRecursively;
+var S_Pinned = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  pointer-events: auto;\n  position: absolute;\n  right: 0;\n  top: 0;\n  z-index: 9999999;\n"], ["\n  pointer-events: auto;\n  position: absolute;\n  right: 0;\n  top: 0;\n  z-index: 9999999;\n"])));
 function clamp(num, min, max) {
     return Math.max(Math.min(num, max), min);
 }
@@ -190,7 +198,21 @@ function calculateRelativeGridArea(componentArea, parentArea) {
         colEnd: componentArea.colEnd - parentArea.colStart + 1
     };
 }
-var S_GroupItem = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  box-shadow: 0 0 0 3px blue;\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  box-shadow: 0 0 0 3px blue;\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) {
+function getMaxHeight(props, rowHeight) {
+    var gap = 10;
+    var rows = props.rows;
+    var height = rows * rowHeight + (rows - 1) * gap;
+    return height;
+    // if (device === 'DESKTOP') {
+    //   const { rows } = props;
+    //   const height = rows * rowHeight + (rows - 1) * gap;
+    //   return height;
+    // }
+    // const rowsMobile = props['CB_PLACEMENT_PROP_PLACEMENT_SPEC_ROWS:MOBILE'];
+    // const height = rowsMobile * rowHeight + (rowsMobile - 1) * gap;
+    // return height;
+}
+var S_GroupItem = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  box-shadow: 0 0 0 3px blue;\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  box-shadow: 0 0 0 3px blue;\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) {
@@ -202,4 +224,4 @@ var S_GroupItem = styled_components_1.default.div(templateObject_1 || (templateO
     )
         .join(' ');
 });
-var templateObject_1;
+var templateObject_1, templateObject_2;

package/package.json

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