pds-dev-kit-web-test 2.5.98 → 2.5.100

package/dist/src/sub/DynamicLayout/sectionActionTypes.d.ts

@@ -101,10 +101,12 @@ type ActionHandlerPayload = {
     };
     '@CUSTOMSECTION/GROUP_RIGHT_CLICKED': {
         e: React.MouseEvent;
-        blockId: string;
+        block: PayloadGBType;
         isEditingGroup: boolean;
-        childrenCBIds: number[];
-        workdir: string;
+    };
+    '@CUSTOMSECTION/BULK_RIGHT_CLICKED': {
+        e: React.MouseEvent;
+        block: PayloadBulkType;
     };
     '@CUSTOMSECTION/BULK_CREATED': {
         message: string;

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

@@ -58,6 +58,7 @@ var renderHelpers_1 = require("publ-echo-test/dist/lib/GridLayoutEditor/utils/re
 var react_1 = __importStar(require("react"));
 var ErrorBoundary_1 = require("../../../DynamicLayout/components/Section/ErrorBoundary");
 var dynamicLayoutContext_1 = require("../../../DynamicLayout/dynamicLayoutContext");
+require("../../../DynamicLayout/sectionActionTypes");
 var styled_components_1 = __importDefault(require("styled-components"));
 var components_1 = require("../../components");
 var ComponentBlockMatcher_1 = __importDefault(require("./components/ComponentBlock/ComponentBlockMatcher"));
@@ -169,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;
         }
@@ -180,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 () {
@@ -238,7 +249,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             });
             setSelectedBlockId(null);
             var newBulkBlockIds = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), blockIds_1, true)));
-            var newBulkCBIds = newBulkBlockIds.map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); });
+            var newBulkCBIds = newBulkBlockIds
+                .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                .filter(function (each) { return each !== null; });
             sectionActionHandler &&
                 sectionActionHandler({
                     type: '@CUSTOMSECTION/BLOCK_CLICKED',
@@ -255,7 +268,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);
@@ -271,7 +283,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                             blockId: 'BULK',
                             childrenBlockIds: bulks,
                             workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _b !== void 0 ? _b : 'NOT-FOUND',
-                            childrenCBIds: bulks.map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                            childrenCBIds: bulks
+                                .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                                .filter(function (each) { return each !== null; })
                         }
                     }
                 });
@@ -454,17 +468,25 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             });
     };
     var onContextGroup = function (e, blockId, isEditingGroup) {
-        var _a;
+        var _a, _b, _c;
         setSelectedBlockId(blockId);
+        var block = (0, group_1.findBlockByBlockId)(newblock, blockId);
+        if ((block === null || block === void 0 ? void 0 : block.type) === 'COMPONENT_BLOCK') {
+            return;
+        }
         sectionActionHandler &&
             sectionActionHandler({
                 type: '@CUSTOMSECTION/GROUP_RIGHT_CLICKED',
                 payload: {
-                    blockId: blockId,
+                    block: {
+                        blockId: blockId,
+                        type: 'GROUP_BLOCK',
+                        workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND',
+                        childrenBlockIds: (_b = (0, group_1.findDirectChildrenBlockIds)(newblock, blockId)) !== null && _b !== void 0 ? _b : [],
+                        childrenCBIds: (_c = (0, group_1.findDirectChildrenCbIds)(newblock, blockId)) !== null && _c !== void 0 ? _c : []
+                    },
                     e: e,
-                    isEditingGroup: isEditingGroup,
-                    workdir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND',
-                    childrenCBIds: (0, group_1.findDirectChildrenCbIds)(newblock, blockId)
+                    isEditingGroup: isEditingGroup
                 }
             });
     };
@@ -601,7 +623,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                 return;
             }
             var newBulkBlockIds_1 = bulkBlockIds.filter(function (each) { return each !== id; });
-            var newBulkCBIds_1 = newBulkBlockIds_1.map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); });
+            var newBulkCBIds_1 = newBulkBlockIds_1
+                .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                .filter(function (each) { return each !== null; });
             setBulkBlockIds(newBulkBlockIds_1);
             sectionActionHandler &&
                 sectionActionHandler({
@@ -621,7 +645,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         if (shortcutKeyMode === 'BULK_SELECT') {
             var added = selectedBlockId ? [selectedBlockId.toString(), id] : [id];
             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); });
+            var newBulkCBIds_2 = newBulkBlockIds_2
+                .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+                .filter(function (each) { return each !== null; });
             setBulkBlockIds(newBulkBlockIds_2);
             setSelectedBlockId(null);
             sectionActionHandler &&
@@ -642,7 +668,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         setBulkBlockIds([]);
         setSelectedBlockId(id);
         var newBulkBlockIds = (0, group_1.findDirectChildrenBlockIds)(newblock, id);
-        var newBulkCBIds = newBulkBlockIds.map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); });
+        var newBulkCBIds = newBulkBlockIds
+            .map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
+            .filter(function (each) { return each !== null; });
         sectionActionHandler &&
             sectionActionHandler({
                 type: '@CUSTOMSECTION/BLOCK_CLICKED',

package/package.json

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