publ-echo-test 0.0.130 → 0.0.131

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -561,13 +561,16 @@ var ReactGridLayout = function (_a) {
             // return zIndexMap.EDITING_GROUP;
             // }
             if (!isRoot && isInBulk) {
-                return zIndexMap.EDITING_GROUP;
+                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
             }
             if (!isRoot && editable) {
-                return zIndexMap.EDITING_GROUP;
+                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
             }
             if (isRoot && editable) {
-                return zIndexMap.ROOT;
+                return zIndexMap.ROOT + zOrder;
+            }
+            if (isRoot && !editable) {
+                return zIndexMap.ROOT + zOrder;
             }
             if (!editable) {
                 return 0;
@@ -666,13 +669,16 @@ var ReactGridLayout = function (_a) {
         var isInBulk = bulkIds === null || bulkIds === void 0 ? void 0 : bulkIds.includes(block.blockId);
         var isBulk = block.blockId === 'BULK';
         var baseZ = (function () {
-            if (isBulk) {
+            if (isEditingGroup) {
                 return zIndexMap.EDITING_GROUP;
             }
-            if (isInBulk) {
+            if (isBulk) {
+                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
+            }
+            if (isInBulk) { // 위와 같지만 이것은 not-editable이긴 함.
                 // const bulkBlock = findBlockByBlockId(blockStructure, 'BULK');
                 // const bulkZOrder = bulkBlock?.[device === 'DESKTOP' ? 'zOrderDesktopInternal' : 'zOrderMobileInternal'] ?? 0;
-                return zIndexMap.EDITING_GROUP;
+                return zIndexMap.EDITING_GROUP_CHILD + zOrder;
             }
             if (!isRoot && type === 'GROUP_BLOCK') {
                 return zIndexMap.EDITING_GROUP;
@@ -685,7 +691,7 @@ var ReactGridLayout = function (_a) {
             }
             return zIndexMap.CB;
         })();
-        var zIndex = editorMode === 'EDIT' ? baseZ + zOrder : zOrder;
+        var zIndex = editorMode === 'EDIT' ? baseZ : zOrder;
         var handleClick = function (e) {
             onClickGroup && onClickGroup(e, block.blockId, type);
         };

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

@@ -1,5 +1,6 @@
 export declare const zIndexMap: {
     BULK: number;
+    EDITING_GROUP_CHILD: number;
     EDITING_GROUP: number;
     GROUP: number;
     CB: number;

package/dist/lib/GridLayoutEditor/group.js

@@ -9,7 +9,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 export var zIndexMap = {
     'BULK': 20000,
-    'EDITING_GROUP': 10000,
+    'EDITING_GROUP_CHILD': 10000,
+    'EDITING_GROUP': 9000,
     'GROUP': 5000,
     'CB': 500,
     'ROOT': 500, //?
@@ -211,12 +212,16 @@ export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     }
     // Remove bulk blocks from target's children
     targetBlock.children = targetBlock.children.filter(function (child) { return !bulkBlockIds.includes(child.blockId); });
+    var zOrdersDesktop = bulkBlocks.map(function (block) { return block.zOrderDesktopInternal; }).filter(function (each) { return each !== null; });
+    var zOrdersMobile = bulkBlocks.map(function (block) { return block.zOrderMobileInternal; }).filter(function (each) { return each !== null; });
+    var zOrderDesktopInternal = Math.max.apply(Math, zOrdersDesktop);
+    var zOrderMobileInternal = Math.max.apply(Math, zOrdersMobile);
     // Create the new bulkBlock
     var bulkBlock = {
         blockId: 'BULK',
         type: 'GROUP_BLOCK',
-        zOrderDesktopInternal: zIndexMap.BULK,
-        zOrderMobileInternal: zIndexMap.BULK,
+        zOrderDesktopInternal: zOrderDesktopInternal,
+        zOrderMobileInternal: zOrderMobileInternal,
         children: bulkBlocks,
     };
     // Add the bulkBlock to the target's children

package/package.json

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