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

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, rowHeight: rowHeight, 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, device: device }, 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

@@ -1,13 +1,15 @@
 /// <reference types="react" />
 import type { ComponentBlock } from '../sections/CustomSection/types';
+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 }: {
+export default function RenderPedigreeRecursively({ block, layoutItems, cbs, parentGroupArea, rowHeight, device }: {
     block: Block;
     layoutItems: LayoutItem[];
     cbs: ComponentBlock[];
     rowHeight: number;
+    device: Device;
     parentGroupArea?: {
         rowStart: number;
         colStart: number;

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

@@ -78,7 +78,7 @@ 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;
+    var block = _a.block, layoutItems = _a.layoutItems, cbs = _a.cbs, parentGroupArea = _a.parentGroupArea, rowHeight = _a.rowHeight, device = _a.device;
     var type = block.type;
     if (type === 'GROUP_BLOCK') {
         var childrenIds = findAllChildrenCbIds(block, block.blockId).map(function (i) { return i.toString(); });
@@ -95,21 +95,13 @@ function RenderPedigreeRecursively(_a) {
         var relativeGridArea_1 = parentGroupArea
             ? calculateRelativeGridArea(gridArea_1, parentGroupArea)
             : gridArea_1;
-        return ((0, jsx_runtime_1.jsxs)(S_GroupItem, __assign({ cols: bounding.w, sectionRow: bounding.h, rowHeight: rowHeight, selectedRows: [], style: {
+        return ((0, jsx_runtime_1.jsx)(S_GroupItem, __assign({ cols: bounding.w, sectionRow: bounding.h, rowHeight: rowHeight, selectedRows: [], style: {
                 gridArea: gridAreaObjToString(relativeGridArea_1),
-                display: 'grid'
-            } }, { children: [(0, jsx_runtime_1.jsx)("div", __assign({ style: {
-                        position: 'absolute',
-                        top: 4,
-                        left: 4,
-                        background: 'rgba(0,0,0,0.6)',
-                        color: '#fff',
-                        padding: '2px 6px',
-                        borderRadius: '4px',
-                        fontSize: '12px',
-                        zIndex: 1,
-                        pointerEvents: 'none'
-                    } }, { 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)); })] })));
+                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)); }) })));
     }
     // default: TYPE === 'COMPONENT_BLOCK'
     var cbIndex = cbs.findIndex(function (c) { return c.blockId === block.blockId; });
@@ -125,12 +117,24 @@ function RenderPedigreeRecursively(_a) {
         : originalGridArea;
     var isEditing = false;
     var isPinned = false;
-    return ((0, jsx_runtime_1.jsx)(S_GridItem, __assign({ style: {
-            gridArea: gridAreaObjToString(relativeGridArea)
-        }, "data-og-grid-area": originalGridAreaString, "data-rel-grid-area": gridAreaObjToString(relativeGridArea) }, { children: (0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(FlexGridItem_1.default, { cb: cb, index: cbIndex, device: "DESKTOP", rowHeight: 50, zIndex: 0, style: {
-                    pointerEvents: 'none'
-                    // opacity: isEditing ? 1 : 0.3
-                }, showPinned: isEditing, isParentGroupPinned: isPinned }) }, cb.id) })));
+    return (
+    // <S_GridItem
+    //   style={{
+    //     gridArea: gridAreaObjToString(relativeGridArea)
+    //   }}
+    //   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'
+                ? 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)
+    // </S_GridItem>
+    );
 }
 exports.default = RenderPedigreeRecursively;
 function clamp(num, min, max) {
@@ -186,8 +190,7 @@ function calculateRelativeGridArea(componentArea, parentArea) {
         colEnd: componentArea.colEnd - parentArea.colStart + 1
     };
 }
-var S_GridItem = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  box-shadow: 0 0 0 2px red;\n  height: 100%;\n  position: relative;\n  width: 100%;\n"], ["\n  box-shadow: 0 0 0 2px red;\n  height: 100%;\n  position: relative;\n  width: 100%;\n"])));
-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) {
+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) {
     //     // 전체 행 개수만큼 배열을 생성하여 각 행의 CSS 값을 정의합니다.
     return Array.from({ length: props.sectionRow })
         .map(function (_, index) {
@@ -199,4 +202,4 @@ var S_GroupItem = styled_components_1.default.div(templateObject_2 || (templateO
     )
         .join(' ');
 });
-var templateObject_1, templateObject_2;
+var templateObject_1;

package/package.json

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