sartography/bpmn-js
1
0
Fork 0
mirror of https://github.com/sartography/bpmn-js.git synced 2025-02-17 03:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(modeling): create label at appropriate position

Browse Source 
This re-introduces adaptive label positioning
on label creation as a feature.

It worked before but broke during the introduction
of optional labels.

Closes #825
This commit is contained in:
Nico Rehwaldt 2018-07-11 13:25:25 +02:00
parent 15596ef97c
commit 4806938600
3 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js
View File

@ -48,6 +48,13 @@ export default function AdaptiveLabelPositioningBehavior(eventBus, modeling) {
}); });
this.postExecuted([
'label.create'
], function(event) {
checkLabelAdjustment(event.context.shape.labelTarget);
});
function checkLabelAdjustment(element) { function checkLabelAdjustment(element) {
// skip non-existing labels // skip non-existing labels

56
test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehavior.bpmn
View File

@ -31,6 +31,13 @@
<sequenceFlow id="SequenceFlow_1qmllcx" sourceRef="Task" targetRef="LabelImpossible" /> <sequenceFlow id="SequenceFlow_1qmllcx" sourceRef="Task" targetRef="LabelImpossible" />
<sequenceFlow id="SequenceFlow_0s993e4" sourceRef="Task" targetRef="LabelImpossible" /> <sequenceFlow id="SequenceFlow_0s993e4" sourceRef="Task" targetRef="LabelImpossible" />
<sequenceFlow id="SequenceFlow_022at7e" sourceRef="Task" targetRef="LabelImpossible" /> <sequenceFlow id="SequenceFlow_022at7e" sourceRef="Task" targetRef="LabelImpossible" />
<exclusiveGateway id="NoLabel">
<outgoing>SequenceFlow_0isa70k</outgoing>
</exclusiveGateway>
<exclusiveGateway id="ExclusiveGateway_02fomt2">
<incoming>SequenceFlow_0isa70k</incoming>
</exclusiveGateway>
<sequenceFlow id="SequenceFlow_0isa70k" sourceRef="NoLabel" targetRef="ExclusiveGateway_02fomt2" />
</process> </process>
<bpmndi:BPMNDiagram id="BpmnDiagram_1"> <bpmndi:BPMNDiagram id="BpmnDiagram_1">
<bpmndi:BPMNPlane id="BpmnPlane_1" bpmnElement="Process_1"> <bpmndi:BPMNPlane id="BpmnPlane_1" bpmnElement="Process_1">
@ -77,15 +84,15 @@
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1_di" bpmnElement="SequenceFlow_1"> <bpmndi:BPMNEdge id="SequenceFlow_1_di" bpmnElement="SequenceFlow_1">
<omgdi:waypoint xsi:type="omgdc:Point" x="334" y="275" /> <omgdi:waypoint x="334" y="275" />
<omgdi:waypoint xsi:type="omgdc:Point" x="334" y="370" /> <omgdi:waypoint x="334" y="370" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds x="346" y="317" width="7" height="12" /> <omgdc:Bounds x="346" y="317" width="7" height="12" />
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_2_di" bpmnElement="SequenceFlow_2"> <bpmndi:BPMNEdge id="SequenceFlow_2_di" bpmnElement="SequenceFlow_2">
<omgdi:waypoint xsi:type="omgdc:Point" x="131" y="275" /> <omgdi:waypoint x="131" y="275" />
<omgdi:waypoint xsi:type="omgdc:Point" x="131" y="370" /> <omgdi:waypoint x="131" y="370" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds x="142" y="317" width="8" height="12" /> <omgdc:Bounds x="142" y="317" width="8" height="12" />
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
@ -100,33 +107,48 @@
<omgdc:Bounds x="776" y="293" width="100" height="80" /> <omgdc:Bounds x="776" y="293" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1qmllcx_di" bpmnElement="SequenceFlow_1qmllcx"> <bpmndi:BPMNEdge id="SequenceFlow_1qmllcx_di" bpmnElement="SequenceFlow_1qmllcx">
<omgdi:waypoint xsi:type="omgdc:Point" x="826" y="293" /> <omgdi:waypoint x="826" y="293" />
<omgdi:waypoint xsi:type="omgdc:Point" x="826" y="202" /> <omgdi:waypoint x="826" y="202" />
<omgdi:waypoint xsi:type="omgdc:Point" x="658" y="202" /> <omgdi:waypoint x="658" y="202" />
<omgdi:waypoint xsi:type="omgdc:Point" x="658" y="308" /> <omgdi:waypoint x="658" y="308" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds x="742" y="181" width="0" height="12" /> <omgdc:Bounds x="742" y="181" width="0" height="12" />
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0s993e4_di" bpmnElement="SequenceFlow_0s993e4"> <bpmndi:BPMNEdge id="SequenceFlow_0s993e4_di" bpmnElement="SequenceFlow_0s993e4">
<omgdi:waypoint xsi:type="omgdc:Point" x="826" y="373" /> <omgdi:waypoint x="826" y="373" />
<omgdi:waypoint xsi:type="omgdc:Point" x="826" y="424" /> <omgdi:waypoint x="826" y="424" />
<omgdi:waypoint xsi:type="omgdc:Point" x="658" y="424" /> <omgdi:waypoint x="658" y="424" />
<omgdi:waypoint xsi:type="omgdc:Point" x="658" y="358" /> <omgdi:waypoint x="658" y="358" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds x="742" y="403" width="0" height="12" /> <omgdc:Bounds x="742" y="403" width="0" height="12" />
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_022at7e_di" bpmnElement="SequenceFlow_022at7e"> <bpmndi:BPMNEdge id="SequenceFlow_022at7e_di" bpmnElement="SequenceFlow_022at7e">
<omgdi:waypoint xsi:type="omgdc:Point" x="845" y="373" /> <omgdi:waypoint x="845" y="373" />
<omgdi:waypoint xsi:type="omgdc:Point" x="845" y="453" /> <omgdi:waypoint x="845" y="453" />
<omgdi:waypoint xsi:type="omgdc:Point" x="594" y="453" /> <omgdi:waypoint x="594" y="453" />
<omgdi:waypoint xsi:type="omgdc:Point" x="594" y="333" /> <omgdi:waypoint x="594" y="333" />
<omgdi:waypoint xsi:type="omgdc:Point" x="633" y="333" /> <omgdi:waypoint x="633" y="333" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds x="719.5" y="432" width="0" height="12" /> <omgdc:Bounds x="719.5" y="432" width="0" height="12" />
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="NoLabel_di" bpmnElement="NoLabel" isMarkerVisible="true">
<omgdc:Bounds x="633" y="82" width="50" height="50" />
<bpmndi:BPMNLabel>
<omgdc:Bounds x="120" y="570" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_02fomt2_di" bpmnElement="ExclusiveGateway_02fomt2" isMarkerVisible="true">
<omgdc:Bounds x="836" y="82" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0isa70k_di" bpmnElement="SequenceFlow_0isa70k">
<omgdi:waypoint x="658" y="132" />
<omgdi:waypoint x="658" y="159" />
<omgdi:waypoint x="861" y="159" />
<omgdi:waypoint x="861" y="132" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane> </bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram> </bpmndi:BPMNDiagram>
</definitions> </definitions>

17
test/spec/features/modeling/behavior/AdaptiveLabelPositioningBehaviorSpec.js
View File

@ -260,4 +260,21 @@ describe('modeling/behavior - AdaptiveLabelPositioningBehavior', function() {
}); });
describe('on label creation', function() {
it('should create label at TOP', inject(
function(elementRegistry, modeling) {
// given
var element = elementRegistry.get('NoLabel');
// when
modeling.updateProperties(element, { name: 'FOO BAR' });
// then
expectLabelOrientation(element, 'top');
}
));
});
}); });