camunda-bpmn-js 5.6.2 → 5.7.0

package/dist/camunda-platform-navigated-viewer.development.js

@@ -3170,8 +3170,8 @@
         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
@@ -3195,17 +3195,23 @@
         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
@@ -3214,23 +3220,23 @@
 
         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,
@@ -3245,8 +3251,8 @@
         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
@@ -3267,8 +3273,8 @@
         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
@@ -3307,8 +3313,8 @@
         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
@@ -3353,8 +3359,8 @@
         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
@@ -3375,8 +3381,8 @@
         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
@@ -3397,10 +3403,10 @@
         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
           }
         });
@@ -3411,6 +3417,7 @@
 
         return drawPath(parentGfx, pathData, {
           fill,
+          stroke: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
           strokeWidth: 1
         });
       },
@@ -3418,8 +3425,8 @@
         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
@@ -3443,57 +3450,59 @@
       }
     };
 
-    function renderEventIcon(element, parentGfx, attrs = {}) {
+    function renderEventIcon(element, parentGfx, attrs = {}, proxyElement) {
       var semantic = getBusinessObject(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;
@@ -3915,14 +3924,23 @@
     function renderSubProcess(parentGfx, element, attrs = {}) {
       var activity = renderActivity(parentGfx, element, attrs);
 
+      var expanded = isExpanded(element);
+
       if (isEventSubProcess(element)) {
         attr$1(activity, {
           strokeDasharray: '0, 5.5',
           strokeWidth: 2.5
         });
-      }
 
-      var expanded = isExpanded(element);
+        if (!expanded) {
+          var flowElements = getBusinessObject(element).flowElements || [];
+          var startEvents = flowElements.filter(e => is$1(e, 'bpmn:StartEvent'));
+
+          if (startEvents.length === 1) {
+            renderEventSubProcessIcon(startEvents[0], parentGfx, attrs, element);
+          }
+        }
+      }
 
       renderEmbeddedLabel(parentGfx, element, expanded ? 'center-top' : 'center-middle', attrs);
 
@@ -3935,6 +3953,39 @@
       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 = getBusinessObject(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);