pds-dev-kit-web-test 2.5.239 → 2.5.241

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/src/sub/DynamicLayout/sections/CustomSection/CustomSection.js +34 -12
  2. package/package.json +2 -2
package/dist/src/sub/DynamicLayout/sections/CustomSection/CustomSection.js CHANGED
@@ -258,6 +258,8 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
258
258
  return;
259
259
  }
260
260
  var bulks_1 = getCollisionGroupIds(selectedCBId);
261
+ var newBulksSet = new Set(__spreadArray(__spreadArray([], bulkBlockIds, true), bulks_1, true));
262
+ var newBulks = Array.from(newBulksSet);
261
263
  if (selectedBlockId) {
262
264
  bulks_1.push(selectedBlockId);
263
265
  }
@@ -292,7 +294,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
292
294
  });
293
295
  return;
294
296
  }
295
- }, [selectedBlockId, shortcutKeyMode, sectionActionHandler, setSelectedBlockId]);
297
+ }, [selectedBlockId, shortcutKeyMode, sectionActionHandler, bulkBlockIds, setSelectedBlockId]);
296
298
  var makeAllInOneGroup = function () {
297
299
  var _a, _b, _c, _d, _e;
298
300
  var allRootChildIds = (0, group_1.findDirectChildrenBlockIds)(pedigreeState, editingGroupBlock);
@@ -391,7 +393,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
391
393
  };
392
394
  var breakpoint = device === 'MOBILE' ? 'sm' : 'lg';
393
395
  var onClickCB = function (id) {
394
- var _a, _b, _c, _d, _e, _f;
396
+ var _a, _b, _c, _d, _e, _f, _g;
395
397
  var blockId = (0, group_1.formatCbIdToBlockId)(id);
396
398
  if (!isEditMode) {
397
399
  return;
@@ -442,6 +444,24 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
442
444
  var bulks = getCollisionGroupIds(id);
443
445
  var newBulksSet = new Set(__spreadArray(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true), bulks, true));
444
446
  var newBulks = Array.from(newBulksSet);
447
+ if (newBulks.length === 1) {
448
+ var blockId_1 = newBulks[0];
449
+ setSelectedBlockId(blockId_1);
450
+ setBulkBlockIds([]);
451
+ sectionActionHandler &&
452
+ sectionActionHandler({
453
+ type: '@CUSTOMSECTION/BLOCK_CLICKED',
454
+ payload: {
455
+ block: {
456
+ type: 'COMPONENT_BLOCK',
457
+ blockId: blockId_1,
458
+ cbId: id,
459
+ workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _b !== void 0 ? _b : 'NOT-FOUND'
460
+ }
461
+ }
462
+ });
463
+ return;
464
+ }
445
465
  setBulkBlockIds(newBulks);
446
466
  setSelectedBlockId(null);
447
467
  var newBulkCBIds = newBulks
@@ -463,7 +483,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
463
483
  type: 'BULK',
464
484
  blockId: 'BULK',
465
485
  childrenBlockIds: newBulks,
466
- workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _b !== void 0 ? _b : 'NOT-FOUND',
486
+ workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _c !== void 0 ? _c : 'NOT-FOUND',
467
487
  childrenCBIds: childrenCBIds
468
488
  }
469
489
  }
@@ -482,7 +502,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
482
502
  blockId: blockId,
483
503
  type: blockType,
484
504
  cbId: id,
485
- workDir: (_c = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _c !== void 0 ? _c : 'NOT-FOUND'
505
+ workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _d !== void 0 ? _d : 'NOT-FOUND'
486
506
  }
487
507
  }
488
508
  });
@@ -496,9 +516,9 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
496
516
  block: {
497
517
  blockId: blockId,
498
518
  type: 'GROUP_BLOCK',
499
- workDir: (_d = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _d !== void 0 ? _d : 'NOT-FOUND',
500
- childrenBlockIds: (_e = (0, group_1.findDirectChildrenBlockIds)(newblock, blockId)) !== null && _e !== void 0 ? _e : [],
501
- childrenCBIds: (_f = (0, group_1.findDirectChildrenCbIds)(newblock, blockId)) !== null && _f !== void 0 ? _f : []
519
+ workDir: (_e = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _e !== void 0 ? _e : 'NOT-FOUND',
520
+ childrenBlockIds: (_f = (0, group_1.findDirectChildrenBlockIds)(newblock, blockId)) !== null && _f !== void 0 ? _f : [],
521
+ childrenCBIds: (_g = (0, group_1.findDirectChildrenCbIds)(newblock, blockId)) !== null && _g !== void 0 ? _g : []
502
522
  }
503
523
  }
504
524
  });
@@ -510,11 +530,14 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
510
530
  if (!isEditMode) {
511
531
  return;
512
532
  }
513
- if (!['COLLISION_SELECT', 'BULK_SELECT'].includes(shortcutKeyMode !== null && shortcutKeyMode !== void 0 ? shortcutKeyMode : '')) {
514
- if (blockId !== selectedBlockId) {
515
- setBulkBlockIds([]);
516
- }
533
+ if (selectedBlockId === 'BULK' && blockId !== selectedBlockId) {
534
+ setBulkBlockIds([]);
517
535
  }
536
+ // if (!['COLLISION_SELECT', 'BULK_SELECT'].includes(shortcutKeyMode ?? '')) {
537
+ // if (blockId !== selectedBlockId) {
538
+ // setBulkBlockIds([]);
539
+ // }
540
+ // }
518
541
  setSelectedBlockId(blockId);
519
542
  if (sectionActionHandler) {
520
543
  sectionActionHandler({
@@ -970,7 +993,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
970
993
  });
971
994
  }
972
995
  };
973
- console.log('newblock', newblock);
974
996
  return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.ErrorBoundary, { children: (0, jsx_runtime_1.jsxs)(gleStyles_1.S_gleStyles, __assign({ isBulkMode: shortcutKeyMode === 'BULK_SELECT' }, { children: [showSectionHiddenCover && (0, jsx_runtime_1.jsx)(S_HiddenCover_1.S_HiddenCover, {}), (0, jsx_runtime_1.jsx)(S_SectionWrapper, __assign({ ref: gleRef, "x-dlayout-section-type": "NO_NAME", onClick: onClickSection, onContextMenu: function (e) {
975
997
  e.stopPropagation();
976
998
  e.preventDefault();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pds-dev-kit-web-test",
3
- "version": "2.5.239",
3
+ "version": "2.5.241",
4
4
  "license": "MIT",
5
5
  "private": false,
6
6
  "main": "dist/index.js",
@@ -23,7 +23,7 @@
23
23
  "lottie-react": "^2.3.1",
24
24
  "nuka-carousel": "^4.8.4",
25
25
  "publ-echo": "^0.0.99",
26
- "publ-echo-test": "^0.0.186",
26
+ "publ-echo-test": "^0.0.187",
27
27
  "react-hook-form": "^7.28.1",
28
28
  "react-i18next": "^11.12.0",
29
29
  "react-router-dom": "^5.2.0",