bpmn-js 18.3.2 → 18.5.0

package/lib/draw/BpmnRenderer.js

@@ -462,8 +462,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_MESSAGE', {
         xScaleFactor: 0.9,
         yScaleFactor: 0.9,
-        containerWidth: element.width,
-        containerHeight: element.height,
+        containerWidth: attrs.width || element.width,
+        containerHeight: attrs.height || element.height,
         position: {
           mx: 0.235,
           my: 0.315
@@ -487,17 +487,23 @@ export default function BpmnRenderer(
       return messagePath;
     },
     'bpmn:TimerEventDefinition': function(parentGfx, element, attrs = {}) {
-      var circle = drawCircle(parentGfx, element.width, element.height, 0.2 * element.height, {
+      var baseWidth = attrs.width || element.width;
+      var baseHeight = attrs.height || element.height;
+
+      // use a lighter stroke for event suprocess icons
+      var strokeWidth = attrs.width ? 1 : 2;
+
+      var circle = drawCircle(parentGfx, baseWidth, baseHeight, 0.2 * baseHeight, {
         fill: getFillColor(element, defaultFillColor, attrs.fill),
         stroke: getStrokeColor(element, defaultStrokeColor, attrs.stroke),
-        strokeWidth: 2
+        strokeWidth: strokeWidth
       });
 
       var pathData = pathMap.getScaledPath('EVENT_TIMER_WH', {
         xScaleFactor: 0.75,
         yScaleFactor: 0.75,
-        containerWidth: element.width,
-        containerHeight: element.height,
+        containerWidth: baseWidth,
+        containerHeight: baseHeight,
         position: {
           mx: 0.5,
           my: 0.5
@@ -506,23 +512,23 @@ export default function BpmnRenderer(
 
       drawPath(parentGfx, pathData, {
         stroke: getStrokeColor(element, defaultStrokeColor, attrs.stroke),
-        strokeWidth: 2
+        strokeWidth: strokeWidth
       });
 
       for (var i = 0; i < 12; i++) {
         var linePathData = pathMap.getScaledPath('EVENT_TIMER_LINE', {
           xScaleFactor: 0.75,
           yScaleFactor: 0.75,
-          containerWidth: element.width,
-          containerHeight: element.height,
+          containerWidth: baseWidth,
+          containerHeight: baseHeight,
           position: {
             mx: 0.5,
             my: 0.5
           }
         });
 
-        var width = element.width / 2,
-            height = element.height / 2;
+        var width = baseWidth / 2,
+            height = baseHeight / 2;
 
         drawPath(parentGfx, linePathData, {
           strokeWidth: 1,
@@ -537,8 +543,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_ESCALATION', {
         xScaleFactor: 1,
         yScaleFactor: 1,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.5,
           my: 0.2
@@ -559,8 +565,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_CONDITIONAL', {
         xScaleFactor: 1,
         yScaleFactor: 1,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.5,
           my: 0.222
@@ -599,8 +605,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_ERROR', {
         xScaleFactor: 1.1,
         yScaleFactor: 1.1,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.2,
           my: 0.722
@@ -645,8 +651,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_COMPENSATION', {
         xScaleFactor: 1,
         yScaleFactor: 1,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.22,
           my: 0.5
@@ -667,8 +673,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_SIGNAL', {
         xScaleFactor: 0.9,
         yScaleFactor: 0.9,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.5,
           my: 0.2
@@ -689,10 +695,10 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_MULTIPLE', {
         xScaleFactor: 1.1,
         yScaleFactor: 1.1,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
-          mx: 0.222,
+          mx: 0.211,
           my: 0.36
         }
       });
@@ -703,6 +709,7 @@ export default function BpmnRenderer(
 
       return drawPath(parentGfx, pathData, {
         fill,
+        stroke: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
         strokeWidth: 1
       });
     },
@@ -710,8 +717,8 @@ export default function BpmnRenderer(
       var pathData = pathMap.getScaledPath('EVENT_PARALLEL_MULTIPLE', {
         xScaleFactor: 1.2,
         yScaleFactor: 1.2,
-        containerWidth: event.width,
-        containerHeight: event.height,
+        containerWidth: attrs.width || event.width,
+        containerHeight: attrs.height || event.height,
         position: {
           mx: 0.458,
           my: 0.194
@@ -735,57 +742,59 @@ export default function BpmnRenderer(
     }
   };
 
-  function renderEventIcon(element, parentGfx, attrs = {}) {
+  function renderEventIcon(element, parentGfx, attrs = {}, proxyElement) {
     var semantic = getSemantic(element),
         isThrowing = isThrowEvent(semantic);
 
+    var nodeElement = proxyElement || element;
+
     if (semantic.get('eventDefinitions') && semantic.get('eventDefinitions').length > 1) {
       if (semantic.get('parallelMultiple')) {
-        return eventIconRenderers[ 'bpmn:ParallelMultipleEventDefinition' ](parentGfx, element, attrs, isThrowing);
+        return eventIconRenderers[ 'bpmn:ParallelMultipleEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
       }
       else {
-        return eventIconRenderers[ 'bpmn:MultipleEventDefinition' ](parentGfx, element, attrs, isThrowing);
+        return eventIconRenderers[ 'bpmn:MultipleEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
       }
     }
 
     if (isTypedEvent(semantic, 'bpmn:MessageEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:MessageEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:MessageEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:TimerEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:TimerEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:TimerEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:ConditionalEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:ConditionalEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:ConditionalEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:SignalEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:SignalEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:SignalEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:EscalationEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:EscalationEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:EscalationEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:LinkEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:LinkEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:LinkEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:ErrorEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:ErrorEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:ErrorEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:CancelEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:CancelEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:CancelEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:CompensateEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:CompensateEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:CompensateEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     if (isTypedEvent(semantic, 'bpmn:TerminateEventDefinition')) {
-      return eventIconRenderers[ 'bpmn:TerminateEventDefinition' ](parentGfx, element, attrs, isThrowing);
+      return eventIconRenderers[ 'bpmn:TerminateEventDefinition' ](parentGfx, nodeElement, attrs, isThrowing);
     }
 
     return null;
@@ -1207,14 +1216,23 @@ export default function BpmnRenderer(
   function renderSubProcess(parentGfx, element, attrs = {}) {
     var activity = renderActivity(parentGfx, element, attrs);
 
+    var expanded = isExpanded(element);
+
     if (isEventSubProcess(element)) {
       svgAttr(activity, {
         strokeDasharray: '0, 5.5',
         strokeWidth: 2.5
       });
-    }
 
-    var expanded = isExpanded(element);
+      if (!expanded) {
+        var flowElements = getSemantic(element).flowElements || [];
+        var startEvents = flowElements.filter(e => is(e, 'bpmn:StartEvent'));
+
+        if (startEvents.length === 1) {
+          renderEventSubProcessIcon(startEvents[0], parentGfx, attrs, element);
+        }
+      }
+    }
 
     renderEmbeddedLabel(parentGfx, element, expanded ? 'center-top' : 'center-middle', attrs);
 
@@ -1227,6 +1245,39 @@ export default function BpmnRenderer(
     return activity;
   }
 
+  function renderEventSubProcessIcon(startEvent, parentGfx, attrs, proxyElement) {
+    var iconSize = 22;
+
+    // match the colors of the enclosing subprocess
+    var proxyAttrs = {
+      fill: getFillColor(proxyElement, defaultFillColor, attrs.fill),
+      stroke: getStrokeColor(proxyElement, defaultStrokeColor, attrs.stroke),
+      width: iconSize,
+      height: iconSize
+    };
+
+    var interrupting = getSemantic(startEvent).isInterrupting;
+    var strokeDasharray = interrupting ? 0 : 3;
+
+    // better visibility for non-interrupting events
+    var strokeWidth = interrupting ? 1 : 1.2;
+
+    // make the icon look larger by drawing a smaller circle
+    var circleSize = 20;
+    var shift = (iconSize - circleSize) / 2;
+    var transform = 'translate(' + shift + ',' + shift + ')';
+
+    drawCircle(parentGfx, circleSize, circleSize, {
+      fill: proxyAttrs.fill,
+      stroke: proxyAttrs.stroke,
+      strokeWidth,
+      strokeDasharray,
+      transform
+    });
+
+    renderEventIcon(startEvent, parentGfx, proxyAttrs, proxyElement);
+  }
+
   function renderTask(parentGfx, element, attrs = {}) {
     var activity = renderActivity(parentGfx, element, attrs);
 

package/lib/features/context-pad/ContextPadProvider.js

@@ -485,6 +485,16 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     });
   }
 
+  if (is(businessObject, 'bpmn:MessageFlow')) {
+    assign(actions, {
+      'append.text-annotation': appendAction(
+        'bpmn:TextAnnotation',
+        'bpmn-icon-text-annotation',
+        translate('Add text annotation')
+      )
+    });
+  }
+
   if (
     isAny(businessObject, [
       'bpmn:FlowNode',

package/lib/import/BpmnTreeWalker.js

@@ -430,12 +430,11 @@ export default function BpmnTreeWalker(handler) {
 
     forEach(collaboration.participants, contextual(handleParticipant, context));
 
-    handleArtifacts(collaboration.artifacts, context);
-
-    // handle message flows latest in the process
     deferred.push(function() {
       handleMessageFlows(collaboration.messageFlows, context);
     });
+
+    handleArtifacts(collaboration.artifacts, context);
   }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "18.3.2",
+  "version": "18.5.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "lib/index.js",
   "files": [