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

Merge master to develop

Browse Source
This commit is contained in:
bpmn-io-bot 2022-02-24 14:22:59 +00:00
commit 9794498543
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/features/label-editing/LabelEditingProvider.js
View File

@ -48,7 +48,8 @@ export default function LabelEditingProvider(
'canvas.viewbox.changing', 'canvas.viewbox.changing',
'drag.init', 'drag.init',
'element.mousedown', 'element.mousedown',
'popupMenu.open' 'popupMenu.open',
'root.set'
], function(event) { ], function(event) {
if (directEditing.isActive()) { if (directEditing.isActive()) {

10
test/spec/features/label-editing/LabelEditing.bpmn
View File

@ -14,11 +14,12 @@
<bpmn:flowNodeRef>SubProcess_1</bpmn:flowNodeRef> <bpmn:flowNodeRef>SubProcess_1</bpmn:flowNodeRef>
</bpmn:lane> </bpmn:lane>
<bpmn:lane id="Lane_1" name="FOO BAR"> <bpmn:lane id="Lane_1" name="FOO BAR">
<bpmn:flowNodeRef>Task_1</bpmn:flowNodeRef>
<bpmn:flowNodeRef>StartEvent_08jn2xd</bpmn:flowNodeRef> <bpmn:flowNodeRef>StartEvent_08jn2xd</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Task_1</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Task_1fo1fvh</bpmn:flowNodeRef> <bpmn:flowNodeRef>Task_1fo1fvh</bpmn:flowNodeRef>
<bpmn:flowNodeRef>ExclusiveGateway_1</bpmn:flowNodeRef> <bpmn:flowNodeRef>ExclusiveGateway_1</bpmn:flowNodeRef>
<bpmn:flowNodeRef>EndEvent_1</bpmn:flowNodeRef> <bpmn:flowNodeRef>EndEvent_1</bpmn:flowNodeRef>
<bpmn:flowNodeRef>SubProcess_2</bpmn:flowNodeRef>
</bpmn:lane> </bpmn:lane>
</bpmn:laneSet> </bpmn:laneSet>
<bpmn:ioSpecification> <bpmn:ioSpecification>
@ -66,6 +67,7 @@
<bpmn:dataObjectReference id="DataObjectReference_1" dataObjectRef="DataObject_1rq8hb8" /> <bpmn:dataObjectReference id="DataObjectReference_1" dataObjectRef="DataObject_1rq8hb8" />
<bpmn:dataObject id="DataObject_1rq8hb8" /> <bpmn:dataObject id="DataObject_1rq8hb8" />
<bpmn:dataStoreReference id="DataStoreReference_1" /> <bpmn:dataStoreReference id="DataStoreReference_1" />
<bpmn:subProcess id="SubProcess_2" />
<bpmn:association id="Association_0ckvfj2" sourceRef="SubProcess_1" targetRef="TextAnnotation_1" /> <bpmn:association id="Association_0ckvfj2" sourceRef="SubProcess_1" targetRef="TextAnnotation_1" />
<bpmn:group id="Group_1" categoryValueRef="CategoryValue_1" /> <bpmn:group id="Group_1" categoryValueRef="CategoryValue_1" />
<bpmn:group id="Group_2" /> <bpmn:group id="Group_2" />
@ -87,6 +89,9 @@
<bpmndi:BPMNShape id="SubProcess_194zznr_di" bpmnElement="SubProcess_1" isExpanded="true"> <bpmndi:BPMNShape id="SubProcess_194zznr_di" bpmnElement="SubProcess_1" isExpanded="true">
<dc:Bounds x="311" y="147" width="350" height="200" /> <dc:Bounds x="311" y="147" width="350" height="200" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="SubProcess_194zznr_di" bpmnElement="SubProcess_1" isExpanded="true">
<dc:Bounds x="311" y="147" width="350" height="200" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_0909sti_di" bpmnElement="StartEvent_1"> <bpmndi:BPMNShape id="StartEvent_0909sti_di" bpmnElement="StartEvent_1">
<dc:Bounds x="223" y="229" width="36" height="36" /> <dc:Bounds x="223" y="229" width="36" height="36" />
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
@ -211,4 +216,7 @@
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
</bpmndi:BPMNPlane> </bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram> </bpmndi:BPMNDiagram>
<bpmndi:BPMNDiagram id="BPMNDiagram_17fa1v0">
<bpmndi:BPMNPlane id="BPMNPlane_1yas56k" bpmnElement="SubProcess_2" />
</bpmndi:BPMNDiagram>
</bpmn:definitions> </bpmn:definitions>

28
test/spec/features/label-editing/LabelEditingProviderSpec.js
View File

@ -155,6 +155,34 @@ describe('features - label-editing', function() {
} }
)); ));
it('should submit on root element changed', inject(
function(elementRegistry, directEditing, canvas, eventBus) {
// given
var shape = elementRegistry.get('Task_1'),
task = shape.businessObject,
newRoot = elementRegistry.get('SubProcess_2_plane');
// activate
eventBus.fire('element.dblclick', { element: shape });
var newName = 'new value';
// a <textarea /> element
var content = directEditing._textbox.content;
content.innerText = newName;
// when
canvas.setRootElement(newRoot);
// then
expect(directEditing.isActive()).to.be.false;
expect(task.name).to.equal(newName);
}
));
}); });