bpmn-js 9.3.1 → 9.4.1

package/lib/features/drilldown/index.js

@@ -9,7 +9,7 @@ import DrilldownOverlayBehavior from './DrilldownOverlayBehavior';
 
 export default {
   __depends__: [ OverlaysModule, ChangeSupportModule, RootElementsModule ],
-  __init__: [ 'drilldownBreadcrumbs', 'drilldownOverlayBehavior', 'drilldownCentering', 'subprocessCompatibility'],
+  __init__: [ 'drilldownBreadcrumbs', 'drilldownOverlayBehavior', 'drilldownCentering', 'subprocessCompatibility' ],
   drilldownBreadcrumbs: [ 'type', DrilldownBreadcrumbs ],
   drilldownCentering: [ 'type', DrilldownCentering ],
   drilldownOverlayBehavior: [ 'type', DrilldownOverlayBehavior ],

package/lib/features/grid-snapping/behavior/{AutoPlaceBehavior.js → GridSnappingAutoPlaceBehavior.js}

@@ -6,7 +6,7 @@ import { is } from '../../../util/ModelUtil';
 var HIGH_PRIORITY = 2000;
 
 
-export default function AutoPlaceBehavior(eventBus, gridSnapping) {
+export default function GridSnappingAutoPlaceBehavior(eventBus, gridSnapping) {
   eventBus.on('autoPlace', HIGH_PRIORITY, function(context) {
     var source = context.source,
         sourceMid = getMid(source),
@@ -47,7 +47,7 @@ export default function AutoPlaceBehavior(eventBus, gridSnapping) {
   });
 }
 
-AutoPlaceBehavior.$inject = [
+GridSnappingAutoPlaceBehavior.$inject = [
   'eventBus',
   'gridSnapping'
 ];

package/lib/features/grid-snapping/behavior/{LayoutConnectionBehavior.js → GridSnappingLayoutConnectionBehavior.js}

@@ -14,7 +14,7 @@ var HIGH_PRIORITY = 3000;
 /**
  * Snaps connections with Manhattan layout.
  */
-export default function LayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
+export default function GridSnappingLayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
   CommandInterceptor.call(this, eventBus);
 
   this._gridSnapping = gridSnapping;
@@ -42,13 +42,13 @@ export default function LayoutConnectionBehavior(eventBus, gridSnapping, modelin
   });
 }
 
-LayoutConnectionBehavior.$inject = [
+GridSnappingLayoutConnectionBehavior.$inject = [
   'eventBus',
   'gridSnapping',
   'modeling'
 ];
 
-inherits(LayoutConnectionBehavior, CommandInterceptor);
+inherits(GridSnappingLayoutConnectionBehavior, CommandInterceptor);
 
 /**
  * Snap middle segments of a given connection.
@@ -57,7 +57,7 @@ inherits(LayoutConnectionBehavior, CommandInterceptor);
  *
  * @returns {Array<Point>}
  */
-LayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
+GridSnappingLayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
   var gridSnapping = this._gridSnapping,
       snapped;
 

package/lib/features/grid-snapping/behavior/{CreateParticipantBehavior.js → GridSnappingParticipantBehavior.js}

@@ -3,7 +3,7 @@ import { is } from '../../../util/ModelUtil';
 var HIGHER_PRIORITY = 1750;
 
 
-export default function CreateParticipantBehavior(canvas, eventBus, gridSnapping) {
+export default function GridSnappingParticipantBehavior(canvas, eventBus, gridSnapping) {
   eventBus.on([
     'create.start',
     'shape.move.start'
@@ -29,7 +29,7 @@ export default function CreateParticipantBehavior(canvas, eventBus, gridSnapping
   });
 }
 
-CreateParticipantBehavior.$inject = [
+GridSnappingParticipantBehavior.$inject = [
   'canvas',
   'eventBus',
   'gridSnapping'

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

@@ -1,14 +1,14 @@
-import AutoPlaceBehavior from './AutoPlaceBehavior';
-import CreateParticipantBehavior from './CreateParticipantBehavior';
-import LayoutConnectionBehavior from './LayoutConnectionBehavior';
+import GridSnappingAutoPlaceBehavior from './GridSnappingAutoPlaceBehavior';
+import GridSnappingParticipantBehavior from './GridSnappingParticipantBehavior';
+import GridSnappingLayoutConnectionBehavior from './GridSnappingLayoutConnectionBehavior';
 
 export default {
   __init__: [
     'gridSnappingAutoPlaceBehavior',
-    'gridSnappingCreateParticipantBehavior',
+    'gridSnappingParticipantBehavior',
     'gridSnappingLayoutConnectionBehavior',
   ],
-  gridSnappingAutoPlaceBehavior: [ 'type', AutoPlaceBehavior ],
-  gridSnappingCreateParticipantBehavior: [ 'type', CreateParticipantBehavior ],
-  gridSnappingLayoutConnectionBehavior: [ 'type', LayoutConnectionBehavior ]
+  gridSnappingAutoPlaceBehavior: [ 'type', GridSnappingAutoPlaceBehavior ],
+  gridSnappingParticipantBehavior: [ 'type', GridSnappingParticipantBehavior ],
+  gridSnappingLayoutConnectionBehavior: [ 'type', GridSnappingLayoutConnectionBehavior ]
 };

package/lib/features/keyboard/BpmnKeyboardBindings.js

@@ -50,7 +50,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
 
     var event = context.keyEvent;
 
-    if (keyboard.isKey(['a', 'A'], event) && keyboard.isCmd(event)) {
+    if (keyboard.isKey([ 'a', 'A' ], event) && keyboard.isCmd(event)) {
       editorActions.trigger('selectElements');
 
       return true;
@@ -63,7 +63,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
 
     var event = context.keyEvent;
 
-    if (keyboard.isKey(['f', 'F'], event) && keyboard.isCmd(event)) {
+    if (keyboard.isKey([ 'f', 'F' ], event) && keyboard.isCmd(event)) {
       editorActions.trigger('find');
 
       return true;
@@ -80,7 +80,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
       return;
     }
 
-    if (keyboard.isKey(['s', 'S'], event)) {
+    if (keyboard.isKey([ 's', 'S' ], event)) {
       editorActions.trigger('spaceTool');
 
       return true;
@@ -97,7 +97,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
       return;
     }
 
-    if (keyboard.isKey(['l', 'L'], event)) {
+    if (keyboard.isKey([ 'l', 'L' ], event)) {
       editorActions.trigger('lassoTool');
 
       return true;
@@ -114,7 +114,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
       return;
     }
 
-    if (keyboard.isKey(['h', 'H'], event)) {
+    if (keyboard.isKey([ 'h', 'H' ], event)) {
       editorActions.trigger('handTool');
 
       return true;
@@ -131,7 +131,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
       return;
     }
 
-    if (keyboard.isKey(['c', 'C'], event)) {
+    if (keyboard.isKey([ 'c', 'C' ], event)) {
       editorActions.trigger('globalConnectTool');
 
       return true;
@@ -148,7 +148,7 @@ BpmnKeyboardBindings.prototype.registerBindings = function(keyboard, editorActio
       return;
     }
 
-    if (keyboard.isKey(['e', 'E'], event)) {
+    if (keyboard.isKey([ 'e', 'E' ], event)) {
       editorActions.trigger('directEditing');
 
       return true;

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

@@ -7,14 +7,9 @@ import {
 } from './LabelUtil';
 
 import {
-  getBusinessObject,
   is
 } from '../../util/ModelUtil';
 
-import {
-  createCategoryValue
-} from '../modeling/behavior/util/CategoryUtil';
-
 import { isAny } from '../modeling/util/ModelingUtil';
 import { isExpanded } from '../../util/DiUtil';
 
@@ -267,7 +262,7 @@ LabelEditingProvider.prototype.getEditingBBox = function(element) {
 
   // internal labels for tasks and collapsed call activities,
   // sub processes and participants
-  if (isAny(element, [ 'bpmn:Task', 'bpmn:CallActivity']) ||
+  if (isAny(element, [ 'bpmn:Task', 'bpmn:CallActivity' ]) ||
       isCollapsedPool(element) ||
       isCollapsedSubProcess(element)) {
 
@@ -399,23 +394,6 @@ LabelEditingProvider.prototype.update = function(
     };
   }
 
-  if (is(element, 'bpmn:Group')) {
-
-    var businessObject = getBusinessObject(element);
-
-    // initialize categoryValue if not existing
-    if (!businessObject.categoryValueRef) {
-
-      var rootElement = this._canvas.getRootElement(),
-          definitions = getBusinessObject(rootElement).$parent;
-
-      var categoryValue = createCategoryValue(definitions, this._bpmnFactory);
-
-      getBusinessObject(element).categoryValueRef = categoryValue;
-    }
-
-  }
-
   if (isEmptyText(newLabel)) {
     newLabel = null;
   }

package/lib/features/modeling/ElementFactory.js

@@ -1,7 +1,8 @@
 import {
   assign,
   forEach,
-  isObject
+  isObject,
+  omit
 } from 'min-dash';
 
 import inherits from 'inherits-browser';
@@ -69,7 +70,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
   var size,
       translate = this._translate;
 
-  attrs = attrs || {};
+  attrs = assign({}, attrs || {});
 
   var businessObject = attrs.businessObject,
       di = attrs.di;
@@ -86,6 +87,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
 
   if (!isModdleDi(di)) {
     var diAttrs = assign(
+      {},
       di || {},
       { id: businessObject.id + '_di' }
     );
@@ -106,7 +108,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
     }, attrs);
   }
 
-  applyAttributes(businessObject, attrs, [
+  attrs = applyAttributes(businessObject, attrs, [
     'processRef',
     'isInterrupting',
     'associationDirection',
@@ -114,7 +116,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
   ]);
 
   if (attrs.isExpanded) {
-    applyAttribute(di, attrs, 'isExpanded');
+    attrs = applyAttribute(di, attrs, 'isExpanded');
   }
 
   if (is(businessObject, 'bpmn:SubProcess')) {
@@ -247,14 +249,16 @@ ElementFactory.prototype.createParticipantShape = function(attrs) {
  * @param {Base} element
  * @param {Object} attrs (in/out map of attributes)
  * @param {Array<string>} attributeNames name of attributes to apply
+ *
+ * @return {Object} changed attrs
  */
 function applyAttributes(element, attrs, attributeNames) {
 
   forEach(attributeNames, function(property) {
-    if (attrs[property] !== undefined) {
-      applyAttribute(element, attrs, property);
-    }
+    attrs = applyAttribute(element, attrs, property);
   });
+
+  return attrs;
 }
 
 /**
@@ -264,11 +268,17 @@ function applyAttributes(element, attrs, attributeNames) {
  * @param {Base} element
  * @param {Object} attrs (in/out map of attributes)
  * @param {string} attributeName to apply
+ *
+ * @return {Object} changed attrs
  */
 function applyAttribute(element, attrs, attributeName) {
+  if (attrs[attributeName] === undefined) {
+    return attrs;
+  }
+
   element[attributeName] = attrs[attributeName];
 
-  delete attrs[attributeName];
+  return omit(attrs, [ attributeName ]);
 }
 
 

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

@@ -9,13 +9,11 @@ import {
   forEach
 } from 'min-dash';
 
-var HIGH_PRIORITY = 2000;
-
 
 /**
  * BPMN specific boundary event behavior
  */
-export default function BoundaryEventBehavior(eventBus, moddle, modeling) {
+export default function BoundaryEventBehavior(eventBus, modeling) {
 
   CommandInterceptor.call(this, eventBus);
 
@@ -60,23 +58,10 @@ export default function BoundaryEventBehavior(eventBus, moddle, modeling) {
     }
   });
 
-  // copy reference to root element on replace
-  eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY, function(context) {
-    var parent = context.parent,
-        property = context.property,
-        propertyName = context.propertyName;
-
-    var propertyDescriptor = moddle.getPropertyDescriptor(parent, propertyName);
-
-    if (propertyDescriptor && propertyDescriptor.isReference && is(property, 'bpmn:RootElement')) {
-      parent.set(propertyName, property);
-    }
-  });
 }
 
 BoundaryEventBehavior.$inject = [
   'eventBus',
-  'moddle',
   'modeling'
 ];
 

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

@@ -59,7 +59,7 @@ export default function DropOnFlowBehavior(eventBus, bpmnRules, modeling) {
       dockingPoint = intersection.bendpoint ? waypoints[intersection.index] : mid;
 
       // if last waypointBefore is inside shape's bounds, ignore docking point
-      if (waypointsBefore.length === 1 || !isPointInsideBBox(shape, waypointsBefore[waypointsBefore.length-1])) {
+      if (waypointsBefore.length === 1 || !isPointInsideBBox(shape, waypointsBefore[waypointsBefore.length - 1])) {
         waypointsBefore.push(copy(dockingPoint));
       }