pds-dev-kit-web-test 0.3.35 → 0.3.37

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

@@ -132,6 +132,11 @@ function CustomSection(props) {
             makeAllInOneGroup();
             return;
         }
+    }, [shortcutKeyMode]);
+    (0, react_1.useLayoutEffect)(function () {
+        if (props.id !== editingSectionId) {
+            return;
+        }
         if (shortcutKeyMode === 'MANUAL_COLLISION_SELECT') {
             if (!selectedCB || selectedCB === 'group') {
                 return;
@@ -162,6 +167,9 @@ function CustomSection(props) {
             return;
         }
         if (selectedCB && shortcutKeyMode === 'BULK_SELECT') {
+            if (id === selectedCB) {
+                return;
+            }
             setGroupCB(selectedCB, id);
             sectionActionHandler &&
                 sectionActionHandler({
@@ -174,7 +182,8 @@ function CustomSection(props) {
             return;
         }
         if (shortcutKeyMode === 'COLLISION_SELECT') {
-            makeCollisionGroup(id);
+            var selectedCBId = typeof selectedCB === 'number' ? selectedCB : undefined;
+            makeCollisionGroup(id, selectedCBId);
             sectionActionHandler &&
                 sectionActionHandler({
                     type: '@CUSTOMSECTION/CB_CLICKED',

package/dist/src/sub/DynamicLayout/sections/CustomSection/hooks/useGroupDrag/useGroupDrag.d.ts

@@ -14,7 +14,7 @@ declare function useGroupDrag({ device, setLayouts, sectionActionHandler }: Prop
     breakGroupCB: () => void;
     makeAllInOneGroup: () => void;
     escapeFromGroup: (id: string) => void;
-    makeCollisionGroup: (id: number) => void;
+    makeCollisionGroup: (id: number, selectedCBId?: number) => void;
 };
 export declare function getGroupCB(layout: Layout): LayoutItemWithGroupType | null;
 export declare const filterItemsById: (layout: Layout, idsToRemove: string[]) => LayoutItem[];

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

@@ -138,20 +138,35 @@ function useGroupDrag(_a) {
                 }
             });
     }
-    function makeCollisionGroup(id) {
+    function makeCollisionGroup(id, selectedCBId) {
         setLayouts(function (prev) {
             var _a, _b;
             var _c, _d;
             var currentLayoutCopy = JSON.parse(JSON.stringify(prev[layoutByDevice]));
+            var additionalSelectedCBLayout = (function () {
+                if (selectedCBId === undefined) {
+                    return null;
+                }
+                if (id === selectedCBId) {
+                    return null;
+                }
+                return (0, renderHelpers_1.getLayoutItem)(currentLayoutCopy, selectedCBId.toString());
+            })();
             var layout = (0, renderHelpers_1.getLayoutItem)(currentLayoutCopy, id.toString());
             if (!layout) {
                 return prev;
             }
             var prevGroupIdx = currentLayoutCopy.findIndex(function (item) { return item.i === 'group'; });
-            // const prevGroup = currentLayoutCopy[prevGroupIdx];
             if (prevGroupIdx < 0) {
                 var collisions = (0, renderHelpers_1.getAllCollisions)(currentLayoutCopy, layout);
-                var group_2 = (0, utils_1.getGroupForMultiple)(__spreadArray([layout], collisions, true));
+                var groupLayouts = __spreadArray([layout], collisions, true);
+                if (collisions.length === 0 && !additionalSelectedCBLayout) {
+                    return prev;
+                }
+                if (additionalSelectedCBLayout) {
+                    groupLayouts.push(additionalSelectedCBLayout);
+                }
+                var group_2 = (0, utils_1.getGroupForMultiple)(groupLayouts);
                 var filtered = currentLayoutCopy.filter(function (layout) { return !group_2.childrenIds.includes(layout.i); });
                 return __assign(__assign({}, prev), (_a = {}, _a[layoutByDevice] = __spreadArray([group_2], filtered, true), _a));
             }

package/package.json

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

package/release-note.md

@@ -1,8 +1,6 @@
 # pds-dev-kit-web-test Release Notes
-## [v0.3.35]
+## [v0.3.37]
 ## 기준 pds-dev-kit-web 버전 @2.2.41
 ### sub
     * DynamicLayout
-        * 단축키 기능 모두추가
-        * 단축키 hook 추가
-        * collision group시 기존 그룹과 합체
+        * 몇개의 가드 추가