pds-dev-kit-web-test 2.5.235 → 2.5.237
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.
@@ -116,6 +116,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
116
116
|
var newblock = bulkBlockIds.length > 0
|
117
117
|
? (0, group_1.addBulkToTarget)(pedigreeState, editingGroupBlock, bulkBlockIds)
|
118
118
|
: pedigreeState;
|
119
|
+
console.log('bulkBlockIds', bulkBlockIds);
|
119
120
|
(0, react_1.useImperativeHandle)(ref, function () {
|
120
121
|
return {
|
121
122
|
selectCB: function (blockId) {
|
@@ -436,21 +437,17 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
436
437
|
return;
|
437
438
|
}
|
438
439
|
if (shortcutKeyMode === 'COLLISION_SELECT') {
|
439
|
-
var
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
setBulkBlockIds(function (prev) {
|
444
|
-
var set = new Set(__spreadArray(__spreadArray(__spreadArray([], prev, true), added, true), bulks_2, true));
|
445
|
-
return Array.from(set);
|
446
|
-
});
|
440
|
+
var bulks = getCollisionGroupIds(id);
|
441
|
+
var newBulksSet = new Set(__spreadArray(__spreadArray(__spreadArray([], bulkBlockIds, true), added, true), bulks, true));
|
442
|
+
var newBulks = Array.from(newBulksSet);
|
443
|
+
setBulkBlockIds(newBulks);
|
447
444
|
setSelectedBlockId(null);
|
448
|
-
var newBulkCBIds =
|
445
|
+
var newBulkCBIds = newBulks
|
449
446
|
.map(function (id) { return (0, group_1.formatBlockIdToCbId)(id); })
|
450
447
|
.filter(function (each) { return each !== null; });
|
451
448
|
var childrenCBIds = [];
|
452
449
|
if (newBulkCBIds.length === 0) {
|
453
|
-
var oneCB = (0, group_1.findOneComponentBlock)(newblock,
|
450
|
+
var oneCB = (0, group_1.findOneComponentBlock)(newblock, bulks[0]);
|
454
451
|
childrenCBIds = oneCB ? [oneCB] : [];
|
455
452
|
}
|
456
453
|
else {
|
@@ -463,7 +460,7 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
463
460
|
block: {
|
464
461
|
type: 'BULK',
|
465
462
|
blockId: 'BULK',
|
466
|
-
childrenBlockIds:
|
463
|
+
childrenBlockIds: newBulks,
|
467
464
|
workDir: (_b = (0, group_1.getBlockWorkDirPath)(newblock, editingGroupBlock)) !== null && _b !== void 0 ? _b : 'NOT-FOUND',
|
468
465
|
childrenCBIds: childrenCBIds
|
469
466
|
}
|
@@ -742,7 +739,6 @@ var CustomSection = (0, react_1.forwardRef)(function CustomSection(props, ref) {
|
|
742
739
|
var _a;
|
743
740
|
var blockId = (0, group_1.formatCbIdToBlockId)(id);
|
744
741
|
if (shortcutKeyMode === 'COLLISION_SELECT') {
|
745
|
-
// makeCollisionOfBulk();
|
746
742
|
return;
|
747
743
|
}
|
748
744
|
if (shortcutKeyMode === 'BULK_SELECT') {
|