bpmn-js 9.0.0-subprocesses.1 → 9.0.1

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/label-editing/cmd/UpdateLabelHandler.js

@@ -11,6 +11,7 @@ import {
 } from '../../../util/LabelUtil';
 
 import {
+  getDi,
   is
 } from '../../../util/ModelUtil';
 
@@ -23,7 +24,30 @@ var NULL_DIMENSIONS = {
 /**
  * A handler that updates the text of a BPMN element.
  */
-export default function UpdateLabelHandler(modeling, textRenderer) {
+export default function UpdateLabelHandler(modeling, textRenderer, bpmnFactory) {
+
+  /**
+   * Creates an empty `diLabel` attribute for embedded labels.
+   *
+   * @param {djs.model.Base} element
+   * @param {string} text
+   */
+  function ensureInternalLabelDi(element, text) {
+    if (isLabelExternal(element)) {
+      return;
+    }
+
+    var di = getDi(element);
+
+    if (text && !di.label) {
+      di.label = bpmnFactory.create('bpmndi:BPMNLabel');
+    }
+
+    if (!text && di.label) {
+      di.label = null;
+    }
+  }
+
 
   /**
    * Set the label and return the changed elements.
@@ -42,6 +66,8 @@ export default function UpdateLabelHandler(modeling, textRenderer) {
 
     setLabel(label, text, labelTarget !== label);
 
+    ensureInternalLabelDi(element, text);
+
     return [ label, labelTarget ];
   }
 
@@ -127,7 +153,8 @@ export default function UpdateLabelHandler(modeling, textRenderer) {
 
 UpdateLabelHandler.$inject = [
   'modeling',
-  'textRenderer'
+  'textRenderer',
+  'bpmnFactory'
 ];
 
 

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,7 @@ BpmnFactory.prototype.createDiWaypoint = function(point) {
 BpmnFactory.prototype.createDiEdge = function(semantic, attrs) {
   return this.create('bpmndi:BPMNEdge', assign({
     bpmnElement: semantic,
-    waypoints: this.createDiWaypoints([])
+    waypoint: this.createDiWaypoints([])
   }, attrs));
 };
 

package/lib/features/modeling/BpmnUpdater.js

@@ -24,6 +24,10 @@ import {
   isAny
 } from './util/ModelingUtil';
 
+import {
+  delta
+} from 'diagram-js/lib/util/PositionUtil';
+
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
 /**
@@ -344,7 +348,18 @@ BpmnUpdater.prototype.updateParent = function(element, oldParent) {
 
 BpmnUpdater.prototype.updateBounds = function(shape) {
 
-  var di = getDi(shape);
+  var di = getDi(shape),
+      embeddedLabelBounds = getEmbeddedLabelBounds(shape);
+
+  // update embedded label bounds if possible
+  if (embeddedLabelBounds) {
+    var embeddedLabelBoundsDelta = delta(embeddedLabelBounds, di.get('bounds'));
+
+    assign(embeddedLabelBounds, {
+      x: shape.x + embeddedLabelBoundsDelta.x,
+      y: shape.y + embeddedLabelBoundsDelta.y
+    });
+  }
 
   var target = (shape instanceof Label) ? this._getLabel(di) : di;
 
@@ -718,3 +733,30 @@ function ifBpmn(fn) {
     }
   };
 }
+
+/**
+ * Return dc:Bounds of bpmndi:BPMNLabel if exists.
+ *
+ * @param {djs.model.shape} shape
+ *
+ * @returns {Object|undefined}
+ */
+function getEmbeddedLabelBounds(shape) {
+  if (!is(shape, 'bpmn:Activity')) {
+    return;
+  }
+
+  var di = getDi(shape);
+
+  if (!di) {
+    return;
+  }
+
+  var label = di.get('label');
+
+  if (!label) {
+    return;
+  }
+
+  return label.get('bounds');
+}

package/lib/features/modeling/ElementFactory.js

@@ -117,6 +117,10 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
     applyAttribute(di, attrs, 'isExpanded');
   }
 
+  if (is(businessObject, 'bpmn:SubProcess')) {
+    attrs.collapsed = !isExpanded(businessObject, di);
+  }
+
   if (is(businessObject, 'bpmn:ExclusiveGateway')) {
     di.isMarkerVisible = true;
   }

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/RemoveEmbeddedLabelBoundsBehavior.js

@@ -0,0 +1,34 @@
+import inherits from 'inherits';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+import { getDi } from '../../../util/ModelUtil';
+
+/**
+ * BPMN specific behavior ensuring that bpmndi:Label's dc:Bounds are removed
+ * when shape is resized.
+ */
+export default function RemoveEmbeddedLabelBoundsBehavior(eventBus, modeling) {
+  CommandInterceptor.call(this, eventBus);
+
+  this.preExecute('shape.resize', function(context) {
+    var shape = context.shape;
+
+    var di = getDi(shape),
+        label = di && di.get('label'),
+        bounds = label && label.get('bounds');
+
+    if (bounds) {
+      modeling.updateModdleProperties(shape, label, {
+        bounds: undefined
+      });
+    }
+  }, true);
+}
+
+inherits(RemoveEmbeddedLabelBoundsBehavior, CommandInterceptor);
+
+RemoveEmbeddedLabelBoundsBehavior.$inject = [
+  'eventBus',
+  'modeling'
+];