publ-echo 0.0.111 → 0.0.114

package/dist/lib/GridItem/GridItem.js

@@ -410,12 +410,6 @@ var GridItem = function (_a) {
             cssTransforms: useCSSTransforms,
         }),
         style: __assign(__assign(__assign({}, props.style), child.props.style), createStyle(pos)),
-        onClick: function (event) {
-            var _a;
-            if ((_a = child.props.className) === null || _a === void 0 ? void 0 : _a.includes('not-editable-grid-item')) {
-                event.preventDefault();
-            }
-        },
     });
     newChild = mixinResizable(newChild, pos, isResizable);
     newChild = mixinDraggable(newChild, isDraggable);

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -567,11 +567,11 @@ var ReactGridLayout = function (_a) {
         var zOrder = (_a = block[device === 'DESKTOP' ? 'zOrderDesktopInternal' : 'zOrderMobileInternal']) !== null && _a !== void 0 ? _a : 0;
         var isInsideOfEditingGroup = editingGroupAllChildren.includes(l.i);
         var editorZIndex = (function () {
-            if (isInBulk) {
-                return zIndexMap.EDITING_GROUP_CHILD + z;
+            if (isRoot && isInBulk) {
+                return z;
             }
             if (!isRoot && isInsideOfEditingGroup) {
-                return zIndexMap.EDITING_GROUP_CHILD + z;
+                return zIndexMap.CB_IN_EDITING_GROUP + z;
             }
             if (isRoot && editable) {
                 return zIndexMap.ROOT + z;
@@ -672,37 +672,32 @@ var ReactGridLayout = function (_a) {
         if (!groupItem) {
             return _jsx(_Fragment, {});
         }
-        var zOrder = (_a = block[device === 'DESKTOP' ? 'zOrderDesktopInternal' : 'zOrderMobileInternal']) !== null && _a !== void 0 ? _a : 0;
+        var internalZOrder = (_a = block[device === 'DESKTOP' ? 'zOrderDesktopInternal' : 'zOrderMobileInternal']) !== null && _a !== void 0 ? _a : 0;
         var isEditingGroup = block.blockId === editingGroupBlock;
         var type = getBlockSpecificType(block);
         var isRoot = editingGroupBlock === 'ROOT';
         var isInBulk = bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(block.blockId);
         var isBulk = block.blockId === 'BULK';
         var baseZ = (function () {
-            if (isEditingGroup) {
-                return zIndexMap.EDITING_GROUP;
-            }
             if (isBulk) {
-                return zIndexMap.EDITING_GROUP_CHILD + groupItem.z;
+                // groupItem.z : 그룹 내 CB중 가장 큰 zorder
+                return zIndexMap.CB_IN_EDITING_GROUP + groupItem.z;
             }
             if (isInBulk) {
-                // 위와 같지만 이것은 not-editable이긴 함.
-                // const bulkBlock = findBlockByBlockId(blockStructure, 'BULK');
-                // const bulkZOrder = bulkBlock?.[device === 'DESKTOP' ? 'zOrderDesktopInternal' : 'zOrderMobileInternal'] ?? 0;
-                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
+                return zIndexMap.CB_IN_EDITING_GROUP + internalZOrder;
+            }
+            if (isEditingGroup) {
+                return zIndexMap.EDITING_GROUP;
             }
             if (!isRoot && type === 'GROUP_BLOCK') {
-                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
+                return zIndexMap.EDITABLE_GROUP + internalZOrder;
             }
             if (type === 'GROUP_BLOCK') {
                 return zIndexMap.GROUP;
             }
-            if (type === 'BULK') {
-                return zIndexMap.BULK;
-            }
-            return zIndexMap.CB;
+            return -1; // NOTE: ERROR
         })();
-        var zIndex = editorMode === 'EDIT' ? baseZ : zOrder;
+        var zIndex = editorMode === 'EDIT' ? baseZ : internalZOrder;
         var handleClick = function (e) {
             onClickGroup && onClickGroup(e, block.blockId, type);
         };
@@ -721,11 +716,11 @@ var ReactGridLayout = function (_a) {
                     'grid-bulk-block': block.blockId === 'BULK',
                     editing: editingGroupBlock === block.blockId,
                     selected: selectedGroupBlock === block.blockId,
-                }), z: zIndex, minZ: groupItem.minZ, zOrder: zOrder, zOrderInternal: parent
+                }), z: zIndex, minZ: groupItem.minZ, zOrder: internalZOrder, 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, 
+                        : 'zOrderMobileInternal'], " > ").concat(internalZOrder)
+                    : internalZOrder.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

@@ -1,7 +1,8 @@
 export declare const zIndexMap: {
     ISDRAGGING: number;
     BULK: number;
-    EDITING_GROUP_CHILD: number;
+    EDITABLE_GROUP: number;
+    CB_IN_EDITING_GROUP: number;
     EDITING_GROUP: number;
     GROUP: number;
     CB: number;

package/dist/lib/GridLayoutEditor/group.js

@@ -9,8 +9,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 export var zIndexMap = {
     ISDRAGGING: 999999,
-    BULK: 20000,
-    EDITING_GROUP_CHILD: 10000,
+    BULK: 30000,
+    EDITABLE_GROUP: 20000,
+    CB_IN_EDITING_GROUP: 10000,
     EDITING_GROUP: 9000,
     GROUP: 5000,
     CB: 0,

package/package.json

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