feat(bpmn-renderer): correctly render all parallel and multiple events

Closes #1090
bpmn-io · Jun 27, 2019 · 92bdcb8 · 92bdcb8
1 parent 470ee9a
commit 92bdcb8
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 54 deletions.
diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js
@@ -392,6 +392,15 @@ export default function BpmnRenderer(
     var event = getSemantic(element);
     var isThrowing = isThrowEvent(event);
 
+    if (event.eventDefinitions && event.eventDefinitions.length>1) {
+      if (event.parallelMultiple) {
+        return renderer('bpmn:ParallelMultipleEventDefinition')(parentGfx, element, isThrowing);
+      }
+      else {
+        return renderer('bpmn:MultipleEventDefinition')(parentGfx, element, isThrowing);
+      }
+    }
+
     if (isTypedEvent(event, 'bpmn:MessageEventDefinition')) {
       return renderer('bpmn:MessageEventDefinition')(parentGfx, element, isThrowing);
     }
@@ -408,16 +417,6 @@ export default function BpmnRenderer(
       return renderer('bpmn:SignalEventDefinition')(parentGfx, element, isThrowing);
     }
 
-    if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
-      isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: false })) {
-      return renderer('bpmn:MultipleEventDefinition')(parentGfx, element, isThrowing);
-    }
-
-    if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
-      isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: true })) {
-      return renderer('bpmn:ParallelMultipleEventDefinition')(parentGfx, element, isThrowing);
-    }
-
     if (isTypedEvent(event, 'bpmn:EscalationEventDefinition')) {
       return renderer('bpmn:EscalationEventDefinition')(parentGfx, element, isThrowing);
     }