pds-dev-kit-web-test 2.5.234 → 2.5.236

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

@@ -257,18 +257,21 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             if (!selectedCBId) {
                 return;
             }
-            var bulks = getCollisionGroupIds(selectedCBId);
+            var bulks_1 = getCollisionGroupIds(selectedCBId);
             if (selectedBlockId) {
-                bulks.push(selectedBlockId);
+                bulks_1.push(selectedBlockId);
             }
-            setBulkBlockIds(bulks);
+            setBulkBlockIds(function (prev) {
+                var set = new Set(__spreadArray(__spreadArray([], prev, true), bulks_1, true));
+                return Array.from(set);
+            });
             setSelectedBlockId(null);
-            var newBulkCBIds = bulks
+            var newBulkCBIds = bulks_1
                 .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
                 .filter(function (each) { return each !== null; });
             var childrenCBIds = [];
             if (newBulkCBIds.length === 0) {
-                var oneCB = (0, group_1.findOneComponentBlock)(newblock, bulks[0]);
+                var oneCB = (0, group_1.findOneComponentBlock)(newblock, bulks_1[0]);
                 childrenCBIds = oneCB ? [oneCB] : [];
             }
             else {
@@ -281,7 +284,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             type: 'BULK',
                             blockId: 'BULK',
-                            childrenBlockIds: bulks,
+                            childrenBlockIds: bulks_1,
                             workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _a !== void 0 ? _a : 'NOT-FOUND',
                             childrenCBIds: childrenCBIds
                         }
@@ -433,25 +436,17 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             return;
         }
         if (shortcutKeyMode === 'COLLISION_SELECT') {
-            var bulks_1 = getCollisionGroupIds(id);
-            if (selectedBlockId) {
-                bulks_1.push(selectedBlockId);
-            }
-            console.log('bulks', bulks_1);
-            console.log('added', added);
-            console.log('selectedBlockId', selectedBlockId);
-            // setBulkBlockIds(bulks);
-            setBulkBlockIds(function (prev) {
-                var set = new Set(__spreadArray(__spreadArray(__spreadArray([], prev, true), added, true), bulks_1, true));
-                return Array.from(set);
-            });
+            var bulks = getCollisionGroupIds(id);
+            var newBulksSet = new Set(__spreadArray(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true), bulks, true));
+            var newBulks = Array.from(newBulksSet);
+            setBulkBlockIds(newBulks);
             setSelectedBlockId(null);
-            var newBulkCBIds = bulks_1
+            var newBulkCBIds = newBulks
                 .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
                 .filter(function (each) { return each !== null; });
             var childrenCBIds = [];
             if (newBulkCBIds.length === 0) {
-                var oneCB = (0, group_1.findOneComponentBlock)(newblock, bulks_1[0]);
+                var oneCB = (0, group_1.findOneComponentBlock)(newblock, bulks[0]);
                 childrenCBIds = oneCB ? [oneCB] : [];
             }
             else {
@@ -464,7 +459,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             type: 'BULK',
                             blockId: 'BULK',
-                            childrenBlockIds: bulks_1,
+                            childrenBlockIds: newBulks,
                             workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _b !== void 0 ? _b : 'NOT-FOUND',
                             childrenCBIds: childrenCBIds
                         }
@@ -743,7 +738,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         var _a;
         var blockId = (0, group_1.formatCbIdToBlockId)(id);
         if (shortcutKeyMode === 'COLLISION_SELECT') {
-            // makeCollisionOfBulk();
             return;
         }
         if (shortcutKeyMode === 'BULK_SELECT') {

package/package.json

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