bpmn-js 9.3.2 → 10.0.0-alpha.1

package/dist/bpmn-modeler.development.js

@@ -1,5 +1,5 @@
 /*!
- * bpmn-js - bpmn-modeler v9.3.2
+ * bpmn-js - bpmn-modeler v10.0.0-alpha.1
  *
  * Copyright (c) 2014-present, camunda Services GmbH
  *
@@ -8,7 +8,7 @@
  *
  * Source Code: https://github.com/bpmn-io/bpmn-js
  *
- * Date: 2022-08-04
+ * Date: 2022-08-17
  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -2393,20 +2393,11 @@
       return function() {
         initializers.forEach(function(initializer) {
 
-          try {
-
-            // eagerly resolve component (fn or string)
-            if (typeof initializer === 'string') {
-              injector.get(initializer);
-            } else {
-              injector.invoke(initializer);
-            }
-          } catch (error) {
-            if (typeof AggregateError !== 'undefined') {
-              throw new AggregateError([ error ], 'Failed to initialize!');
-            }
-
-            throw new Error('Failed to initialize! ' + error.message);
+          // eagerly resolve component (fn or string)
+          if (typeof initializer === 'string') {
+            injector.get(initializer);
+          } else {
+            injector.invoke(initializer);
           }
         });
       };
@@ -4749,7 +4740,19 @@
     var container = this._container = createContainer(config);
 
     var svg = this._svg = create$1('svg');
-    attr(svg, { width: '100%', height: '100%' });
+
+    attr(svg, {
+      width: '100%',
+      height: '100%'
+    });
+
+    attr$1(svg, 'tabindex', 0);
+
+    eventBus.on('element.hover', function() {
+      if (document.activeElement === document.body) {
+        svg.focus();
+      }
+    });
 
     append(container, svg);
 
@@ -23478,6 +23481,16 @@
   // default moddle extensions the viewer is composed of
   Viewer.prototype._moddleExtensions = {};
 
+  var KEYCODE_C = 67;
+  var KEYCODE_V = 86;
+  var KEYCODE_Y = 89;
+  var KEYCODE_Z = 90;
+
+  var KEYS_COPY = [ 'c', 'C', KEYCODE_C ];
+  var KEYS_PASTE = [ 'v', 'V', KEYCODE_V ];
+  var KEYS_REDO = [ 'y', 'Y', KEYCODE_Y ];
+  var KEYS_UNDO = [ 'z', 'Z', KEYCODE_Z ];
+
   /**
    * Returns true if event was triggered with any modifier
    * @param {KeyboardEvent} event
@@ -23517,15 +23530,36 @@
    */
   function isShift(event) {
     return event.shiftKey;
+  }
+
+  function isCopy(event) {
+    return isCmd(event) && isKey(KEYS_COPY, event);
+  }
+
+  function isPaste(event) {
+    return isCmd(event) && isKey(KEYS_PASTE, event);
+  }
+
+  function isUndo(event) {
+    return isCmd(event) && !isShift(event) && isKey(KEYS_UNDO, event);
+  }
+
+  function isRedo(event) {
+    return isCmd(event) && (
+      isKey(KEYS_REDO, event) || (
+        isKey(KEYS_UNDO, event) && isShift(event)
+      )
+    );
   }
 
   var KEYDOWN_EVENT = 'keyboard.keydown',
       KEYUP_EVENT = 'keyboard.keyup';
 
-  var HANDLE_MODIFIER_ATTRIBUTE = 'input-handle-modified-keys';
-
   var DEFAULT_PRIORITY$3 = 1000;
 
+  var compatMessage = 'Explicit binding of keyboard to an element got removed. For more information, see https://github.com/bpmn-io/diagram-js/issues/661';
+
+
   /**
    * A keyboard abstraction that may be activated and
    * deactivated by users at will, consuming key events
@@ -23544,8 +23578,8 @@
    *
    * All events contain one field which is node.
    *
-   * A default binding for the keyboard may be specified via the
-   * `keyboard.bindTo` configuration option.
+   * Specify the initial keyboard binding state via the
+   * `keyboard.bind=true|false` configuration option.
    *
    * @param {Config} config
    * @param {EventBus} eventBus
@@ -23553,7 +23587,8 @@
   function Keyboard(config, eventBus) {
     var self = this;
 
-    this._config = config || {};
+    this._config = config = config || {};
+
     this._eventBus = eventBus;
 
     this._keydownHandler = this._keydownHandler.bind(this);
@@ -23566,19 +23601,22 @@
       self.unbind();
     });
 
-    eventBus.on('diagram.init', function() {
-      self._fire('init');
-    });
+    if (config.bindTo) {
+      console.error('unsupported configuration <keyboard.bindTo>', new Error(compatMessage));
+    }
+
+    var bind = config && config.bind !== false;
 
-    eventBus.on('attach', function() {
-      if (config && config.bindTo) {
-        self.bind(config.bindTo);
+    eventBus.on('canvas.init', function(event) {
+      self._target = event.svg;
+
+      if (bind) {
+        self.bind();
       }
-    });
 
-    eventBus.on('detach', function() {
-      self.unbind();
+      self._fire('init');
     });
+
   }
 
   Keyboard.$inject = [
@@ -23613,34 +23651,19 @@
   };
 
   Keyboard.prototype._isEventIgnored = function(event) {
-    return isInput(event.target) && this._isModifiedKeyIgnored(event);
-  };
-
-  Keyboard.prototype._isModifiedKeyIgnored = function(event) {
-    if (!isCmd(event)) {
-      return true;
-    }
-
-    var allowedModifiers = this._getAllowedModifiers(event.target);
-    return allowedModifiers.indexOf(event.key) === -1;
+    return false;
   };
 
-  Keyboard.prototype._getAllowedModifiers = function(element) {
-    var modifierContainer = closest(element, '[' + HANDLE_MODIFIER_ATTRIBUTE + ']', true);
+  Keyboard.prototype.bind = function(node) {
 
-    if (!modifierContainer || (this._node && !this._node.contains(modifierContainer))) {
-      return [];
+    if (node) {
+      console.error('unsupported argument <node>', new Error(compatMessage));
     }
 
-    return modifierContainer.getAttribute(HANDLE_MODIFIER_ATTRIBUTE).split(',');
-  };
-
-  Keyboard.prototype.bind = function(node) {
-
     // make sure that the keyboard is only bound once to the DOM
     this.unbind();
 
-    this._node = node;
+    node = this._node = this._target;
 
     // bind key events
     componentEvent.bind(node, 'keydown', this._keydownHandler, true);
@@ -23699,26 +23722,8 @@
   Keyboard.prototype.isShift = isShift;
   Keyboard.prototype.isKey = isKey;
 
-
-
-  // helpers ///////
-
-  function isInput(target) {
-    return target && (matchesSelector(target, 'input, textarea') || target.contentEditable === 'true');
-  }
-
   var LOW_PRIORITY$m = 500;
 
-  var KEYCODE_C = 67;
-  var KEYCODE_V = 86;
-  var KEYCODE_Y = 89;
-  var KEYCODE_Z = 90;
-
-  var KEYS_COPY = [ 'c', 'C', KEYCODE_C ];
-  var KEYS_PASTE = [ 'v', 'V', KEYCODE_V ];
-  var KEYS_REDO = [ 'y', 'Y', KEYCODE_Y ];
-  var KEYS_UNDO = [ 'z', 'Z', KEYCODE_Z ];
-
 
   /**
    * Adds default keyboard bindings.
@@ -23776,7 +23781,7 @@
 
       var event = context.keyEvent;
 
-      if (isCmd(event) && !isShift(event) && isKey(KEYS_UNDO, event)) {
+      if (isUndo(event)) {
         editorActions.trigger('undo');
 
         return true;
@@ -23790,7 +23795,7 @@
 
       var event = context.keyEvent;
 
-      if (isCmd(event) && (isKey(KEYS_REDO, event) || (isKey(KEYS_UNDO, event) && isShift(event)))) {
+      if (isRedo(event)) {
         editorActions.trigger('redo');
 
         return true;
@@ -23803,7 +23808,7 @@
 
       var event = context.keyEvent;
 
-      if (isCmd(event) && isKey(KEYS_COPY, event)) {
+      if (isCopy(event)) {
         editorActions.trigger('copy');
 
         return true;
@@ -23816,7 +23821,7 @@
 
       var event = context.keyEvent;
 
-      if (isCmd(event) && isKey(KEYS_PASTE, event)) {
+      if (isPaste(event)) {
         editorActions.trigger('paste');
 
         return true;
@@ -29988,7 +29993,7 @@
     bpmnAutoResizeProvider: [ 'type', BpmnAutoResizeProvider ]
   };
 
-  var HIGH_PRIORITY$l = 1500;
+  var HIGH_PRIORITY$j = 1500;
 
 
   /**
@@ -30056,7 +30061,7 @@
        */
       eventBus.on('drag.start', function(event) {
 
-        eventBus.once('drag.move', HIGH_PRIORITY$l, function(event) {
+        eventBus.once('drag.move', HIGH_PRIORITY$j, function(event) {
 
           ensureHover(event);
 
@@ -30087,7 +30092,7 @@
         hover = event.element;
       });
 
-      eventBus.on('element.hover', HIGH_PRIORITY$l, function(event) {
+      eventBus.on('element.hover', HIGH_PRIORITY$j, function(event) {
 
         // (3) am I on an element still?
         if (hover) {
@@ -31917,7 +31922,7 @@
       MARKER_CONNECT_UPDATING$1 = 'djs-updating',
       MARKER_ELEMENT_HIDDEN = 'djs-element-hidden';
 
-  var HIGH_PRIORITY$k = 1100;
+  var HIGH_PRIORITY$i = 1100;
 
   /**
    * Preview connection while moving bendpoints.
@@ -31980,7 +31985,7 @@
     eventBus.on([
       'bendpoint.move.out',
       'bendpoint.move.cleanup'
-    ], HIGH_PRIORITY$k, function(event) {
+    ], HIGH_PRIORITY$i, function(event) {
       var context = event.context,
           hover = context.hover,
           target = context.target;
@@ -32066,7 +32071,7 @@
     eventBus.on([
       'bendpoint.move.end',
       'bendpoint.move.cancel'
-    ], HIGH_PRIORITY$k, function(event) {
+    ], HIGH_PRIORITY$i, function(event) {
       var context = event.context,
           connection = context.connection,
           draggerGfx = context.draggerGfx,
@@ -33027,7 +33032,7 @@
     return hover && source && hover === source && source !== target;
   }
 
-  var HIGH_PRIORITY$j = 1100,
+  var HIGH_PRIORITY$h = 1100,
       LOW_PRIORITY$j = 900;
 
   var MARKER_OK$3 = 'connect-ok',
@@ -33088,7 +33093,7 @@
     eventBus.on([
       'connect.out',
       'connect.cleanup'
-    ], HIGH_PRIORITY$j, function(event) {
+    ], HIGH_PRIORITY$h, function(event) {
       var hover = event.hover;
 
       if (hover) {
@@ -34286,7 +34291,7 @@
 
   var PREFIX = 'create';
 
-  var HIGH_PRIORITY$i = 2000;
+  var HIGH_PRIORITY$g = 2000;
 
 
   /**
@@ -34514,7 +34519,7 @@
     eventBus.on('create.init', function() {
       eventBus.on('elements.changed', cancel);
 
-      eventBus.once([ 'create.cancel', 'create.end' ], HIGH_PRIORITY$i, function() {
+      eventBus.once([ 'create.cancel', 'create.end' ], HIGH_PRIORITY$g, function() {
         eventBus.off('elements.changed', cancel);
       });
     });
@@ -35462,67 +35467,52 @@
     });
   }
 
-  function removeProperties(element, properties) {
-    if (!isArray$3(properties)) {
-      properties = [ properties ];
-    }
-
-    forEach$1(properties, function(property) {
-      if (element[property]) {
-        delete element[property];
-      }
-    });
-  }
-
   var LOW_PRIORITY$h = 750;
 
 
   function BpmnCopyPaste(bpmnFactory, eventBus, moddleCopy) {
 
-    eventBus.on('copyPaste.copyElement', LOW_PRIORITY$h, function(context) {
-      var descriptor = context.descriptor,
-          element = context.element;
-
-      var businessObject = descriptor.oldBusinessObject = getBusinessObject(element);
-      var di = descriptor.oldDi = getDi(element);
+    function copy(bo, clone) {
+      var targetBo = bpmnFactory.create(bo.$type);
 
-      descriptor.type = element.type;
-
-      copyProperties$1(businessObject, descriptor, 'name');
+      return moddleCopy.copyElement(bo, targetBo, null, clone);
+    }
 
-      copyProperties$1(di, descriptor, 'isExpanded');
+    eventBus.on('copyPaste.copyElement', LOW_PRIORITY$h, function(context) {
+      var descriptor = context.descriptor,
+          element = context.element,
+          businessObject = getBusinessObject(element);
 
-      if (isLabel$3(descriptor)) {
+      // do not copy business object + di for labels;
+      // will be pulled from the referenced label target
+      if (isLabel$3(element)) {
         return descriptor;
       }
 
+      var businessObjectCopy = descriptor.businessObject = copy(businessObject, true);
+      var diCopy = descriptor.di = copy(getDi(element), true);
+      diCopy.bpmnElement = businessObjectCopy;
+
+      copyProperties$1(businessObjectCopy, descriptor, 'name');
+      copyProperties$1(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$1(parent, 'bpmn:Participant') &&
-        is$1(property, 'bpmn:Process')
-      ) {
-        bpmnProcess = bpmnFactory.create('bpmn:Process');
+    var referencesKey = '-bpmn-js-refs';
 
-        // return copy of process
-        return moddleCopy.copyElement(property, bpmnProcess);
-      }
-    });
+    function getReferences(cache) {
+      return (cache[referencesKey] = cache[referencesKey] || {});
+    }
 
-    var references;
+    function setReferences(cache, references) {
+      cache[referencesKey] = references;
+    }
 
-    function resolveReferences(descriptor, cache) {
+    function resolveReferences(descriptor, cache, references) {
       var businessObject = getBusinessObject(descriptor);
 
       // default sequence flows
@@ -35542,7 +35532,7 @@
         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;
 
@@ -35556,18 +35546,13 @@
       }, []));
     }
 
-    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$3(descriptor)) {
         descriptor.businessObject = getBusinessObject(cache[ descriptor.labelTarget ]);
         descriptor.di = getDi(cache[ descriptor.labelTarget ]);
@@ -35575,30 +35560,56 @@
         return;
       }
 
-      newBusinessObject = bpmnFactory.create(oldBusinessObject.$type);
-
-      descriptor.businessObject = moddleCopy.copyElement(
-        oldBusinessObject,
-        newBusinessObject
-      );
-
-      newDi = bpmnFactory.create(oldDi.$type);
-      newDi.bpmnElement = newBusinessObject;
+      businessObject = descriptor.businessObject = copy(businessObject);
 
-      descriptor.di = moddleCopy.copyElement(
-        oldDi,
-        newDi
-      );
-
-      // resolve references e.g. default sequence flow
-      resolveReferences(descriptor, cache);
+      di = descriptor.di = copy(di);
+      di.bpmnElement = businessObject;
 
-      copyProperties$1(descriptor, newBusinessObject, [
+      copyProperties$1(descriptor, businessObject, [
         'isExpanded',
         'name'
       ]);
 
-      removeProperties(descriptor, 'oldBusinessObject');
+      descriptor.type = businessObject.$type;
+    });
+
+    // copy + paste processRef with participant
+
+    eventBus.on('copyPaste.copyElement', LOW_PRIORITY$h, function(context) {
+      var descriptor = context.descriptor,
+          element = context.element;
+
+      if (!is$1(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$h, function(context) {
+      var cache = context.cache,
+          descriptor = context.descriptor;
+
+      // resolve references e.g. default sequence flow
+      setReferences(
+        cache,
+        resolveReferences(descriptor, cache, getReferences(cache))
+      );
     });
 
   }
@@ -35624,7 +35635,8 @@
     'flowElements',
     'lanes',
     'incoming',
-    'outgoing'
+    'outgoing',
+    'categoryValue'
   ];
 
   /**
@@ -35733,10 +35745,11 @@
    * @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$3(propertyNames)) {
@@ -35748,7 +35761,8 @@
     var canCopyProperties = this._eventBus.fire('moddleCopy.canCopyProperties', {
       propertyNames: propertyNames,
       sourceElement: sourceElement,
-      targetElement: targetElement
+      targetElement: targetElement,
+      clone: clone
     });
 
     if (canCopyProperties === false) {
@@ -35767,7 +35781,11 @@
         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,
@@ -35779,9 +35797,9 @@
         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;
@@ -35793,17 +35811,19 @@
    * @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
@@ -35828,7 +35848,7 @@
 
     // copy id
     if (propertyDescriptor.isId) {
-      return this._copyId(property, parent);
+      return property && this._copyId(property, parent, clone);
     }
 
     // copy arrays
@@ -35836,7 +35856,7 @@
       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) {
@@ -35858,7 +35878,7 @@
       copiedProperty.$parent = parent;
 
       // recursion
-      copiedProperty = self.copyElement(property, copiedProperty);
+      copiedProperty = self.copyElement(property, copiedProperty, null, clone);
 
       return copiedProperty;
     }
@@ -35867,7 +35887,11 @@
     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)) {
@@ -39040,7 +39064,9 @@
       this.register('copy', function() {
         var selectedElements = selection.get();
 
-        copyPaste.copy(selectedElements);
+        if (selectedElements.length) {
+          return copyPaste.copy(selectedElements);
+        }
       });
     }
 
@@ -39419,7 +39445,7 @@
     return Math[ fn ](value / quantum) * quantum;
   }
 
-  var LOWER_PRIORITY = 1200;
+  var LOWER_PRIORITY$1 = 1200;
   var LOW_PRIORITY$f = 800;
 
   /**
@@ -39451,7 +39477,7 @@
       'resize.end',
       'shape.move.move',
       'shape.move.end'
-    ], LOWER_PRIORITY, function(event) {
+    ], LOWER_PRIORITY$1, function(event) {
       var originalEvent = event.originalEvent;
 
       if (!self.active || (originalEvent && isCmd(originalEvent))) {
@@ -39919,7 +39945,7 @@
     return newBounds;
   };
 
-  var HIGH_PRIORITY$h = 2000;
+  var HIGH_PRIORITY$f = 2000;
 
   /**
    * Integrates space tool with grid snapping.
@@ -39928,7 +39954,7 @@
     eventBus.on([
       'spaceTool.move',
       'spaceTool.end'
-    ], HIGH_PRIORITY$h, function(event) {
+    ], HIGH_PRIORITY$f, function(event) {
       var context = event.context;
 
       if (!context.initialized) {
@@ -39977,11 +40003,11 @@
     gridSnapping: [ 'type', GridSnapping ]
   };
 
-  var HIGH_PRIORITY$g = 2000;
+  var HIGH_PRIORITY$e = 2000;
 
 
-  function AutoPlaceBehavior(eventBus, gridSnapping) {
-    eventBus.on('autoPlace', HIGH_PRIORITY$g, function(context) {
+  function GridSnappingAutoPlaceBehavior(eventBus, gridSnapping) {
+    eventBus.on('autoPlace', HIGH_PRIORITY$e, function(context) {
       var source = context.source,
           sourceMid = getMid(source),
           shape = context.shape;
@@ -40021,7 +40047,7 @@
     });
   }
 
-  AutoPlaceBehavior.$inject = [
+  GridSnappingAutoPlaceBehavior.$inject = [
     'eventBus',
     'gridSnapping'
   ];
@@ -40035,7 +40061,7 @@
   var HIGHER_PRIORITY$4 = 1750;
 
 
-  function CreateParticipantBehavior$1(canvas, eventBus, gridSnapping) {
+  function GridSnappingParticipantBehavior(canvas, eventBus, gridSnapping) {
     eventBus.on([
       'create.start',
       'shape.move.start'
@@ -40061,19 +40087,19 @@
     });
   }
 
-  CreateParticipantBehavior$1.$inject = [
+  GridSnappingParticipantBehavior.$inject = [
     'canvas',
     'eventBus',
     'gridSnapping'
   ];
 
-  var HIGH_PRIORITY$f = 3000;
+  var HIGH_PRIORITY$d = 3000;
 
 
   /**
    * Snaps connections with Manhattan layout.
    */
-  function LayoutConnectionBehavior$1(eventBus, gridSnapping, modeling) {
+  function GridSnappingLayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
     CommandInterceptor.call(this, eventBus);
 
     this._gridSnapping = gridSnapping;
@@ -40083,7 +40109,7 @@
     this.postExecuted([
       'connection.create',
       'connection.layout'
-    ], HIGH_PRIORITY$f, function(event) {
+    ], HIGH_PRIORITY$d, function(event) {
       var context = event.context,
           connection = context.connection,
           hints = context.hints || {},
@@ -40101,13 +40127,13 @@
     });
   }
 
-  LayoutConnectionBehavior$1.$inject = [
+  GridSnappingLayoutConnectionBehavior.$inject = [
     'eventBus',
     'gridSnapping',
     'modeling'
   ];
 
-  e(LayoutConnectionBehavior$1, CommandInterceptor);
+  e(GridSnappingLayoutConnectionBehavior, CommandInterceptor);
 
   /**
    * Snap middle segments of a given connection.
@@ -40116,7 +40142,7 @@
    *
    * @returns {Array<Point>}
    */
-  LayoutConnectionBehavior$1.prototype.snapMiddleSegments = function(waypoints) {
+  GridSnappingLayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
     var gridSnapping = this._gridSnapping,
         snapped;
 
@@ -40205,12 +40231,12 @@
   var GridSnappingBehaviorModule = {
     __init__: [
       'gridSnappingAutoPlaceBehavior',
-      'gridSnappingCreateParticipantBehavior',
+      'gridSnappingParticipantBehavior',
       'gridSnappingLayoutConnectionBehavior',
     ],
-    gridSnappingAutoPlaceBehavior: [ 'type', AutoPlaceBehavior ],
-    gridSnappingCreateParticipantBehavior: [ 'type', CreateParticipantBehavior$1 ],
-    gridSnappingLayoutConnectionBehavior: [ 'type', LayoutConnectionBehavior$1 ]
+    gridSnappingAutoPlaceBehavior: [ 'type', GridSnappingAutoPlaceBehavior ],
+    gridSnappingParticipantBehavior: [ 'type', GridSnappingParticipantBehavior ],
+    gridSnappingLayoutConnectionBehavior: [ 'type', GridSnappingLayoutConnectionBehavior ]
   };
 
   var GridSnappingModule = {
@@ -41199,30 +41225,7 @@
     resizeHandles: [ 'type', ResizeHandles ]
   };
 
-  /**
-   * Creates a new bpmn:CategoryValue inside a new bpmn:Category
-   *
-   * @param {ModdleElement} definitions
-   * @param {BpmnFactory} bpmnFactory
-   *
-   * @return {ModdleElement} categoryValue.
-   */
-  function createCategoryValue(definitions, bpmnFactory) {
-    var categoryValue = bpmnFactory.create('bpmn:CategoryValue'),
-        category = bpmnFactory.create('bpmn:Category', {
-          categoryValue: [ categoryValue ]
-        });
-
-    // add to correct place
-    add(definitions.get('rootElements'), category);
-    getBusinessObject(category).$parent = definitions;
-    getBusinessObject(categoryValue).$parent = category;
-
-    return categoryValue;
-
-  }
-
-  var HIGH_PRIORITY$e = 2000;
+  var HIGH_PRIORITY$c = 2000;
 
 
   function LabelEditingProvider(
@@ -41260,7 +41263,7 @@
     eventBus.on([
       'shape.remove',
       'connection.remove'
-    ], HIGH_PRIORITY$e, function(event) {
+    ], HIGH_PRIORITY$c, function(event) {
 
       if (directEditing.isActive(event.element)) {
         directEditing.cancel();
@@ -41596,23 +41599,6 @@
       };
     }
 
-    if (is$1(element, 'bpmn:Group')) {
-
-      var businessObject = getBusinessObject(element);
-
-      // initialize categoryValue if not existing
-      if (!businessObject.categoryValueRef) {
-
-        var rootElement = this._canvas.getRootElement(),
-            definitions = getBusinessObject(rootElement).$parent;
-
-        var categoryValue = createCategoryValue(definitions, this._bpmnFactory);
-
-        getBusinessObject(element).categoryValueRef = categoryValue;
-      }
-
-    }
-
     if (isEmptyText$1(newLabel)) {
       newLabel = null;
     }
@@ -42187,13 +42173,10 @@
       isAny(shape, [ 'bpmn:IntermediateThrowEvent', 'bpmn:IntermediateCatchEvent' ]) && !!host;
   }
 
-  var HIGH_PRIORITY$d = 2000;
-
-
   /**
    * BPMN specific boundary event behavior
    */
-  function BoundaryEventBehavior(eventBus, moddle, modeling) {
+  function BoundaryEventBehavior(eventBus, modeling) {
 
     CommandInterceptor.call(this, eventBus);
 
@@ -42238,23 +42221,10 @@
       }
     });
 
-    // copy reference to root element on replace
-    eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY$d, function(context) {
-      var parent = context.parent,
-          property = context.property,
-          propertyName = context.propertyName;
-
-      var propertyDescriptor = moddle.getPropertyDescriptor(parent, propertyName);
-
-      if (propertyDescriptor && propertyDescriptor.isReference && is$1(property, 'bpmn:RootElement')) {
-        parent.set(propertyName, property);
-      }
-    });
   }
 
   BoundaryEventBehavior.$inject = [
     'eventBus',
-    'moddle',
     'modeling'
   ];
 
@@ -42317,7 +42287,7 @@
 
   var PARTICIPANT_BORDER_WIDTH = 30;
 
-  var HIGH_PRIORITY$c = 2000;
+  var HIGH_PRIORITY$b = 2000;
 
 
   /**
@@ -42330,7 +42300,7 @@
     eventBus.on([
       'create.start',
       'shape.move.start'
-    ], HIGH_PRIORITY$c, function(event) {
+    ], HIGH_PRIORITY$b, function(event) {
       var context = event.context,
           shape = context.shape,
           rootElement = canvas.getRootElement();
@@ -42365,7 +42335,7 @@
     });
 
     // force hovering process when creating first participant
-    eventBus.on('create.start', HIGH_PRIORITY$c, function(event) {
+    eventBus.on('create.start', HIGH_PRIORITY$b, function(event) {
       var context = event.context,
           shape = context.shape,
           rootElement = canvas.getRootElement(),
@@ -42377,7 +42347,7 @@
       }
 
       if (is$1(shape, 'bpmn:Participant') && is$1(rootElement, 'bpmn:Process')) {
-        eventBus.on('element.hover', HIGH_PRIORITY$c, ensureHoveringProcess);
+        eventBus.on('element.hover', HIGH_PRIORITY$b, ensureHoveringProcess);
 
         eventBus.once('create.cleanup', function() {
           eventBus.off('element.hover', ensureHoveringProcess);
@@ -42398,7 +42368,7 @@
 
     // 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$c, function(context) {
+    this.preExecute('elements.create', HIGH_PRIORITY$b, function(context) {
       var elements = context.elements,
           parent = context.parent,
           participant = findParticipant(elements),
@@ -43357,7 +43327,7 @@
     return is$1(connection, 'bpmn:SequenceFlow');
   }
 
-  var HIGH_PRIORITY$b = 1500;
+  var HIGH_PRIORITY$a = 1500;
   var HIGHEST_PRIORITY = 2000;
 
 
@@ -43379,7 +43349,7 @@
       'shape.move.move',
       'shape.move.out',
       'shape.move.end'
-    ], HIGH_PRIORITY$b, function(event) {
+    ], HIGH_PRIORITY$a, function(event) {
       var context = event.context,
           shape = context.shape || event.shape,
           hover = event.hover;
@@ -43410,7 +43380,7 @@
       'global-connect.out',
       'global-connect.end',
       'global-connect.cleanup'
-    ], HIGH_PRIORITY$b, function(event) {
+    ], HIGH_PRIORITY$a, function(event) {
       var hover = event.hover;
 
       // ensure connections start/end on bpmn:Participant,
@@ -43424,7 +43394,7 @@
 
     eventBus.on([
       'bendpoint.move.hover'
-    ], HIGH_PRIORITY$b, function(event) {
+    ], HIGH_PRIORITY$a, function(event) {
       var context = event.context,
           hover = event.hover,
           type = context.type;
@@ -43440,7 +43410,7 @@
 
     eventBus.on([
       'connect.start'
-    ], HIGH_PRIORITY$b, function(event) {
+    ], HIGH_PRIORITY$a, function(event) {
       var context = event.context,
           start = context.start;
 
@@ -43469,7 +43439,85 @@
     'canvas'
   ];
 
-  var HIGH_PRIORITY$a = 2000;
+  /**
+   * Creates a new bpmn:CategoryValue inside a new bpmn:Category
+   *
+   * @param {BpmnFactory} bpmnFactory
+   *
+   * @return {ModdleElement} categoryValue.
+   */
+  function createCategory(bpmnFactory) {
+    return bpmnFactory.create('bpmn:Category');
+  }
+
+  /**
+   * Creates a new bpmn:CategoryValue inside a new bpmn:Category
+   *
+   * @param {BpmnFactory} bpmnFactory
+   *
+   * @return {ModdleElement} categoryValue.
+   */
+  function createCategoryValue(bpmnFactory) {
+    return bpmnFactory.create('bpmn:CategoryValue');
+  }
+
+  /**
+   * Adds category value to definitions
+   *
+   * @param {ModdleElement} categoryValue
+   * @param {ModdleElement} category
+   * @param {ModdleElement} definitions
+   *
+   * @return {ModdleElement} categoryValue
+   */
+  function linkCategoryValue(categoryValue, category, definitions) {
+    add(category.get('categoryValue'), categoryValue);
+    categoryValue.$parent = category;
+
+    add(definitions.get('rootElements'), category);
+    category.$parent = definitions;
+
+    return categoryValue;
+  }
+
+  /**
+   * Unlink category value from parent
+   *
+   * @param {ModdleElement} categoryValue
+   *
+   * @return {ModdleElement} categoryValue
+   */
+  function unlinkCategoryValue(categoryValue) {
+    var category = categoryValue.$parent;
+
+    if (category) {
+      remove(category.get('categoryValue'), categoryValue);
+      categoryValue.$parent = null;
+    }
+
+    return categoryValue;
+  }
+
+  /**
+   * Unlink category from parent
+   *
+   * @param {ModdleElement} category
+   * @param {ModdleElement} definitions
+   *
+   * @return {ModdleElement} categoryValue
+   */
+  function unlinkCategory(category) {
+    var definitions = category.$parent;
+
+    if (definitions) {
+      remove(definitions.get('rootElements'), category);
+      category.$parent = null;
+    }
+
+    return category;
+  }
+
+  var LOWER_PRIORITY = 770;
 
 
   /**
@@ -43486,156 +43534,268 @@
     injector.invoke(CommandInterceptor, this);
 
     /**
-     * Removes a referenced category value for a given group shape
+     * Returns all group element in the current registry
      *
-     * @param {djs.model.Shape} shape
+     * @return {Array<djs.model.shape>} a list of group shapes
      */
-    function removeReferencedCategoryValue(shape) {
-
-      var businessObject = getBusinessObject(shape),
-          categoryValue = businessObject.categoryValueRef;
-
-      if (!categoryValue) {
-        return;
-      }
-
-      var category = categoryValue.$parent;
-
-      if (!categoryValue) {
-        return;
-      }
-
-      remove(category.categoryValue, categoryValue);
-
-      // cleanup category if it is empty
-      if (category && !category.categoryValue.length) {
-        removeCategory(category);
-      }
+    function getGroupElements() {
+      return elementRegistry.filter(function(e) {
+        return is$1(e, 'bpmn:Group');
+      });
     }
 
     /**
-     * Removes a given category from the definitions
+     * Returns true if given category is referenced in one of the given elements
      *
-     * @param {ModdleElement} category
+     * @param { djs.model.Element[] } elements
+     * @param { ModdleElement } category
+     *
+     * @return { boolean }
      */
-    function removeCategory(category) {
+    function isReferencedCategory(elements, category) {
+      return elements.some(function(element) {
+        var businessObject = getBusinessObject(element);
 
-      var definitions = bpmnjs.getDefinitions();
+        var _category = businessObject.categoryValueRef && businessObject.categoryValueRef.$parent;
 
-      remove(definitions.get('rootElements'), category);
+        return _category === category;
+      });
     }
 
     /**
-     * Returns all group element in the current registry
+     * Returns true if given categoryValue is referenced in one of the given elements
      *
-     * @return {Array<djs.model.shape>} a list of group shapes
+     * @param { djs.model.Element[] } elements
+     * @param { ModdleElement } categoryValue
+     *
+     * @return { boolean }
      */
-    function getGroupElements() {
-      return elementRegistry.filter(function(e) {
-        return is$1(e, 'bpmn:Group');
+    function isReferencedCategoryValue(elements, categoryValue) {
+      return elements.some(function(element) {
+        var businessObject = getBusinessObject(element);
+
+        return businessObject.categoryValueRef === categoryValue;
       });
     }
 
     /**
-     * Returns true if given categoryValue is referenced in one of the given elements
+     * Remove category value unless it is still referenced
      *
-     * @param {Array<djs.model.shape>} elements
      * @param {ModdleElement} categoryValue
-     * @return {boolean}
+     * @param {ModdleElement} category
+     * @param {ModdleElement} businessObject
      */
-    function isReferenced(elements, categoryValue) {
-      return elements.some(function(e) {
+    function removeCategoryValue(categoryValue, category, businessObject) {
 
-        var businessObject = getBusinessObject(e);
-
-        return businessObject.categoryValueRef
-          && businessObject.categoryValueRef === categoryValue;
+      var groups = getGroupElements().filter(function(element) {
+        return element.businessObject !== businessObject;
       });
+
+      if (category && !isReferencedCategory(groups, category)) {
+        unlinkCategory(category);
+      }
+
+      if (categoryValue && !isReferencedCategoryValue(groups, categoryValue)) {
+        unlinkCategoryValue(categoryValue);
+      }
     }
 
     /**
-     * remove referenced category + value when group was deleted
+     * Add category value
+     *
+     * @param {ModdleElement} categoryValue
+     * @param {ModdleElement} category
      */
-    this.executed('shape.delete', function(event) {
+    function addCategoryValue(categoryValue, category) {
+      return linkCategoryValue(categoryValue, category, bpmnjs.getDefinitions());
+    }
 
-      var context = event.context,
-          shape = context.shape;
+    function setCategoryValue(element, context) {
+      var businessObject = getBusinessObject(element),
+          categoryValue = businessObject.categoryValueRef;
 
-      if (is$1(shape, 'bpmn:Group')) {
+      if (!categoryValue) {
+        categoryValue =
+        businessObject.categoryValueRef =
+        context.categoryValue = (
+          context.categoryValue || createCategoryValue(bpmnFactory)
+        );
+      }
 
-        var businessObject = getBusinessObject(shape),
-            categoryValueRef = businessObject.categoryValueRef,
-            groupElements = getGroupElements();
+      var category = categoryValue.$parent;
 
-        if (!isReferenced(groupElements, categoryValueRef)) {
-          removeReferencedCategoryValue(shape);
-        }
+      if (!category) {
+        category =
+        categoryValue.$parent =
+        context.category = (
+          context.category || createCategory(bpmnFactory)
+        );
       }
-    });
 
-    /**
-     * re-attach removed category
-     */
-    this.reverted('shape.delete', function(event) {
+      addCategoryValue(categoryValue, category, bpmnjs.getDefinitions());
+    }
+
+    function unsetCategoryValue(element, context) {
+      var category = context.category,
+          categoryValue = context.categoryValue,
+          businessObject = getBusinessObject(element);
+
+      if (categoryValue) {
+        businessObject.categoryValueRef = null;
+
+        removeCategoryValue(categoryValue, category, businessObject);
+      } else {
+        removeCategoryValue(null, businessObject.categoryValueRef.$parent, businessObject);
+      }
+    }
+
+
+    // ensure category + value exist before label editing
 
+    this.execute('label.create', function(event) {
       var context = event.context,
-          shape = context.shape;
+          labelTarget = context.labelTarget;
+
+      if (!is$1(labelTarget, 'bpmn:Group')) {
+        return;
+      }
 
-      if (is$1(shape, 'bpmn:Group')) {
+      setCategoryValue(labelTarget, context);
+    });
 
-        var businessObject = getBusinessObject(shape),
-            categoryValueRef = businessObject.categoryValueRef,
-            definitions = bpmnjs.getDefinitions(),
-            category = categoryValueRef ? categoryValueRef.$parent : null;
+    this.revert('label.create', function(event) {
+      var context = event.context,
+          labelTarget = context.labelTarget;
 
-        add(category.get('categoryValue'), categoryValueRef);
-        add(definitions.get('rootElements'), category);
+      if (!is$1(labelTarget, 'bpmn:Group')) {
+        return;
       }
+
+      unsetCategoryValue(labelTarget, context);
     });
 
-    /**
-     * create new category + value when group was created
-     */
-    this.execute('shape.create', function(event) {
+
+    // remove referenced category + value when group was deleted
+
+    this.execute('shape.delete', function(event) {
+
       var context = event.context,
           shape = context.shape,
           businessObject = getBusinessObject(shape);
 
-      if (is$1(businessObject, 'bpmn:Group') && !businessObject.categoryValueRef) {
+      if (!is$1(shape, 'bpmn:Group') || shape.labelTarget) {
+        return;
+      }
+
+      var categoryValue = context.categoryValue = businessObject.categoryValueRef,
+          category;
+
+      if (categoryValue) {
+        category = context.category = categoryValue.$parent;
+
+        removeCategoryValue(categoryValue, category, businessObject);
+
+        businessObject.categoryValueRef = null;
+      }
+    });
+
+    this.reverted('shape.delete', function(event) {
 
-        var definitions = bpmnjs.getDefinitions(),
-            categoryValue = createCategoryValue(definitions, bpmnFactory);
+      var context = event.context,
+          shape = context.shape;
 
-        // link the reference to the Group
+      if (!is$1(shape, 'bpmn:Group') || shape.labelTarget) {
+        return;
+      }
+
+      var category = context.category,
+          categoryValue = context.categoryValue,
+          businessObject = getBusinessObject(shape);
+
+      if (categoryValue) {
         businessObject.categoryValueRef = categoryValue;
+
+        addCategoryValue(categoryValue, category);
       }
     });
 
 
-    this.revert('shape.create', function(event) {
+    // create new category + value when group was created
 
+    this.execute('shape.create', function(event) {
       var context = event.context,
           shape = context.shape;
 
-      if (is$1(shape, 'bpmn:Group')) {
-        removeReferencedCategoryValue(shape);
+      if (!is$1(shape, 'bpmn:Group') || shape.labelTarget) {
+        return;
+      }
+
+      if (getBusinessObject(shape).categoryValueRef) {
+        setCategoryValue(shape, context);
+      }
+    });
 
-        delete getBusinessObject(shape).categoryValueRef;
+    this.reverted('shape.create', function(event) {
 
+      var context = event.context,
+          shape = context.shape;
+
+      if (!is$1(shape, 'bpmn:Group') || shape.labelTarget) {
+        return;
+      }
+
+      if (getBusinessObject(shape).categoryValueRef) {
+        unsetCategoryValue(shape, context);
+      }
+    });
+
+
+    // copy + paste categoryValueRef with group
+
+    function copy(bo, clone) {
+      var targetBo = bpmnFactory.create(bo.$type);
+
+      return moddleCopy.copyElement(bo, targetBo, null, clone);
+    }
+
+    eventBus.on('copyPaste.copyElement', LOWER_PRIORITY, function(context) {
+      var descriptor = context.descriptor,
+          element = context.element;
+
+      if (!is$1(element, 'bpmn:Group') || element.labelTarget) {
+        return;
+      }
+
+      var groupBo = getBusinessObject(element);
+
+      if (groupBo.categoryValueRef) {
+
+        var categoryValue = groupBo.categoryValueRef;
+
+        descriptor.categoryValue = copy(categoryValue, true);
+
+        if (categoryValue.$parent) {
+          descriptor.category = copy(categoryValue.$parent, true);
+        }
       }
     });
 
-    // copy bpmn:CategoryValue when copying element
-    eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY$a, function(context) {
-      var property = context.property,
-          categoryValue;
+    eventBus.on('copyPaste.pasteElement', LOWER_PRIORITY, function(context) {
+      var descriptor = context.descriptor,
+          businessObject = descriptor.businessObject,
+          categoryValue = descriptor.categoryValue,
+          category = descriptor.category;
 
-      if (is$1(property, 'bpmn:CategoryValue')) {
-        categoryValue = createCategoryValue(bpmnjs.getDefinitions(), bpmnFactory);
+      if (categoryValue) {
+        categoryValue = businessObject.categoryValueRef = copy(categoryValue);
+      }
 
-        // return copy of category
-        return moddleCopy.copyElement(property, categoryValue);
+      if (category) {
+        categoryValue.$parent = copy(category);
       }
+
+      delete descriptor.category;
+      delete descriptor.categoryValue;
     });
 
   }
@@ -45526,6 +45686,8 @@
 
   var HIGH_PRIORITY$9 = 1500;
 
+  var GROUP_MIN_DIMENSIONS = { width: 140, height: 120 };
+
   var LANE_MIN_DIMENSIONS = { width: 300, height: 60 };
 
   var PARTICIPANT_MIN_DIMENSIONS = { width: 300, height: 150 };
@@ -45842,7 +46004,7 @@
       var descriptor = context.descriptor,
           element = context.element;
 
-      if (!canHaveRootElementReference(element)) {
+      if (element.labelTarget || !canHaveRootElementReference(element)) {
         return;
       }
 
@@ -45850,19 +46012,16 @@
           rootElement = getRootElement(businessObject);
 
       if (rootElement) {
+
+        // TODO(nikku): clone on copy
         descriptor.referencedRootElement = rootElement;
       }
     });
 
     eventBus.on('copyPaste.pasteElement', LOW_PRIORITY$a, function(context) {
       var descriptor = context.descriptor,
-          businessObject = descriptor.businessObject;
-
-      if (!canHaveRootElementReference(businessObject)) {
-        return;
-      }
-
-      var referencedRootElement = descriptor.referencedRootElement;
+          businessObject = descriptor.businessObject,
+          referencedRootElement = descriptor.referencedRootElement;
 
       if (!referencedRootElement) {
         return;
@@ -45876,6 +46035,8 @@
       }
 
       setRootElement(businessObject, referencedRootElement);
+
+      delete descriptor.referencedRootElement;
     });
   }
 
@@ -45934,6 +46095,10 @@
         if (is$1(shape, 'bpmn:TextAnnotation')) {
           minDimensions[ id ] = TEXT_ANNOTATION_MIN_DIMENSIONS;
         }
+
+        if (is$1(shape, 'bpmn:Group')) {
+          minDimensions[ id ] = GROUP_MIN_DIMENSIONS;
+        }
       });
 
       return minDimensions;
@@ -51645,7 +51810,7 @@
     var size,
         translate = this._translate;
 
-    attrs = attrs || {};
+    attrs = assign({}, attrs || {});
 
     var businessObject = attrs.businessObject,
         di = attrs.di;
@@ -51662,6 +51827,7 @@
 
     if (!isModdleDi(di)) {
       var diAttrs = assign(
+        {},
         di || {},
         { id: businessObject.id + '_di' }
       );
@@ -51682,7 +51848,7 @@
       }, attrs);
     }
 
-    applyAttributes(businessObject, attrs, [
+    attrs = applyAttributes(businessObject, attrs, [
       'processRef',
       'isInterrupting',
       'associationDirection',
@@ -51690,7 +51856,7 @@
     ]);
 
     if (attrs.isExpanded) {
-      applyAttribute(di, attrs, 'isExpanded');
+      attrs = applyAttribute(di, attrs, 'isExpanded');
     }
 
     if (is$1(businessObject, 'bpmn:SubProcess')) {
@@ -51823,14 +51989,16 @@
    * @param {Base} element
    * @param {Object} attrs (in/out map of attributes)
    * @param {Array<string>} attributeNames name of attributes to apply
+   *
+   * @return {Object} changed attrs
    */
   function applyAttributes(element, attrs, attributeNames) {
 
     forEach$1(attributeNames, function(property) {
-      if (attrs[property] !== undefined) {
-        applyAttribute(element, attrs, property);
-      }
+      attrs = applyAttribute(element, attrs, property);
     });
+
+    return attrs;
   }
 
   /**
@@ -51840,11 +52008,17 @@
    * @param {Base} element
    * @param {Object} attrs (in/out map of attributes)
    * @param {string} attributeName to apply
+   *
+   * @return {Object} changed attrs
    */
   function applyAttribute(element, attrs, attributeName) {
+    if (attrs[attributeName] === undefined) {
+      return attrs;
+    }
+
     element[attributeName] = attrs[attributeName];
 
-    delete attrs[attributeName];
+    return omit(attrs, [ attributeName ]);
   }
 
 
@@ -54223,6 +54397,9 @@
       throw new Error('<moddleElement> required');
     }
 
+    // TODO(nikku): we need to ensure that ID properties
+    // are properly registered / unregistered via
+    // this._moddle.ids.assigned(id)
     var changed = context.changed || this.getVisualReferences(moddleElement).concat(element);
     var oldProperties = context.oldProperties || getModdleProperties(moddleElement, keys(properties));