bpmn-js 9.3.1 → 9.4.1

package/lib/draw/BpmnRenderUtil.js

@@ -86,11 +86,11 @@ export function getCirclePath(shape) {
       radius = shape.width / 2;
 
   var circlePath = [
-    ['M', cx, cy],
-    ['m', 0, -radius],
-    ['a', radius, radius, 0, 1, 1, 0, 2 * radius],
-    ['a', radius, radius, 0, 1, 1, 0, -2 * radius],
-    ['z']
+    [ 'M', cx, cy ],
+    [ 'm', 0, -radius ],
+    [ 'a', radius, radius, 0, 1, 1, 0, 2 * radius ],
+    [ 'a', radius, radius, 0, 1, 1, 0, -2 * radius ],
+    [ 'z' ]
   ];
 
   return componentsToPath(circlePath);
@@ -104,16 +104,16 @@ export function getRoundRectPath(shape, borderRadius) {
       height = shape.height;
 
   var roundRectPath = [
-    ['M', x + borderRadius, y],
-    ['l', width - borderRadius * 2, 0],
-    ['a', borderRadius, borderRadius, 0, 0, 1, borderRadius, borderRadius],
-    ['l', 0, height - borderRadius * 2],
-    ['a', borderRadius, borderRadius, 0, 0, 1, -borderRadius, borderRadius],
-    ['l', borderRadius * 2 - width, 0],
-    ['a', borderRadius, borderRadius, 0, 0, 1, -borderRadius, -borderRadius],
-    ['l', 0, borderRadius * 2 - height],
-    ['a', borderRadius, borderRadius, 0, 0, 1, borderRadius, -borderRadius],
-    ['z']
+    [ 'M', x + borderRadius, y ],
+    [ 'l', width - borderRadius * 2, 0 ],
+    [ 'a', borderRadius, borderRadius, 0, 0, 1, borderRadius, borderRadius ],
+    [ 'l', 0, height - borderRadius * 2 ],
+    [ 'a', borderRadius, borderRadius, 0, 0, 1, -borderRadius, borderRadius ],
+    [ 'l', borderRadius * 2 - width, 0 ],
+    [ 'a', borderRadius, borderRadius, 0, 0, 1, -borderRadius, -borderRadius ],
+    [ 'l', 0, borderRadius * 2 - height ],
+    [ 'a', borderRadius, borderRadius, 0, 0, 1, borderRadius, -borderRadius ],
+    [ 'z' ]
   ];
 
   return componentsToPath(roundRectPath);
@@ -129,11 +129,11 @@ export function getDiamondPath(shape) {
       halfHeight = height / 2;
 
   var diamondPath = [
-    ['M', x + halfWidth, y],
-    ['l', halfWidth, halfHeight],
-    ['l', -halfWidth, halfHeight],
-    ['l', -halfWidth, -halfHeight],
-    ['z']
+    [ 'M', x + halfWidth, y ],
+    [ 'l', halfWidth, halfHeight ],
+    [ 'l', -halfWidth, halfHeight ],
+    [ 'l', -halfWidth, -halfHeight ],
+    [ 'z' ]
   ];
 
   return componentsToPath(diamondPath);
@@ -146,11 +146,11 @@ export function getRectPath(shape) {
       height = shape.height;
 
   var rectPath = [
-    ['M', x, y],
-    ['l', width, 0],
-    ['l', 0, height],
-    ['l', -width, 0],
-    ['z']
+    [ 'M', x, y ],
+    [ 'l', width, 0 ],
+    [ 'l', 0, height ],
+    [ 'l', -width, 0 ],
+    [ 'z' ]
   ];
 
   return componentsToPath(rectPath);

package/lib/draw/BpmnRenderer.js

@@ -100,7 +100,7 @@ export default function BpmnRenderer(
     // fix for safari / chrome / firefox bug not correctly
     // resetting stroke dash array
     if (attrs.strokeDasharray === 'none') {
-      attrs.strokeDasharray = [10000, 1];
+      attrs.strokeDasharray = [ 10000, 1 ];
     }
 
     var marker = svgCreate('marker');
@@ -327,7 +327,7 @@ export default function BpmnRenderer(
     var x_2 = width / 2;
     var y_2 = height / 2;
 
-    var points = [{ x: x_2, y: 0 }, { x: width, y: y_2 }, { x: x_2, y: height }, { x: 0, y: y_2 }];
+    var points = [ { x: x_2, y: 0 }, { x: width, y: y_2 }, { x: x_2, y: height }, { x: 0, y: y_2 } ];
 
     var pointsString = points.map(function(point) {
       return point.x + ',' + point.y;
@@ -399,7 +399,7 @@ export default function BpmnRenderer(
     var event = getSemantic(element);
     var isThrowing = isThrowEvent(event);
 
-    if (event.eventDefinitions && event.eventDefinitions.length>1) {
+    if (event.eventDefinitions && event.eventDefinitions.length > 1) {
       if (event.parallelMultiple) {
         return renderer('bpmn:ParallelMultipleEventDefinition')(parentGfx, element, isThrowing);
       }
@@ -1115,7 +1115,7 @@ export default function BpmnRenderer(
       if (expanded) {
         attachTaskMarkers(parentGfx, element);
       } else {
-        attachTaskMarkers(parentGfx, element, ['SubProcessMarker']);
+        attachTaskMarkers(parentGfx, element, [ 'SubProcessMarker' ]);
       }
 
       return rect;

package/lib/draw/PathMap.js

@@ -40,22 +40,22 @@ export default function PathMap() {
       d: 'm {mx},{my} l 0,{e.y1} l {e.x1},0 l 0,-{e.y1} z l {e.x0},{e.y0} l {e.x0},-{e.y0}',
       height: 36,
       width:  36,
-      heightElements: [6, 14],
-      widthElements: [10.5, 21]
+      heightElements: [ 6, 14 ],
+      widthElements: [ 10.5, 21 ]
     },
     'EVENT_SIGNAL': {
       d: 'M {mx},{my} l {e.x0},{e.y0} l -{e.x1},0 Z',
       height: 36,
       width: 36,
-      heightElements: [18],
-      widthElements: [10, 20]
+      heightElements: [ 18 ],
+      widthElements: [ 10, 20 ]
     },
     'EVENT_ESCALATION': {
       d: 'M {mx},{my} l {e.x0},{e.y0} l -{e.x0},-{e.y1} l -{e.x0},{e.y1} Z',
       height: 36,
       width: 36,
-      heightElements: [20, 7],
-      widthElements: [8]
+      heightElements: [ 20, 7 ],
+      widthElements: [ 8 ]
     },
     'EVENT_CONDITIONAL': {
       d: 'M {e.x0},{e.y0} l {e.x1},0 l 0,{e.y2} l -{e.x1},0 Z ' +
@@ -67,67 +67,67 @@ export default function PathMap() {
          'M {e.x2},{e.y8} l {e.x0},0 ',
       height: 36,
       width:  36,
-      heightElements: [8.5, 14.5, 18, 11.5, 14.5, 17.5, 20.5, 23.5, 26.5],
-      widthElements:  [10.5, 14.5, 12.5]
+      heightElements: [ 8.5, 14.5, 18, 11.5, 14.5, 17.5, 20.5, 23.5, 26.5 ],
+      widthElements:  [ 10.5, 14.5, 12.5 ]
     },
     'EVENT_LINK': {
       d: 'm {mx},{my} 0,{e.y0} -{e.x1},0 0,{e.y1} {e.x1},0 0,{e.y0} {e.x0},-{e.y2} -{e.x0},-{e.y2} z',
       height: 36,
       width: 36,
-      heightElements: [4.4375, 6.75, 7.8125],
-      widthElements: [9.84375, 13.5]
+      heightElements: [ 4.4375, 6.75, 7.8125 ],
+      widthElements: [ 9.84375, 13.5 ]
     },
     'EVENT_ERROR': {
       d: 'm {mx},{my} {e.x0},-{e.y0} {e.x1},-{e.y1} {e.x2},{e.y2} {e.x3},-{e.y3} -{e.x4},{e.y4} -{e.x5},-{e.y5} z',
       height: 36,
       width: 36,
-      heightElements: [0.023, 8.737, 8.151, 16.564, 10.591, 8.714],
-      widthElements: [0.085, 6.672, 6.97, 4.273, 5.337, 6.636]
+      heightElements: [ 0.023, 8.737, 8.151, 16.564, 10.591, 8.714 ],
+      widthElements: [ 0.085, 6.672, 6.97, 4.273, 5.337, 6.636 ]
     },
     'EVENT_CANCEL_45': {
       d: 'm {mx},{my} -{e.x1},0 0,{e.x0} {e.x1},0 0,{e.y1} {e.x0},0 ' +
         '0,-{e.y1} {e.x1},0 0,-{e.y0} -{e.x1},0 0,-{e.y1} -{e.x0},0 z',
       height: 36,
       width: 36,
-      heightElements: [4.75, 8.5],
-      widthElements: [4.75, 8.5]
+      heightElements: [ 4.75, 8.5 ],
+      widthElements: [ 4.75, 8.5 ]
     },
     'EVENT_COMPENSATION': {
       d: 'm {mx},{my} {e.x0},-{e.y0} 0,{e.y1} z m {e.x1},-{e.y2} {e.x2},-{e.y3} 0,{e.y1} -{e.x2},-{e.y3} z',
       height: 36,
       width: 36,
-      heightElements: [6.5, 13, 0.4, 6.1],
-      widthElements: [9, 9.3, 8.7]
+      heightElements: [ 6.5, 13, 0.4, 6.1 ],
+      widthElements: [ 9, 9.3, 8.7 ]
     },
     'EVENT_TIMER_WH': {
       d: 'M {mx},{my} l {e.x0},-{e.y0} m -{e.x0},{e.y0} l {e.x1},{e.y1} ',
       height: 36,
       width:  36,
-      heightElements: [10, 2],
-      widthElements: [3, 7]
+      heightElements: [ 10, 2 ],
+      widthElements: [ 3, 7 ]
     },
     'EVENT_TIMER_LINE': {
       d:  'M {mx},{my} ' +
           'm {e.x0},{e.y0} l -{e.x1},{e.y1} ',
       height: 36,
       width:  36,
-      heightElements: [10, 3],
-      widthElements: [0, 0]
+      heightElements: [ 10, 3 ],
+      widthElements: [ 0, 0 ]
     },
     'EVENT_MULTIPLE': {
       d:'m {mx},{my} {e.x1},-{e.y0} {e.x1},{e.y0} -{e.x0},{e.y1} -{e.x2},0 z',
       height: 36,
       width:  36,
-      heightElements: [6.28099, 12.56199],
-      widthElements: [3.1405, 9.42149, 12.56198]
+      heightElements: [ 6.28099, 12.56199 ],
+      widthElements: [ 3.1405, 9.42149, 12.56198 ]
     },
     'EVENT_PARALLEL_MULTIPLE': {
       d:'m {mx},{my} {e.x0},0 0,{e.y1} {e.x1},0 0,{e.y0} -{e.x1},0 0,{e.y1} ' +
         '-{e.x0},0 0,-{e.y1} -{e.x1},0 0,-{e.y0} {e.x1},0 z',
       height: 36,
       width:  36,
-      heightElements: [2.56228, 7.68683],
-      widthElements: [2.56228, 7.68683]
+      heightElements: [ 2.56228, 7.68683 ],
+      widthElements: [ 2.56228, 7.68683 ]
     },
     'GATEWAY_EXCLUSIVE': {
       d:'m {mx},{my} {e.x0},{e.y0} {e.x1},{e.y0} {e.x2},0 {e.x4},{e.y2} ' +
@@ -135,23 +135,23 @@ export default function PathMap() {
                     '{e.x3},0 {e.x5},{e.y1} {e.x5},{e.y2} {e.x3},0 z',
       height: 17.5,
       width:  17.5,
-      heightElements: [8.5, 6.5312, -6.5312, -8.5],
-      widthElements:  [6.5, -6.5, 3, -3, 5, -5]
+      heightElements: [ 8.5, 6.5312, -6.5312, -8.5 ],
+      widthElements:  [ 6.5, -6.5, 3, -3, 5, -5 ]
     },
     'GATEWAY_PARALLEL': {
       d:'m {mx},{my} 0,{e.y1} -{e.x1},0 0,{e.y0} {e.x1},0 0,{e.y1} {e.x0},0 ' +
         '0,-{e.y1} {e.x1},0 0,-{e.y0} -{e.x1},0 0,-{e.y1} -{e.x0},0 z',
       height: 30,
       width:  30,
-      heightElements: [5, 12.5],
-      widthElements: [5, 12.5]
+      heightElements: [ 5, 12.5 ],
+      widthElements: [ 5, 12.5 ]
     },
     'GATEWAY_EVENT_BASED': {
       d:'m {mx},{my} {e.x0},{e.y0} {e.x0},{e.y1} {e.x1},{e.y2} {e.x2},0 z',
       height: 11,
       width:  11,
-      heightElements: [-6, 6, 12, -12],
-      widthElements: [9, -3, -12]
+      heightElements: [ -6, 6, 12, -12 ],
+      widthElements: [ 9, -3, -12 ]
     },
     'GATEWAY_COMPLEX': {
       d:'m {mx},{my} 0,{e.y0} -{e.x0},-{e.y1} -{e.x1},{e.y2} {e.x0},{e.y1} -{e.x2},0 0,{e.y3} ' +
@@ -160,15 +160,15 @@ export default function PathMap() {
         '-{e.x0},{e.y1} 0,-{e.y0} -{e.x3},0 z',
       height: 17.125,
       width:  17.125,
-      heightElements: [4.875, 3.4375, 2.125, 3],
-      widthElements: [3.4375, 2.125, 4.875, 3]
+      heightElements: [ 4.875, 3.4375, 2.125, 3 ],
+      widthElements: [ 3.4375, 2.125, 4.875, 3 ]
     },
     'DATA_OBJECT_PATH': {
       d:'m 0,0 {e.x1},0 {e.x0},{e.y0} 0,{e.y1} -{e.x2},0 0,-{e.y2} {e.x1},0 0,{e.y0} {e.x0},0',
       height: 61,
       width:  51,
-      heightElements: [10, 50, 60],
-      widthElements: [10, 40, 50, 60]
+      heightElements: [ 10, 50, 60 ],
+      widthElements: [ 10, 40, 50, 60 ]
     },
     'DATA_OBJECT_COLLECTION_PATH': {
       d: 'm{mx},{my} m 3,2 l 0,10 m 3,-10 l 0,10 m 3,-10 l 0,10',
@@ -197,15 +197,15 @@ export default function PathMap() {
         'c  {e.x0},{e.y1} {e.x1},{e.y1}  {e.x2},0',
       height: 61,
       width:  61,
-      heightElements: [7, 10, 45],
-      widthElements:  [2, 58, 60]
+      heightElements: [ 7, 10, 45 ],
+      widthElements:  [ 2, 58, 60 ]
     },
     'TEXT_ANNOTATION': {
       d: 'm {mx}, {my} m 10,0 l -10,0 l 0,{e.y0} l 10,0',
       height: 30,
       width: 10,
-      heightElements: [30],
-      widthElements: [10]
+      heightElements: [ 30 ],
+      widthElements: [ 10 ]
     },
     'MARKER_SUB_PROCESS': {
       d: 'm{mx},{my} m 7,2 l 0,10 m -5,-5 l 10,0',
@@ -260,8 +260,8 @@ export default function PathMap() {
       d: 'm {mx},{my} l 0,{e.y1} l {e.x1},0 l 0,-{e.y1} z l {e.x0},{e.y0} l {e.x0},-{e.y0}',
       height: 14,
       width:  21,
-      heightElements: [6, 14],
-      widthElements: [10.5, 21]
+      heightElements: [ 6, 14 ],
+      widthElements: [ 10.5, 21 ]
     },
     'TASK_TYPE_SCRIPT': {
       d: 'm {mx},{my} c 9.966553,-6.27276 -8.000926,-7.91932 2.968968,-14.938 l -8.802728,0 ' +
@@ -272,8 +272,8 @@ export default function PathMap() {
         'm -4,3 l 5,0',
       height: 15,
       width:  12.6,
-      heightElements: [6, 14],
-      widthElements: [10.5, 21]
+      heightElements: [ 6, 14 ],
+      widthElements: [ 10.5, 21 ]
     },
     'TASK_TYPE_USER_1': {
       d: 'm {mx},{my} c 0.909,-0.845 1.594,-2.049 1.594,-3.385 0,-2.554 -1.805,-4.62199999 ' +

package/lib/features/align-elements/index.js

@@ -19,5 +19,5 @@ export default {
   ],
   alignElementsContextPadProvider: [ 'type', AlignElementsContextPadProvider ],
   alignElementsMenuProvider: [ 'type', AlignElementsMenuProvider ],
-  bpmnAlignElements: [ 'type', BpmnAlignElements]
+  bpmnAlignElements: [ 'type', BpmnAlignElements ]
 };

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

@@ -24,67 +24,52 @@ function copyProperties(source, target, properties) {
   });
 }
 
-function removeProperties(element, properties) {
-  if (!isArray(properties)) {
-    properties = [ properties ];
-  }
-
-  forEach(properties, function(property) {
-    if (element[property]) {
-      delete element[property];
-    }
-  });
-}
-
 var LOW_PRIORITY = 750;
 
 
 export default function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
 
-  eventBus.on('copyPaste.copyElement', LOW_PRIORITY, function(context) {
-    var descriptor = context.descriptor,
-        element = context.element;
+  function copy(bo, clone) {
+    var targetBo = bpmnFactory.create(bo.$type);
 
-    var businessObject = descriptor.oldBusinessObject = getBusinessObject(element);
-    var di = descriptor.oldDi = getDi(element);
-
-    descriptor.type = element.type;
-
-    copyProperties(businessObject, descriptor, 'name');
+    return moddleCopy.copyElement(bo, targetBo, null, clone);
+  }
 
-    copyProperties(di, descriptor, 'isExpanded');
+  eventBus.on('copyPaste.copyElement', LOW_PRIORITY, function(context) {
+    var descriptor = context.descriptor,
+        element = context.element,
+        businessObject = getBusinessObject(element);
 
-    if (isLabel(descriptor)) {
+    // do not copy business object + di for labels;
+    // will be pulled from the referenced label target
+    if (isLabel(element)) {
       return descriptor;
     }
 
+    var businessObjectCopy = descriptor.businessObject = copy(businessObject, true);
+    var diCopy = descriptor.di = copy(getDi(element), true);
+    diCopy.bpmnElement = businessObjectCopy;
+
+    copyProperties(businessObjectCopy, descriptor, 'name');
+    copyProperties(diCopy, descriptor, 'isExpanded');
+
     // default sequence flow
     if (businessObject.default) {
       descriptor.default = businessObject.default.id;
     }
   });
 
-  eventBus.on('moddleCopy.canCopyProperty', function(context) {
-    var parent = context.parent,
-        property = context.property,
-        propertyName = context.propertyName,
-        bpmnProcess;
-
-    if (
-      propertyName === 'processRef' &&
-      is(parent, 'bpmn:Participant') &&
-      is(property, 'bpmn:Process')
-    ) {
-      bpmnProcess = bpmnFactory.create('bpmn:Process');
-
-      // return copy of process
-      return moddleCopy.copyElement(property, bpmnProcess);
-    }
-  });
+  var referencesKey = '-bpmn-js-refs';
 
-  var references;
+  function getReferences(cache) {
+    return (cache[referencesKey] = cache[referencesKey] || {});
+  }
+
+  function setReferences(cache, references) {
+    cache[referencesKey] = references;
+  }
 
-  function resolveReferences(descriptor, cache) {
+  function resolveReferences(descriptor, cache, references) {
     var businessObject = getBusinessObject(descriptor);
 
     // default sequence flows
@@ -104,7 +89,7 @@ export default function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
       getBusinessObject(descriptor).attachedToRef = getBusinessObject(cache[ descriptor.host ]);
     }
 
-    references = omit(references, reduce(references, function(array, reference, key) {
+    return omit(references, reduce(references, function(array, reference, key) {
       var element = reference.element,
           property = reference.property;
 
@@ -118,18 +103,13 @@ export default function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
     }, []));
   }
 
-  eventBus.on('copyPaste.pasteElements', function() {
-    references = {};
-  });
-
   eventBus.on('copyPaste.pasteElement', function(context) {
     var cache = context.cache,
         descriptor = context.descriptor,
-        oldBusinessObject = descriptor.oldBusinessObject,
-        oldDi = descriptor.oldDi,
-        newBusinessObject, newDi;
+        businessObject = descriptor.businessObject,
+        di = descriptor.di;
 
-    // do NOT copy business object if external label
+    // wire existing di + businessObject for external label
     if (isLabel(descriptor)) {
       descriptor.businessObject = getBusinessObject(cache[ descriptor.labelTarget ]);
       descriptor.di = getDi(cache[ descriptor.labelTarget ]);
@@ -137,30 +117,56 @@ export default function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
       return;
     }
 
-    newBusinessObject = bpmnFactory.create(oldBusinessObject.$type);
-
-    descriptor.businessObject = moddleCopy.copyElement(
-      oldBusinessObject,
-      newBusinessObject
-    );
-
-    newDi = bpmnFactory.create(oldDi.$type);
-    newDi.bpmnElement = newBusinessObject;
-
-    descriptor.di = moddleCopy.copyElement(
-      oldDi,
-      newDi
-    );
+    businessObject = descriptor.businessObject = copy(businessObject);
 
-    // resolve references e.g. default sequence flow
-    resolveReferences(descriptor, cache);
+    di = descriptor.di = copy(di);
+    di.bpmnElement = businessObject;
 
-    copyProperties(descriptor, newBusinessObject, [
+    copyProperties(descriptor, businessObject, [
       'isExpanded',
       'name'
     ]);
 
-    removeProperties(descriptor, 'oldBusinessObject');
+    descriptor.type = businessObject.$type;
+  });
+
+  // copy + paste processRef with participant
+
+  eventBus.on('copyPaste.copyElement', LOW_PRIORITY, function(context) {
+    var descriptor = context.descriptor,
+        element = context.element;
+
+    if (!is(element, 'bpmn:Participant')) {
+      return;
+    }
+
+    var participantBo = getBusinessObject(element);
+
+    if (participantBo.processRef) {
+      descriptor.processRef = copy(participantBo.processRef, true);
+    }
+  });
+
+  eventBus.on('copyPaste.pasteElement', function(context) {
+    var descriptor = context.descriptor,
+        processRef = descriptor.processRef;
+
+    if (processRef) {
+      descriptor.processRef = copy(processRef);
+    }
+  });
+
+  // resolve references
+
+  eventBus.on('copyPaste.pasteElement', LOW_PRIORITY, function(context) {
+    var cache = context.cache,
+        descriptor = context.descriptor;
+
+    // resolve references e.g. default sequence flow
+    setReferences(
+      cache,
+      resolveReferences(descriptor, cache, getReferences(cache))
+    );
   });
 
 }

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

@@ -18,7 +18,8 @@ var DISALLOWED_PROPERTIES = [
   'flowElements',
   'lanes',
   'incoming',
-  'outgoing'
+  'outgoing',
+  'categoryValue'
 ];
 
 /**
@@ -127,10 +128,11 @@ ModdleCopy.$inject = [
  * @param {ModdleElement} sourceElement
  * @param {ModdleElement} targetElement
  * @param {Array<string>} [propertyNames]
+ * @param {boolean} clone
  *
  * @param {ModdleElement}
  */
-ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, propertyNames) {
+ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, propertyNames, clone) {
   var self = this;
 
   if (propertyNames && !isArray(propertyNames)) {
@@ -142,7 +144,8 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
   var canCopyProperties = this._eventBus.fire('moddleCopy.canCopyProperties', {
     propertyNames: propertyNames,
     sourceElement: sourceElement,
-    targetElement: targetElement
+    targetElement: targetElement,
+    clone: clone
   });
 
   if (canCopyProperties === false) {
@@ -161,7 +164,11 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
       sourceProperty = sourceElement.get(propertyName);
     }
 
-    var copiedProperty = self.copyProperty(sourceProperty, targetElement, propertyName);
+    var copiedProperty = self.copyProperty(sourceProperty, targetElement, propertyName, clone);
+
+    if (!isDefined(copiedProperty)) {
+      return;
+    }
 
     var canSetProperty = self._eventBus.fire('moddleCopy.canSetCopiedProperty', {
       parent: targetElement,
@@ -173,9 +180,9 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
       return;
     }
 
-    if (isDefined(copiedProperty)) {
-      targetElement.set(propertyName, copiedProperty);
-    }
+    // TODO(nikku): unclaim old IDs if ID property is copied over
+    // this._moddle.getPropertyDescriptor(parent, propertyName)
+    targetElement.set(propertyName, copiedProperty);
   });
 
   return targetElement;
@@ -187,17 +194,19 @@ ModdleCopy.prototype.copyElement = function(sourceElement, targetElement, proper
  * @param {*} property
  * @param {ModdleElement} parent
  * @param {string} propertyName
+ * @param {boolean} clone
  *
  * @returns {*}
  */
-ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
+ModdleCopy.prototype.copyProperty = function(property, parent, propertyName, clone) {
   var self = this;
 
   // allow others to copy property
   var copiedProperty = this._eventBus.fire('moddleCopy.canCopyProperty', {
     parent: parent,
     property: property,
-    propertyName: propertyName
+    propertyName: propertyName,
+    clone: clone
   });
 
   // return if copying is NOT allowed
@@ -222,7 +231,7 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
 
   // copy id
   if (propertyDescriptor.isId) {
-    return this._copyId(property, parent);
+    return property && this._copyId(property, parent, clone);
   }
 
   // copy arrays
@@ -230,7 +239,7 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
     return reduce(property, function(childProperties, childProperty) {
 
       // recursion
-      copiedProperty = self.copyProperty(childProperty, parent, propertyName);
+      copiedProperty = self.copyProperty(childProperty, parent, propertyName, clone);
 
       // copying might NOT be allowed
       if (copiedProperty) {
@@ -252,7 +261,7 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
     copiedProperty.$parent = parent;
 
     // recursion
-    copiedProperty = self.copyElement(property, copiedProperty);
+    copiedProperty = self.copyElement(property, copiedProperty, null, clone);
 
     return copiedProperty;
   }
@@ -261,7 +270,11 @@ ModdleCopy.prototype.copyProperty = function(property, parent, propertyName) {
   return property;
 };
 
-ModdleCopy.prototype._copyId = function(id, element) {
+ModdleCopy.prototype._copyId = function(id, element, clone) {
+
+  if (clone) {
+    return id;
+  }
 
   // disallow if already taken
   if (this._moddle.ids.assigned(id)) {

package/lib/features/drilldown/DrilldownOverlayBehavior.js

@@ -46,7 +46,7 @@ export default function DrilldownOverlayBehavior(
   }, true);
 
 
-  this.executed(['shape.create', 'shape.move', 'shape.delete'], LOW_PRIORITY,
+  this.executed([ 'shape.create', 'shape.move', 'shape.delete' ], LOW_PRIORITY,
     function(context) {
       var oldParent = context.oldParent,
           newParent = context.newParent || context.parent,
@@ -63,7 +63,7 @@ export default function DrilldownOverlayBehavior(
     }, true);
 
 
-  this.reverted(['shape.create', 'shape.move', 'shape.delete'], LOW_PRIORITY,
+  this.reverted([ 'shape.create', 'shape.move', 'shape.delete' ], LOW_PRIORITY,
     function(context) {
       var oldParent = context.oldParent,
           newParent = context.newParent || context.parent,

package/lib/features/drilldown/SubprocessCompatibility.js

@@ -210,7 +210,7 @@ function shouldMoveToPlane(bo, plane) {
 
   // 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'])) {
+  if (isAny(bo, [ 'bpmn:DataInputAssociation', 'bpmn:DataOutputAssociation' ])) {
     return false;
   }