bpmn-js 16.3.1 → 16.4.0
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.
- package/dist/bpmn-modeler.development.js +602 -374
- package/dist/bpmn-modeler.production.min.js +26 -26
- package/dist/bpmn-navigated-viewer.development.js +2 -2
- package/dist/bpmn-navigated-viewer.production.min.js +1 -1
- package/dist/bpmn-viewer.development.js +2 -2
- package/dist/bpmn-viewer.production.min.js +1 -1
- package/lib/features/context-pad/ContextPadProvider.js +9 -14
- package/lib/features/modeling/BpmnUpdater.js +3 -1
- package/lib/features/modeling/ElementFactory.js +10 -1
- package/lib/features/modeling/behavior/CompensateBoundaryEventBehavior.js +8 -6
- package/lib/features/modeling/behavior/DeleteLaneBehavior.js +52 -7
- package/lib/features/modeling/behavior/FixHoverBehavior.js +2 -4
- package/lib/features/modeling/behavior/ResizeBehavior.d.ts +10 -0
- package/lib/features/modeling/behavior/ResizeBehavior.js +262 -210
- package/lib/features/modeling/behavior/SpaceToolBehavior.js +207 -139
- package/lib/features/modeling/behavior/TextAnnotationBehavior.d.ts +6 -0
- package/lib/features/modeling/behavior/TextAnnotationBehavior.js +43 -0
- package/lib/features/modeling/behavior/index.js +3 -0
- package/lib/features/modeling/util/LaneUtil.js +30 -4
- package/lib/features/ordering/BpmnOrderingProvider.js +9 -2
- package/lib/features/palette/PaletteProvider.js +2 -9
- package/lib/features/replace/BpmnReplace.js +4 -0
- package/lib/features/rules/BpmnRules.js +2 -2
- package/lib/features/space-tool/BpmnSpaceTool.js +8 -3
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* bpmn-js - bpmn-modeler v16.
|
|
2
|
+
* bpmn-js - bpmn-modeler v16.4.0
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) 2014-present, camunda Services GmbH
|
|
5
5
|
*
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Source Code: https://github.com/bpmn-io/bpmn-js
|
|
10
10
|
*
|
|
11
|
-
* Date: 2024-01-
|
|
11
|
+
* Date: 2024-01-23
|
|
12
12
|
*/
|
|
13
13
|
(function (global, factory) {
|
|
14
14
|
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
|
|
@@ -17839,7 +17839,7 @@
|
|
|
17839
17839
|
*
|
|
17840
17840
|
* @return {boolean}
|
|
17841
17841
|
*/
|
|
17842
|
-
function isHorizontal$
|
|
17842
|
+
function isHorizontal$3(element) {
|
|
17843
17843
|
|
|
17844
17844
|
if (!is$1(element, 'bpmn:Participant') && !is$1(element, 'bpmn:Lane')) {
|
|
17845
17845
|
return undefined;
|
|
@@ -19392,7 +19392,7 @@
|
|
|
19392
19392
|
}
|
|
19393
19393
|
|
|
19394
19394
|
function renderLaneLabel(parentGfx, text, element, attrs = {}) {
|
|
19395
|
-
var isHorizontalLane = isHorizontal$
|
|
19395
|
+
var isHorizontalLane = isHorizontal$3(element);
|
|
19396
19396
|
|
|
19397
19397
|
var textBox = renderLabel(parentGfx, text, {
|
|
19398
19398
|
box: {
|
|
@@ -20126,7 +20126,7 @@
|
|
|
20126
20126
|
var participant = renderLane(parentGfx, element, attrs);
|
|
20127
20127
|
|
|
20128
20128
|
var expandedParticipant = isExpanded(element);
|
|
20129
|
-
var horizontalParticipant = isHorizontal$
|
|
20129
|
+
var horizontalParticipant = isHorizontal$3(element);
|
|
20130
20130
|
|
|
20131
20131
|
var semantic = getBusinessObject(element),
|
|
20132
20132
|
name = semantic.get('name');
|
|
@@ -37401,13 +37401,15 @@
|
|
|
37401
37401
|
* and remove the potential candidates for connection replacement to have a single compensation activity.
|
|
37402
37402
|
*/
|
|
37403
37403
|
function handleReplacement(context) {
|
|
37404
|
-
const {
|
|
37405
|
-
|
|
37404
|
+
const {
|
|
37405
|
+
newData,
|
|
37406
|
+
oldShape
|
|
37407
|
+
} = context;
|
|
37406
37408
|
|
|
37407
37409
|
// from compensate boundary event
|
|
37408
37410
|
if (isCompensationBoundaryEvent(context.oldShape) &&
|
|
37409
|
-
|
|
37410
|
-
|
|
37411
|
+
newData.eventDefinitionType !== 'bpmn:CompensateEventDefinition' ||
|
|
37412
|
+
newData.type !== 'bpmn:BoundaryEvent'
|
|
37411
37413
|
) {
|
|
37412
37414
|
const targetConnection = oldShape.outgoing.find(
|
|
37413
37415
|
({ target }) => isForCompensation$1(target)
|
|
@@ -37421,8 +37423,8 @@
|
|
|
37421
37423
|
// to compensate boundary event
|
|
37422
37424
|
else if (
|
|
37423
37425
|
!isCompensationBoundaryEvent(context.oldShape) &&
|
|
37424
|
-
|
|
37425
|
-
|
|
37426
|
+
newData.eventDefinitionType === 'bpmn:CompensateEventDefinition' &&
|
|
37427
|
+
newData.type === 'bpmn:BoundaryEvent'
|
|
37426
37428
|
) {
|
|
37427
37429
|
const targetConnection = oldShape.outgoing.find(
|
|
37428
37430
|
({ target }) => isForCompensationAllowed(target)
|
|
@@ -38548,16 +38550,18 @@
|
|
|
38548
38550
|
trblResize = getTRBLResize(shape, newBounds),
|
|
38549
38551
|
resizeNeeded = [];
|
|
38550
38552
|
|
|
38553
|
+
var isHorizontalLane = isHorizontal$3(shape);
|
|
38554
|
+
|
|
38551
38555
|
allLanes.forEach(function(other) {
|
|
38552
38556
|
|
|
38553
38557
|
if (other === shape) {
|
|
38554
38558
|
return;
|
|
38555
38559
|
}
|
|
38556
38560
|
|
|
38557
|
-
var topResize = 0,
|
|
38558
|
-
rightResize = trblResize.right,
|
|
38559
|
-
bottomResize = 0,
|
|
38560
|
-
leftResize = trblResize.left;
|
|
38561
|
+
var topResize = isHorizontalLane ? 0 : trblResize.top,
|
|
38562
|
+
rightResize = isHorizontalLane ? trblResize.right : 0,
|
|
38563
|
+
bottomResize = isHorizontalLane ? 0 : trblResize.bottom,
|
|
38564
|
+
leftResize = isHorizontalLane ? trblResize.left : 0;
|
|
38561
38565
|
|
|
38562
38566
|
var otherTrbl = asTRBL(other);
|
|
38563
38567
|
|
|
@@ -38571,6 +38575,16 @@
|
|
|
38571
38575
|
}
|
|
38572
38576
|
}
|
|
38573
38577
|
|
|
38578
|
+
if (trblResize.left) {
|
|
38579
|
+
if (abs$4(otherTrbl.right - shapeTrbl.left) < 10) {
|
|
38580
|
+
rightResize = shapeNewTrbl.left - otherTrbl.right;
|
|
38581
|
+
}
|
|
38582
|
+
|
|
38583
|
+
if (abs$4(otherTrbl.left - shapeTrbl.left) < 5) {
|
|
38584
|
+
leftResize = shapeNewTrbl.left - otherTrbl.left;
|
|
38585
|
+
}
|
|
38586
|
+
}
|
|
38587
|
+
|
|
38574
38588
|
if (trblResize.bottom) {
|
|
38575
38589
|
if (abs$4(otherTrbl.top - shapeTrbl.bottom) < 10) {
|
|
38576
38590
|
topResize = shapeNewTrbl.bottom - otherTrbl.top;
|
|
@@ -38581,6 +38595,16 @@
|
|
|
38581
38595
|
}
|
|
38582
38596
|
}
|
|
38583
38597
|
|
|
38598
|
+
if (trblResize.right) {
|
|
38599
|
+
if (abs$4(otherTrbl.left - shapeTrbl.right) < 10) {
|
|
38600
|
+
leftResize = shapeNewTrbl.right - otherTrbl.left;
|
|
38601
|
+
}
|
|
38602
|
+
|
|
38603
|
+
if (abs$4(otherTrbl.right - shapeTrbl.right) < 5) {
|
|
38604
|
+
rightResize = shapeNewTrbl.right - otherTrbl.right;
|
|
38605
|
+
}
|
|
38606
|
+
}
|
|
38607
|
+
|
|
38584
38608
|
if (topResize || rightResize || bottomResize || leftResize) {
|
|
38585
38609
|
|
|
38586
38610
|
resizeNeeded.push({
|
|
@@ -38619,18 +38643,29 @@
|
|
|
38619
38643
|
|
|
38620
38644
|
|
|
38621
38645
|
function compensateLaneDelete(shape, oldParent) {
|
|
38646
|
+
var isHorizontalLane = isHorizontal$3(shape);
|
|
38622
38647
|
|
|
38623
38648
|
var siblings = getChildLanes(oldParent);
|
|
38624
38649
|
|
|
38625
38650
|
var topAffected = [];
|
|
38626
38651
|
var bottomAffected = [];
|
|
38652
|
+
var leftAffected = [];
|
|
38653
|
+
var rightAffected = [];
|
|
38627
38654
|
|
|
38628
38655
|
eachElement(siblings, function(element) {
|
|
38629
38656
|
|
|
38630
|
-
if (
|
|
38631
|
-
|
|
38657
|
+
if (isHorizontalLane) {
|
|
38658
|
+
if (element.y > shape.y) {
|
|
38659
|
+
bottomAffected.push(element);
|
|
38660
|
+
} else {
|
|
38661
|
+
topAffected.push(element);
|
|
38662
|
+
}
|
|
38632
38663
|
} else {
|
|
38633
|
-
|
|
38664
|
+
if (element.x > shape.x) {
|
|
38665
|
+
rightAffected.push(element);
|
|
38666
|
+
} else {
|
|
38667
|
+
leftAffected.push(element);
|
|
38668
|
+
}
|
|
38634
38669
|
}
|
|
38635
38670
|
|
|
38636
38671
|
return element.children;
|
|
@@ -38642,14 +38677,24 @@
|
|
|
38642
38677
|
|
|
38643
38678
|
var offset;
|
|
38644
38679
|
|
|
38645
|
-
if (
|
|
38646
|
-
|
|
38680
|
+
if (isHorizontalLane) {
|
|
38681
|
+
if (bottomAffected.length && topAffected.length) {
|
|
38682
|
+
offset = shape.height / 2;
|
|
38683
|
+
} else {
|
|
38684
|
+
offset = shape.height;
|
|
38685
|
+
}
|
|
38647
38686
|
} else {
|
|
38648
|
-
|
|
38687
|
+
if (rightAffected.length && leftAffected.length) {
|
|
38688
|
+
offset = shape.width / 2;
|
|
38689
|
+
} else {
|
|
38690
|
+
offset = shape.width;
|
|
38691
|
+
}
|
|
38649
38692
|
}
|
|
38650
38693
|
|
|
38651
38694
|
var topAdjustments,
|
|
38652
|
-
bottomAdjustments
|
|
38695
|
+
bottomAdjustments,
|
|
38696
|
+
leftAdjustments,
|
|
38697
|
+
rightAdjustments;
|
|
38653
38698
|
|
|
38654
38699
|
if (topAffected.length) {
|
|
38655
38700
|
topAdjustments = spaceTool.calculateAdjustments(
|
|
@@ -38670,6 +38715,26 @@
|
|
|
38670
38715
|
bottomAdjustments.resizingShapes,
|
|
38671
38716
|
{ x: 0, y: -offset }, 'n');
|
|
38672
38717
|
}
|
|
38718
|
+
|
|
38719
|
+
if (leftAffected.length) {
|
|
38720
|
+
leftAdjustments = spaceTool.calculateAdjustments(
|
|
38721
|
+
leftAffected, 'x', offset, shape.x - 10);
|
|
38722
|
+
|
|
38723
|
+
spaceTool.makeSpace(
|
|
38724
|
+
leftAdjustments.movingShapes,
|
|
38725
|
+
leftAdjustments.resizingShapes,
|
|
38726
|
+
{ x: offset, y: 0 }, 'e');
|
|
38727
|
+
}
|
|
38728
|
+
|
|
38729
|
+
if (rightAffected.length) {
|
|
38730
|
+
rightAdjustments = spaceTool.calculateAdjustments(
|
|
38731
|
+
rightAffected, 'x', -offset, shape.x + shape.width + 10);
|
|
38732
|
+
|
|
38733
|
+
spaceTool.makeSpace(
|
|
38734
|
+
rightAdjustments.movingShapes,
|
|
38735
|
+
rightAdjustments.resizingShapes,
|
|
38736
|
+
{ x: -offset, y: 0 }, 'w');
|
|
38737
|
+
}
|
|
38673
38738
|
}
|
|
38674
38739
|
|
|
38675
38740
|
|
|
@@ -39150,7 +39215,7 @@
|
|
|
39150
39215
|
|
|
39151
39216
|
// ensure bpmn:Group and label elements are dropped
|
|
39152
39217
|
// always onto the root
|
|
39153
|
-
if (hover !== rootElement && (shape.labelTarget ||
|
|
39218
|
+
if (hover !== rootElement && (shape.labelTarget || isAny(shape, [ 'bpmn:Group', 'bpmn:TextAnnotation' ]))) {
|
|
39154
39219
|
event.hover = rootElement;
|
|
39155
39220
|
event.hoverGfx = elementRegistry.getGraphics(event.hover);
|
|
39156
39221
|
}
|
|
@@ -41648,203 +41713,252 @@
|
|
|
41648
41713
|
'selection'
|
|
41649
41714
|
];
|
|
41650
41715
|
|
|
41651
|
-
var HIGH_PRIORITY$e = 1500;
|
|
41652
|
-
|
|
41653
|
-
/**
|
|
41654
|
-
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
41655
|
-
*
|
|
41656
|
-
* @typedef {import('../../../model/Types').Shape} Shape
|
|
41657
|
-
*
|
|
41658
|
-
* @typedef {import('diagram-js/lib/util/Types').Dimensions} Dimensions
|
|
41659
|
-
* @typedef {import('diagram-js/lib/util/Types').Direction} Direction
|
|
41660
|
-
* @typedef {import('diagram-js/lib/util/Types').RectTRBL} RectTRBL
|
|
41661
|
-
*/
|
|
41662
|
-
|
|
41663
|
-
/**
|
|
41664
|
-
* @type {Dimensions}
|
|
41665
|
-
*/
|
|
41666
|
-
var GROUP_MIN_DIMENSIONS = { width: 140, height: 120 };
|
|
41667
|
-
|
|
41668
|
-
/**
|
|
41669
|
-
* @type {Dimensions}
|
|
41670
|
-
*/
|
|
41671
|
-
var LANE_MIN_DIMENSIONS = { width: 300, height: 60 };
|
|
41672
|
-
|
|
41673
|
-
/**
|
|
41674
|
-
* @type {Dimensions}
|
|
41675
|
-
*/
|
|
41676
|
-
var
|
|
41677
|
-
|
|
41678
|
-
/**
|
|
41679
|
-
* @type {Dimensions}
|
|
41680
|
-
*/
|
|
41681
|
-
var
|
|
41682
|
-
|
|
41683
|
-
/**
|
|
41684
|
-
* @type {Dimensions}
|
|
41685
|
-
*/
|
|
41686
|
-
var
|
|
41687
|
-
|
|
41688
|
-
/**
|
|
41689
|
-
*
|
|
41690
|
-
|
|
41691
|
-
|
|
41692
|
-
|
|
41693
|
-
|
|
41694
|
-
|
|
41695
|
-
|
|
41696
|
-
|
|
41697
|
-
|
|
41698
|
-
|
|
41699
|
-
|
|
41700
|
-
|
|
41701
|
-
|
|
41702
|
-
|
|
41703
|
-
|
|
41704
|
-
|
|
41705
|
-
|
|
41706
|
-
|
|
41707
|
-
|
|
41708
|
-
|
|
41709
|
-
|
|
41710
|
-
|
|
41711
|
-
|
|
41712
|
-
|
|
41713
|
-
|
|
41714
|
-
|
|
41715
|
-
|
|
41716
|
-
|
|
41717
|
-
|
|
41718
|
-
|
|
41719
|
-
|
|
41720
|
-
|
|
41721
|
-
|
|
41722
|
-
|
|
41723
|
-
|
|
41724
|
-
|
|
41725
|
-
|
|
41726
|
-
|
|
41727
|
-
|
|
41728
|
-
|
|
41729
|
-
|
|
41730
|
-
|
|
41731
|
-
|
|
41732
|
-
|
|
41733
|
-
|
|
41734
|
-
|
|
41735
|
-
|
|
41736
|
-
|
|
41737
|
-
|
|
41738
|
-
|
|
41739
|
-
|
|
41740
|
-
|
|
41741
|
-
|
|
41742
|
-
|
|
41743
|
-
|
|
41744
|
-
|
|
41745
|
-
|
|
41746
|
-
|
|
41747
|
-
|
|
41748
|
-
|
|
41749
|
-
|
|
41750
|
-
|
|
41751
|
-
|
|
41752
|
-
|
|
41753
|
-
* @
|
|
41754
|
-
*
|
|
41755
|
-
*
|
|
41756
|
-
*
|
|
41757
|
-
|
|
41758
|
-
|
|
41759
|
-
|
|
41760
|
-
|
|
41761
|
-
|
|
41762
|
-
|
|
41763
|
-
|
|
41764
|
-
|
|
41765
|
-
var
|
|
41766
|
-
|
|
41767
|
-
|
|
41768
|
-
|
|
41769
|
-
|
|
41770
|
-
|
|
41771
|
-
|
|
41772
|
-
|
|
41773
|
-
|
|
41774
|
-
|
|
41775
|
-
|
|
41776
|
-
|
|
41777
|
-
|
|
41778
|
-
|
|
41779
|
-
|
|
41780
|
-
|
|
41781
|
-
|
|
41782
|
-
|
|
41783
|
-
|
|
41784
|
-
|
|
41785
|
-
|
|
41786
|
-
|
|
41787
|
-
|
|
41788
|
-
|
|
41789
|
-
|
|
41790
|
-
|
|
41791
|
-
|
|
41792
|
-
|
|
41793
|
-
|
|
41794
|
-
|
|
41795
|
-
|
|
41796
|
-
|
|
41797
|
-
|
|
41798
|
-
|
|
41799
|
-
|
|
41800
|
-
|
|
41801
|
-
|
|
41802
|
-
|
|
41803
|
-
|
|
41804
|
-
|
|
41805
|
-
|
|
41806
|
-
|
|
41807
|
-
|
|
41808
|
-
|
|
41809
|
-
|
|
41810
|
-
|
|
41811
|
-
|
|
41812
|
-
|
|
41813
|
-
|
|
41814
|
-
|
|
41815
|
-
|
|
41816
|
-
|
|
41817
|
-
|
|
41818
|
-
|
|
41819
|
-
|
|
41820
|
-
|
|
41821
|
-
|
|
41822
|
-
|
|
41823
|
-
|
|
41824
|
-
|
|
41825
|
-
|
|
41826
|
-
|
|
41827
|
-
|
|
41828
|
-
|
|
41829
|
-
|
|
41830
|
-
|
|
41831
|
-
|
|
41832
|
-
|
|
41833
|
-
|
|
41834
|
-
|
|
41835
|
-
|
|
41836
|
-
|
|
41837
|
-
|
|
41838
|
-
|
|
41839
|
-
|
|
41840
|
-
|
|
41841
|
-
|
|
41842
|
-
|
|
41843
|
-
|
|
41844
|
-
|
|
41845
|
-
|
|
41846
|
-
|
|
41847
|
-
|
|
41716
|
+
var HIGH_PRIORITY$e = 1500;
|
|
41717
|
+
|
|
41718
|
+
/**
|
|
41719
|
+
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
41720
|
+
*
|
|
41721
|
+
* @typedef {import('../../../model/Types').Shape} Shape
|
|
41722
|
+
*
|
|
41723
|
+
* @typedef {import('diagram-js/lib/util/Types').Dimensions} Dimensions
|
|
41724
|
+
* @typedef {import('diagram-js/lib/util/Types').Direction} Direction
|
|
41725
|
+
* @typedef {import('diagram-js/lib/util/Types').RectTRBL} RectTRBL
|
|
41726
|
+
*/
|
|
41727
|
+
|
|
41728
|
+
/**
|
|
41729
|
+
* @type {Dimensions}
|
|
41730
|
+
*/
|
|
41731
|
+
var GROUP_MIN_DIMENSIONS = { width: 140, height: 120 };
|
|
41732
|
+
|
|
41733
|
+
/**
|
|
41734
|
+
* @type {Dimensions}
|
|
41735
|
+
*/
|
|
41736
|
+
var LANE_MIN_DIMENSIONS = { width: 300, height: 60 };
|
|
41737
|
+
|
|
41738
|
+
/**
|
|
41739
|
+
* @type {Dimensions}
|
|
41740
|
+
*/
|
|
41741
|
+
var VERTICAL_LANE_MIN_DIMENSIONS = { width: 60, height: 300 };
|
|
41742
|
+
|
|
41743
|
+
/**
|
|
41744
|
+
* @type {Dimensions}
|
|
41745
|
+
*/
|
|
41746
|
+
var PARTICIPANT_MIN_DIMENSIONS = { width: 300, height: 150 };
|
|
41747
|
+
|
|
41748
|
+
/**
|
|
41749
|
+
* @type {Dimensions}
|
|
41750
|
+
*/
|
|
41751
|
+
var VERTICAL_PARTICIPANT_MIN_DIMENSIONS = { width: 150, height: 300 };
|
|
41752
|
+
|
|
41753
|
+
/**
|
|
41754
|
+
* @type {Dimensions}
|
|
41755
|
+
*/
|
|
41756
|
+
var SUB_PROCESS_MIN_DIMENSIONS = { width: 140, height: 120 };
|
|
41757
|
+
|
|
41758
|
+
/**
|
|
41759
|
+
* @type {Dimensions}
|
|
41760
|
+
*/
|
|
41761
|
+
var TEXT_ANNOTATION_MIN_DIMENSIONS = { width: 50, height: 30 };
|
|
41762
|
+
|
|
41763
|
+
/**
|
|
41764
|
+
* Set minimum bounds/resize constraints on resize.
|
|
41765
|
+
*
|
|
41766
|
+
* @param {EventBus} eventBus
|
|
41767
|
+
*/
|
|
41768
|
+
function ResizeBehavior$1(eventBus) {
|
|
41769
|
+
eventBus.on('resize.start', HIGH_PRIORITY$e, function(event) {
|
|
41770
|
+
var context = event.context,
|
|
41771
|
+
shape = context.shape,
|
|
41772
|
+
direction = context.direction,
|
|
41773
|
+
balanced = context.balanced;
|
|
41774
|
+
|
|
41775
|
+
if (is$1(shape, 'bpmn:Lane') || is$1(shape, 'bpmn:Participant')) {
|
|
41776
|
+
context.resizeConstraints = getParticipantResizeConstraints(shape, direction, balanced);
|
|
41777
|
+
}
|
|
41778
|
+
|
|
41779
|
+
if (is$1(shape, 'bpmn:SubProcess') && isExpanded(shape)) {
|
|
41780
|
+
context.minDimensions = SUB_PROCESS_MIN_DIMENSIONS;
|
|
41781
|
+
}
|
|
41782
|
+
|
|
41783
|
+
if (is$1(shape, 'bpmn:TextAnnotation')) {
|
|
41784
|
+
context.minDimensions = TEXT_ANNOTATION_MIN_DIMENSIONS;
|
|
41785
|
+
}
|
|
41786
|
+
});
|
|
41787
|
+
}
|
|
41788
|
+
|
|
41789
|
+
ResizeBehavior$1.$inject = [ 'eventBus' ];
|
|
41790
|
+
|
|
41791
|
+
|
|
41792
|
+
var abs$2 = Math.abs,
|
|
41793
|
+
min$1 = Math.min,
|
|
41794
|
+
max$3 = Math.max;
|
|
41795
|
+
|
|
41796
|
+
|
|
41797
|
+
function addToTrbl(trbl, attr, value, choice) {
|
|
41798
|
+
var current = trbl[attr];
|
|
41799
|
+
|
|
41800
|
+
// make sure to set the value if it does not exist
|
|
41801
|
+
// or apply the correct value by comparing against
|
|
41802
|
+
// choice(value, currentValue)
|
|
41803
|
+
trbl[attr] = current === undefined ? value : choice(value, current);
|
|
41804
|
+
}
|
|
41805
|
+
|
|
41806
|
+
function addMin(trbl, attr, value) {
|
|
41807
|
+
return addToTrbl(trbl, attr, value, min$1);
|
|
41808
|
+
}
|
|
41809
|
+
|
|
41810
|
+
function addMax(trbl, attr, value) {
|
|
41811
|
+
return addToTrbl(trbl, attr, value, max$3);
|
|
41812
|
+
}
|
|
41813
|
+
|
|
41814
|
+
var LANE_PADDING = { top: 20, left: 50, right: 20, bottom: 20 },
|
|
41815
|
+
VERTICAL_LANE_PADDING = { top: 50, left: 20, right: 20, bottom: 20 };
|
|
41816
|
+
|
|
41817
|
+
/**
|
|
41818
|
+
* @param {Shape} laneShape
|
|
41819
|
+
* @param {Direction} resizeDirection
|
|
41820
|
+
* @param {boolean} [balanced=false]
|
|
41821
|
+
*
|
|
41822
|
+
* @return { {
|
|
41823
|
+
* min: RectTRBL;
|
|
41824
|
+
* max: RectTRBL;
|
|
41825
|
+
* } }
|
|
41826
|
+
*/
|
|
41827
|
+
function getParticipantResizeConstraints(laneShape, resizeDirection, balanced) {
|
|
41828
|
+
var lanesRoot = getLanesRoot(laneShape);
|
|
41829
|
+
|
|
41830
|
+
var isFirst = true,
|
|
41831
|
+
isLast = true;
|
|
41832
|
+
|
|
41833
|
+
var allLanes = collectLanes(lanesRoot, [ lanesRoot ]);
|
|
41834
|
+
|
|
41835
|
+
var laneTrbl = asTRBL(laneShape);
|
|
41836
|
+
|
|
41837
|
+
var maxTrbl = {},
|
|
41838
|
+
minTrbl = {};
|
|
41839
|
+
|
|
41840
|
+
var isHorizontalLane = isHorizontal$3(laneShape);
|
|
41841
|
+
|
|
41842
|
+
var minDimensions = isHorizontalLane ? LANE_MIN_DIMENSIONS : VERTICAL_LANE_MIN_DIMENSIONS;
|
|
41843
|
+
|
|
41844
|
+
if (/n/.test(resizeDirection)) {
|
|
41845
|
+
minTrbl.top = laneTrbl.bottom - minDimensions.height;
|
|
41846
|
+
} else
|
|
41847
|
+
if (/e/.test(resizeDirection)) {
|
|
41848
|
+
minTrbl.right = laneTrbl.left + minDimensions.width;
|
|
41849
|
+
} else
|
|
41850
|
+
if (/s/.test(resizeDirection)) {
|
|
41851
|
+
minTrbl.bottom = laneTrbl.top + minDimensions.height;
|
|
41852
|
+
} else
|
|
41853
|
+
if (/w/.test(resizeDirection)) {
|
|
41854
|
+
minTrbl.left = laneTrbl.right - minDimensions.width;
|
|
41855
|
+
}
|
|
41856
|
+
|
|
41857
|
+
// min/max size based on related lanes
|
|
41858
|
+
allLanes.forEach(function(other) {
|
|
41859
|
+
|
|
41860
|
+
var otherTrbl = asTRBL(other);
|
|
41861
|
+
|
|
41862
|
+
if (/n/.test(resizeDirection)) {
|
|
41863
|
+
if (isHorizontalLane && otherTrbl.top < (laneTrbl.top - 10)) {
|
|
41864
|
+
isFirst = false;
|
|
41865
|
+
}
|
|
41866
|
+
|
|
41867
|
+
// max top size (based on next element)
|
|
41868
|
+
if (balanced && abs$2(laneTrbl.top - otherTrbl.bottom) < 10) {
|
|
41869
|
+
addMax(maxTrbl, 'top', otherTrbl.top + minDimensions.height);
|
|
41870
|
+
}
|
|
41871
|
+
|
|
41872
|
+
// min top size (based on self or nested element)
|
|
41873
|
+
if (abs$2(laneTrbl.top - otherTrbl.top) < 5) {
|
|
41874
|
+
addMin(minTrbl, 'top', otherTrbl.bottom - minDimensions.height);
|
|
41875
|
+
}
|
|
41876
|
+
}
|
|
41877
|
+
|
|
41878
|
+
if (/e/.test(resizeDirection)) {
|
|
41879
|
+
|
|
41880
|
+
if (!isHorizontalLane && otherTrbl.right > (laneTrbl.right + 10)) {
|
|
41881
|
+
isLast = false;
|
|
41882
|
+
}
|
|
41883
|
+
|
|
41884
|
+
// max right size (based on previous element)
|
|
41885
|
+
if (balanced && abs$2(laneTrbl.right - otherTrbl.left) < 10) {
|
|
41886
|
+
addMin(maxTrbl, 'right', otherTrbl.right - minDimensions.width);
|
|
41887
|
+
}
|
|
41888
|
+
|
|
41889
|
+
// min right size (based on self or nested element)
|
|
41890
|
+
if (abs$2(laneTrbl.right - otherTrbl.right) < 5) {
|
|
41891
|
+
addMax(minTrbl, 'right', otherTrbl.left + minDimensions.width);
|
|
41892
|
+
}
|
|
41893
|
+
}
|
|
41894
|
+
|
|
41895
|
+
if (/s/.test(resizeDirection)) {
|
|
41896
|
+
|
|
41897
|
+
if (isHorizontalLane && otherTrbl.bottom > (laneTrbl.bottom + 10)) {
|
|
41898
|
+
isLast = false;
|
|
41899
|
+
}
|
|
41900
|
+
|
|
41901
|
+
// max bottom size (based on previous element)
|
|
41902
|
+
if (balanced && abs$2(laneTrbl.bottom - otherTrbl.top) < 10) {
|
|
41903
|
+
addMin(maxTrbl, 'bottom', otherTrbl.bottom - minDimensions.height);
|
|
41904
|
+
}
|
|
41905
|
+
|
|
41906
|
+
// min bottom size (based on self or nested element)
|
|
41907
|
+
if (abs$2(laneTrbl.bottom - otherTrbl.bottom) < 5) {
|
|
41908
|
+
addMax(minTrbl, 'bottom', otherTrbl.top + minDimensions.height);
|
|
41909
|
+
}
|
|
41910
|
+
}
|
|
41911
|
+
|
|
41912
|
+
if (/w/.test(resizeDirection)) {
|
|
41913
|
+
|
|
41914
|
+
if (!isHorizontalLane && otherTrbl.left < (laneTrbl.left - 10)) {
|
|
41915
|
+
isFirst = false;
|
|
41916
|
+
}
|
|
41917
|
+
|
|
41918
|
+
// max left size (based on next element)
|
|
41919
|
+
if (balanced && abs$2(laneTrbl.left - otherTrbl.right) < 10) {
|
|
41920
|
+
addMax(maxTrbl, 'left', otherTrbl.left + minDimensions.width);
|
|
41921
|
+
}
|
|
41922
|
+
|
|
41923
|
+
// min left size (based on self or nested element)
|
|
41924
|
+
if (abs$2(laneTrbl.left - otherTrbl.left) < 5) {
|
|
41925
|
+
addMin(minTrbl, 'left', otherTrbl.right - minDimensions.width);
|
|
41926
|
+
}
|
|
41927
|
+
}
|
|
41928
|
+
});
|
|
41929
|
+
|
|
41930
|
+
// max top/bottom/left/right size based on flow nodes
|
|
41931
|
+
var flowElements = lanesRoot.children.filter(function(s) {
|
|
41932
|
+
return !s.hidden && !s.waypoints && (is$1(s, 'bpmn:FlowElement') || is$1(s, 'bpmn:Artifact'));
|
|
41933
|
+
});
|
|
41934
|
+
|
|
41935
|
+
var padding = isHorizontalLane ? LANE_PADDING : VERTICAL_LANE_PADDING;
|
|
41936
|
+
|
|
41937
|
+
flowElements.forEach(function(flowElement) {
|
|
41938
|
+
|
|
41939
|
+
var flowElementTrbl = asTRBL(flowElement);
|
|
41940
|
+
|
|
41941
|
+
if (isFirst && /n/.test(resizeDirection)) {
|
|
41942
|
+
addMin(minTrbl, 'top', flowElementTrbl.top - padding.top);
|
|
41943
|
+
}
|
|
41944
|
+
|
|
41945
|
+
if (isLast && /e/.test(resizeDirection)) {
|
|
41946
|
+
addMax(minTrbl, 'right', flowElementTrbl.right + padding.right);
|
|
41947
|
+
}
|
|
41948
|
+
|
|
41949
|
+
if (isLast && /s/.test(resizeDirection)) {
|
|
41950
|
+
addMax(minTrbl, 'bottom', flowElementTrbl.bottom + padding.bottom);
|
|
41951
|
+
}
|
|
41952
|
+
|
|
41953
|
+
if (isFirst && /w/.test(resizeDirection)) {
|
|
41954
|
+
addMin(minTrbl, 'left', flowElementTrbl.left - padding.left);
|
|
41955
|
+
}
|
|
41956
|
+
});
|
|
41957
|
+
|
|
41958
|
+
return {
|
|
41959
|
+
min: minTrbl,
|
|
41960
|
+
max: maxTrbl
|
|
41961
|
+
};
|
|
41848
41962
|
}
|
|
41849
41963
|
|
|
41850
41964
|
/**
|
|
@@ -42095,128 +42209,191 @@
|
|
|
42095
42209
|
});
|
|
42096
42210
|
}
|
|
42097
42211
|
|
|
42098
|
-
/**
|
|
42099
|
-
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
42100
|
-
*
|
|
42101
|
-
* @typedef {import('../../../model/Types').Shape} Shape
|
|
42102
|
-
*/
|
|
42103
|
-
|
|
42104
|
-
var max$2 = Math.max;
|
|
42105
|
-
|
|
42106
|
-
/**
|
|
42107
|
-
* @param {EventBus} eventBus
|
|
42108
|
-
*/
|
|
42109
|
-
function SpaceToolBehavior$1(eventBus) {
|
|
42110
|
-
eventBus.on('spaceTool.getMinDimensions', function(context) {
|
|
42111
|
-
var shapes = context.shapes,
|
|
42112
|
-
axis = context.axis,
|
|
42113
|
-
start = context.start,
|
|
42114
|
-
minDimensions = {};
|
|
42115
|
-
|
|
42116
|
-
forEach$1(shapes, function(shape) {
|
|
42117
|
-
var id = shape.id;
|
|
42118
|
-
|
|
42119
|
-
if (is$1(shape, 'bpmn:Participant')) {
|
|
42120
|
-
|
|
42121
|
-
|
|
42122
|
-
|
|
42123
|
-
|
|
42124
|
-
|
|
42125
|
-
|
|
42126
|
-
|
|
42127
|
-
|
|
42128
|
-
|
|
42129
|
-
|
|
42130
|
-
|
|
42131
|
-
|
|
42132
|
-
|
|
42133
|
-
|
|
42134
|
-
|
|
42135
|
-
|
|
42136
|
-
|
|
42137
|
-
|
|
42138
|
-
|
|
42139
|
-
|
|
42140
|
-
|
|
42141
|
-
|
|
42142
|
-
|
|
42143
|
-
|
|
42144
|
-
|
|
42145
|
-
|
|
42146
|
-
|
|
42147
|
-
|
|
42148
|
-
|
|
42149
|
-
|
|
42150
|
-
|
|
42151
|
-
|
|
42152
|
-
|
|
42153
|
-
|
|
42154
|
-
|
|
42155
|
-
|
|
42156
|
-
|
|
42157
|
-
|
|
42158
|
-
*
|
|
42159
|
-
*
|
|
42160
|
-
|
|
42161
|
-
|
|
42162
|
-
|
|
42163
|
-
|
|
42164
|
-
|
|
42165
|
-
|
|
42166
|
-
|
|
42167
|
-
|
|
42168
|
-
|
|
42169
|
-
|
|
42170
|
-
|
|
42171
|
-
|
|
42172
|
-
|
|
42173
|
-
|
|
42174
|
-
|
|
42175
|
-
|
|
42176
|
-
|
|
42177
|
-
|
|
42178
|
-
|
|
42179
|
-
|
|
42180
|
-
|
|
42181
|
-
|
|
42182
|
-
|
|
42183
|
-
|
|
42184
|
-
|
|
42185
|
-
|
|
42186
|
-
|
|
42187
|
-
|
|
42188
|
-
|
|
42189
|
-
|
|
42190
|
-
|
|
42191
|
-
|
|
42192
|
-
|
|
42193
|
-
|
|
42194
|
-
|
|
42195
|
-
|
|
42196
|
-
*
|
|
42197
|
-
*
|
|
42198
|
-
*
|
|
42199
|
-
* @
|
|
42200
|
-
|
|
42201
|
-
|
|
42202
|
-
|
|
42203
|
-
|
|
42204
|
-
|
|
42205
|
-
|
|
42206
|
-
|
|
42207
|
-
|
|
42208
|
-
|
|
42209
|
-
|
|
42210
|
-
|
|
42211
|
-
|
|
42212
|
-
|
|
42213
|
-
|
|
42214
|
-
|
|
42215
|
-
|
|
42216
|
-
|
|
42217
|
-
|
|
42218
|
-
|
|
42219
|
-
|
|
42212
|
+
/**
|
|
42213
|
+
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
42214
|
+
*
|
|
42215
|
+
* @typedef {import('../../../model/Types').Shape} Shape
|
|
42216
|
+
*/
|
|
42217
|
+
|
|
42218
|
+
var max$2 = Math.max;
|
|
42219
|
+
|
|
42220
|
+
/**
|
|
42221
|
+
* @param {EventBus} eventBus
|
|
42222
|
+
*/
|
|
42223
|
+
function SpaceToolBehavior$1(eventBus) {
|
|
42224
|
+
eventBus.on('spaceTool.getMinDimensions', function(context) {
|
|
42225
|
+
var shapes = context.shapes,
|
|
42226
|
+
axis = context.axis,
|
|
42227
|
+
start = context.start,
|
|
42228
|
+
minDimensions = {};
|
|
42229
|
+
|
|
42230
|
+
forEach$1(shapes, function(shape) {
|
|
42231
|
+
var id = shape.id;
|
|
42232
|
+
|
|
42233
|
+
if (is$1(shape, 'bpmn:Participant')) {
|
|
42234
|
+
minDimensions[ id ] = getParticipantMinDimensions(shape, axis, start);
|
|
42235
|
+
}
|
|
42236
|
+
|
|
42237
|
+
if (is$1(shape, 'bpmn:Lane')) {
|
|
42238
|
+
minDimensions[ id ] = isHorizontal$3(shape) ? LANE_MIN_DIMENSIONS : VERTICAL_LANE_MIN_DIMENSIONS;
|
|
42239
|
+
}
|
|
42240
|
+
|
|
42241
|
+
if (is$1(shape, 'bpmn:SubProcess') && isExpanded(shape)) {
|
|
42242
|
+
minDimensions[ id ] = SUB_PROCESS_MIN_DIMENSIONS;
|
|
42243
|
+
}
|
|
42244
|
+
|
|
42245
|
+
if (is$1(shape, 'bpmn:TextAnnotation')) {
|
|
42246
|
+
minDimensions[ id ] = TEXT_ANNOTATION_MIN_DIMENSIONS;
|
|
42247
|
+
}
|
|
42248
|
+
|
|
42249
|
+
if (is$1(shape, 'bpmn:Group')) {
|
|
42250
|
+
minDimensions[ id ] = GROUP_MIN_DIMENSIONS;
|
|
42251
|
+
}
|
|
42252
|
+
});
|
|
42253
|
+
|
|
42254
|
+
return minDimensions;
|
|
42255
|
+
});
|
|
42256
|
+
}
|
|
42257
|
+
|
|
42258
|
+
SpaceToolBehavior$1.$inject = [ 'eventBus' ];
|
|
42259
|
+
|
|
42260
|
+
|
|
42261
|
+
// helpers //////////
|
|
42262
|
+
function isHorizontalAxis(axis) {
|
|
42263
|
+
return axis === 'x';
|
|
42264
|
+
}
|
|
42265
|
+
|
|
42266
|
+
/**
|
|
42267
|
+
* Get minimum dimensions for participant taking lanes into account.
|
|
42268
|
+
*
|
|
42269
|
+
* @param {Shape} participant
|
|
42270
|
+
* @param {Axis} axis
|
|
42271
|
+
* @param {number} start
|
|
42272
|
+
*
|
|
42273
|
+
* @return {number}
|
|
42274
|
+
*/
|
|
42275
|
+
function getParticipantMinDimensions(participant, axis, start) {
|
|
42276
|
+
var isHorizontalLane = isHorizontal$3(participant);
|
|
42277
|
+
|
|
42278
|
+
if (!hasChildLanes(participant)) {
|
|
42279
|
+
return isHorizontalLane ? PARTICIPANT_MIN_DIMENSIONS : VERTICAL_PARTICIPANT_MIN_DIMENSIONS;
|
|
42280
|
+
}
|
|
42281
|
+
|
|
42282
|
+
var isHorizontalResize = isHorizontalAxis(axis);
|
|
42283
|
+
var minDimensions = {};
|
|
42284
|
+
|
|
42285
|
+
if (isHorizontalResize) {
|
|
42286
|
+
if (isHorizontalLane) {
|
|
42287
|
+
minDimensions = PARTICIPANT_MIN_DIMENSIONS;
|
|
42288
|
+
} else {
|
|
42289
|
+
minDimensions = {
|
|
42290
|
+
width: getParticipantMinWidth(participant, start, isHorizontalResize),
|
|
42291
|
+
height: VERTICAL_PARTICIPANT_MIN_DIMENSIONS.height
|
|
42292
|
+
};
|
|
42293
|
+
}
|
|
42294
|
+
|
|
42295
|
+
} else {
|
|
42296
|
+
if (isHorizontalLane) {
|
|
42297
|
+
minDimensions = {
|
|
42298
|
+
width: PARTICIPANT_MIN_DIMENSIONS.width,
|
|
42299
|
+
height: getParticipantMinHeight(participant, start, isHorizontalResize)
|
|
42300
|
+
};
|
|
42301
|
+
} else {
|
|
42302
|
+
minDimensions = VERTICAL_PARTICIPANT_MIN_DIMENSIONS;
|
|
42303
|
+
}
|
|
42304
|
+
}
|
|
42305
|
+
|
|
42306
|
+
return minDimensions;
|
|
42307
|
+
}
|
|
42308
|
+
|
|
42309
|
+
/**
|
|
42310
|
+
* Get minimum height for participant taking lanes into account.
|
|
42311
|
+
*
|
|
42312
|
+
* @param {Shape} participant
|
|
42313
|
+
* @param {number} start
|
|
42314
|
+
* @param {boolean} isHorizontalResize
|
|
42315
|
+
*
|
|
42316
|
+
* @return {number}
|
|
42317
|
+
*/
|
|
42318
|
+
function getParticipantMinHeight(participant, start, isHorizontalResize) {
|
|
42319
|
+
var lanesMinHeight;
|
|
42320
|
+
lanesMinHeight = getLanesMinHeight(participant, start, isHorizontalResize);
|
|
42321
|
+
return max$2(PARTICIPANT_MIN_DIMENSIONS.height, lanesMinHeight);
|
|
42322
|
+
}
|
|
42323
|
+
|
|
42324
|
+
/**
|
|
42325
|
+
* Get minimum width for participant taking lanes into account.
|
|
42326
|
+
*
|
|
42327
|
+
* @param {Shape} participant
|
|
42328
|
+
* @param {number} start
|
|
42329
|
+
* @param {boolean} isHorizontalResize
|
|
42330
|
+
*
|
|
42331
|
+
* @return {number}
|
|
42332
|
+
*/
|
|
42333
|
+
function getParticipantMinWidth(participant, start, isHorizontalResize) {
|
|
42334
|
+
var lanesMinWidth;
|
|
42335
|
+
lanesMinWidth = getLanesMinWidth(participant, start, isHorizontalResize);
|
|
42336
|
+
return max$2(VERTICAL_PARTICIPANT_MIN_DIMENSIONS.width, lanesMinWidth);
|
|
42337
|
+
}
|
|
42338
|
+
|
|
42339
|
+
function hasChildLanes(element) {
|
|
42340
|
+
return !!getChildLanes(element).length;
|
|
42341
|
+
}
|
|
42342
|
+
|
|
42343
|
+
function getLanesMinHeight(participant, resizeStart, isHorizontalResize) {
|
|
42344
|
+
var lanes = getChildLanes(participant),
|
|
42345
|
+
resizedLane;
|
|
42346
|
+
|
|
42347
|
+
// find the nested lane which is currently resized
|
|
42348
|
+
resizedLane = findResizedLane(lanes, resizeStart, isHorizontalResize);
|
|
42349
|
+
|
|
42350
|
+
// resized lane cannot shrink below the minimum height
|
|
42351
|
+
// but remaining lanes' dimensions are kept intact
|
|
42352
|
+
return participant.height - resizedLane.height + LANE_MIN_DIMENSIONS.height;
|
|
42353
|
+
}
|
|
42354
|
+
|
|
42355
|
+
function getLanesMinWidth(participant, resizeStart, isHorizontalResize) {
|
|
42356
|
+
var lanes = getChildLanes(participant),
|
|
42357
|
+
resizedLane;
|
|
42358
|
+
|
|
42359
|
+
// find the nested lane which is currently resized
|
|
42360
|
+
resizedLane = findResizedLane(lanes, resizeStart, isHorizontalResize);
|
|
42361
|
+
|
|
42362
|
+
// resized lane cannot shrink below the minimum width
|
|
42363
|
+
// but remaining lanes' dimensions are kept intact
|
|
42364
|
+
return participant.width - resizedLane.width + VERTICAL_LANE_MIN_DIMENSIONS.width;
|
|
42365
|
+
}
|
|
42366
|
+
|
|
42367
|
+
/**
|
|
42368
|
+
* Find nested lane which is currently resized.
|
|
42369
|
+
*
|
|
42370
|
+
* @param {Shape[]} lanes
|
|
42371
|
+
* @param {number} resizeStart
|
|
42372
|
+
* @param {boolean} isHorizontalResize
|
|
42373
|
+
*
|
|
42374
|
+
* @return {Shape}
|
|
42375
|
+
*/
|
|
42376
|
+
function findResizedLane(lanes, resizeStart, isHorizontalResize) {
|
|
42377
|
+
var i, lane, childLanes;
|
|
42378
|
+
|
|
42379
|
+
for (i = 0; i < lanes.length; i++) {
|
|
42380
|
+
lane = lanes[i];
|
|
42381
|
+
|
|
42382
|
+
// resizing current lane or a lane nested
|
|
42383
|
+
if (!isHorizontalResize && resizeStart >= lane.y && resizeStart <= lane.y + lane.height ||
|
|
42384
|
+
isHorizontalResize && resizeStart >= lane.x && resizeStart <= lane.x + lane.width) {
|
|
42385
|
+
|
|
42386
|
+
childLanes = getChildLanes(lane);
|
|
42387
|
+
|
|
42388
|
+
// a nested lane is resized
|
|
42389
|
+
if (childLanes.length) {
|
|
42390
|
+
return findResizedLane(childLanes, resizeStart, isHorizontalResize);
|
|
42391
|
+
}
|
|
42392
|
+
|
|
42393
|
+
// current lane is the resized one
|
|
42394
|
+
return lane;
|
|
42395
|
+
}
|
|
42396
|
+
}
|
|
42220
42397
|
}
|
|
42221
42398
|
|
|
42222
42399
|
/**
|
|
@@ -42835,6 +43012,44 @@
|
|
|
42835
43012
|
};
|
|
42836
43013
|
}
|
|
42837
43014
|
|
|
43015
|
+
/**
|
|
43016
|
+
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
43017
|
+
*/
|
|
43018
|
+
|
|
43019
|
+
function TextAnnotationBehavior(eventBus) {
|
|
43020
|
+
|
|
43021
|
+
CommandInterceptor.call(this, eventBus);
|
|
43022
|
+
|
|
43023
|
+
// On Append, TextAnnotations will be created on the Root.
|
|
43024
|
+
// The default for connections will create the connection in the parent of
|
|
43025
|
+
// the source element, so we overwrite the parent here.
|
|
43026
|
+
this.preExecute('connection.create', function(context) {
|
|
43027
|
+
const { target } = context;
|
|
43028
|
+
|
|
43029
|
+
if (!is$1(target, 'bpmn:TextAnnotation')) {
|
|
43030
|
+
return;
|
|
43031
|
+
}
|
|
43032
|
+
|
|
43033
|
+
context.parent = target.parent;
|
|
43034
|
+
}, true);
|
|
43035
|
+
|
|
43036
|
+
this.preExecute([ 'shape.create', 'shape.resize', 'elements.move' ], function(context) {
|
|
43037
|
+
const shapes = context.shapes || [ context.shape ];
|
|
43038
|
+
|
|
43039
|
+
if (shapes.length === 1 && is$1(shapes[0], 'bpmn:TextAnnotation')) {
|
|
43040
|
+
context.hints = context.hints || {};
|
|
43041
|
+
|
|
43042
|
+
context.hints.autoResize = false;
|
|
43043
|
+
}
|
|
43044
|
+
}, true);
|
|
43045
|
+
}
|
|
43046
|
+
|
|
43047
|
+
e$2(TextAnnotationBehavior, CommandInterceptor);
|
|
43048
|
+
|
|
43049
|
+
TextAnnotationBehavior.$inject = [
|
|
43050
|
+
'eventBus'
|
|
43051
|
+
];
|
|
43052
|
+
|
|
42838
43053
|
/**
|
|
42839
43054
|
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
|
|
42840
43055
|
* @typedef {import('../Modeling').default} Modeling
|
|
@@ -43355,6 +43570,7 @@
|
|
|
43355
43570
|
'spaceToolBehavior',
|
|
43356
43571
|
'subProcessPlaneBehavior',
|
|
43357
43572
|
'subProcessStartEventBehavior',
|
|
43573
|
+
'textAnnotationBehavior',
|
|
43358
43574
|
'toggleCollapseConnectionBehaviour',
|
|
43359
43575
|
'toggleElementCollapseBehaviour',
|
|
43360
43576
|
'unclaimIdBehavior',
|
|
@@ -43395,6 +43611,7 @@
|
|
|
43395
43611
|
spaceToolBehavior: [ 'type', SpaceToolBehavior$1 ],
|
|
43396
43612
|
subProcessPlaneBehavior: [ 'type', SubProcessPlaneBehavior ],
|
|
43397
43613
|
subProcessStartEventBehavior: [ 'type', SubProcessStartEventBehavior ],
|
|
43614
|
+
textAnnotationBehavior: [ 'type', TextAnnotationBehavior ],
|
|
43398
43615
|
toggleCollapseConnectionBehaviour: [ 'type', ToggleCollapseConnectionBehaviour ],
|
|
43399
43616
|
toggleElementCollapseBehaviour : [ 'type', ToggleElementCollapseBehaviour ],
|
|
43400
43617
|
unclaimIdBehavior: [ 'type', UnclaimIdBehavior ],
|
|
@@ -44371,11 +44588,11 @@
|
|
|
44371
44588
|
}
|
|
44372
44589
|
|
|
44373
44590
|
if (is$1(shape, 'bpmn:Lane')) {
|
|
44374
|
-
return
|
|
44591
|
+
return true;
|
|
44375
44592
|
}
|
|
44376
44593
|
|
|
44377
44594
|
if (is$1(shape, 'bpmn:Participant')) {
|
|
44378
|
-
return
|
|
44595
|
+
return true;
|
|
44379
44596
|
}
|
|
44380
44597
|
|
|
44381
44598
|
if (isTextAnnotation(shape)) {
|
|
@@ -44772,6 +44989,12 @@
|
|
|
44772
44989
|
]
|
|
44773
44990
|
}
|
|
44774
44991
|
},
|
|
44992
|
+
{
|
|
44993
|
+
type: 'bpmn:TextAnnotation',
|
|
44994
|
+
order: {
|
|
44995
|
+
level: 9
|
|
44996
|
+
}
|
|
44997
|
+
},
|
|
44775
44998
|
{
|
|
44776
44999
|
type: 'bpmn:MessageFlow', order: {
|
|
44777
45000
|
level: 9,
|
|
@@ -44854,8 +45077,8 @@
|
|
|
44854
45077
|
|
|
44855
45078
|
this.getOrdering = function(element, newParent) {
|
|
44856
45079
|
|
|
44857
|
-
// render labels always on top
|
|
44858
|
-
if (element.labelTarget) {
|
|
45080
|
+
// render labels and text annotations always on top
|
|
45081
|
+
if (element.labelTarget || is$1(element, 'bpmn:TextAnnotation')) {
|
|
44859
45082
|
return {
|
|
44860
45083
|
parent: canvas.findRoot(newParent) || canvas.getRootElement(),
|
|
44861
45084
|
index: -1
|
|
@@ -46809,6 +47032,10 @@
|
|
|
46809
47032
|
|
|
46810
47033
|
newElement.di = {};
|
|
46811
47034
|
|
|
47035
|
+
if (type === 'bpmn:ExclusiveGateway') {
|
|
47036
|
+
newElement.di.isMarkerVisible = true;
|
|
47037
|
+
}
|
|
47038
|
+
|
|
46812
47039
|
// colors will be set to DI
|
|
46813
47040
|
copyProperties(element.di, newElement.di, [
|
|
46814
47041
|
'fill',
|
|
@@ -48251,15 +48478,18 @@
|
|
|
48251
48478
|
// do not resize:
|
|
48252
48479
|
//
|
|
48253
48480
|
// * text annotations (horizontally/vertically)
|
|
48254
|
-
// * empty pools (vertically)
|
|
48481
|
+
// * empty horizontal pools (vertically)
|
|
48482
|
+
// * empty vertical pools (horizontally)
|
|
48255
48483
|
adjustments.resizingShapes = adjustments.resizingShapes.filter(function(shape) {
|
|
48256
48484
|
|
|
48257
48485
|
if (is$1(shape, 'bpmn:TextAnnotation')) {
|
|
48258
48486
|
return false;
|
|
48259
48487
|
}
|
|
48260
48488
|
|
|
48261
|
-
if (
|
|
48262
|
-
|
|
48489
|
+
if (isCollapsedPool$1(shape)) {
|
|
48490
|
+
if (axis === 'y' && isHorizontal$3(shape) || axis === 'x' && !isHorizontal$3(shape)) {
|
|
48491
|
+
return false;
|
|
48492
|
+
}
|
|
48263
48493
|
}
|
|
48264
48494
|
|
|
48265
48495
|
return true;
|
|
@@ -49824,7 +50054,7 @@
|
|
|
49824
50054
|
const di = getDi(element),
|
|
49825
50055
|
diLabel = di && di.get('label');
|
|
49826
50056
|
|
|
49827
|
-
if (isLabelExternal(element)) {
|
|
50057
|
+
if (isLabelExternal(element) || isPlane(element)) {
|
|
49828
50058
|
return;
|
|
49829
50059
|
}
|
|
49830
50060
|
|
|
@@ -50548,7 +50778,15 @@
|
|
|
50548
50778
|
}
|
|
50549
50779
|
|
|
50550
50780
|
if (is$1(businessObject, 'bpmn:ExclusiveGateway')) {
|
|
50551
|
-
|
|
50781
|
+
if (has$1(attrs, 'isMarkerVisible')) {
|
|
50782
|
+
if (attrs.isMarkerVisible === undefined) {
|
|
50783
|
+
di.isMarkerVisible = false;
|
|
50784
|
+
} else {
|
|
50785
|
+
attrs = applyAttribute(di, attrs, 'isMarkerVisible');
|
|
50786
|
+
}
|
|
50787
|
+
} else {
|
|
50788
|
+
di.isMarkerVisible = true;
|
|
50789
|
+
}
|
|
50552
50790
|
}
|
|
50553
50791
|
|
|
50554
50792
|
if (isDefined(attrs.triggeredByEvent)) {
|
|
@@ -58893,7 +59131,7 @@
|
|
|
58893
59131
|
'delete': {
|
|
58894
59132
|
group: 'edit',
|
|
58895
59133
|
className: 'bpmn-icon-trash',
|
|
58896
|
-
title: this._translate('
|
|
59134
|
+
title: this._translate('Delete'),
|
|
58897
59135
|
action: {
|
|
58898
59136
|
click: function(event, elements) {
|
|
58899
59137
|
modeling.removeElements(elements.slice());
|
|
@@ -59171,7 +59409,8 @@
|
|
|
59171
59409
|
'append.gateway': appendAction(
|
|
59172
59410
|
'bpmn:ExclusiveGateway',
|
|
59173
59411
|
'bpmn-icon-gateway-none',
|
|
59174
|
-
translate('Append gateway')
|
|
59412
|
+
translate('Append gateway'),
|
|
59413
|
+
{ isMarkerVisible: true }
|
|
59175
59414
|
),
|
|
59176
59415
|
'append.append-task': appendAction(
|
|
59177
59416
|
'bpmn:Task',
|
|
@@ -59194,7 +59433,7 @@
|
|
|
59194
59433
|
'replace': {
|
|
59195
59434
|
group: 'edit',
|
|
59196
59435
|
className: 'bpmn-icon-screw-wrench',
|
|
59197
|
-
title: translate('Change
|
|
59436
|
+
title: translate('Change element'),
|
|
59198
59437
|
action: {
|
|
59199
59438
|
click: function(event, element) {
|
|
59200
59439
|
|
|
@@ -59218,7 +59457,7 @@
|
|
|
59218
59457
|
'append.text-annotation': appendAction(
|
|
59219
59458
|
'bpmn:TextAnnotation',
|
|
59220
59459
|
'bpmn-icon-text-annotation',
|
|
59221
|
-
translate('
|
|
59460
|
+
translate('Add text annotation')
|
|
59222
59461
|
)
|
|
59223
59462
|
});
|
|
59224
59463
|
}
|
|
@@ -59235,19 +59474,13 @@
|
|
|
59235
59474
|
'append.text-annotation': appendAction(
|
|
59236
59475
|
'bpmn:TextAnnotation',
|
|
59237
59476
|
'bpmn-icon-text-annotation',
|
|
59238
|
-
translate('
|
|
59477
|
+
translate('Add text annotation')
|
|
59239
59478
|
),
|
|
59240
59479
|
|
|
59241
59480
|
'connect': {
|
|
59242
59481
|
group: 'connect',
|
|
59243
59482
|
className: 'bpmn-icon-connection-multi',
|
|
59244
|
-
title: translate(
|
|
59245
|
-
'Connect using ' +
|
|
59246
|
-
(businessObject.isForCompensation
|
|
59247
|
-
? ''
|
|
59248
|
-
: 'sequence/message flow or ') +
|
|
59249
|
-
'association'
|
|
59250
|
-
),
|
|
59483
|
+
title: translate('Connect to other element'),
|
|
59251
59484
|
action: {
|
|
59252
59485
|
click: startConnect,
|
|
59253
59486
|
dragstart: startConnect,
|
|
@@ -59289,7 +59522,7 @@
|
|
|
59289
59522
|
'append.text-annotation': appendAction(
|
|
59290
59523
|
'bpmn:TextAnnotation',
|
|
59291
59524
|
'bpmn-icon-text-annotation',
|
|
59292
|
-
translate('
|
|
59525
|
+
translate('Add text annotation')
|
|
59293
59526
|
)
|
|
59294
59527
|
});
|
|
59295
59528
|
}
|
|
@@ -59308,7 +59541,7 @@
|
|
|
59308
59541
|
'delete': {
|
|
59309
59542
|
group: 'edit',
|
|
59310
59543
|
className: 'bpmn-icon-trash',
|
|
59311
|
-
title: translate('
|
|
59544
|
+
title: translate('Delete'),
|
|
59312
59545
|
action: {
|
|
59313
59546
|
click: removeElement
|
|
59314
59547
|
}
|
|
@@ -62449,7 +62682,7 @@
|
|
|
62449
62682
|
|
|
62450
62683
|
// adjust for expanded pools AND lanes
|
|
62451
62684
|
if (is$1(element, 'bpmn:Lane') || isExpandedPool(element)) {
|
|
62452
|
-
var isHorizontalLane = isHorizontal$
|
|
62685
|
+
var isHorizontalLane = isHorizontal$3(element);
|
|
62453
62686
|
|
|
62454
62687
|
var laneBounds = isHorizontalLane ? {
|
|
62455
62688
|
width: bbox.height,
|
|
@@ -62477,7 +62710,7 @@
|
|
|
62477
62710
|
|
|
62478
62711
|
// internal labels for collapsed participants
|
|
62479
62712
|
if (isCollapsedPool(element)) {
|
|
62480
|
-
var isHorizontalPool = isHorizontal$
|
|
62713
|
+
var isHorizontalPool = isHorizontal$3(element);
|
|
62481
62714
|
|
|
62482
62715
|
var poolBounds = isHorizontalPool ? {
|
|
62483
62716
|
width: bbox.width,
|
|
@@ -65149,12 +65382,6 @@
|
|
|
65149
65382
|
|
|
65150
65383
|
function createListener(event) {
|
|
65151
65384
|
var shape = elementFactory.createShape(assign$1({ type: type }, options));
|
|
65152
|
-
|
|
65153
|
-
if (options) {
|
|
65154
|
-
var di = getDi(shape);
|
|
65155
|
-
di.isExpanded = options.isExpanded;
|
|
65156
|
-
}
|
|
65157
|
-
|
|
65158
65385
|
create.start(event, shape);
|
|
65159
65386
|
}
|
|
65160
65387
|
|
|
@@ -65254,7 +65481,8 @@
|
|
|
65254
65481
|
),
|
|
65255
65482
|
'create.exclusive-gateway': createAction(
|
|
65256
65483
|
'bpmn:ExclusiveGateway', 'gateway', 'bpmn-icon-gateway-none',
|
|
65257
|
-
translate('Create gateway')
|
|
65484
|
+
translate('Create gateway'),
|
|
65485
|
+
{ isMarkerVisible: true }
|
|
65258
65486
|
),
|
|
65259
65487
|
'create.task': createAction(
|
|
65260
65488
|
'bpmn:Task', 'activity', 'bpmn-icon-task',
|