bpmn-js 9.1.0 → 9.2.2

package/lib/BaseModeler.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import Ids from 'ids';
 

package/lib/BaseViewer.js

@@ -25,7 +25,7 @@ import {
 import Diagram from 'diagram-js';
 import BpmnModdle from 'bpmn-moddle';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   importBpmnDiagram

package/lib/Modeler.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import BaseModeler from './BaseModeler';
 

package/lib/NavigatedViewer.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import Viewer from './Viewer';
 

package/lib/Viewer.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CoreModule from './core';
 import TranslateModule from 'diagram-js/lib/i18n/translate';

package/lib/draw/BpmnRenderUtil.js

@@ -14,6 +14,8 @@ import {
 // re-export getDi for compatibility
 export { getDi };
 
+export var black = 'hsl(225, 10%, 15%)';
+
 // element utils //////////////////////
 
 /**
@@ -64,7 +66,7 @@ export function getFillColor(element, defaultColor) {
 export function getStrokeColor(element, defaultColor) {
   var di = getDi(element);
 
-  return di.get('color:border-color') || di.get('bioc:stroke') || defaultColor || 'black';
+  return di.get('color:border-color') || di.get('bioc:stroke') || defaultColor || black;
 }
 
 export function getLabelColor(element, defaultColor, defaultStrokeColor) {

package/lib/draw/BpmnRenderer.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   isObject,
@@ -57,6 +57,8 @@ import {
 
 import Ids from 'ids';
 
+import { black } from './BpmnRenderUtil';
+
 var RENDERER_IDS = new Ids();
 
 var TASK_BORDER_RADIUS = 10;
@@ -85,7 +87,7 @@ export default function BpmnRenderer(
 
   function addMarker(id, options) {
     var attrs = assign({
-      fill: 'black',
+      fill: black,
       strokeWidth: 1,
       strokeLinecap: 'round',
       strokeDasharray: 'none'
@@ -264,7 +266,7 @@ export default function BpmnRenderer(
     offset = offset || 0;
 
     attrs = computeStyle(attrs, {
-      stroke: 'black',
+      stroke: black,
       strokeWidth: 2,
       fill: 'white'
     });
@@ -299,7 +301,7 @@ export default function BpmnRenderer(
     offset = offset || 0;
 
     attrs = computeStyle(attrs, {
-      stroke: 'black',
+      stroke: black,
       strokeWidth: 2,
       fill: 'white'
     });
@@ -332,7 +334,7 @@ export default function BpmnRenderer(
     }).join(' ');
 
     attrs = computeStyle(attrs, {
-      stroke: 'black',
+      stroke: black,
       strokeWidth: 2,
       fill: 'white'
     });
@@ -350,7 +352,7 @@ export default function BpmnRenderer(
 
   function drawLine(parentGfx, waypoints, attrs) {
     attrs = computeStyle(attrs, [ 'no-fill' ], {
-      stroke: 'black',
+      stroke: black,
       strokeWidth: 2,
       fill: 'none'
     });
@@ -366,7 +368,7 @@ export default function BpmnRenderer(
 
     attrs = computeStyle(attrs, [ 'no-fill' ], {
       strokeWidth: 2,
-      stroke: 'black'
+      stroke: black
     });
 
     var path = svgCreate('path');
@@ -1471,7 +1473,7 @@ export default function BpmnRenderer(
 
         if (di.messageVisibleKind === 'initiating') {
           messageAttrs.fill = 'white';
-          messageAttrs.stroke = 'black';
+          messageAttrs.stroke = black;
         } else {
           messageAttrs.fill = '#888';
           messageAttrs.stroke = 'white';
@@ -1546,7 +1548,7 @@ export default function BpmnRenderer(
 
       /* output arrow path */ drawPath(parentGfx, arrowPathData, {
         strokeWidth: 1,
-        fill: 'black'
+        fill: black
       });
 
       return elementObject;

package/lib/features/auto-place/BpmnAutoPlaceUtil.js

@@ -104,6 +104,12 @@ export function getTextAnnotationPosition(source, element) {
     y: sourceTrbl.top - 50 - element.height / 2
   };
 
+  if (isConnection(source)) {
+    position = getMid(source);
+    position.x += 100;
+    position.y -= 50;
+  }
+
   var nextPositionDirection = {
     y: {
       margin: -30,
@@ -135,4 +141,8 @@ export function getDataElementPosition(source, element) {
   };
 
   return findFreePosition(source, element, position, generateGetNextPosition(nextPositionDirection));
+}
+
+function isConnection(element) {
+  return !!element.waypoints;
 }

package/lib/features/auto-resize/BpmnAutoResize.js

@@ -1,6 +1,6 @@
 import AutoResize from 'diagram-js/lib/features/auto-resize/AutoResize';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { is } from '../../util/ModelUtil';
 

package/lib/features/auto-resize/BpmnAutoResizeProvider.js

@@ -1,6 +1,6 @@
 import { is } from '../../util/ModelUtil';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { forEach } from 'min-dash';
 

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

@@ -1,7 +1,8 @@
 import {
   assign,
   forEach,
-  isArray
+  isArray,
+  every
 } from 'min-dash';
 
 import {
@@ -86,9 +87,49 @@ ContextPadProvider.$inject = [
   'translate'
 ];
 
+ContextPadProvider.prototype.getMultiElementContextPadEntries = function(elements) {
+  var modeling = this._modeling;
 
-ContextPadProvider.prototype.getContextPadEntries = function(element) {
+  var actions = {};
+
+  if (this._isDeleteAllowed(elements)) {
+    assign(actions, {
+      'delete': {
+        group: 'edit',
+        className: 'bpmn-icon-trash',
+        title: this._translate('Remove'),
+        action: {
+          click: function(event, elements) {
+            modeling.removeElements(elements.slice());
+          }
+        }
+      }
+    });
+  }
 
+  return actions;
+};
+
+/**
+ * @param {djs.model.Base[]} elements
+ * @return {boolean}
+ */
+ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
+
+  var baseAllowed = this._rules.allowed('elements.delete', {
+    elements: elements
+  });
+
+  if (isArray(baseAllowed)) {
+    return every(baseAllowed, function(element) {
+      return includes(baseAllowed, element);
+    });
+  }
+
+  return baseAllowed;
+};
+
+ContextPadProvider.prototype.getContextPadEntries = function(element) {
   var contextPad = this._contextPad,
       modeling = this._modeling,
 
@@ -113,7 +154,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     connect.start(event, element);
   }
 
-  function removeElement(e) {
+  function removeElement(e, element) {
     modeling.removeElements([ element ]);
   }
 
@@ -362,6 +403,15 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     });
   }
 
+  if (is(businessObject, 'bpmn:SequenceFlow')) {
+    assign(actions, {
+      'append.text-annotation': appendAction(
+        'bpmn:TextAnnotation',
+        'bpmn-icon-text-annotation'
+      )
+    });
+  }
+
   if (
     isAny(businessObject, [
       'bpmn:FlowNode',
@@ -470,3 +520,7 @@ function isEventType(eventBo, type, definition) {
 
   return isType && isDefinition;
 }
+
+function includes(array, item) {
+  return array.indexOf(item) !== -1;
+}

package/lib/features/copy-paste/ModdleCopy.js

@@ -234,8 +234,6 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
 
       // copying might NOT be allowed
       if (copiedProperty) {
-        copiedProperty.$parent = parent;
-
         return childProperties.concat(copiedProperty);
       }
 

package/lib/features/drilldown/DrilldownOverlayBehavior.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 import { is } from '../../util/ModelUtil';

package/lib/features/editor-actions/BpmnEditorActions.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import EditorActions from 'diagram-js/lib/features/editor-actions/EditorActions';
 

package/lib/features/grid-snapping/behavior/LayoutConnectionBehavior.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

package/lib/features/keyboard/BpmnKeyboardBindings.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import KeyboardBindings from 'diagram-js/lib/features/keyboard/KeyboardBindings';
 

package/lib/features/label-editing/LabelEditingProvider.js

@@ -25,6 +25,8 @@ import {
   isLabel
 } from '../../util/LabelUtil';
 
+var HIGH_PRIORITY = 2000;
+
 
 export default function LabelEditingProvider(
     eventBus, bpmnFactory, canvas, directEditing,
@@ -58,6 +60,16 @@ export default function LabelEditingProvider(
     }
   });
 
+  eventBus.on([
+    'shape.remove',
+    'connection.remove'
+  ], HIGH_PRIORITY, function(event) {
+
+    if (directEditing.isActive(event.element)) {
+      directEditing.cancel();
+    }
+  });
+
   // cancel on command stack changes
   eventBus.on([ 'commandStack.changed' ], function(e) {
     if (directEditing.isActive()) {

package/lib/features/modeling/BpmnLayouter.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   assign

package/lib/features/modeling/BpmnUpdater.js

@@ -3,7 +3,7 @@ import {
   forEach
 } from 'min-dash';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   remove as collectionRemove,

package/lib/features/modeling/ElementFactory.js

@@ -4,7 +4,7 @@ import {
   isObject
 } from 'min-dash';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   getBusinessObject,

package/lib/features/modeling/Modeling.js

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import BaseModeling from 'diagram-js/lib/features/modeling/Modeling';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   getOrientation,

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { is } from '../../../util/ModelUtil';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { is } from '../../../util/ModelUtil';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { is } from '../../../util/ModelUtil';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   assign,

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -2,7 +2,7 @@ import {
   assign
 } from 'min-dash';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import {
   is,

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

@@ -0,0 +1,117 @@
+import {
+  assign
+} from 'min-dash';
+
+import inherits from 'inherits-browser';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+import { getConnectionAdjustment as getConnectionAnchorPoint } from './util/ConnectionLayoutUtil';
+
+/**
+ * A component that makes sure that Associations connected to Connections
+ * are updated together with the Connection.
+ *
+ * @param {EventBus} eventBus
+ * @param {Modeling} modeling
+ */
+export default function LayoutConnectionBehavior(
+    eventBus, modeling) {
+
+  CommandInterceptor.call(this, eventBus);
+
+  function getnewAnchorPoint(event, point) {
+
+    var context = event.context,
+        connection = context.connection,
+        hints = assign({}, context.hints),
+        newWaypoints = context.newWaypoints || connection.waypoints,
+        oldWaypoints = context.oldWaypoints;
+
+
+    if (typeof hints.startChanged === 'undefined') {
+      hints.startChanged = !!hints.connectionStart;
+    }
+
+    if (typeof hints.endChanged === 'undefined') {
+      hints.endChanged = !!hints.connectionEnd;
+    }
+
+    return getConnectionAnchorPoint(point, newWaypoints, oldWaypoints, hints);
+  }
+
+  this.postExecute([
+    'connection.layout',
+    'connection.updateWaypoints'
+  ], function(event) {
+    var context = event.context;
+
+    var connection = context.connection,
+        outgoing = connection.outgoing,
+        incoming = connection.incoming;
+
+    incoming.forEach(function(connection) {
+      var endPoint = connection.waypoints[connection.waypoints.length - 1];
+      var newEndpoint = getnewAnchorPoint(event, endPoint);
+
+      var newWaypoints = [].concat(connection.waypoints.slice(0, -1), [ newEndpoint ]);
+
+      modeling.updateWaypoints(connection, newWaypoints);
+    });
+
+    outgoing.forEach(function(connection) {
+      var startpoint = connection.waypoints[0];
+      var newStartpoint = getnewAnchorPoint(event, startpoint);
+
+      var newWaypoints = [].concat([ newStartpoint ], connection.waypoints.slice(1));
+
+      modeling.updateWaypoints(connection, newWaypoints);
+    });
+
+  });
+
+
+  this.postExecute([
+    'connection.move'
+  ], function(event) {
+    var context = event.context;
+
+    var connection = context.connection,
+        outgoing = connection.outgoing,
+        incoming = connection.incoming,
+        delta = context.delta;
+
+    incoming.forEach(function(connection) {
+      var endPoint = connection.waypoints[connection.waypoints.length - 1];
+      var newEndpoint = {
+        x: endPoint.x + delta.x,
+        y: endPoint.y + delta.y
+      };
+
+      var newWaypoints = [].concat(connection.waypoints.slice(0, -1), [ newEndpoint ]);
+
+      modeling.updateWaypoints(connection, newWaypoints);
+    });
+
+    outgoing.forEach(function(connection) {
+      var startpoint = connection.waypoints[0];
+      var newStartpoint = {
+        x: startpoint.x + delta.x,
+        y: startpoint.y + delta.y
+      };
+
+      var newWaypoints = [].concat([ newStartpoint ], connection.waypoints.slice(1));
+
+      modeling.updateWaypoints(connection, newWaypoints);
+    });
+
+  });
+
+}
+
+inherits(LayoutConnectionBehavior, CommandInterceptor);
+
+LayoutConnectionBehavior.$inject = [
+  'eventBus',
+  'modeling'
+];

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { is } from '../../../util/ModelUtil';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -4,7 +4,7 @@ import {
   matchPattern
 } from 'min-dash';
 
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 

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

@@ -1,4 +1,4 @@
-import inherits from 'inherits';
+import inherits from 'inherits-browser';
 
 import { forEach } from 'min-dash';