publ-echo-test 0.0.148 → 0.0.150

package/dist/lib/GridItem/GroupItem.d.ts

@@ -4,6 +4,6 @@ import { PropsWithChildren } from '../types';
 declare const GroupItem: ({ children, ...props }: PropsWithChildren<GridItemProps & {
     onContextGroup: (e: React.MouseEvent) => void;
     zOrder: number;
-    zOrderInternal: number;
+    zOrderInternal: string;
 }>) => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 export default GroupItem;

package/dist/lib/GridItem/types.d.ts

@@ -82,7 +82,7 @@ export type GridItemProps = {
     customColWidth?: number;
     autoResize: boolean;
     zOrder?: number;
-    zOrderInternal?: number;
+    zOrderInternal?: string;
 };
 export type GridItemDefaultProps = {
     className: string;

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -37,7 +37,7 @@ import { bottom, cloneLayoutItem, compact, getAllCollisions, getBoundingArea, ge
 import { calcGridColWidth, calcXY, resolveRowHeight, } from '../GridItem/utils/calculateUtils';
 import GridItem from '../GridItem/GridItem';
 import isEqual from '../../external-lib/lodash.isEqual';
-import { findAllChildrenCbIds, findBlockByBlockId, findDirectChildrenBlockIds, findDirectChildrenCbIds, findGroupBlocks, formatCbIdToBlockId, getBlockSpecificType, zIndexMap, } from './group';
+import { findAllChildrenCbIds, findBlockByBlockId, findDirectChildrenBlockIds, findDirectChildrenCbIds, findGroupBlocks, findParentGroupBlock, formatCbIdToBlockId, getBlockSpecificType, zIndexMap, } from './group';
 import GroupItem from '../GridItem/GroupItem';
 import OutsideClickHandler from '../GridItem/OutsideClickHandler';
 var layoutClassName = 'react-grid-layout';
@@ -558,6 +558,9 @@ var ReactGridLayout = function (_a) {
         var block = blockStructure
             ? findBlockByBlockId(blockStructure, formatCbIdToBlockId(Number(l.i)))
             : undefined;
+        var parent = blockStructure
+            ? findParentGroupBlock(blockStructure, formatCbIdToBlockId(Number(l.i)))
+            : null;
         if (!block) {
             return _jsx(_Fragment, { children: "NO-BLOCK-FOUND" });
         }
@@ -587,7 +590,11 @@ var ReactGridLayout = function (_a) {
                 'not-editable-grid-item': !isRoot && !editable,
                 'bulk-child-item': isInBulk,
                 'outside-of-editing-group': outsideOfEditingGroup,
-            }), z: zIndex, zOrder: l.z, zOrderInternal: zOrder, isDraggable: editable && !isInBulk, isResizable: editable && !isInBulk, containerWidth: width, cols: cols, margin: margin, containerPadding: containerPadding || margin, maxRows: maxRows, rowHeight: rowHeight, cancel: draggableCancel, handle: draggableHandle, onDragStop: onDragStopHandler, onDragStart: onDragStartHandler, onDrag: onDragHandler, onResizeStart: onResizeStartHandler, onResize: onResizeHandler, onResizeStop: onResizeStopHandler, onFitToContent: onFitToContentHandler, isBounded: bounded, useCSSTransforms: useCSSTransforms && isMounted, usePercentages: !isMounted, transformScale: transformScale, w: l.w, h: l.h, x: l.x, y: l.y, i: l.i, minH: l.minH, minW: l.minW, maxH: l.maxH, maxW: l.maxW, static: l.static, droppingPosition: isDroppingItem ? droppingPosition : undefined, resizeHandles: resizeHandlesOptions, resizeHandle: resizeHandle, isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: !!l.autoResize, children: child }, l.i));
+            }), z: zIndex, zOrder: l.z, zOrderInternal: parent
+                ? "".concat(parent[device === 'DESKTOP'
+                    ? 'zOrderDesktopInternal'
+                    : 'zOrderMobileInternal'], " > ").concat(zOrder)
+                : zOrder.toString(), isDraggable: editable && !isInBulk, isResizable: editable && !isInBulk, containerWidth: width, cols: cols, margin: margin, containerPadding: containerPadding || margin, maxRows: maxRows, rowHeight: rowHeight, cancel: draggableCancel, handle: draggableHandle, onDragStop: onDragStopHandler, onDragStart: onDragStartHandler, onDrag: onDragHandler, onResizeStart: onResizeStartHandler, onResize: onResizeHandler, onResizeStop: onResizeStopHandler, onFitToContent: onFitToContentHandler, isBounded: bounded, useCSSTransforms: useCSSTransforms && isMounted, usePercentages: !isMounted, transformScale: transformScale, w: l.w, h: l.h, x: l.x, y: l.y, i: l.i, minH: l.minH, minW: l.minW, maxH: l.maxH, maxW: l.maxW, static: l.static, droppingPosition: isDroppingItem ? droppingPosition : undefined, resizeHandles: resizeHandlesOptions, resizeHandle: resizeHandle, isHiddenVisibility: isHiddenVisibility, customColWidth: colWidth, autoResize: !!l.autoResize, children: child }, l.i));
     };
     var onDragOverHandler = function (e) {
         var _a;
@@ -706,12 +713,19 @@ var ReactGridLayout = function (_a) {
             (props === null || props === void 0 ? void 0 : props.onContextGroup) &&
                 props.onContextGroup(e, block.blockId, isEditingGroup);
         };
+        var parent = blockStructure
+            ? findParentGroupBlock(blockStructure, block.blockId)
+            : null;
         return (_jsx(OutsideClickHandler, { onOutsideClick: onDoubleClickOutsideGroup, children: _jsx(GroupItem, { className: classNames({
                     'bulk-child-item': isInBulk,
                     'grid-bulk-block': block.blockId === 'BULK',
                     editing: editingGroupBlock === block.blockId,
                     selected: selectedGroupBlock === block.blockId,
-                }), z: zIndex, zOrder: zOrder, zOrderInternal: zOrder, containerWidth: width, cols: cols, margin: margin, containerPadding: containerPadding || margin, maxRows: maxRows, rowHeight: rowHeight, cancel: draggableCancel, handle: draggableHandle, onDragStop: onDragStopGroupHandler, onDragStart: onDragStartHandler, onDrag: onDragHandler, onResizeStart: onResizeStartHandler, onResize: onResizeHandler, onResizeStop: onResizeStopHandler, onFitToContent: onFitToContentHandler, isDraggable: !viewOnly && !isEditingGroup && !isInBulk, isResizable: !viewOnly && !isEditingGroup && !isInBulk, isBounded: false, useCSSTransforms: useCSSTransforms && isMounted, usePercentages: !isMounted, transformScale: transformScale, w: groupItem.w, h: groupItem.h, x: groupItem.x, y: groupItem.y, i: block.blockId, 
+                }), z: zIndex, zOrder: zOrder, zOrderInternal: parent
+                    ? "".concat(parent[device === 'DESKTOP'
+                        ? 'zOrderDesktopInternal'
+                        : 'zOrderMobileInternal'], " > ").concat(zOrder)
+                    : zOrder.toString(), containerWidth: width, cols: cols, margin: margin, containerPadding: containerPadding || margin, maxRows: maxRows, rowHeight: rowHeight, cancel: draggableCancel, handle: draggableHandle, onDragStop: onDragStopGroupHandler, onDragStart: onDragStartHandler, onDrag: onDragHandler, onResizeStart: onResizeStartHandler, onResize: onResizeHandler, onResizeStop: onResizeStopHandler, onFitToContent: onFitToContentHandler, isDraggable: !viewOnly && !isEditingGroup && !isInBulk, isResizable: !viewOnly && !isEditingGroup && !isInBulk, isBounded: false, useCSSTransforms: useCSSTransforms && isMounted, usePercentages: !isMounted, transformScale: transformScale, w: groupItem.w, h: groupItem.h, x: groupItem.x, y: groupItem.y, i: block.blockId, 
                 // minH={l.minH}
                 // minW={l.minW}
                 // maxH={l.maxH}

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

@@ -53,3 +53,4 @@ export declare const addBulkToTarget: (block: Block, targetId: string, bulkBlock
 export declare function getBlockWorkDirPath(blockStructure: Block, targetBlockId: string): string;
 export declare function formatBlockIdToCbId(blockId: string): number | null;
 export declare function formatCbIdToBlockId(cbId: number): string;
+export declare function findParentGroupBlock(current: Block, targetBlockId: string): GroupBlock | null;

package/dist/lib/GridLayoutEditor/group.js

@@ -278,3 +278,31 @@ export function formatCbIdToBlockId(cbId) {
 //   }
 //   return Array.from(result);
 // };
+export function findParentGroupBlock(current, targetBlockId) {
+    // 현재 블록이 그룹(또는 루트) 블록이고, 자식이 있다면 탐색합니다.
+    if ('children' in current && Array.isArray(current.children)) {
+        for (var _i = 0, _a = current.children; _i < _a.length; _i++) {
+            var child = _a[_i];
+            // 자식 중에 targetBlockId를 가진 블록이 있다면,
+            if (child.blockId === targetBlockId) {
+                // 현재 블록이 ROOT라면 부모가 ROOT이므로 null 반환
+                if (current.blockId === 'ROOT') {
+                    return null;
+                }
+                // 그렇지 않다면 현재 블록이 부모 그룹 블록이므로 반환
+                if (current.type === 'GROUP_BLOCK') {
+                    return current;
+                }
+            }
+            // 만약 자식이 그룹 블록이라면 재귀적으로 탐색
+            if (child.type === 'GROUP_BLOCK') {
+                var found = findParentGroupBlock(child, targetBlockId);
+                if (found !== null) {
+                    return found;
+                }
+            }
+        }
+    }
+    // 찾지 못하면 null 반환
+    return null;
+}

package/package.json

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