pds-dev-kit-web-test 2.5.63 → 2.5.64

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

@@ -8,15 +8,21 @@ export type PayloadCBType = {
     type: ComponentBlock['type'];
     blockId: string;
     cbId: number;
+    workDir: string;
 };
 export type PayloadGBType = {
     type: GroupBlock['type'];
     blockId: string;
+    childrenBlockIds: string[];
+    childrenCBIds: number[];
+    workDir: string;
 };
 export type PayloadBulkType = {
     type: 'BULK';
     blockId: 'BULK';
     childrenBlockIds: string[];
+    childrenCBIds: number[];
+    workDir: string;
 };
 export type BlockPayloadType = PayloadCBType | PayloadGBType | PayloadBulkType;
 type ActionHandlerPayload = {

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

@@ -97,6 +97,11 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             sm: sm
         };
     }), layouts = _l[0], setLayouts = _l[1];
+    var _m = (0, react_1.useState)('ROOT'), editingGroupBlock = _m[0], setEditingGroupBlock = _m[1];
+    var _o = (0, react_1.useState)([]), bulkBlockIds = _o[0], setBulkBlockIds = _o[1];
+    var newblock = bulkBlockIds.length > 0
+        ? (0, group_1.addBulkToTarget)(pedigreeState, editingGroupBlock, bulkBlockIds)
+        : pedigreeState;
     (0, react_1.useImperativeHandle)(ref, function () {
         return {
             selectCB: function (cbId) {
@@ -193,10 +198,10 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         var allRootChildIds = (0, group_1.findAllChildrenIds)(pedigreeState, editingGroupBlock, 'current');
         setBulkBlockIds(allRootChildIds);
     };
-    var _m = (0, util_1.parseCustomSectionPlacement)({
+    var _p = (0, util_1.parseCustomSectionPlacement)({
         isMobile: isMobile,
         customSectionProps: CB_PLACEMENT_PROP_SECTION
-    }), rows = _m.rows, width = _m.width, minHeight = _m.minHeight, isFullWidth = _m.isFullWidth;
+    }), rows = _p.rows, width = _p.width, minHeight = _p.minHeight, isFullWidth = _p.isFullWidth;
     var customSectionStyles = {
         minHeight: "".concat(minHeight, "vh"),
         width: '100%',
@@ -204,6 +209,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
     };
     var breakpoint = device === 'MOBILE' ? 'sm' : 'lg';
     var onClickCB = function (id) {
+        var _a, _b;
         var blockId = blockIdMap.CB_ID[id];
         if (!isEditMode) {
             return;
@@ -221,7 +227,10 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                 return Array.from(set);
             });
             setSelectedBlockId(null);
-            var newBulkIds = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), blockIds_1, true)));
+            var newBulkBlockIds = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), blockIds_1, true)));
+            var newBulkCBIds = newBulkBlockIds
+                .map(function (id) { return blockIdMap.BLOCK_ID[id]; })
+                .filter(function (each) { return each !== undefined; });
             sectionActionHandler &&
                 sectionActionHandler({
                     type: '@CUSTOMSECTION/BLOCK_CLICKED',
@@ -229,7 +238,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             type: 'BULK',
                             blockId: 'BULK',
-                            childrenBlockIds: newBulkIds
+                            childrenBlockIds: newBulkBlockIds,
+                            childrenCBIds: newBulkCBIds,
+                            workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND'
                         }
                     }
                 });
@@ -265,7 +276,8 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                     block: {
                         blockId: blockId,
                         type: 'COMPONENT_BLOCK',
-                        cbId: id
+                        cbId: id,
+                        workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _b !== void 0 ? _b : 'NOT-FOUND'
                     }
                 }
             });
@@ -311,7 +323,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             });
     };
     var onDragStop = function (props) {
-        var _a;
+        var _a, _b;
         if (!isEditMode || !props.item) {
             return;
         }
@@ -353,7 +365,8 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             blockId: blockId,
                             cbId: numberId,
-                            type: 'COMPONENT_BLOCK'
+                            type: 'COMPONENT_BLOCK',
+                            workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _b !== void 0 ? _b : 'NOT-FOUND'
                         }
                     }
                 });
@@ -423,7 +436,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
             });
     };
     var onContextGroup = function (e, blockId, isEditingGroup) {
-        console.log(e, blockId, isEditingGroup);
         setSelectedBlockId(blockId);
         sectionActionHandler &&
             sectionActionHandler({
@@ -471,6 +483,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
     var breakpoints = device === 'DESKTOP' ? { lg: 100, sm: 0 } : { lg: 1200, sm: 480 };
     var innerRef = (0, react_1.useRef)(null);
     var clickOneCBInBulk = function (id) {
+        var _a;
         var blockId = blockIdMap.CB_ID[id];
         if (shortcutKeyMode === 'COLLISION_SELECT') {
             // makeCollisionOfBulk();
@@ -492,7 +505,8 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                             block: {
                                 blockId: oneLastBlockId,
                                 cbId: cbId,
-                                type: 'COMPONENT_BLOCK'
+                                type: 'COMPONENT_BLOCK',
+                                workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, blockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND'
                             }
                         }
                     });
@@ -519,11 +533,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         }
         return false;
     })();
-    var _o = (0, react_1.useState)('ROOT'), editingGroupBlock = _o[0], setEditingGroupBlock = _o[1];
-    var _p = (0, react_1.useState)([]), bulkBlockIds = _p[0], setBulkBlockIds = _p[1];
-    var newblock = bulkBlockIds.length > 0
-        ? (0, group_1.addBulkToTarget)(pedigreeState, editingGroupBlock, bulkBlockIds)
-        : pedigreeState;
     var onDoubleClickGroup = function (e, id, type) {
         e.stopPropagation();
         if (id === 'BULK') {
@@ -535,6 +544,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         setEditingGroupBlock('ROOT');
     };
     var onClickGroup = function (e, id, type) {
+        var _a, _b, _c, _d;
         e.stopPropagation();
         if (id === 'BULK') {
             return;
@@ -551,14 +561,18 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                             block: {
                                 blockId: oneLastBlockId,
                                 type: 'COMPONENT_BLOCK',
-                                cbId: blockIdMap.BLOCK_ID[oneLastBlockId]
+                                cbId: blockIdMap.BLOCK_ID[oneLastBlockId],
+                                workDir: (_a = (0, group_1.getBlockWorkDirPath)(newblock, oneLastBlockId)) !== null && _a !== void 0 ? _a : 'NOT-FOUND'
                             }
                         }
                     });
                 return;
             }
-            var newBulkBlockIds = bulkBlockIds.filter(function (each) { return each !== id; });
-            setBulkBlockIds(newBulkBlockIds);
+            var newBulkBlockIds_1 = bulkBlockIds.filter(function (each) { return each !== id; });
+            var newBulkCBIds_1 = newBulkBlockIds_1
+                .map(function (id) { return blockIdMap.BLOCK_ID[id]; })
+                .filter(function (each) { return each !== undefined; });
+            setBulkBlockIds(newBulkBlockIds_1);
             sectionActionHandler &&
                 sectionActionHandler({
                     type: '@CUSTOMSECTION/BLOCK_CLICKED',
@@ -566,7 +580,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             blockId: 'BULK',
                             type: 'BULK',
-                            childrenBlockIds: newBulkBlockIds
+                            childrenBlockIds: newBulkBlockIds_1,
+                            childrenCBIds: newBulkCBIds_1,
+                            workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, 'BULK')) !== null && _b !== void 0 ? _b : 'NOT-FOUND'
                         }
                     }
                 });
@@ -574,8 +590,11 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         }
         if (shortcutKeyMode === 'BULK_SELECT') {
             var added = selectedBlockId ? [selectedBlockId.toString(), id] : [id];
-            var newBulkBlocks = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true)));
-            setBulkBlockIds(newBulkBlocks);
+            var newBulkBlockIds_2 = Array.from(new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true)));
+            var newBulkCBIds_2 = newBulkBlockIds_2
+                .map(function (id) { return blockIdMap.BLOCK_ID[id]; })
+                .filter(function (each) { return each !== undefined; });
+            setBulkBlockIds(newBulkBlockIds_2);
             setSelectedBlockId(null);
             sectionActionHandler &&
                 sectionActionHandler({
@@ -584,7 +603,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
                         block: {
                             blockId: 'BULK',
                             type: 'BULK',
-                            childrenBlockIds: newBulkBlocks
+                            childrenBlockIds: newBulkBlockIds_2,
+                            childrenCBIds: newBulkCBIds_2,
+                            workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, 'BULK')) !== null && _c !== void 0 ? _c : 'NOT-FOUND'
                         }
                     }
                 });
@@ -592,13 +613,20 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
         }
         setBulkBlockIds([]);
         setSelectedBlockId(id);
+        var newBulkBlockIds = (0, group_1.findAllChildrenIds)(newblock, id, 'current');
+        var newBulkCBIds = newBulkBlockIds
+            .map(function (id) { return blockIdMap.BLOCK_ID[id]; })
+            .filter(function (each) { return each !== undefined; });
         sectionActionHandler &&
             sectionActionHandler({
                 type: '@CUSTOMSECTION/BLOCK_CLICKED',
                 payload: {
                     block: {
                         blockId: id,
-                        type: 'GROUP_BLOCK'
+                        type: 'GROUP_BLOCK',
+                        workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, id)) !== null && _d !== void 0 ? _d : 'NOT-FOUND',
+                        childrenBlockIds: newBulkBlockIds,
+                        childrenCBIds: newBulkCBIds
                     }
                 }
             });

package/package.json

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