pds-dev-kit-web-test 2.5.114 → 2.5.116

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

@@ -164,15 +164,21 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             return;
         }
         if (shortcutKeyMode === 'MANUAL_BULK_BREAK') {
-            setBulkBlockIds([]);
-            setSelectedBlockId(null);
-            sectionActionHandler &&
-                sectionActionHandler({
-                    type: '@CUSTOMSECTION/BULK_DISMISSED',
-                    payload: {
-                        message: 'MANUAL_BULK_BREAK_OR_ESC'
-                    }
-                });
+            if (bulkBlockIds.length > 0) {
+                setBulkBlockIds([]);
+                setSelectedBlockId(null);
+                sectionActionHandler &&
+                    sectionActionHandler({
+                        type: '@CUSTOMSECTION/BULK_DISMISSED',
+                        payload: {
+                            message: 'MANUAL_BULK_BREAK_OR_ESC'
+                        }
+                    });
+                return;
+            }
+            if (editingGroupBlock !== 'ROOT') {
+                setEditingGroupBlock('ROOT');
+            }
             return;
         }
     }, [shortcutKeyMode, setSelectedBlockId]);
@@ -252,7 +258,12 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         if (!isEditMode) {
             return;
         }
-        var added = selectedBlockId ? [selectedBlockId, blockId] : [blockId];
+        var added = (function () {
+            if (selectedBlockId === editingGroupBlock) {
+                return [blockId];
+            }
+            return selectedBlockId ? [selectedBlockId, blockId] : [blockId];
+        })();
         if (shortcutKeyMode === 'BULK_SELECT' && added.length > 1) {
             setBulkBlockIds(function (prev) {
                 var set = new Set(__spreadArray(__spreadArray([], prev, true), added, true));
@@ -624,7 +635,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         setEditingGroupBlock('ROOT');
     };
     var onClickGroup = function (e, id, type) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         e.stopPropagation();
         if (id === 'BULK') {
             return;
@@ -676,7 +687,30 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             return;
         }
         if (shortcutKeyMode === 'BULK_SELECT') {
-            var added = selectedBlockId ? [selectedBlockId.toString(), id] : [id];
+            var added = (function () {
+                if (selectedBlockId === editingGroupBlock) {
+                    return [id];
+                }
+                return selectedBlockId ? [selectedBlockId, id] : [id];
+            })();
+            if (added.length === 1) {
+                setSelectedBlockId(id);
+                setBulkBlockIds([]);
+                sectionActionHandler &&
+                    sectionActionHandler({
+                        type: '@CUSTOMSECTION/BLOCK_CLICKED',
+                        payload: {
+                            block: {
+                                blockId: id,
+                                type: 'GROUP_BLOCK',
+                                workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, id)) !== null && _c !== void 0 ? _c : 'NOT-FOUND',
+                                childrenBlockIds: (_d = (0, group_1.findDirectChildrenBlockIds)(newblock, id)) !== null && _d !== void 0 ? _d : [],
+                                childrenCBIds: (_e = (0, group_1.findDirectChildrenCbIds)(newblock, id)) !== null && _e !== void 0 ? _e : []
+                            }
+                        }
+                    });
+                return;
+            }
             var newBulkBlockIds_2 = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true)));
             var newBulkCBIds_2 = newBulkBlockIds_2
                 .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
@@ -692,7 +726,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                             type: 'BULK',
                             childrenBlockIds: newBulkBlockIds_2,
                             childrenCBIds: newBulkCBIds_2,
-                            workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, 'BULK')) !== null && _c !== void 0 ? _c : 'NOT-FOUND'
+                            workDir: (_f = (0, group_1.getBlockWorkDirPath)(newblock, 'BULK')) !== null && _f !== void 0 ? _f : 'NOT-FOUND'
                         }
                     }
                 });
@@ -711,7 +745,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                     block: {
                         blockId: id,
                         type: 'GROUP_BLOCK',
-                        workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, id)) !== null && _d !== void 0 ? _d : 'NOT-FOUND',
+                        workDir: (_g = (0, group_1.getBlockWorkDirPath)(newblock, id)) !== null && _g !== void 0 ? _g : 'NOT-FOUND',
                         childrenBlockIds: newBulkBlockIds,
                         childrenCBIds: newBulkCBIds
                     }

package/package.json

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