pds-dev-kit-web-test 0.3.21 → 0.3.23

package/dist/src/sub/DynamicLayout/sections/CustomSection/CustomSection.js

@@ -48,6 +48,7 @@ var ReactGridLayout_1 = __importDefault(require("publ-echo/dist/lib/GridLayoutEd
 var react_1 = __importStar(require("react"));
 var ErrorBoundary_1 = require("../../../DynamicLayout/components/Section/ErrorBoundary");
 var dynamicLayoutContext_1 = require("../../../DynamicLayout/dynamicLayoutContext");
+var deepCopy_1 = __importDefault(require("../../../DynamicLayout/utils/deepCopy"));
 var styled_components_1 = __importDefault(require("styled-components"));
 var components_1 = require("../../components");
 var ComponentBlockMatcher_1 = __importDefault(require("./components/ComponentBlock/ComponentBlockMatcher"));
@@ -119,6 +120,7 @@ function CustomSection(props) {
             setSelectedCB('group');
             return;
         }
+        breakGroupCB();
         setSelectedCB(id);
         sectionActionHandler &&
             sectionActionHandler({
@@ -261,13 +263,14 @@ function CustomSection(props) {
                                                 if (!matchedCB) {
                                                     return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
                                                 }
-                                                matchedCB.properties.CB_EFFECT_PROP_ENTANIM.CB_EFFECT_PROP_ENTANIM_SPEC_TYPE =
+                                                var cbCopy = (0, deepCopy_1.default)(matchedCB);
+                                                cbCopy.properties.CB_EFFECT_PROP_ENTANIM.CB_EFFECT_PROP_ENTANIM_SPEC_TYPE =
                                                     'NONE';
-                                                matchedCB.properties.CB_EFFECT_PROP_ENTANIM['CB_EFFECT_PROP_ENTANIM_SPEC_TYPE:MOBILE'] = 'NONE';
+                                                cbCopy.properties.CB_EFFECT_PROP_ENTANIM['CB_EFFECT_PROP_ENTANIM_SPEC_TYPE:MOBILE'] = 'NONE';
                                                 return ((0, jsx_runtime_1.jsx)("div", __assign({ className: "cb-box-in-group", onClick: function (e) {
                                                         e.stopPropagation();
                                                         clickGroupedOne(matchedCB.id);
-                                                    } }, { children: (0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(ComponentBlockMatcher_1.default, { cbProps: matchedCB, device: device }) }) }), matchedCB.id));
+                                                    } }, { children: (0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsx)(ComponentBlockMatcher_1.default, { cbProps: cbCopy, device: device }) }) }), matchedCB.id));
                                             }) })) }), each.i));
                                 }
                                 if (!matchedCB) {

package/dist/src/sub/DynamicLayout/sections/CustomSection/hooks/useGroupDrag/useGroupDrag.js

@@ -70,7 +70,7 @@ function useGroupDrag(_a) {
             var secondIdx = currentLayoutCopy.findIndex(function (item) { return Number(item.i) === newId; });
             var secondElem = currentLayoutCopy.splice(secondIdx, 1)[0];
             var group = (0, utils_1.getGroupData)(firstElem, secondElem);
-            currentLayoutCopy.push(group);
+            currentLayoutCopy.unshift(group);
             return __assign(__assign({}, prev), (_a = {}, _a[layoutByDevice] = currentLayoutCopy, _a));
         });
         sectionActionHandler &&

package/dist/src/sub/DynamicLayout/sections/CustomSection/hooks/useGroupDrag/utils.js

@@ -22,6 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitComponentBlocksByGroup = exports.getGroupForMultiple = exports.getGroupData = void 0;
 function getGroupData(elem1, elem2) {
+    var _a, _b;
     var minX = Math.min(elem1.x, elem2.x);
     var minY = Math.min(elem1.y, elem2.y);
     var elem1W = elem1.x - minX + elem1.w;
@@ -31,6 +32,9 @@ function getGroupData(elem1, elem2) {
     // NOTE: maxW, maxH 이름 변경 필요.
     var maxW = Math.max(elem1W, elem2W);
     var maxH = Math.max(elem1H, elem2H);
+    var maxZ = Math.max((_a = elem1 === null || elem1 === void 0 ? void 0 : elem1.z) !== null && _a !== void 0 ? _a : 0, (_b = elem2 === null || elem2 === void 0 ? void 0 : elem2.z) !== null && _b !== void 0 ? _b : 0);
+    // eslint-disable-next-line no-console
+    console.log('grouping', { elem1Z: elem1.z, elem2Z: elem2.z });
     var elem1InnerData = __assign(__assign({}, elem1), { x: elem1.x - minX, y: elem1.y - minY });
     var elem2InnerData = __assign(__assign({}, elem2), { x: elem2.x - minX, y: elem2.y - minY });
     var groupLayouts = elem1.groupLayouts
@@ -43,6 +47,7 @@ function getGroupData(elem1, elem2) {
         y: minY,
         w: maxW,
         h: maxH,
+        z: maxZ,
         groupLayouts: groupLayouts,
         childrenIds: childrenIds
     };

package/dist/src/sub/DynamicLayout/utils/deepCopy.d.ts

@@ -0,0 +1 @@
+export default function deepCopy<T>(obj: T): T;

package/dist/src/sub/DynamicLayout/utils/deepCopy.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function deepCopy(obj) {
+    if (typeof obj !== 'object' || obj === null) {
+        return obj;
+    }
+    var result = Array.isArray(obj) ? [] : {};
+    for (var key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            result[key] = deepCopy(obj[key]);
+        }
+    }
+    return result;
+}
+exports.default = deepCopy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web-test",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",

package/release-note.md

@@ -1,8 +1,6 @@
 # PDS-DEV-KIT-WEB Release Notes
-## [v0.3.21]
+## [v0.3.23]
 ## 기준 pds-dev-kit-web 버전 @2.2.41
 ### sub
     * DynamicLayout
-        * cb전체 한번에선택/ 하나씩 그룹에서 빼기
-        * 그룹 생성/ 해제 시 상위 액션 방출
-        * group 내부에서 entanim 작동 방지
+      * group에 요소들 중 최대 z-index를 부여