bpmn-js 16.3.2 → 16.5.0

package/lib/draw/BpmnRenderer.js

@@ -720,7 +720,7 @@ export default function BpmnRenderer(
       });
 
       return drawPath(parentGfx, pathData, {
-        fill: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
+        fill: getFillColor(event, defaultFillColor, attrs.fill),
         stroke: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
         strokeWidth: 1
       });

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

@@ -142,7 +142,7 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
       'delete': {
         group: 'edit',
         className: 'bpmn-icon-trash',
-        title: this._translate('Remove'),
+        title: this._translate('Delete'),
         action: {
           click: function(event, elements) {
             modeling.removeElements(elements.slice());
@@ -443,7 +443,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'replace': {
         group: 'edit',
         className: 'bpmn-icon-screw-wrench',
-        title: translate('Change type'),
+        title: translate('Change element'),
         action: {
           click: function(event, element) {
 
@@ -467,7 +467,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append text annotation')
+        translate('Add text annotation')
       )
     });
   }
@@ -484,19 +484,13 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append text annotation')
+        translate('Add text annotation')
       ),
 
       'connect': {
         group: 'connect',
         className: 'bpmn-icon-connection-multi',
-        title: translate(
-          'Connect using ' +
-            (businessObject.isForCompensation
-              ? ''
-              : 'sequence/message flow or ') +
-            'association'
-        ),
+        title: translate('Connect to other element'),
         action: {
           click: startConnect,
           dragstart: startConnect,
@@ -538,7 +532,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'append.text-annotation': appendAction(
         'bpmn:TextAnnotation',
         'bpmn-icon-text-annotation',
-        translate('Append text annotation')
+        translate('Add text annotation')
       )
     });
   }
@@ -557,7 +551,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       'delete': {
         group: 'edit',
         className: 'bpmn-icon-trash',
-        title: translate('Remove'),
+        title: translate('Delete'),
         action: {
           click: removeElement
         }

package/lib/features/modeling/BpmnUpdater.js

@@ -24,6 +24,8 @@ import {
   isLabelExternal
 } from '../../util/LabelUtil';
 
+import { isPlane } from '../../util/DrilldownUtil';
+
 import { delta } from 'diagram-js/lib/util/PositionUtil';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
@@ -303,7 +305,7 @@ export default function BpmnUpdater(
     const di = getDi(element),
           diLabel = di && di.get('label');
 
-    if (isLabelExternal(element)) {
+    if (isLabelExternal(element) || isPlane(element)) {
       return;
     }
 

package/lib/features/modeling/ElementFactory.js

@@ -1,6 +1,7 @@
 import {
   assign,
   forEach,
+  has,
   isDefined,
   isObject,
   omit
@@ -206,12 +207,24 @@ ElementFactory.prototype.createElement = function(elementType, attrs) {
     attrs = applyAttribute(di, attrs, 'isExpanded');
   }
 
+  if (isAny(businessObject, [ 'bpmn:Lane', 'bpmn:Participant' ])) {
+    attrs = applyAttribute(di, attrs, 'isHorizontal');
+  }
+
   if (is(businessObject, 'bpmn:SubProcess')) {
     attrs.collapsed = !isExpanded(businessObject, di);
   }
 
   if (is(businessObject, 'bpmn:ExclusiveGateway')) {
-    di.isMarkerVisible = true;
+    if (has(attrs, 'isMarkerVisible')) {
+      if (attrs.isMarkerVisible === undefined) {
+        di.isMarkerVisible = false;
+      } else {
+        attrs = applyAttribute(di, attrs, 'isMarkerVisible');
+      }
+    } else {
+      di.isMarkerVisible = true;
+    }
   }
 
   if (isDefined(attrs.triggeredByEvent)) {

package/lib/features/modeling/behavior/DeleteLaneBehavior.js

@@ -8,6 +8,10 @@ import {
   getChildLanes
 } from '../util/LaneUtil';
 
+import {
+  isHorizontal
+} from '../../../util/DiUtil';
+
 import {
   eachElement
 } from 'diagram-js/lib/util/Elements';
@@ -32,18 +36,29 @@ export default function DeleteLaneBehavior(eventBus, spaceTool) {
 
 
   function compensateLaneDelete(shape, oldParent) {
+    var isHorizontalLane = isHorizontal(shape);
 
     var siblings = getChildLanes(oldParent);
 
     var topAffected = [];
     var bottomAffected = [];
+    var leftAffected = [];
+    var rightAffected = [];
 
     eachElement(siblings, function(element) {
 
-      if (element.y > shape.y) {
-        bottomAffected.push(element);
+      if (isHorizontalLane) {
+        if (element.y > shape.y) {
+          bottomAffected.push(element);
+        } else {
+          topAffected.push(element);
+        }
       } else {
-        topAffected.push(element);
+        if (element.x > shape.x) {
+          rightAffected.push(element);
+        } else {
+          leftAffected.push(element);
+        }
       }
 
       return element.children;
@@ -55,14 +70,24 @@ export default function DeleteLaneBehavior(eventBus, spaceTool) {
 
     var offset;
 
-    if (bottomAffected.length && topAffected.length) {
-      offset = shape.height / 2;
+    if (isHorizontalLane) {
+      if (bottomAffected.length && topAffected.length) {
+        offset = shape.height / 2;
+      } else {
+        offset = shape.height;
+      }
     } else {
-      offset = shape.height;
+      if (rightAffected.length && leftAffected.length) {
+        offset = shape.width / 2;
+      } else {
+        offset = shape.width;
+      }
     }
 
     var topAdjustments,
-        bottomAdjustments;
+        bottomAdjustments,
+        leftAdjustments,
+        rightAdjustments;
 
     if (topAffected.length) {
       topAdjustments = spaceTool.calculateAdjustments(
@@ -83,6 +108,26 @@ export default function DeleteLaneBehavior(eventBus, spaceTool) {
         bottomAdjustments.resizingShapes,
         { x: 0, y: -offset }, 'n');
     }
+
+    if (leftAffected.length) {
+      leftAdjustments = spaceTool.calculateAdjustments(
+        leftAffected, 'x', offset, shape.x - 10);
+
+      spaceTool.makeSpace(
+        leftAdjustments.movingShapes,
+        leftAdjustments.resizingShapes,
+        { x: offset, y: 0 }, 'e');
+    }
+
+    if (rightAffected.length) {
+      rightAdjustments = spaceTool.calculateAdjustments(
+        rightAffected, 'x', -offset, shape.x + shape.width + 10);
+
+      spaceTool.makeSpace(
+        rightAdjustments.movingShapes,
+        rightAdjustments.resizingShapes,
+        { x: -offset, y: 0 }, 'w');
+    }
   }
 
 

package/lib/features/modeling/behavior/FixHoverBehavior.js

@@ -1,8 +1,6 @@
 import { getLanesRoot } from '../util/LaneUtil';
 
-import { is } from '../../../util/ModelUtil';
-
-import { isAny } from '../util/ModelingUtil';
+import { is, isAny } from '../../../util/ModelUtil';
 
 /**
  * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
@@ -48,7 +46,7 @@ export default function FixHoverBehavior(elementRegistry, eventBus, canvas) {
 
     // ensure bpmn:Group and label elements are dropped
     // always onto the root
-    if (hover !== rootElement && (shape.labelTarget || is(shape, 'bpmn:Group'))) {
+    if (hover !== rootElement && (shape.labelTarget || isAny(shape, [ 'bpmn:Group', 'bpmn:TextAnnotation' ]))) {
       event.hover = rootElement;
       event.hoverGfx = elementRegistry.getGraphics(event.hover);
     }

package/lib/features/modeling/behavior/ResizeBehavior.d.ts

@@ -20,11 +20,21 @@ export const GROUP_MIN_DIMENSIONS: Dimensions;
  */
 export const LANE_MIN_DIMENSIONS: Dimensions;
 
+/**
+ * @type {Dimensions}
+ */
+export const VERTICAL_LANE_MIN_DIMENSIONS: Dimensions;
+
 /**
  * @type {Dimensions}
  */
 export const PARTICIPANT_MIN_DIMENSIONS: Dimensions;
 
+/**
+ * @type {Dimensions}
+ */
+export const VERTICAL_PARTICIPANT_MIN_DIMENSIONS: Dimensions;
+
 /**
  * @type {Dimensions}
  */