sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(snapping) snap on sequence flows 

Closes #398
This commit is contained in:
pedesen 2017-07-14 11:29:41 +02:00
parent e797d9c142
commit b234f17244
3 changed files with 129 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/features/snapping/BpmnSnapping.js
View File

@ -373,18 +373,34 @@ BpmnSnapping.prototype.addTargetSnaps = function(snapPoints, shape, target) {
var siblings = this.getSiblings(shape, target) || [];
forEach(siblings, function(s) {
forEach(siblings, function(sibling) {
// do not snap to lanes
if (is(s, 'bpmn:Lane')) {
if (is(sibling, 'bpmn:Lane')) {
return;
}
snapPoints.add('mid', mid(s));
if (sibling.waypoints) {
forEach(sibling.waypoints, function(waypoint, i) {
var nextWaypoint = sibling.waypoints[i+1];
if (is(s, 'bpmn:Participant')) {
snapPoints.add('top-left', topLeft(s));
snapPoints.add('bottom-right', bottomRight(s));
if (!nextWaypoint) {
return;
}
if (nextWaypoint.x === waypoint.x || nextWaypoint.y === waypoint.y) {
snapPoints.add('mid', waypoint);
}
});
return;
}
snapPoints.add('mid', mid(sibling));
if (is(sibling, 'bpmn:Participant')) {
snapPoints.add('top-left', topLeft(sibling));
snapPoints.add('bottom-right', bottomRight(sibling));
}
});

41
test/spec/features/snapping/BpmnSnapping.sequenceFlow.bpmn Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0-dev">
<bpmn:process id="Process_1" isExecutable="false">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>SequenceFlow_1</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:task id="Task_1">
<bpmn:incoming>SequenceFlow_1</bpmn:incoming>
</bpmn:task>
<bpmn:sequenceFlow id="SequenceFlow_1" sourceRef="StartEvent_1" targetRef="Task_1" />
<bpmn:task id="Task_099t40a" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
<bpmndi:BPMNShape id="StartEvent_1oc4unz_di" bpmnElement="StartEvent_1">
<dc:Bounds x="70" y="49" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="88" y="88" width="0" height="13" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_1ndpsyi_di" bpmnElement="Task_1">
<dc:Bounds x="538" y="405" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1mpqh64_di" bpmnElement="SequenceFlow_1">
<di:waypoint xsi:type="dc:Point" x="106" y="67" />
<di:waypoint xsi:type="dc:Point" x="191" y="67" />
<di:waypoint xsi:type="dc:Point" x="191" y="134" />
<di:waypoint xsi:type="dc:Point" x="304" y="134" />
<di:waypoint xsi:type="dc:Point" x="304" y="325" />
<di:waypoint xsi:type="dc:Point" x="588" y="325" />
<di:waypoint xsi:type="dc:Point" x="588" y="405" />
<bpmndi:BPMNLabel>
<dc:Bounds x="247.5" y="112.5" width="0" height="13" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Task_099t40a_di" bpmnElement="Task_099t40a">
<dc:Bounds x="118" y="405" width="100" height="80" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

66
test/spec/features/snapping/BpmnSnappingSpec.js
View File

@ -99,6 +99,72 @@ describe('features/snapping - BpmnSnapping', function() {
});
describe('on Sequence Flows', function() {
var diagramXML = require('./BpmnSnapping.sequenceFlow.bpmn');
beforeEach(bootstrapModeler(diagramXML, {
modules: testModules
}));
var sequenceFlow, task;
beforeEach(inject(function(elementFactory, elementRegistry, dragging) {
sequenceFlow = elementRegistry.get('SequenceFlow_1');
task = elementFactory.createShape({
type: 'bpmn:Task'
});
dragging.setOptions({ manual: true });
}));
afterEach(inject(function(dragging) {
dragging.setOptions({ manual: false });
}));
it('should snap vertically',
inject(function(canvas, create, dragging) {
// given
var sequenceFlowGfx = canvas.getGraphics(sequenceFlow);
// when
create.start(canvasEvent({ x: 0, y: 0 }), task);
dragging.hover({ element: sequenceFlow, gfx: sequenceFlowGfx });
dragging.move(canvasEvent({ x: 300, y: 245 }));
dragging.end();
// then
expect(task.x).to.eql(254);
})
);
it('should snap horizontally',
inject(function(canvas, create, dragging) {
// given
var sequenceFlowGfx = canvas.getGraphics(sequenceFlow);
// when
create.start(canvasEvent({ x: 0, y: 0 }), task);
dragging.hover({ element: sequenceFlow, gfx: sequenceFlowGfx });
dragging.move(canvasEvent({ x: 410, y: 320 }));
dragging.end();
// then
expect(task.y).to.eql(285);
})
);
});
describe('on Participant create', function() {
describe('in non-empty process', function() {