bpmn-js 9.3.2 → 10.0.0-alpha.1

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/grid-snapping/behavior/{AutoPlaceBehavior.js → GridSnappingAutoPlaceBehavior.js}

@@ -6,7 +6,7 @@ import { is } from '../../../util/ModelUtil';
 var HIGH_PRIORITY = 2000;
 
 
-export default function AutoPlaceBehavior(eventBus, gridSnapping) {
+export default function GridSnappingAutoPlaceBehavior(eventBus, gridSnapping) {
   eventBus.on('autoPlace', HIGH_PRIORITY, function(context) {
     var source = context.source,
         sourceMid = getMid(source),
@@ -47,7 +47,7 @@ export default function AutoPlaceBehavior(eventBus, gridSnapping) {
   });
 }
 
-AutoPlaceBehavior.$inject = [
+GridSnappingAutoPlaceBehavior.$inject = [
   'eventBus',
   'gridSnapping'
 ];

package/lib/features/grid-snapping/behavior/{LayoutConnectionBehavior.js → GridSnappingLayoutConnectionBehavior.js}

@@ -14,7 +14,7 @@ var HIGH_PRIORITY = 3000;
 /**
  * Snaps connections with Manhattan layout.
  */
-export default function LayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
+export default function GridSnappingLayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
   CommandInterceptor.call(this, eventBus);
 
   this._gridSnapping = gridSnapping;
@@ -42,13 +42,13 @@ export default function LayoutConnectionBehavior(eventBus, gridSnapping, modelin
   });
 }
 
-LayoutConnectionBehavior.$inject = [
+GridSnappingLayoutConnectionBehavior.$inject = [
   'eventBus',
   'gridSnapping',
   'modeling'
 ];
 
-inherits(LayoutConnectionBehavior, CommandInterceptor);
+inherits(GridSnappingLayoutConnectionBehavior, CommandInterceptor);
 
 /**
  * Snap middle segments of a given connection.
@@ -57,7 +57,7 @@ inherits(LayoutConnectionBehavior, CommandInterceptor);
  *
  * @returns {Array<Point>}
  */
-LayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
+GridSnappingLayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
   var gridSnapping = this._gridSnapping,
       snapped;
 

package/lib/features/grid-snapping/behavior/{CreateParticipantBehavior.js → GridSnappingParticipantBehavior.js}

@@ -3,7 +3,7 @@ import { is } from '../../../util/ModelUtil';
 var HIGHER_PRIORITY = 1750;
 
 
-export default function CreateParticipantBehavior(canvas, eventBus, gridSnapping) {
+export default function GridSnappingParticipantBehavior(canvas, eventBus, gridSnapping) {
   eventBus.on([
     'create.start',
     'shape.move.start'
@@ -29,7 +29,7 @@ export default function CreateParticipantBehavior(canvas, eventBus, gridSnapping
   });
 }
 
-CreateParticipantBehavior.$inject = [
+GridSnappingParticipantBehavior.$inject = [
   'canvas',
   'eventBus',
   'gridSnapping'

package/lib/features/grid-snapping/behavior/index.js

@@ -1,14 +1,14 @@
-import AutoPlaceBehavior from './AutoPlaceBehavior';
-import CreateParticipantBehavior from './CreateParticipantBehavior';
-import LayoutConnectionBehavior from './LayoutConnectionBehavior';
+import GridSnappingAutoPlaceBehavior from './GridSnappingAutoPlaceBehavior';
+import GridSnappingParticipantBehavior from './GridSnappingParticipantBehavior';
+import GridSnappingLayoutConnectionBehavior from './GridSnappingLayoutConnectionBehavior';
 
 export default {
   __init__: [
     'gridSnappingAutoPlaceBehavior',
-    'gridSnappingCreateParticipantBehavior',
+    'gridSnappingParticipantBehavior',
     'gridSnappingLayoutConnectionBehavior',
   ],
-  gridSnappingAutoPlaceBehavior: [ 'type', AutoPlaceBehavior ],
-  gridSnappingCreateParticipantBehavior: [ 'type', CreateParticipantBehavior ],
-  gridSnappingLayoutConnectionBehavior: [ 'type', LayoutConnectionBehavior ]
+  gridSnappingAutoPlaceBehavior: [ 'type', GridSnappingAutoPlaceBehavior ],
+  gridSnappingParticipantBehavior: [ 'type', GridSnappingParticipantBehavior ],
+  gridSnappingLayoutConnectionBehavior: [ 'type', GridSnappingLayoutConnectionBehavior ]
 };

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

@@ -7,14 +7,9 @@ import {
 } from './LabelUtil';
 
 import {
-  getBusinessObject,
   is
 } from '../../util/ModelUtil';
 
-import {
-  createCategoryValue
-} from '../modeling/behavior/util/CategoryUtil';
-
 import { isAny } from '../modeling/util/ModelingUtil';
 import { isExpanded } from '../../util/DiUtil';
 
@@ -399,23 +394,6 @@ LabelEditingProvider.prototype.update = function(
     };
   }
 
-  if (is(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(newLabel)) {
     newLabel = null;
   }

package/lib/features/modeling/ElementFactory.js

@@ -1,7 +1,8 @@
 import {
   assign,
   forEach,
-  isObject
+  isObject,
+  omit
 } from 'min-dash';
 
 import inherits from 'inherits-browser';
@@ -69,7 +70,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
   var size,
       translate = this._translate;
 
-  attrs = attrs || {};
+  attrs = assign({}, attrs || {});
 
   var businessObject = attrs.businessObject,
       di = attrs.di;
@@ -86,6 +87,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
 
   if (!isModdleDi(di)) {
     var diAttrs = assign(
+      {},
       di || {},
       { id: businessObject.id + '_di' }
     );
@@ -106,7 +108,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
     }, attrs);
   }
 
-  applyAttributes(businessObject, attrs, [
+  attrs = applyAttributes(businessObject, attrs, [
     'processRef',
     'isInterrupting',
     'associationDirection',
@@ -114,7 +116,7 @@ ElementFactory.prototype.createBpmnElement = function(elementType, attrs) {
   ]);
 
   if (attrs.isExpanded) {
-    applyAttribute(di, attrs, 'isExpanded');
+    attrs = applyAttribute(di, attrs, 'isExpanded');
   }
 
   if (is(businessObject, 'bpmn:SubProcess')) {
@@ -247,14 +249,16 @@ ElementFactory.prototype.createParticipantShape = function(attrs) {
  * @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(attributeNames, function(property) {
-    if (attrs[property] !== undefined) {
-      applyAttribute(element, attrs, property);
-    }
+    attrs = applyAttribute(element, attrs, property);
   });
+
+  return attrs;
 }
 
 /**
@@ -264,11 +268,17 @@ function applyAttributes(element, attrs, attributeNames) {
  * @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 ]);
 }
 
 

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

@@ -9,13 +9,11 @@ import {
   forEach
 } from 'min-dash';
 
-var HIGH_PRIORITY = 2000;
-
 
 /**
  * BPMN specific boundary event behavior
  */
-export default function BoundaryEventBehavior(eventBus, moddle, modeling) {
+export default function BoundaryEventBehavior(eventBus, modeling) {
 
   CommandInterceptor.call(this, eventBus);
 
@@ -60,23 +58,10 @@ export default function BoundaryEventBehavior(eventBus, moddle, modeling) {
     }
   });
 
-  // copy reference to root element on replace
-  eventBus.on('moddleCopy.canCopyProperty', HIGH_PRIORITY, function(context) {
-    var parent = context.parent,
-        property = context.property,
-        propertyName = context.propertyName;
-
-    var propertyDescriptor = moddle.getPropertyDescriptor(parent, propertyName);
-
-    if (propertyDescriptor && propertyDescriptor.isReference && is(property, 'bpmn:RootElement')) {
-      parent.set(propertyName, property);
-    }
-  });
 }
 
 BoundaryEventBehavior.$inject = [
   'eventBus',
-  'moddle',
   'modeling'
 ];