camunda-bpmn-js 0.13.0 → 0.14.0

package/dist/base-viewer.development.js

@@ -507,6 +507,21 @@
 	  return bo && (typeof bo.$instanceOf === 'function') && bo.$instanceOf(type);
 	}
 
+
+	/**
+	 * Return true if element has any of the given types.
+	 *
+	 * @param {djs.model.Base} element
+	 * @param {Array<string>} types
+	 *
+	 * @return {boolean}
+	 */
+	function isAny(element, types) {
+	  return some(types, function(t) {
+	    return is(element, t);
+	  });
+	}
+
 	/**
 	 * Return the business object for a given element.
 	 *
@@ -7998,7 +8013,7 @@
 	      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 });
@@ -8087,7 +8102,7 @@
 	SubprocessCompatibility.$inject = [ 'eventBus', 'moddle' ];
 
 
-	// helpers
+	// helpers //////////////////////////
 
 	function findRootDiagram(element) {
 	  if (is(element, 'bpmndi:BPMNDiagram')) {
@@ -8119,6 +8134,23 @@
 	  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;
+	}
+
 	var LOW_PRIORITY$3 = 250;
 	var ARROW_DOWN_SVG = '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.81801948,3.50735931 L10.4996894,9.1896894 L10.5,4 L12,4 L12,12 L4,12 L4,10.5 L9.6896894,10.4996894 L3.75735931,4.56801948 C3.46446609,4.27512627 3.46446609,3.80025253 3.75735931,3.50735931 C4.05025253,3.21446609 4.52512627,3.21446609 4.81801948,3.50735931 Z"/></svg>';
 
@@ -8194,7 +8226,7 @@
 	    }, true);
 
 
-	  eventBus.on('import.done', function() {
+	  eventBus.on('import.render.complete', function() {
 	    elementRegistry.filter(function(e) {
 	      return self.canDrillDown(e);
 	    }).map(function(el) {
@@ -20244,7 +20276,7 @@
 	}
 
 	/**
-	 * 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