bpmn-js 8.8.1 → 8.9.1

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

@@ -220,9 +220,9 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
     return;
   }
 
-  // disallow copying IDs if already assigned
-  if (propertyDescriptor.isId && this._moddle.ids.assigned(property)) {
-    return;
+  // copy id
+  if (propertyDescriptor.isId) {
+    return this._copyId(property, parent);
   }
 
   // copy arrays
@@ -263,6 +263,18 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
   return property;
 };
 
+ModdleCopy.prototype._copyId = function(id, element) {
+
+  // disallow if already taken
+  if (this._moddle.ids.assigned(id)) {
+    return;
+  } else {
+
+    this._moddle.ids.claim(id, element);
+    return id;
+  }
+};
+
 // helpers //////////
 
 export function getPropertyNames(descriptor, keepDefaultProperties) {

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

@@ -105,7 +105,7 @@ export default function LabelEditingProvider(
 
   function activateDirectEdit(element, force) {
     if (force ||
-        isAny(element, [ 'bpmn:Task', 'bpmn:TextAnnotation', 'bpmn:Group' ]) ||
+        isAny(element, [ 'bpmn:Task', 'bpmn:TextAnnotation' ]) ||
         isCollapsedSubProcess(element)) {
 
       directEditing.activate(element);

package/lib/features/modeling/BpmnFactory.js

@@ -42,6 +42,10 @@ BpmnFactory.prototype._needsId = function(element) {
 };
 
 BpmnFactory.prototype._ensureId = function(element) {
+  if (element.id) {
+    this._model.ids.claim(element.id, element);
+    return;
+  }
 
   // generate semantic ids for elements
   // bpmn:SequenceFlow -> SequenceFlow_ID
@@ -112,7 +116,8 @@ BpmnFactory.prototype.createDiWaypoint = function(point) {
 
 BpmnFactory.prototype.createDiEdge = function(semantic, waypoints, attrs) {
   return this.create('bpmndi:BPMNEdge', assign({
-    bpmnElement: semantic
+    bpmnElement: semantic,
+    waypoint: this.createDiWaypoints(waypoints)
   }, attrs));
 };
 

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

@@ -2,7 +2,7 @@ import inherits from 'inherits';
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-import { is } from '../../../util/ModelUtil';
+import { getBusinessObject, is } from '../../../util/ModelUtil';
 
 import { isLabel } from '../../../util/LabelUtil';
 
@@ -88,122 +88,97 @@ export default function CreateParticipantBehavior(canvas, eventBus, modeling) {
     }
   });
 
-  function ensureCollaboration(context) {
-    var parent = context.parent,
-        collaboration;
-
+  // turn process into collaboration when creating first participant
+  function getOrCreateCollaboration() {
     var rootElement = canvas.getRootElement();
 
     if (is(rootElement, 'bpmn:Collaboration')) {
-      collaboration = rootElement;
-    } else {
-
-      // update root element by making collaboration
-      collaboration = modeling.makeCollaboration();
-
-      // re-use process when creating first participant
-      context.process = parent;
+      return rootElement;
     }
 
-    context.parent = collaboration;
+    return modeling.makeCollaboration();
   }
 
-  // turn process into collaboration before adding participant
-  this.preExecute('shape.create', function(context) {
-    var parent = context.parent,
-        shape = context.shape;
-
-    if (is(shape, 'bpmn:Participant') && is(parent, 'bpmn:Process')) {
-      ensureCollaboration(context);
-    }
-  }, true);
-
-  this.execute('shape.create', function(context) {
-    var process = context.process,
-        shape = context.shape;
-
-    if (process) {
-      context.oldProcessRef = shape.businessObject.processRef;
-
-      // re-use process when creating first participant
-      shape.businessObject.processRef = process.businessObject;
-    }
-  }, true);
+  // when creating mutliple elements through `elements.create` parent must be set to collaboration
+  // and passed to `shape.create` as hint
+  this.preExecute('elements.create', HIGH_PRIORITY, function(context) {
+    var elements = context.elements,
+        parent = context.parent,
+        participant = findParticipant(elements),
+        hints;
 
-  this.revert('shape.create', function(context) {
-    var process = context.process,
-        shape = context.shape;
+    if (participant && is(parent, 'bpmn:Process')) {
+      context.parent = getOrCreateCollaboration();
 
-    if (process) {
+      hints = context.hints = context.hints || {};
 
-      // re-use process when creating first participant
-      shape.businessObject.processRef = context.oldProcessRef;
+      hints.participant = participant;
+      hints.process = parent;
+      hints.processRef = getBusinessObject(participant).get('processRef');
     }
   }, true);
 
-  this.postExecute('shape.create', function(context) {
-    var process = context.process,
+  // when creating single shape through `shape.create` parent must be set to collaboration
+  // unless it was already set through `elements.create`
+  this.preExecute('shape.create', function(context) {
+    var parent = context.parent,
         shape = context.shape;
 
-    if (process) {
-
-      // move children from process to participant
-      var processChildren = process.children.slice();
+    if (is(shape, 'bpmn:Participant') && is(parent, 'bpmn:Process')) {
+      context.parent = getOrCreateCollaboration();
 
-      modeling.moveElements(processChildren, { x: 0, y: 0 }, shape);
+      context.process = parent;
+      context.processRef = getBusinessObject(shape).get('processRef');
     }
-
   }, true);
 
-  // turn process into collaboration when creating participants
-  this.preExecute('elements.create', HIGH_PRIORITY, function(context) {
-    var elements = context.elements,
-        parent = context.parent,
-        participant;
-
-    var hasParticipants = findParticipant(elements);
-
-    if (hasParticipants && is(parent, 'bpmn:Process')) {
-      ensureCollaboration(context);
-
-      participant = findParticipant(elements);
+  // #execute necessary because #preExecute not called on CommandStack#redo
+  this.execute('shape.create', function(context) {
+    var hints = context.hints || {},
+        process = context.process || hints.process,
+        shape = context.shape,
+        participant = hints.participant;
 
-      context.oldProcessRef = participant.businessObject.processRef;
+    // both shape.create and elements.create must be handled
+    if (process && (!participant || shape === participant)) {
 
-      // re-use process when creating first participant
-      participant.businessObject.processRef = parent.businessObject;
+      // monkey-patch process ref
+      getBusinessObject(shape).set('processRef', getBusinessObject(process));
     }
   }, true);
 
-  this.revert('elements.create', function(context) {
-    var elements = context.elements,
-        process = context.process,
-        participant;
+  this.revert('shape.create', function(context) {
+    var hints = context.hints || {},
+        process = context.process || hints.process,
+        processRef = context.processRef || hints.processRef,
+        shape = context.shape,
+        participant = hints.participant;
 
-    if (process) {
-      participant = findParticipant(elements);
+    // both shape.create and elements.create must be handled
+    if (process && (!participant || shape === participant)) {
 
-      // re-use process when creating first participant
-      participant.businessObject.processRef = context.oldProcessRef;
+      // monkey-patch process ref
+      getBusinessObject(shape).set('processRef', processRef);
     }
   }, true);
 
-  this.postExecute('elements.create', function(context) {
-    var elements = context.elements,
-        process = context.process,
-        participant;
+  this.postExecute('shape.create', function(context) {
+    var hints = context.hints || {},
+        process = context.process || context.hints.process,
+        shape = context.shape,
+        participant = hints.participant;
 
     if (process) {
-      participant = findParticipant(elements);
-
-      // move children from process to first participant
-      var processChildren = process.children.slice();
-
-      modeling.moveElements(processChildren, { x: 0, y: 0 }, participant);
+      var children = process.children.slice();
+
+      // both shape.create and elements.create must be handled
+      if (!participant) {
+        modeling.moveElements(children, { x: 0, y: 0 }, shape);
+      } else if (shape === participant) {
+        modeling.moveElements(children, { x: 0, y: 0 }, participant);
+      }
     }
-
   }, true);
-
 }
 
 CreateParticipantBehavior.$inject = [

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

@@ -59,12 +59,12 @@ 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 (!isPointInsideBBox(shape, waypointsBefore[waypointsBefore.length-1])) {
+      if (waypointsBefore.length === 1 || !isPointInsideBBox(shape, waypointsBefore[waypointsBefore.length-1])) {
         waypointsBefore.push(copy(dockingPoint));
       }
 
       // if first waypointAfter is inside shape's bounds, ignore docking point
-      if (!isPointInsideBBox(shape, waypointsAfter[0])) {
+      if (waypointsAfter.length === 1 || !isPointInsideBBox(shape, waypointsAfter[0])) {
         waypointsAfter.unshift(copy(dockingPoint));
       }
     }

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

@@ -47,7 +47,9 @@ export default function UnclaimIdBehavior(canvas, injector, moddle, modeling) {
     var rootElement = canvas.getRootElement(),
         rootElementBo = rootElement.businessObject;
 
-    moddle.ids.unclaim(rootElementBo.id);
+    if (is(rootElement, 'bpmn:Collaboration')) {
+      moddle.ids.unclaim(rootElementBo.id);
+    }
   });
 }
 

package/lib/features/modeling/cmd/SetColorHandler.js

@@ -63,12 +63,26 @@ SetColorHandler.prototype.postExecute = function(context) {
     // TODO @barmac: remove once we drop bpmn.io properties
     ensureLegacySupport(assignedDi);
 
-    self._commandStack.execute('element.updateProperties', {
-      element: element,
-      properties: {
-        di: assignedDi
-      }
-    });
+    if (element.labelTarget) {
+
+      // set label colors as bpmndi:BPMNLabel#color
+      self._commandStack.execute('element.updateModdleProperties', {
+        element: element,
+        moddleElement: element.businessObject.di.label,
+        properties: {
+          color: di['background-color']
+        }
+      });
+    } else {
+
+      // set colors bpmndi:BPMNEdge or bpmndi:BPMNShape
+      self._commandStack.execute('element.updateProperties', {
+        element: element,
+        properties: {
+          di: assignedDi
+        }
+      });
+    }
   });
 
 };

package/lib/features/palette/PaletteProvider.js

@@ -88,7 +88,7 @@ PaletteProvider.prototype.getPaletteEntries = function(element) {
 
     create.start(event, [ subProcess, startEvent ], {
       hints: {
-        autoSelect: [ startEvent ]
+        autoSelect: [ subProcess ]
       }
     });
   }

package/lib/features/popup-menu/ReplaceMenuProvider.js

@@ -83,7 +83,7 @@ ReplaceMenuProvider.prototype.getEntries = function(element) {
     return this._createEntries(element, replaceOptions.DATA_OBJECT_REFERENCE);
   }
 
-  if (is(businessObject, 'bpmn:DataStoreReference')) {
+  if (is(businessObject, 'bpmn:DataStoreReference') && !is(element.parent, 'bpmn:Collaboration')) {
     return this._createEntries(element, replaceOptions.DATA_STORE_REFERENCE);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "8.8.1",
+  "version": "8.9.1",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -100,7 +100,7 @@
   "dependencies": {
     "bpmn-moddle": "^7.1.2",
     "css.escape": "^1.5.1",
-    "diagram-js": "^7.5.0",
+    "diagram-js": "^7.8.2",
     "diagram-js-direct-editing": "^1.6.3",
     "ids": "^1.0.0",
     "inherits": "^2.0.4",

package/test/util/MockEvents.js

@@ -13,7 +13,7 @@ import {
  * specified canvas local coordinates.
  *
  * @param {Point} point of the event local the canvas (closure)
- * @param {Object} data
+ * @param {Object} [data]
  *
  * @return {Event} event, scoped to the given canvas
  */
@@ -34,7 +34,15 @@ export function createCanvasEvent(position, data) {
   });
 }
 
-
+/**
+ * Create an Event
+ *
+ * @param  {Element} target
+ * @param  { { x: number, y: number } } position
+ * @param  {any} [data]
+ *
+ * @return {Event}
+ */
 export function createEvent(target, position, data) {
 
   return getBpmnJS().invoke(function(eventBus) {