pds-dev-kit-web-test 2.5.113 → 2.5.115

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

@@ -247,25 +247,24 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
     };
     var breakpoint = device === 'MOBILE' ? 'sm' : 'lg';
     var onClickCB = function (id) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         var blockId = (0, group_1.formatCbIdToBlockId)(id);
         if (!isEditMode) {
             return;
         }
-        if (shortcutKeyMode === 'BULK_SELECT' && selectedBlockId) {
-            var added = selectedBlockId ? [selectedBlockId, id] : [id];
-            var blockIds_1 = added.map(function (cbId) {
-                if (typeof cbId === 'number') {
-                    return (0, group_1.formatCbIdToBlockId)(cbId);
-                }
-                return cbId;
-            });
+        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), blockIds_1, true));
+                var set = new Set(__spreadArray(__spreadArray([], prev, true), added, true));
                 return Array.from(set);
             });
             setSelectedBlockId(null);
-            var newBulkBlockIds = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), blockIds_1, true)));
+            var newBulkBlockIds = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true)));
             var newBulkCBIds = newBulkBlockIds
                 .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
                 .filter(function (each) { return each !== null; });
@@ -308,20 +307,39 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                 });
             return;
         }
+        var blockType = blockId.startsWith('GB_') ? 'GROUP_BLOCK' : 'COMPONENT_BLOCK';
         setSelectedBlockId(blockId);
         setBulkBlockIds([]);
-        sectionActionHandler &&
-            sectionActionHandler({
-                type: '@CUSTOMSECTION/BLOCK_CLICKED',
-                payload: {
-                    block: {
-                        blockId: blockId,
-                        type: 'COMPONENT_BLOCK',
-                        cbId: id,
-                        workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _c !== void 0 ? _c : 'NOT-FOUND'
+        if (blockType === 'COMPONENT_BLOCK') {
+            sectionActionHandler &&
+                sectionActionHandler({
+                    type: '@CUSTOMSECTION/BLOCK_CLICKED',
+                    payload: {
+                        block: {
+                            blockId: blockId,
+                            type: blockType,
+                            cbId: id,
+                            workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _c !== void 0 ? _c : 'NOT-FOUND'
+                        }
                     }
-                }
-            });
+                });
+            return;
+        }
+        if (blockType === 'GROUP_BLOCK') {
+            sectionActionHandler &&
+                sectionActionHandler({
+                    type: '@CUSTOMSECTION/BLOCK_CLICKED',
+                    payload: {
+                        block: {
+                            blockId: blockId,
+                            type: 'GROUP_BLOCK',
+                            workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _d !== void 0 ? _d : 'NOT-FOUND',
+                            childrenBlockIds: (_e = (0, group_1.findDirectChildrenBlockIds)(newblock, blockId)) !== null && _e !== void 0 ? _e : [],
+                            childrenCBIds: (_f = (0, group_1.findDirectChildrenCbIds)(newblock, blockId)) !== null && _f !== void 0 ? _f : []
+                        }
+                    }
+                });
+        }
     };
     var onContextMenuCB = function (id, e) {
         var _a;
@@ -611,7 +629,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;
@@ -663,7 +681,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); })
@@ -679,7 +720,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'
                         }
                     }
                 });
@@ -698,7 +739,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.113",
+  "version": "2.5.115",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",