bpmn-js 18.22.0 → 18.23.0

package/lib/BaseViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseViewer.d.ts","mappings":";;;;;;;;;qBA8IAA;;;;EAAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsDW,MAAM,gBACN,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;iCAuGzB,aAAa,gBACb,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,uBAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;wBA2BjC,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;oBA4DpB,cAAc,GAEb,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;aAuEtB,OAAO,CAAC,aAAa,CAAC;;;;;;;EA0Db,cAFT,iBAAiB,EAAE;;;;;;;;;;;;;;;;;;;;EA+FV;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;EAUA,YAHV,OAAM,EAAC,MAAM,EAAE;;;;;;;EAYL,qBAFV,WAAW;;;;;;;EAiCD,kBAFT,aAAa;;;;;;;EAWJ;;;cAnoBR,KAEC,OAAO,8BAA8B,EAAE,OAAO,CAAC,CAAC;2BAIjD,KAEA,OAAO,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;yBAI9D,OAAO,MAAM,EAAE;cAEf,OAAO,eAAe,EAAE;qBACxB,OAAO,eAAe,EAAE;uBACxB,OAAO,eAAe,EAAE;;gCAEvB;IACT,KAAK,CAAC,EAAE,OAAM,EAAC,MAAM;IACrB,MAAM,CAAC,EAAE,OAAM,EAAC,MAAM;IACtB,QAAQ,CAAC,EAAE,MAAM;IACjB,SAAS,CAAC,EAAE,OAAM,EAAC,WAAW;IAC9B,gBAAgB,CAAC,EAAE,gBAAgB;IACnC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE;EACzC,EAAI,MAAM,CAAC,MAAM,EAAE,GAAG;;iCAEZ,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;;+BAE5B;IACb,CAAK,GAAG,EAAE,MAAM,GAAG,eAAe;CAChC;;8BAEW;IACT,QAAQ,EAAE,MAAM,EAAE;CACpB;;6BAEU,gBAAc,EAAI,KAAK;sCAEvB,eAAe;qCAEf,cAAc;yBAEd,eAAe;wBAEf,cAAc;;6BAEb;IACT,MAAM,CAAC,EAAE,OAAO;IAChB,QAAQ,CAAC,EAAE,OAAO;CACpB;;4BAEW;IACT,GAAG,CAAC,EAAE,MAAM;IACZ,KAAK,CAAC,EAAE,KAAK;CACf;;4BAEW;IACT,GAAG,EAAE,MAAM;CACb;;oCAEW;IACT,GAAG,EAAE,MAAM;CACb;;uCAEW;IACT,KAAK,CAAC,EAAE,cAAc;IACtB,WAAW,CAAC,EAAE,aAAa;IAC3B,YAAY,CAAC,EAAE,kBAAkB;IACjC,UAAU,CAAC,EAAE,aAAa,EAAE;IAC5B,QAAQ,EAAE,MAAM,EAAE;CACpB;;8BAEW;IACT,KAAK,CAAC,EAAE,cAAc;IACtB,QAAQ,EAAE,MAAM,EAAE;CACpB;;gCAEW;IACT,WAAW,EAAE,aAAa;CAC5B;;+BAEU,aAAa;;+BAEZ;IACT,KAAK,CAAC,EAAE,KAAK;IACb,GAAG,EAAE,MAAM;CACb;;qBAIU,IAAG,IAEF,KAAG,QAAU;IAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;EAAE,EAAI,IAAI,KAAI;;oBAvGjD,YAAY","names":["BaseViewer class","BaseViewer constructor"],"ignoreList":[],"sources":["BaseViewer.js"]}
+{"version":3,"file":"BaseViewer.d.ts","mappings":";;;;;;;;;qBAgKAA;;;;EAAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsDW,MAAM,gBACN,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;iCAuGzB,aAAa,gBACb,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,uBAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;wBA2BjC,cAAa,EAAC,MAAM,GAEnB,OAAO,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;oBA4DpB,cAAc,GAEb,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;aAuEtB,OAAO,CAAC,aAAa,CAAC;;;;;;;EA0Eb,cAFT,iBAAiB,EAAE;;;;;;;;;;;;;;;;;;;;EA+FV;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;;;;;;;;;;;;EAAA;;;;;;;;EAUA,YAHV,OAAM,EAAC,MAAM,EAAE;;;;;;;EAYL,qBAFV,WAAW;;;;;;;EAiCD,kBAFT,aAAa;;;;;;;EAWJ;;;cAnpBR,KAEC,OAAO,8BAA8B,EAAE,OAAO,CAAC,CAAC;2BAIjD,KAEA,OAAO,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;yBAI9D,OAAO,MAAM,EAAE;cAEf,OAAO,eAAe,EAAE;qBACxB,OAAO,eAAe,EAAE;uBACxB,OAAO,eAAe,EAAE;;gCAEvB;IACT,KAAK,CAAC,EAAE,OAAM,EAAC,MAAM;IACrB,MAAM,CAAC,EAAE,OAAM,EAAC,MAAM;IACtB,QAAQ,CAAC,EAAE,MAAM;IACjB,SAAS,CAAC,EAAE,OAAM,EAAC,WAAW;IAC9B,gBAAgB,CAAC,EAAE,gBAAgB;IACnC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE;EACzC,EAAI,MAAM,CAAC,MAAM,EAAE,GAAG;;iCAEZ,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;;+BAE5B;IACb,CAAK,GAAG,EAAE,MAAM,GAAG,eAAe;CAChC;;8BAEW;IACT,QAAQ,EAAE,MAAM,EAAE;CACpB;;6BAEU,gBAAc,EAAI,KAAK;sCAEvB,eAAe;qCAEf,cAAc;yBAEd,eAAe;wBAEf,cAAc;;6BAEb;IACT,MAAM,CAAC,EAAE,OAAO;IAChB,QAAQ,CAAC,EAAE,OAAO;CACpB;;4BAEW;IACT,GAAG,CAAC,EAAE,MAAM;IACZ,KAAK,CAAC,EAAE,KAAK;CACf;;4BAEW;IACT,GAAG,EAAE,MAAM;CACb;;oCAEW;IACT,GAAG,EAAE,MAAM;CACb;;uCAEW;IACT,KAAK,CAAC,EAAE,cAAc;IACtB,WAAW,CAAC,EAAE,aAAa;IAC3B,YAAY,CAAC,EAAE,kBAAkB;IACjC,UAAU,CAAC,EAAE,aAAa,EAAE;IAC5B,QAAQ,EAAE,MAAM,EAAE;CACpB;;8BAEW;IACT,KAAK,CAAC,EAAE,cAAc;IACtB,QAAQ,EAAE,MAAM,EAAE;CACpB;;gCAEW;IACT,WAAW,EAAE,aAAa;CAC5B;;+BAEU,aAAa;;+BAEZ;IACT,KAAK,CAAC,EAAE,KAAK;IACb,GAAG,EAAE,MAAM;CACb;;qBAIU,IAAG,IAEF,KAAG,QAAU;IAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;EAAE,EAAI,IAAI,KAAI;;oBAxHjD,YAAY","names":["BaseViewer class","BaseViewer constructor"],"ignoreList":[],"sources":["BaseViewer.js"]}

package/lib/BaseViewer.js

@@ -14,6 +14,7 @@ import {
 import {
   domify,
   assignStyle,
+  classes as domClasses,
   query as domQuery,
   remove as domRemove
 } from 'min-dom';
@@ -31,6 +32,23 @@ import {
   importBpmnDiagram
 } from './import/Importer';
 
+/**
+ * Padding added around the diagram bounds on SVG export.
+ *
+ * `getBBox` returns the geometry bounds only, excluding element strokes, so
+ * without padding strokes at the diagram edges get clipped. Historically this
+ * padding was provided implicitly by element outlines, which diagram-js now
+ * creates lazily (diagram-js@15.19, bpmn-io/diagram-js#1064).
+ */
+const EXPORT_PADDING = 5;
+
+/**
+ * Class set on the canvas container to hide element outlines, which diagram-js
+ * excludes from rendering while present. Applied when measuring the export
+ * bounds so lazily created outlines do not skew them.
+ */
+const OUTLINE_HIDDEN_CLS = 'djs-outline-hidden';
+
 /**
  * @template T
  *
@@ -481,15 +499,31 @@ BaseViewer.prototype.saveSVG = async function saveSVG() {
     const contents = innerSVG(contentNode),
           defs = defsNode ? '<defs>' + innerSVG(defsNode) + '</defs>' : '';
 
-    const bbox = contentNode.getBBox();
+    // hide outlines so they do not skew the measured bounds
+    const container = canvas.getContainer();
+
+    domClasses(container).add(OUTLINE_HIDDEN_CLS);
+
+    let bbox;
+
+    try {
+      bbox = contentNode.getBBox();
+    } finally {
+      domClasses(container).remove(OUTLINE_HIDDEN_CLS);
+    }
+
+    const x = bbox.x - EXPORT_PADDING,
+          y = bbox.y - EXPORT_PADDING,
+          width = bbox.width + EXPORT_PADDING * 2,
+          height = bbox.height + EXPORT_PADDING * 2;
 
     svg =
       '<?xml version="1.0" encoding="utf-8"?>\n' +
       '<!-- created with bpmn-js / http://bpmn.io -->\n' +
       '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n' +
       '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ' +
-      'width="' + bbox.width + '" height="' + bbox.height + '" ' +
-      'viewBox="' + bbox.x + ' ' + bbox.y + ' ' + bbox.width + ' ' + bbox.height + '" version="1.1">' +
+      'width="' + width + '" height="' + height + '" ' +
+      'viewBox="' + x + ' ' + y + ' ' + width + ' ' + height + '" version="1.1">' +
       defs + contents +
       '</svg>';
   } catch (e) {

package/lib/features/modeling/Modeling.d.ts

@@ -102,6 +102,14 @@ export default class Modeling<T extends Connection = import("../../model/Types")
    */
   updateLaneRefs(flowNodeShapes: Shape[], laneShapes: Shape[]): void;
 
+  /**
+   * Update the referenced category values of each flow element.
+   *
+   * @param affectedFlowElements The flow elements to update.
+   * @param affectedGroupEntries The groups to update.
+   */
+  updateCategoryValueRefs(affectedFlowElements: Element[], affectedGroupEntries: GroupEntry[]): void;
+
   /**
    * Claim an ID.
    *
@@ -146,5 +154,10 @@ export type UpdateLabelHints = {
     removeShape?: boolean;
 };
 
+export type GroupEntry = {
+    categoryValue?: ModdleElement;
+    groupShape: Shape;
+};
+
 import BaseModeling from 'diagram-js/lib/features/modeling/Modeling';
 //# sourceMappingURL=Modeling.d.ts.map

package/lib/features/modeling/Modeling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Modeling.d.ts","mappings":";;;;;;qBAyDAA;;;;;;;EAAAC;;EAsBmB;;;;;;;;;;EAyBA,qBALR,OAAO,YACP,MAAM,cACN,IAAI,UACJ,gBAAgB;;;;;;;;;;EAmBR,gBAPR,OAAO,UACP,OAAO,UACP,OAAO,CAAC,UAAU,CAAC,UACnB,aAAa,GAEZ,CAAC;;;;;;;;;EAwBM,gCAJR,OAAO,iBACP,aAAa;;;;;;;;EAiBL,0BAHR,OAAO;;;;;;;;;EAiBC,sBAJR,KAAK,aACL,IAAI,aACJ,OAAO;;;;;;;;;;EAkBC,yBALR,KAAK,YACL,MAAM,GAEL,KAAK;;;;;;;;;EAoBE,sBAJR,KAAK,SACL,MAAM;;;;;;;EAeE,qBAFP,IAAI;;;;;;;EAsBG,eAFP,IAAI;;;;;;;;EAuBG,+BAHR,KAAK,EAAE,cACP,KAAK,EAAE;;;;;;;;EAgBC,YAHR,MAAM,iBACN,aAAa;;;;;;;;EAgBL,cAHR,MAAM,iBACN,aAAa;;;;;;;;EAeL,mBAHR,OAAO,EAAE,UACT,MAAM;;;iBAxRJ,OAAO,oBAAoB,EAAE;oBAC7B,OAAO,qCAAqC,EAAE;sBAC9C,OAAO,kBAAkB,EAAE;gBAC3B,OAAO,8BAA8B,EAAE;qBAEvC,OAAO,2CAA2C,EAAE;kBAEpD,OAAO,mBAAmB,EAAE;eAC5B,OAAO,mBAAmB,EAAE;aAC5B,OAAO,mBAAmB,EAAE;cAC5B,OAAO,mBAAmB,EAAE;YAC5B,OAAO,mBAAmB,EAAE;aAC5B,OAAO,mBAAmB,EAAE;qBAC5B,OAAO,mBAAmB,EAAE;YAE5B,OAAO,2BAA2B,EAAE;cAEpC,OAAO,kBAAkB,EAAE;;+BAE1B;IACT,WAAW,CAAC,EAAE,OAAO;CACvB;;yBApCsB,2CAA2C","names":["Modeling class","Modeling constructor"],"ignoreList":[],"sources":["Modeling.js"]}
+{"version":3,"file":"Modeling.d.ts","mappings":";;;;;;qBA+DAA;;;;;;;EAAAC;;EAsBmB;;;;;;;;;;EA0BA,qBALR,OAAO,YACP,MAAM,cACN,IAAI,UACJ,gBAAgB;;;;;;;;;;EAmBR,gBAPR,OAAO,UACP,OAAO,UACP,OAAO,CAAC,UAAU,CAAC,UACnB,aAAa,GAEZ,CAAC;;;;;;;;;EAwBM,gCAJR,OAAO,iBACP,aAAa;;;;;;;;EAiBL,0BAHR,OAAO;;;;;;;;;EAiBC,sBAJR,KAAK,aACL,IAAI,aACJ,OAAO;;;;;;;;;;EAkBC,yBALR,KAAK,YACL,MAAM,GAEL,KAAK;;;;;;;;;EAoBE,sBAJR,KAAK,SACL,MAAM;;;;;;;EAeE,qBAFP,IAAI;;;;;;;EAsBG,eAFP,IAAI;;;;;;;;EAuBG,+BAHR,KAAK,EAAE,cACP,KAAK,EAAE;;;;;;;;EAgBC,8CAHR,OAAO,EAAE,wBACT,UAAU,EAAE;;;;;;;;EAgBJ,YAHR,MAAM,iBACN,aAAa;;;;;;;;EAgBL,cAHR,MAAM,iBACN,aAAa;;;;;;;;EAeL,mBAHR,OAAO,EAAE,UACT,MAAM;;;iBA5SJ,OAAO,oBAAoB,EAAE;oBAC7B,OAAO,qCAAqC,EAAE;sBAC9C,OAAO,kBAAkB,EAAE;gBAC3B,OAAO,8BAA8B,EAAE;qBAEvC,OAAO,2CAA2C,EAAE;kBAEpD,OAAO,mBAAmB,EAAE;eAC5B,OAAO,mBAAmB,EAAE;aAC5B,OAAO,mBAAmB,EAAE;cAC5B,OAAO,mBAAmB,EAAE;YAC5B,OAAO,mBAAmB,EAAE;aAC5B,OAAO,mBAAmB,EAAE;qBAC5B,OAAO,mBAAmB,EAAE;YAE5B,OAAO,2BAA2B,EAAE;cAEpC,OAAO,kBAAkB,EAAE;;+BAE1B;IACT,WAAW,CAAC,EAAE,OAAO;CACvB;;yBAEW;IACT,aAAa,CAAC,EAAE,aAAa;IAC7B,UAAU,EAAE,KAAK;CACnB;;yBA1CsB,2CAA2C","names":["Modeling class","Modeling constructor"],"ignoreList":[],"sources":["Modeling.js"]}

package/lib/features/modeling/Modeling.js

@@ -9,6 +9,7 @@ import AddLaneHandler from './cmd/AddLaneHandler';
 import SplitLaneHandler from './cmd/SplitLaneHandler';
 import ResizeLaneHandler from './cmd/ResizeLaneHandler';
 import UpdateFlowNodeRefsHandler from './cmd/UpdateFlowNodeRefsHandler';
+import UpdateCategoryValueRefsHandler from './cmd/UpdateCategoryValueRefsHandler';
 import IdClaimHandler from './cmd/IdClaimHandler';
 import SetColorHandler from './cmd/SetColorHandler';
 
@@ -37,6 +38,11 @@ import UpdateLabelHandler from '../label-editing/cmd/UpdateLabelHandler';
  * @typedef { {
  *   removeShape?: boolean;
  * } } UpdateLabelHints
+ *
+ * @typedef { {
+ *   categoryValue?: ModdleElement;
+ *   groupShape: Shape;
+ * } } GroupEntry
  */
 
 /**
@@ -87,6 +93,7 @@ Modeling.prototype.getHandlers = function() {
   handlers['lane.resize'] = ResizeLaneHandler;
   handlers['lane.split'] = SplitLaneHandler;
   handlers['lane.updateRefs'] = UpdateFlowNodeRefsHandler;
+  handlers['group.updateRefs'] = UpdateCategoryValueRefsHandler;
   handlers['id.updateClaim'] = IdClaimHandler;
   handlers['element.setColor'] = SetColorHandler;
   handlers['element.updateLabel'] = UpdateLabelHandler;
@@ -264,6 +271,20 @@ Modeling.prototype.updateLaneRefs = function(flowNodeShapes, laneShapes) {
   });
 };
 
+/**
+ * Update the referenced category values of each flow element.
+ *
+ * @param {Element[]} affectedFlowElements The flow elements to update.
+ * @param {GroupEntry[]} affectedGroupEntries The groups to update.
+ */
+Modeling.prototype.updateCategoryValueRefs = function(affectedFlowElements, affectedGroupEntries) {
+
+  this._commandStack.execute('group.updateRefs', {
+    affectedFlowElements: affectedFlowElements,
+    affectedGroupEntries: affectedGroupEntries
+  });
+};
+
 /**
  * Claim an ID.
  *

package/lib/features/modeling/behavior/CategoryRootElementReferenceBehavior.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Maintains a group's category (value) inside definitions#rootElements.
+ *
+ */
+export default class CategoryRootElementReferenceBehavior extends CommandInterceptor {
+    /**
+     * @param bpmnjs
+     * @param elementRegistry
+     * @param injector
+     */
+    constructor(bpmnjs: Modeler, elementRegistry: ElementRegistry, injector: Injector);
+}
+
+type Modeler = import("../../../Modeler").default;
+type ElementRegistry = import("diagram-js/lib/core/ElementRegistry").default;
+type Injector = import("didi").Injector;
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+//# sourceMappingURL=CategoryRootElementReferenceBehavior.d.ts.map

package/lib/features/modeling/behavior/CategoryRootElementReferenceBehavior.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CategoryRootElementReferenceBehavior.d.ts","mappings":";;;;qBA8BAA;;;;;;IAAAC;;;eAZa,OAAO,kBAAkB,EAAE;uBAC3B,OAAO,qCAAqC,EAAE;gBAC9C,OAAO,MAAM,EAAE;;+BAlBG,2CAA2C","names":["CategoryRootElementReferenceBehavior class","CategoryRootElementReferenceBehavior constructor"],"ignoreList":[],"sources":["CategoryRootElementReferenceBehavior.js"]}

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

@@ -0,0 +1,157 @@
+import inherits from 'inherits-browser';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+import {
+  getBusinessObject,
+  is
+} from '../../../util/ModelUtil';
+
+import {
+  linkCategoryValue,
+  unlinkCategory,
+  unlinkCategoryValue
+} from './util/CategoryUtil';
+
+var LOW_PRIORITY = 500;
+
+/**
+ * @typedef {import('../../../Modeler').default} Modeler
+ * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
+ * @typedef {import('didi').Injector} Injector
+ */
+
+/**
+ * Maintains a group's category (value) inside definitions#rootElements.
+ *
+ * @param {Modeler} bpmnjs
+ * @param {ElementRegistry} elementRegistry
+ * @param {Injector} injector
+ */
+export default function CategoryRootElementReferenceBehavior(
+    bpmnjs, elementRegistry, injector
+) {
+  injector.invoke(CommandInterceptor, this);
+
+  function getGroupBusinessObjects(ignoredBusinessObject) {
+    return elementRegistry.filter(function(element) {
+      return is(element, 'bpmn:Group') && !element.labelTarget;
+    }).map(getBusinessObject).filter(function(businessObject) {
+      return businessObject !== ignoredBusinessObject;
+    });
+  }
+
+  function isCategoryValueReferenced(categoryValue, ignoredBusinessObject) {
+    return getGroupBusinessObjects(ignoredBusinessObject).some(function(businessObject) {
+      return businessObject.get('categoryValueRef') === categoryValue;
+    });
+  }
+
+  function isCategoryReferenced(category, ignoredBusinessObject) {
+    return getGroupBusinessObjects(ignoredBusinessObject).some(function(businessObject) {
+      var categoryValue = businessObject.get('categoryValueRef');
+
+      return categoryValue && categoryValue.$parent === category;
+    });
+  }
+
+  function link(categoryValue, category) {
+    if (categoryValue && category) {
+      linkCategoryValue(categoryValue, category, bpmnjs.getDefinitions());
+    }
+  }
+
+  function unlink(categoryValue, category, ignoredBusinessObject) {
+    if (category && !isCategoryReferenced(category, ignoredBusinessObject)) {
+      unlinkCategory(category);
+    }
+
+    if (categoryValue && !isCategoryValueReferenced(categoryValue, ignoredBusinessObject)) {
+      unlinkCategoryValue(categoryValue);
+    }
+  }
+
+
+  this.executed([ 'shape.create', 'label.create' ], function(context) {
+    var shape = context.labelTarget || context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
+      return;
+    }
+
+    link(context.categoryValue, context.category);
+  }, true);
+
+  this.reverted([ 'shape.create', 'label.create' ], function(context) {
+    var shape = context.labelTarget || context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
+      return;
+    }
+
+    unlink(context.categoryValue, context.category, getBusinessObject(shape));
+  }, true);
+
+  this.executed([ 'shape.move', 'shape.resize' ], LOW_PRIORITY, function(context) {
+    link(context.categoryValue, context.category);
+  }, true);
+
+  this.reverted([ 'shape.move', 'shape.resize' ], function(context) {
+    var shape = context.shape;
+
+    if (context.categoryValue) {
+      unlink(context.categoryValue, context.category, getBusinessObject(shape));
+    }
+  }, true);
+
+  this.executed('group.updateRefs', function(context) {
+    getGroupUpdates(context).forEach(function(update) {
+      link(update.categoryValue, update.category);
+    });
+  }, true);
+
+  this.reverted('group.updateRefs', function(context) {
+    getGroupUpdates(context).forEach(function(update) {
+      unlink(
+        update.categoryValue,
+        update.category,
+        getBusinessObject(update.groupShape)
+      );
+    });
+  }, true);
+
+  this.executed('shape.delete', function(context) {
+    var shape = context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
+      return;
+    }
+
+    unlink(context.categoryValue, context.category, getBusinessObject(shape));
+  }, true);
+
+  this.reverted('shape.delete', function(context) {
+    var shape = context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
+      return;
+    }
+
+    link(context.categoryValue, context.category);
+  }, true);
+}
+
+CategoryRootElementReferenceBehavior.$inject = [
+  'bpmnjs',
+  'elementRegistry',
+  'injector'
+];
+
+inherits(CategoryRootElementReferenceBehavior, CommandInterceptor);
+
+
+// helpers //////////
+
+function getGroupUpdates(context) {
+  return context.updates?.groups || [];
+}

package/lib/features/modeling/behavior/GroupBehavior.d.ts

@@ -5,24 +5,18 @@
 export default class GroupBehavior extends CommandInterceptor {
     /**
      * @param bpmnFactory
-     * @param bpmnjs
-     * @param elementRegistry
      * @param eventBus
      * @param injector
      * @param moddleCopy
      */
-    constructor(bpmnFactory: BpmnFactory, bpmnjs: Modeler, elementRegistry: ElementRegistry, eventBus: EventBus, injector: Injector, moddleCopy: ModdleCopy);
+    constructor(bpmnFactory: BpmnFactory, eventBus: EventBus, injector: Injector, moddleCopy: ModdleCopy);
 }
 
 type BpmnFactory = import("../BpmnFactory").default;
-type Modeler = import("../../../Modeler").default;
-type ElementRegistry = import("diagram-js/lib/core/ElementRegistry").default;
 type EventBus = import("diagram-js/lib/core/EventBus").default;
+type ElementRegistry = import("diagram-js/lib/core/ElementRegistry").default;
 type Injector = import("didi").Injector;
 type ModdleCopy = import("../../copy-paste/ModdleCopy").default;
-type Element = import("../../../model/Types").Element;
-type Shape = import("../../../model/Types").Shape;
-type DirectionTRBL = import("diagram-js/lib/util/Types").DirectionTRBL;
 
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 //# sourceMappingURL=GroupBehavior.d.ts.map

package/lib/features/modeling/behavior/GroupBehavior.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupBehavior.d.ts","mappings":";;;;AA4CAA;;;;;;;;;IAAAC;;;mBA1Ba,OAAO,gBAAgB,EAAE;eACzB,OAAO,kBAAkB,EAAE;uBAC3B,OAAO,qCAAqC,EAAE;gBAC9C,OAAO,8BAA8B,EAAE;gBACvC,OAAO,MAAM,EAAE;kBACf,OAAO,6BAA6B,EAAE;eAEtC,OAAO,sBAAsB,EAAE;aAC/B,OAAO,sBAAsB,EAAE;qBAE/B,OAAO,2BAA2B,EAAE;;+BA1BlB,2CAA2C","names":["GroupBehavior class","GroupBehavior constructor"],"ignoreList":[],"sources":["GroupBehavior.js"]}
+{"version":3,"file":"GroupBehavior.d.ts","mappings":";;;;AAiCAA;;;;;;;IAAAC;;;mBAlBa,OAAO,gBAAgB,EAAE;gBACzB,OAAO,8BAA8B,EAAE;uBACvC,OAAO,qCAAqC,EAAE;gBAC9C,OAAO,MAAM,EAAE;kBACf,OAAO,6BAA6B,EAAE;;+BAjBpB,2CAA2C","names":["GroupBehavior class","GroupBehavior constructor"],"ignoreList":[],"sources":["GroupBehavior.js"]}

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

@@ -8,25 +8,16 @@ import {
 } from '../../../util/ModelUtil';
 
 import {
-  createCategory,
-  createCategoryValue,
-  linkCategoryValue,
-  unlinkCategory,
-  unlinkCategoryValue
+  getOrCreateCategoryValueForGroup,
+  createCategory
 } from './util/CategoryUtil';
 
 /**
  * @typedef {import('../BpmnFactory').default} BpmnFactory
- * @typedef {import('../../../Modeler').default} Modeler
- * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
  * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
  * @typedef {import('didi').Injector} Injector
  * @typedef {import('../../copy-paste/ModdleCopy').default} ModdleCopy
- *
- * @typedef {import('../../../model/Types').Element} Element
- * @typedef {import('../../../model/Types').Shape} Shape
- *
- * @typedef {import('diagram-js/lib/util/Types').DirectionTRBL} DirectionTRBL
  */
 
 var LOWER_PRIORITY = 770;
@@ -36,137 +27,45 @@ var LOWER_PRIORITY = 770;
  * BPMN specific group behavior.
  *
  * @param {BpmnFactory} bpmnFactory
- * @param {Modeler} bpmnjs
- * @param {ElementRegistry} elementRegistry
  * @param {EventBus} eventBus
  * @param {Injector} injector
  * @param {ModdleCopy} moddleCopy
  */
 export default function GroupBehavior(
     bpmnFactory,
-    bpmnjs,
-    elementRegistry,
     eventBus,
     injector,
     moddleCopy
 ) {
   injector.invoke(CommandInterceptor, this);
 
-  /**
-   * Returns all group element in the current registry.
-   *
-   * @return {Shape[]}
-   */
-  function getGroupElements() {
-    return elementRegistry.filter(function(e) {
-      return is(e, 'bpmn:Group');
-    });
-  }
-
-  /**
-   * Returns true if given category is referenced in one of the given elements.
-   *
-   * @param {Element[]} elements
-   * @param {ModdleElement} category
-   *
-   * @return {boolean}
-   */
-  function isReferencedCategory(elements, category) {
-    return elements.some(function(element) {
-      var businessObject = getBusinessObject(element);
-
-      var _category = businessObject.categoryValueRef && businessObject.categoryValueRef.$parent;
-
-      return _category === category;
-    });
-  }
-
-  /**
-   * Returns true if given categoryValue is referenced in one of the given elements.
-   *
-   * @param {Element[]} elements
-   * @param {ModdleElement} categoryValue
-   *
-   * @return {boolean}
-   */
-  function isReferencedCategoryValue(elements, categoryValue) {
-    return elements.some(function(element) {
-      var businessObject = getBusinessObject(element);
-
-      return businessObject.categoryValueRef === categoryValue;
-    });
-  }
-
-  /**
-   * Remove category value unless it is still referenced.
-   *
-   * @param {ModdleElement} categoryValue
-   * @param {ModdleElement} category
-   * @param {ModdleElement} businessObject
-   */
-  function removeCategoryValue(categoryValue, category, businessObject) {
-
-    var groups = getGroupElements().filter(function(element) {
-      return element.businessObject !== businessObject;
-    });
-
-    if (category && !isReferencedCategory(groups, category)) {
-      unlinkCategory(category);
-    }
-
-    if (categoryValue && !isReferencedCategoryValue(groups, categoryValue)) {
-      unlinkCategoryValue(categoryValue);
-    }
-  }
-
-  /**
-   * Add category value.
-   *
-   * @param {ModdleElement} categoryValue
-   * @param {ModdleElement} category
-   *
-   * @return {ModdleElement}
-   */
-  function addCategoryValue(categoryValue, category) {
-    return linkCategoryValue(categoryValue, category, bpmnjs.getDefinitions());
-  }
-
   function setCategoryValue(element, context) {
     var businessObject = getBusinessObject(element),
-        categoryValue = businessObject.categoryValueRef;
+        categoryValue = context.categoryValue || businessObject.categoryValueRef;
 
     if (!categoryValue) {
-      categoryValue =
-      businessObject.categoryValueRef =
-      context.categoryValue = (
-        context.categoryValue || createCategoryValue(bpmnFactory)
-      );
+      categoryValue = getOrCreateCategoryValueForGroup(bpmnFactory, businessObject);
     }
 
-    var category = categoryValue.$parent;
+    var category = context.category || categoryValue.$parent || createCategory(bpmnFactory);
 
-    if (!category) {
-      category =
-      categoryValue.$parent =
-      context.category = (
-        context.category || createCategory(bpmnFactory)
-      );
-    }
+    businessObject.categoryValueRef = categoryValue;
+    categoryValue.$parent = category;
 
-    addCategoryValue(categoryValue, category, bpmnjs.getDefinitions());
+    context.categoryValue = categoryValue;
+    context.category = category;
   }
 
   function unsetCategoryValue(element, context) {
-    var category = context.category,
-        categoryValue = context.categoryValue,
-        businessObject = getBusinessObject(element);
+    var businessObject = getBusinessObject(element),
+        categoryValue = context.categoryValue || businessObject.categoryValueRef,
+        category = context.category || (categoryValue && categoryValue.$parent);
 
     if (categoryValue) {
-      businessObject.categoryValueRef = null;
+      context.categoryValue = categoryValue;
+      context.category = category;
 
-      removeCategoryValue(categoryValue, category, businessObject);
-    } else {
-      removeCategoryValue(null, businessObject.categoryValueRef.$parent, businessObject);
+      businessObject.categoryValueRef = null;
     }
   }
 
@@ -208,14 +107,10 @@ export default function GroupBehavior(
       return;
     }
 
-    var categoryValue = context.categoryValue = businessObject.categoryValueRef,
-        category;
+    var categoryValue = context.categoryValue = businessObject.categoryValueRef;
 
     if (categoryValue) {
-      category = context.category = categoryValue.$parent;
-
-      removeCategoryValue(categoryValue, category, businessObject);
-
+      context.category = categoryValue.$parent;
       businessObject.categoryValueRef = null;
     }
   });
@@ -235,39 +130,77 @@ export default function GroupBehavior(
 
     if (categoryValue) {
       businessObject.categoryValueRef = categoryValue;
-
-      addCategoryValue(categoryValue, category);
+      categoryValue.$parent = category;
     }
   });
 
 
-  // create new category + value when group was created
+  // create new category + value when group was created so that visually
+  // enclosed elements can be categorized against it, even if it is unlabeled
 
   this.execute('shape.create', function(event) {
     var context = event.context,
-        shape = context.shape;
+        shape = context.shape,
+        hints = context.hints || {};
 
     if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
       return;
     }
 
-    if (getBusinessObject(shape).categoryValueRef) {
-      setCategoryValue(shape, context);
+    // during paste the category value (if any) is carried over from the
+    // source; only fabricate one for genuinely new groups
+    if (hints.createElementsBehavior === false &&
+        !getBusinessObject(shape).categoryValueRef &&
+        !context.categoryValue) {
+      return;
     }
+
+    setCategoryValue(shape, context);
   });
 
   this.reverted('shape.create', function(event) {
 
     var context = event.context,
-        shape = context.shape;
+        shape = context.shape,
+        hints = context.hints || {};
 
     if (!is(shape, 'bpmn:Group') || shape.labelTarget) {
       return;
     }
 
-    if (getBusinessObject(shape).categoryValueRef) {
-      unsetCategoryValue(shape, context);
+    if (hints.createElementsBehavior === false &&
+        !getBusinessObject(shape).categoryValueRef &&
+        !context.categoryValue) {
+      return;
+    }
+
+    unsetCategoryValue(shape, context);
+  });
+
+
+  // add category -> categoryValue for groups when they change
+
+  this.executed([ 'shape.move', 'shape.resize' ], function(event) {
+    var context = event.context,
+        shape = context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget ||
+        getBusinessObject(shape).categoryValueRef) {
+      return;
+    }
+
+    setCategoryValue(shape, context);
+  });
+
+  this.reverted([ 'shape.move', 'shape.resize' ], function(event) {
+    var context = event.context,
+        shape = context.shape;
+
+    if (!is(shape, 'bpmn:Group') || shape.labelTarget || !context.categoryValue) {
+      return;
     }
+
+    unsetCategoryValue(shape, context);
   });
 
 
@@ -323,8 +256,6 @@ export default function GroupBehavior(
 
 GroupBehavior.$inject = [
   'bpmnFactory',
-  'bpmnjs',
-  'elementRegistry',
   'eventBus',
   'injector',
   'moddleCopy'