bpmn-js 9.0.1 → 9.0.4

package/lib/features/drilldown/DrilldownOverlayBehavior.js

@@ -80,7 +80,7 @@ export default function DrilldownOverlayBehavior(
     }, true);
 
 
-  eventBus.on('import.done', function() {
+  eventBus.on('import.render.complete', function() {
     elementRegistry.filter(function(e) {
       return self.canDrillDown(e);
     }).map(function(el) {

package/lib/features/drilldown/SubprocessCompatibility.js

@@ -1,6 +1,6 @@
 
 import { asBounds, asTRBL } from 'diagram-js/lib/layout/LayoutUtil';
-import { is } from '../../util/ModelUtil';
+import { is, isAny } from '../../util/ModelUtil';
 
 var DEFAULT_POSITION = {
   x: 180,
@@ -79,7 +79,7 @@ SubprocessCompatibility.prototype.createNewDiagrams = function(plane) {
       collapsedElements.push(bo);
     }
 
-    if (is(parent, 'bpmn:SubProcess') && parent !== plane.bpmnElement) {
+    if (shouldMoveToPlane(bo, plane)) {
 
       // don't change the array while we iterate over it
       elementsToMove.push({ diElement: diElement, parent: parent });
@@ -168,7 +168,7 @@ SubprocessCompatibility.prototype.createDiagram = function(bo) {
 SubprocessCompatibility.$inject = [ 'eventBus', 'moddle' ];
 
 
-// helpers
+// helpers //////////////////////////
 
 function findRootDiagram(element) {
   if (is(element, 'bpmndi:BPMNDiagram')) {
@@ -199,3 +199,20 @@ function getPlaneBounds(plane) {
 
   return asBounds(planeTrbl);
 }
+
+function shouldMoveToPlane(bo, plane) {
+  var parent = bo.$parent;
+
+  // don't move elements that are already on the plane
+  if (!is(parent, 'bpmn:SubProcess') || parent === plane.bpmnElement) {
+    return false;
+  }
+
+  // dataAssociations are children of the subprocess but rendered on process level
+  // cf. https://github.com/bpmn-io/bpmn-js/issues/1619
+  if (isAny(bo, ['bpmn:DataInputAssociation', 'bpmn:DataOutputAssociation'])) {
+    return false;
+  }
+
+  return true;
+}

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

@@ -48,7 +48,8 @@ export default function LabelEditingProvider(
     'canvas.viewbox.changing',
     'drag.init',
     'element.mousedown',
-    'popupMenu.open'
+    'popupMenu.open',
+    'root.set'
   ], function(event) {
 
     if (directEditing.isActive()) {

package/lib/features/label-editing/cmd/UpdateLabelHandler.js

@@ -44,7 +44,7 @@ export default function UpdateLabelHandler(modeling, textRenderer, bpmnFactory)
     }
 
     if (!text && di.label) {
-      di.label = null;
+      delete di.label;
     }
   }
 

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

@@ -24,7 +24,7 @@ var HIGH_PRIORITY = 2000;
  */
 export default function GroupBehavior(
     bpmnFactory,
-    canvas,
+    bpmnjs,
     elementRegistry,
     eventBus,
     injector,
@@ -32,18 +32,6 @@ export default function GroupBehavior(
 ) {
   injector.invoke(CommandInterceptor, this);
 
-  /**
-   * Gets process definitions
-   *
-   * @return {ModdleElement} definitions
-   */
-  function getDefinitions() {
-    var rootElement = canvas.getRootElement(),
-        businessObject = getBusinessObject(rootElement);
-
-    return businessObject.$parent;
-  }
-
   /**
    * Removes a referenced category value for a given group shape
    *
@@ -79,7 +67,7 @@ export default function GroupBehavior(
    */
   function removeCategory(category) {
 
-    var definitions = getDefinitions();
+    var definitions = bpmnjs.getDefinitions();
 
     collectionRemove(definitions.get('rootElements'), category);
   }
@@ -144,7 +132,7 @@ export default function GroupBehavior(
 
       var businessObject = getBusinessObject(shape),
           categoryValueRef = businessObject.categoryValueRef,
-          definitions = getDefinitions(),
+          definitions = bpmnjs.getDefinitions(),
           category = categoryValueRef ? categoryValueRef.$parent : null;
 
       collectionAdd(category.get('categoryValue'), categoryValueRef);
@@ -162,7 +150,7 @@ export default function GroupBehavior(
 
     if (is(businessObject, 'bpmn:Group') && !businessObject.categoryValueRef) {
 
-      var definitions = getDefinitions(),
+      var definitions = bpmnjs.getDefinitions(),
           categoryValue = createCategoryValue(definitions, bpmnFactory);
 
       // link the reference to the Group
@@ -190,7 +178,7 @@ export default function GroupBehavior(
         categoryValue;
 
     if (is(property, 'bpmn:CategoryValue')) {
-      categoryValue = createCategoryValue(getDefinitions(), bpmnFactory);
+      categoryValue = createCategoryValue(bpmnjs.getDefinitions(), bpmnFactory);
 
       // return copy of category
       return moddleCopy.copyElement(property, categoryValue);
@@ -201,7 +189,7 @@ export default function GroupBehavior(
 
 GroupBehavior.$inject = [
   'bpmnFactory',
-  'canvas',
+  'bpmnjs',
   'elementRegistry',
   'eventBus',
   'injector',

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

@@ -20,7 +20,7 @@ export default function SubProcessStartEventBehavior(injector, modeling) {
 
     if (
       !is(newShape, 'bpmn:SubProcess') ||
-      !is(oldShape, 'bpmn:Task') ||
+      ! (is(oldShape, 'bpmn:Task') || is(oldShape, 'bpmn:CallActivity')) ||
       !isExpanded(newShape)
     ) {
       return;

package/lib/features/ordering/BpmnOrderingProvider.js

@@ -131,7 +131,7 @@ export default function BpmnOrderingProvider(eventBus, canvas, translate) {
     // render labels always on top
     if (element.labelTarget) {
       return {
-        parent: canvas.findRoot(element.labelTarget) || canvas.getRootElement(),
+        parent: canvas.findRoot(newParent) || canvas.getRootElement(),
         index: -1
       };
     }

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

@@ -14,7 +14,8 @@ import {
 
 import {
   forEach,
-  filter
+  filter,
+  isUndefined
 } from 'min-dash';
 
 import * as replaceOptions from '../replace/ReplaceOptions';
@@ -426,16 +427,16 @@ ReplaceMenuProvider.prototype._getLoopEntries = function(element) {
   var translate = this._translate;
 
   function toggleLoopEntry(event, entry) {
-    var loopCharacteristics;
+    var loopCharacteristics = getBusinessObject(element).loopCharacteristics;
 
     if (entry.active) {
       loopCharacteristics = undefined;
     } else {
-      loopCharacteristics = self._moddle.create(entry.options.loopCharacteristics);
-
-      if (entry.options.isSequential) {
-        loopCharacteristics.isSequential = entry.options.isSequential;
+      if (isUndefined(entry.options.isSequential) || !loopCharacteristics) {
+        loopCharacteristics = self._moddle.create(entry.options.loopCharacteristics);
       }
+
+      loopCharacteristics.isSequential = entry.options.isSequential;
     }
     self._modeling.updateProperties(element, { loopCharacteristics: loopCharacteristics });
   }

package/lib/import/Importer.js

@@ -124,7 +124,7 @@ export function importBpmnDiagram(diagram, definitions, bpmnDiagram) {
 }
 
 /**
- * Returns all diagrams in the same hirarchy as the requested diagram.
+ * Returns all diagrams in the same hierarchy as the requested diagram.
  * Includes all parent and sub process diagrams.
  *
  * @param {Array} definitions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "9.0.1",
+  "version": "9.0.4",
   "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": "^8.1.2",
+    "diagram-js": "^8.2.0",
     "diagram-js-direct-editing": "^1.6.3",
     "ids": "^1.0.0",
     "inherits": "^2.0.4",