pds-dev-kit-web-test 2.5.99 → 2.5.101

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

@@ -170,6 +170,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         }
     }, [shortcutKeyMode, setSelectedBlockId]);
     (0, react_1.useLayoutEffect)(function () {
+        var _a;
         if (props.id !== editingSectionId) {
             return;
         }
@@ -181,19 +182,28 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             if (!selectedCBId) {
                 return;
             }
-            // const bulks = getCollisionGroupIds(selectedCBId).map(
-            //   (cbid) => formatCbIdToBlockId[Number(cbid)]
-            // );
-            // const bulkIds = findAccessibleChildrenBlocks(pedigreeState, editingGroupBlock, bulks);
-            // setBulkBlockIds(bulkIds);
-            // sectionActionHandler &&
-            //   sectionActionHandler({
-            //     type: '@CUSTOMSECTION/BLOCK_CLICKED',
-            //     payload: {
-            //       block: { type: 'BULK', blockId: 'BULK', childrenBlockIds: bulks }
-            //     }
-            //   });
-            setSelectedBlockId('BULK');
+            var bulks = getCollisionGroupIds(selectedCBId);
+            if (selectedBlockId) {
+                bulks.push(selectedBlockId);
+            }
+            setBulkBlockIds(bulks);
+            setSelectedBlockId(null);
+            sectionActionHandler &&
+                sectionActionHandler({
+                    type: '@CUSTOMSECTION/BLOCK_CLICKED',
+                    payload: {
+                        block: {
+                            type: 'BULK',
+                            blockId: 'BULK',
+                            childrenBlockIds: bulks,
+                            workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, selectedBlockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND',
+                            childrenCBIds: bulks
+                                .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                                .filter(function (each) { return each !== null; })
+                        }
+                    }
+                });
+            return;
         }
     }, [selectedBlockId, shortcutKeyMode, sectionActionHandler, setSelectedBlockId]);
     var makeAllInOneGroup = function () {
@@ -202,12 +212,26 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
     };
     var getCollisionGroupIds = function (cdId1) {
         var layoutItem = (0, renderHelpers_1.getLayoutItem)(layouts[layoutByDevice], cdId1.toString());
-        if (!layoutItem) {
+        if (!layoutItem || !selectedBlockId) {
             return [];
         }
         var allCollisions = (0, renderHelpers_1.getAllCollisions)(layouts[layoutByDevice], layoutItem);
-        var blockIds = allCollisions.map(function (each) { return (0, group_1.formatCbIdToBlockId)(Number(each.i)); });
-        return __spreadArray(__spreadArray([], blockIds, true), [(0, group_1.formatCbIdToBlockId)(cdId1)], false);
+        var allCollisionsCbIds = allCollisions.map(function (each) { return Number(each.i); });
+        var workdir = (0, group_1.getBlockWorkDirPath)(newblock, selectedBlockId);
+        if (!workdir) {
+            return [];
+        }
+        var workDirChildrenBlockIds = (0, group_1.findDirectChildrenBlockIds)(newblock, workdir);
+        var collisions = workDirChildrenBlockIds.filter(function (each) {
+            var cbId = (0, group_1.formatBlockIdToCbId)(each);
+            var allCollisions = (0, group_1.findAllChildrenCbIds)(newblock, each);
+            if (cbId !== null && allCollisionsCbIds.includes(cbId)) {
+                return true;
+            }
+            var hasCollision = allCollisions.some(function (each) { return allCollisionsCbIds.includes(each); });
+            return hasCollision;
+        });
+        return __spreadArray(__spreadArray([], collisions, true), [(0, group_1.formatCbIdToBlockId)(cdId1)], false);
     };
     var _m = (0, util_1.parseCustomSectionPlacement)({
         isMobile: isMobile,
@@ -258,7 +282,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             return;
         }
         if (shortcutKeyMode === 'COLLISION_SELECT') {
-            // const selectedCBId = selectedBlockId ? formatBlockIdToCbId(selectedBlockId) : undefined;
             var bulks = getCollisionGroupIds(id);
             if (selectedBlockId) {
                 bulks.push(selectedBlockId);

package/package.json

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