publ-echo-test 0.0.377 → 0.0.379

package/dist/lib/GridLayoutEditor/ReactGridLayout.js

@@ -38,7 +38,7 @@ import { calcGridColWidth, calcXY, getRowsForHeightFitContentItems, resolveRowHe
 // NOTE: 필수 변경하기
 import GridItem from "../GridItem/GridItem";
 import isEqual from "../../external-lib/lodash.isEqual";
-import { findAllChildrenCbIds, findBlockByBlockId, findDirectChildrenBlockIds, findDirectChildrenCbIds, findGroupBlocks, findParentGroupBlock, formatCbIdToBlockId, getBlockSpecificType, zIndexMap, } from "./group";
+import { findAllChildrenCbIds, findBlockByBlockId, findDirectChildrenBlockIds, findDirectChildrenCbIds, findGroupBlocks, findParentGroupBlock, formatCbIdToBlockId, getBlockIdKind, getBlockSpecificType, zIndexMap, } from "./group";
 import GroupItem from "../GridItem/GroupItem";
 import OutsideClickHandler from "../GridItem/OutsideClickHandler";
 import { GridBackgroundPlaceholder } from "./Placeholder";
@@ -53,6 +53,7 @@ var ReactGridLayout = function (_a) {
     _x = props.resizeHandles, // TODO fix
     resizeHandles = _x === void 0 ? ["se"] : _x, _y = props.width, width = _y === void 0 ? 0 : _y, resizeHandle = props.resizeHandle, _z = props.isHiddenVisibility, isHiddenVisibility = _z === void 0 ? true : _z, innerRef = props.innerRef, minNbRow = props.minNbRow, customColWidth = props.customColWidth, blockStructure = props.blockStructure, onDoubleClickGroup = props.onDoubleClickGroup, _0 = props.editingGroupBlock, editingGroupBlock = _0 === void 0 ? "ROOT" : _0, _1 = props.selectedGroupBlock, selectedGroupBlock = _1 === void 0 ? "ROOT" : _1, onClickGroup = props.onClickGroup, bulkIds = props.bulkIds, onDoubleClickOutsideGroup = props.onDoubleClickOutsideGroup;
     var device = cols === 24 ? "DESKTOP" : "MOBILE";
+    var parsedSelectedBlockId = getBlockIdKind(selectedBlockId !== null && selectedBlockId !== void 0 ? selectedBlockId : "");
     var _2 = useState(), activeDrag = _2[0], setActiveDrag = _2[1];
     var _3 = useState(), oldDragItem = _3[0], setOldDragItem = _3[1];
     var _4 = useState(), oldLayout = _4[0], setOldLayout = _4[1];
@@ -573,7 +574,7 @@ var ReactGridLayout = function (_a) {
         var zIndex = editorMode === "EDIT" ? editorZIndex : z;
         // Check if a layout item overlaps any of the activeRows (vertical overlap)
         var isOverlappingActiveRows = function (item) {
-            if (selectedBlockId === item.i) {
+            if ((parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.id) === item.i) {
                 return false;
             }
             if (!(activeDragItemOrSelectedItem === null || activeDragItemOrSelectedItem === void 0 ? void 0 : activeDragItemOrSelectedItem.heightFitContent)) {
@@ -753,10 +754,22 @@ var ReactGridLayout = function (_a) {
     var currentGroupBlocks = blockStructure
         ? findGroupBlocks(blockStructure, editingGroupBlock)
         : [];
-    var selectedLayoutItem = selectedBlockId
-        ? getLayoutItem(layout, selectedBlockId)
-        : null;
-    console.log("layout", layout);
+    function generateGrouplayout(groupblockId) {
+        if (!blockStructure) {
+            return null;
+        }
+        var childrenIds = findAllChildrenCbIds(blockStructure, groupblockId).map(function (i) { return i.toString(); });
+        var groupItem = getBoundingArea(layout, childrenIds);
+        if (!groupItem) {
+            return null;
+        }
+        return __assign({ i: groupblockId }, groupItem);
+    }
+    var selectedLayoutItem = (parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.type) === "CB"
+        ? getLayoutItem(layout, parsedSelectedBlockId.id)
+        : (parsedSelectedBlockId === null || parsedSelectedBlockId === void 0 ? void 0 : parsedSelectedBlockId.type) === "GB"
+            ? generateGrouplayout(parsedSelectedBlockId.id)
+            : null;
     var activeDragItemOrSelectedItem = activeDrag || selectedLayoutItem;
     var activeBlock = activeDragItemOrSelectedItem
         ? blockStructure
@@ -774,6 +787,7 @@ var ReactGridLayout = function (_a) {
         : activeRows;
     console.log("activeDragItemOrSelectedItem", activeDragItemOrSelectedItem);
     console.log("selectedBlockId", selectedBlockId);
+    console.log('curentgroupblocks"', currentGroupBlocks);
     console.log("selectedLayoutItem", selectedLayoutItem);
     console.log("activeBlock", activeBlock);
     console.log("activeRowsFiltered", activeRowsFiltered);

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

@@ -62,5 +62,12 @@ 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 getBlockIdKind(blockId: string): {
+    type: "GB";
+    id: string;
+} | {
+    type: "CB";
+    id: string;
+} | null;
 export declare function findParentGroupBlock(current: Block, targetBlockId: string): GroupBlock | null;
 export declare function findOneComponentBlock(current: Block, targetBlockId: string): number | null;

package/dist/lib/GridLayoutEditor/group.js

@@ -250,6 +250,21 @@ export function formatBlockIdToCbId(blockId) {
 export function formatCbIdToBlockId(cbId) {
     return "CB_".concat(cbId);
 }
+export function getBlockIdKind(blockId) {
+    if (/^GB_.+$/i.test(blockId)) {
+        return {
+            type: "GB",
+            id: blockId,
+        };
+    }
+    if (/^CB_\d+$/i.test(blockId)) {
+        return {
+            type: "CB",
+            id: formatBlockIdToCbId(blockId).toString(),
+        };
+    }
+    return null;
+}
 // export const findAccessibleChildrenBlocks = (
 //   block: Block,
 //   targetGroupId: string,

package/dist/lib/GridLayoutEditor/utils/renderHelpers.js

@@ -565,7 +565,9 @@ function log() {
 }
 export var noop = function (_args) { return undefined; };
 export function getBoundingArea(layout, ids) {
-    var layoutItems = ids.map(function (id) { return getLayoutItem(layout, id); }).filter(function (item) { return item !== undefined; });
+    var layoutItems = ids
+        .map(function (id) { return getLayoutItem(layout, id); })
+        .filter(function (item) { return item !== undefined; });
     if (layoutItems.length === 0) {
         return null;
     }

package/package.json

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