publ-echo-test 0.0.333 → 0.0.334

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -577,7 +577,7 @@ var ReactGridLayout = function (_a) {
                 return zIndexMap.ROOT + z;
             }
             if (isRoot && !editable) {
-                return zIndexMap.ROOT + z;
+                return z;
             }
             if (!editable) {
                 return z;
@@ -692,12 +692,12 @@ var ReactGridLayout = function (_a) {
             if (isEditingGroup) {
                 return zIndexMap.EDITING_GROUP;
             }
-            if (!isRoot && type === "GROUP_BLOCK") {
-                return zIndexMap.EDITABLE_GROUP + internalZOrder;
-            }
             if (type === "GROUP_BLOCK") {
-                return internalZOrder;
+                return zIndexMap.ROOT + internalZOrder;
             }
+            // if (type === "GROUP_BLOCK") {
+            //   return internalZOrder;
+            // }
             return -1; // NOTE: ERROR
         })();
         var zIndex = editorMode === "EDIT" ? baseZ : internalZOrder;

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

@@ -12,34 +12,34 @@ export declare function getBlockSpecificType(block: Block): "ROOT" | "BULK" | "C
 export type SectionPedigree = RootBlock;
 export type Block = ComponentBlock | GroupBlock | RootBlock;
 export type ZOrder = {
-    [platform in 'mobile' | 'desktop']: {
+    [platform in "mobile" | "desktop"]: {
         [componentBlockId: string]: number;
     };
 };
 export type ComponentBlock = {
     blockId: string;
-    type: 'COMPONENT_BLOCK';
+    type: "COMPONENT_BLOCK";
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     componentBlockId: number;
 };
 export type GroupBlock = {
     blockId: string;
-    type: 'GROUP_BLOCK';
+    type: "GROUP_BLOCK";
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     children: (ComponentBlock | GroupBlock)[];
 };
 export type RootBlock = {
-    blockId: 'ROOT';
-    type: 'GROUP_BLOCK';
+    blockId: "ROOT";
+    type: "GROUP_BLOCK";
     zOrderDesktopInternal: number | null;
     zOrderMobileInternal: number | null;
     children: (ComponentBlock | GroupBlock)[];
 };
 export type BulkBlockInternal = {
-    blockId: 'BULK';
-    type: 'GROUP_BLOCK';
+    blockId: "BULK";
+    type: "GROUP_BLOCK";
     zOrderDesktopInternal: number;
     zOrderMobileInternal: number;
     children: (ComponentBlock | GroupBlock)[];

package/dist/lib/GridLayoutEditor/group.js

@@ -15,27 +15,27 @@ export var zIndexMap = {
     EDITING_GROUP: 9000,
     GROUP: 5000,
     CB: 0,
-    ROOT: 0, //?
+    ROOT: 20000, //?
 };
 export function getBlockSpecificType(block) {
-    if (block.blockId === 'ROOT') {
-        return 'ROOT';
+    if (block.blockId === "ROOT") {
+        return "ROOT";
     }
-    if (block.blockId === 'BULK') {
-        return 'BULK';
+    if (block.blockId === "BULK") {
+        return "BULK";
     }
     return block.type;
 }
 var deepClone = function (blocks) { return JSON.parse(JSON.stringify(blocks)); };
 var collectChildrenCbIds = function (block, depth) {
     var ids = [];
-    if ('children' in block && block.children) {
+    if ("children" in block && block.children) {
         for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
             var child = _a[_i];
-            if (child.type === 'COMPONENT_BLOCK') {
+            if (child.type === "COMPONENT_BLOCK") {
                 ids.push(child.componentBlockId);
             }
-            if (depth === 'deep' && child.type === 'GROUP_BLOCK') {
+            if (depth === "deep" && child.type === "GROUP_BLOCK") {
                 ids = ids.concat(collectChildrenCbIds(child, depth));
             }
         }
@@ -44,11 +44,11 @@ var collectChildrenCbIds = function (block, depth) {
 };
 var collectChildrenBlockIds = function (block, depth) {
     var ids = [];
-    if ('children' in block && block.children) {
+    if ("children" in block && block.children) {
         for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
             var child = _a[_i];
             ids.push(child.blockId);
-            if (depth === 'deep') {
+            if (depth === "deep") {
                 ids = ids.concat(collectChildrenBlockIds(child, depth));
             }
         }
@@ -56,10 +56,10 @@ var collectChildrenBlockIds = function (block, depth) {
     return ids;
 };
 export var findBlockByBlockId = function (block, blockId) {
-    if (block.type !== 'GROUP_BLOCK' || block.children.length === 0) {
+    if (block.type !== "GROUP_BLOCK" || block.children.length === 0) {
         return null;
     }
-    if (block.blockId === 'ROOT' && blockId === 'ROOT') {
+    if (block.blockId === "ROOT" && blockId === "ROOT") {
         return block;
     }
     for (var _i = 0, _a = block.children; _i < _a.length; _i++) {
@@ -67,7 +67,7 @@ export var findBlockByBlockId = function (block, blockId) {
         if (child.blockId === blockId) {
             return child;
         }
-        if (child.type === 'GROUP_BLOCK' && child.children) {
+        if (child.type === "GROUP_BLOCK" && child.children) {
             var found = findBlockByBlockId(child, blockId);
             if (found) {
                 return found;
@@ -78,31 +78,31 @@ export var findBlockByBlockId = function (block, blockId) {
 };
 export var findDirectChildrenCbIds = function (block, targetId) {
     var targetBlock = findBlockByBlockId(block, targetId);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+    if (!targetBlock || targetBlock.type !== "GROUP_BLOCK") {
         return [];
     }
-    return collectChildrenCbIds(targetBlock, 'current');
+    return collectChildrenCbIds(targetBlock, "current");
 };
 export var findAllChildrenCbIds = function (block, targetId) {
     var targetBlock = findBlockByBlockId(block, targetId);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+    if (!targetBlock || targetBlock.type !== "GROUP_BLOCK") {
         return [];
     }
-    return collectChildrenCbIds(targetBlock, 'deep');
+    return collectChildrenCbIds(targetBlock, "deep");
 };
 export var findAllChildrenBlockIds = function (block, targetId) {
     var targetBlock = findBlockByBlockId(block, targetId);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+    if (!targetBlock || targetBlock.type !== "GROUP_BLOCK") {
         return [];
     }
-    return collectChildrenBlockIds(targetBlock, 'deep');
+    return collectChildrenBlockIds(targetBlock, "deep");
 };
 export var findDirectChildrenBlockIds = function (block, targetId) {
     var targetBlock = findBlockByBlockId(block, targetId);
-    if (!targetBlock || targetBlock.type !== 'GROUP_BLOCK') {
+    if (!targetBlock || targetBlock.type !== "GROUP_BLOCK") {
         return [];
     }
-    return collectChildrenBlockIds(targetBlock, 'current');
+    return collectChildrenBlockIds(targetBlock, "current");
 };
 // NOTE: 타겟과 하위 모두.
 export var findGroupBlocks = function (block, targetId) {
@@ -110,21 +110,21 @@ export var findGroupBlocks = function (block, targetId) {
     if (!targetBlock) {
         return [];
     }
-    if (targetBlock.type !== 'GROUP_BLOCK') {
+    if (targetBlock.type !== "GROUP_BLOCK") {
         return [];
     }
-    var groupBlocks = targetBlock.children.filter(function (child) { return child.type === 'GROUP_BLOCK'; });
-    var bulkInTarget = targetBlock.children.find(function (block) { return block.blockId === 'BULK'; });
-    if (bulkInTarget && bulkInTarget.type === 'GROUP_BLOCK') {
-        var groupInBulk = bulkInTarget.children.filter(function (child) { return child.type === 'GROUP_BLOCK'; });
-        if (targetBlock.blockId === 'ROOT') {
+    var groupBlocks = targetBlock.children.filter(function (child) { return child.type === "GROUP_BLOCK"; });
+    var bulkInTarget = targetBlock.children.find(function (block) { return block.blockId === "BULK"; });
+    if (bulkInTarget && bulkInTarget.type === "GROUP_BLOCK") {
+        var groupInBulk = bulkInTarget.children.filter(function (child) { return child.type === "GROUP_BLOCK"; });
+        if (targetBlock.blockId === "ROOT") {
             return groupBlocks.concat(groupInBulk);
         }
         if (groupInBulk && groupInBulk.length > 0) {
             return [targetBlock].concat(groupBlocks).concat(groupInBulk);
         }
     }
-    if (targetBlock.blockId === 'ROOT') {
+    if (targetBlock.blockId === "ROOT") {
         return groupBlocks;
     }
     return [targetBlock].concat(groupBlocks);
@@ -180,16 +180,16 @@ export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     var blockCopy = deepClone(block);
     var targetBlock = findBlockByBlockId(blockCopy, targetId);
     if (!targetBlock ||
-        targetBlock.type !== 'GROUP_BLOCK' ||
+        targetBlock.type !== "GROUP_BLOCK" ||
         !targetBlock.children) {
         return block;
     }
     var bulkBlocks = targetBlock.children.filter(function (child) {
-        if (child.type === 'COMPONENT_BLOCK' &&
+        if (child.type === "COMPONENT_BLOCK" &&
             bulkBlockIds.includes(child.blockId.toString())) {
             return true;
         }
-        if (child.type === 'GROUP_BLOCK' && bulkBlockIds.includes(child.blockId)) {
+        if (child.type === "GROUP_BLOCK" && bulkBlockIds.includes(child.blockId)) {
             return true;
         }
         return false;
@@ -212,8 +212,8 @@ export var addBulkToTarget = function (block, targetId, bulkBlockIds) {
     var zOrderMobileInternal = Math.max.apply(Math, zOrdersMobile);
     // Create the new bulkBlock
     var bulkBlock = {
-        blockId: 'BULK',
-        type: 'GROUP_BLOCK',
+        blockId: "BULK",
+        type: "GROUP_BLOCK",
         zOrderDesktopInternal: zOrderDesktopInternal,
         zOrderMobileInternal: zOrderMobileInternal,
         children: bulkBlocks,
@@ -226,7 +226,7 @@ function findPathHelper(current, targetBlockId) {
     if (current.blockId === targetBlockId) {
         return [current.blockId];
     }
-    if ('children' in current && Array.isArray(current.children)) {
+    if ("children" in current && Array.isArray(current.children)) {
         for (var _i = 0, _a = current.children; _i < _a.length; _i++) {
             var child = _a[_i];
             var result = findPathHelper(child, targetBlockId);
@@ -239,7 +239,7 @@ function findPathHelper(current, targetBlockId) {
 }
 export function getBlockWorkDirPath(blockStructure, targetBlockId) {
     var path = findPathHelper(blockStructure, targetBlockId);
-    return path ? '/' + path.join('/') : '';
+    return path ? "/" + path.join("/") : "";
 }
 export function formatBlockIdToCbId(blockId) {
     var match = blockId.match(/^CB_(\d+)$/);
@@ -284,22 +284,22 @@ export function formatCbIdToBlockId(cbId) {
 // };
 export function findParentGroupBlock(current, targetBlockId) {
     // 현재 블록이 그룹(또는 루트) 블록이고, 자식이 있다면 탐색합니다.
-    if ('children' in current && Array.isArray(current.children)) {
+    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') {
+                if (current.blockId === "ROOT") {
                     return null;
                 }
                 // 그렇지 않다면 현재 블록이 부모 그룹 블록이므로 반환
-                if (current.type === 'GROUP_BLOCK') {
+                if (current.type === "GROUP_BLOCK") {
                     return current;
                 }
             }
             // 만약 자식이 그룹 블록이라면 재귀적으로 탐색
-            if (child.type === 'GROUP_BLOCK') {
+            if (child.type === "GROUP_BLOCK") {
                 var found = findParentGroupBlock(child, targetBlockId);
                 if (found !== null) {
                     return found;
@@ -313,24 +313,24 @@ export function findParentGroupBlock(current, targetBlockId) {
 export function findOneComponentBlock(current, targetBlockId) {
     var targetBlock = findBlockByBlockId(current, targetBlockId);
     if (!targetBlock) {
-        console.error('Target block not found');
+        console.error("Target block not found");
         return null;
     }
-    if (targetBlock.type !== 'GROUP_BLOCK') {
-        console.error('Target block is not a group block');
+    if (targetBlock.type !== "GROUP_BLOCK") {
+        console.error("Target block is not a group block");
         return null;
     }
     // 직속 하위에서 먼저 찾기
     for (var _i = 0, _a = targetBlock.children; _i < _a.length; _i++) {
         var child = _a[_i];
-        if (child.type === 'COMPONENT_BLOCK') {
+        if (child.type === "COMPONENT_BLOCK") {
             return child.componentBlockId;
         }
     }
     // 직속 하위에 없다면 재귀적으로 찾기
     for (var _b = 0, _c = targetBlock.children; _b < _c.length; _b++) {
         var child = _c[_b];
-        if (child.type === 'GROUP_BLOCK') {
+        if (child.type === "GROUP_BLOCK") {
             var found = findOneComponentBlock(child, child.blockId);
             if (found !== null) {
                 return found;

package/package.json

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