bpmn-js 17.7.0 → 17.7.1

package/lib/features/drilldown/SubprocessCompatibility.js

@@ -1,268 +1,266 @@
-
-import { asBounds, asTRBL } from 'diagram-js/lib/layout/LayoutUtil';
-import { is, isAny } from '../../util/ModelUtil';
-
-/**
- * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- * @typedef {import('../../model/Types').Moddle} Moddle
- *
- * @typedef {import('../../model/Types').Element} Element
- * @typedef {import('../../model/Types').Shape} Shape
- *
- * @typedef {import('diagram-js/lib/core/Canvas').CanvasPlane} CanvasPlane
- *
- * @typedef {import('diagram-js/lib/util/Types').Rect} Rect
- */
-
-var DEFAULT_POSITION = {
-  x: 180,
-  y: 160
-};
-
-/**
- * Hook into `import.render.start` and create new planes for diagrams with
- * collapsed subprocesses and all DI elements on the same plane.
- *
- * @param {EventBus} eventBus
- * @param {Moddle} moddle
- */
-export default function SubprocessCompatibility(eventBus, moddle) {
-  this._eventBus = eventBus;
-  this._moddle = moddle;
-
-  var self = this;
-
-  eventBus.on('import.render.start', 1500, function(e, context) {
-    self._handleImport(context.definitions);
-  });
-}
-
-/**
- * @param {ModdleElement} definitions
- */
-SubprocessCompatibility.prototype._handleImport = function(definitions) {
-  if (!definitions.diagrams) {
-    return;
-  }
-
-  var self = this;
-  this._definitions = definitions;
-  this._processToDiagramMap = {};
-
-  definitions.diagrams.forEach(function(diagram) {
-    if (!diagram.plane || !diagram.plane.bpmnElement) {
-      return;
-    }
-
-    self._processToDiagramMap[diagram.plane.bpmnElement.id] = diagram;
-  });
-
-  var newDiagrams = [];
-  definitions.diagrams.forEach(function(diagram) {
-    var createdDiagrams = self._createNewDiagrams(diagram.plane);
-    Array.prototype.push.apply(newDiagrams, createdDiagrams);
-  });
-
-  newDiagrams.forEach(function(diagram) {
-    self._movePlaneElementsToOrigin(diagram.plane);
-  });
-};
-
-
-/**
- * Moves all DI elements from collapsed subprocesses to a new plane.
- *
- * @param {CanvasPlane} plane
- *
- * @return {ModdleElement[]} new diagrams created for the collapsed subprocesses
- */
-SubprocessCompatibility.prototype._createNewDiagrams = function(plane) {
-  var self = this;
-
-  var collapsedElements = [];
-  var elementsToMove = [];
-
-  plane.get('planeElement').forEach(function(diElement) {
-    var businessObject = diElement.bpmnElement;
-
-    if (!businessObject) {
-      return;
-    }
-
-    var parent = businessObject.$parent;
-
-    if (is(businessObject, 'bpmn:SubProcess') && !diElement.isExpanded) {
-      collapsedElements.push(businessObject);
-    }
-
-    if (shouldMoveToPlane(businessObject, plane)) {
-
-      // don't change the array while we iterate over it
-      elementsToMove.push({ diElement: diElement, parent: parent });
-    }
-  });
-
-  var newDiagrams = [];
-
-  // create new planes for all collapsed subprocesses, even when they are empty
-  collapsedElements.forEach(function(element) {
-    if (!self._processToDiagramMap[ element.id ]) {
-      var diagram = self._createDiagram(element);
-
-      self._processToDiagramMap[element.id] = diagram;
-
-      newDiagrams.push(diagram);
-    }
-  });
-
-  elementsToMove.forEach(function(element) {
-    var diElement = element.diElement;
-    var parent = element.parent;
-
-    // parent is expanded, get nearest collapsed parent
-    while (parent && collapsedElements.indexOf(parent) === -1) {
-      parent = parent.$parent;
-    }
-
-    // false positive, all parents are expanded
-    if (!parent) {
-      return;
-    }
-
-    var diagram = self._processToDiagramMap[ parent.id ];
-
-    self._moveToDiPlane(diElement, diagram.plane);
-  });
-
-  return newDiagrams;
-};
-
-/**
- * @param {CanvasPlane} plane
- */
-SubprocessCompatibility.prototype._movePlaneElementsToOrigin = function(plane) {
-  var elements = plane.get('planeElement');
-
-  // get bounding box of all elements
-  var planeBounds = getPlaneBounds(plane);
-
-  var offset = {
-    x: planeBounds.x - DEFAULT_POSITION.x,
-    y: planeBounds.y - DEFAULT_POSITION.y
-  };
-
-  elements.forEach(function(diElement) {
-    if (diElement.waypoint) {
-      diElement.waypoint.forEach(function(waypoint) {
-        waypoint.x = waypoint.x - offset.x;
-        waypoint.y = waypoint.y - offset.y;
-      });
-    } else if (diElement.bounds) {
-      diElement.bounds.x = diElement.bounds.x - offset.x;
-      diElement.bounds.y = diElement.bounds.y - offset.y;
-    }
-  });
-};
-
-/**
- * @param {ModdleElement} diElement
- * @param {CanvasPlane} newPlane
- */
-SubprocessCompatibility.prototype._moveToDiPlane = function(diElement, newPlane) {
-  var containingDiagram = findRootDiagram(diElement);
-
-  // remove DI from old Plane and add it to the new one
-  var parentPlaneElement = containingDiagram.plane.get('planeElement');
-
-  parentPlaneElement.splice(parentPlaneElement.indexOf(diElement), 1);
-
-  newPlane.get('planeElement').push(diElement);
-};
-
-/**
- * @param {ModdleElement} businessObject
- *
- * @return {ModdleElement}
- */
-SubprocessCompatibility.prototype._createDiagram = function(businessObject) {
-  var plane = this._moddle.create('bpmndi:BPMNPlane', {
-    bpmnElement: businessObject
-  });
-
-  var diagram = this._moddle.create('bpmndi:BPMNDiagram', {
-    plane: plane
-  });
-
-  plane.$parent = diagram;
-
-  plane.bpmnElement = businessObject;
-
-  diagram.$parent = this._definitions;
-
-  this._definitions.diagrams.push(diagram);
-
-  return diagram;
-};
-
-SubprocessCompatibility.$inject = [ 'eventBus', 'moddle' ];
-
-
-// helpers //////////
-
-function findRootDiagram(element) {
-  if (is(element, 'bpmndi:BPMNDiagram')) {
-    return element;
-  } else {
-    return findRootDiagram(element.$parent);
-  }
-}
-
-/**
- * @param {CanvasPlane} plane
- *
- * @return {Rect}
- */
-function getPlaneBounds(plane) {
-  var planeTrbl = {
-    top: Infinity,
-    right: -Infinity,
-    bottom: -Infinity,
-    left: Infinity
-  };
-
-  plane.planeElement.forEach(function(element) {
-    if (!element.bounds) {
-      return;
-    }
-
-    var trbl = asTRBL(element.bounds);
-
-    planeTrbl.top = Math.min(trbl.top, planeTrbl.top);
-    planeTrbl.left = Math.min(trbl.left, planeTrbl.left);
-  });
-
-  return asBounds(planeTrbl);
-}
-
-/**
- * @param {ModdleElement} businessObject
- * @param {CanvasPlane} plane
- *
- * @return {boolean}
- */
-function shouldMoveToPlane(businessObject, plane) {
-  var parent = businessObject.$parent;
-
-  // don't move elements that are already on the plane
-  if (!is(parent, 'bpmn:SubProcess') || parent === plane.bpmnElement) {
-    return false;
-  }
-
-  // dataAssociations are children of the subprocess but rendered on process level
-  // cf. https://github.com/bpmn-io/bpmn-js/issues/1619
-  if (isAny(businessObject, [ 'bpmn:DataInputAssociation', 'bpmn:DataOutputAssociation' ])) {
-    return false;
-  }
-
-  return true;
-}
+
+import { asBounds, asTRBL } from 'diagram-js/lib/layout/LayoutUtil';
+import { is, isAny } from '../../util/ModelUtil';
+
+/**
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ * @typedef {import('../../model/Types').Moddle} Moddle
+ *
+ * @typedef {import('../../model/Types').Element} Element
+ * @typedef {import('../../model/Types').Shape} Shape
+ *
+ * @typedef {import('diagram-js/lib/core/Canvas').CanvasPlane} CanvasPlane
+ *
+ * @typedef {import('diagram-js/lib/util/Types').Rect} Rect
+ */
+
+var DEFAULT_POSITION = {
+  x: 180,
+  y: 160
+};
+
+/**
+ * Hook into `import.render.start` and create new planes for diagrams with
+ * collapsed subprocesses and all DI elements on the same plane.
+ *
+ * @param {EventBus} eventBus
+ * @param {Moddle} moddle
+ */
+export default function SubprocessCompatibility(eventBus, moddle) {
+  this._eventBus = eventBus;
+  this._moddle = moddle;
+
+  var self = this;
+
+  eventBus.on('import.render.start', 1500, function(e, context) {
+    self._handleImport(context.definitions);
+  });
+}
+
+/**
+ * @param {ModdleElement} definitions
+ */
+SubprocessCompatibility.prototype._handleImport = function(definitions) {
+  if (!definitions.diagrams) {
+    return;
+  }
+
+  var self = this;
+  this._definitions = definitions;
+  this._processToDiagramMap = {};
+
+  definitions.diagrams.forEach(function(diagram) {
+    if (!diagram.plane || !diagram.plane.bpmnElement) {
+      return;
+    }
+
+    self._processToDiagramMap[diagram.plane.bpmnElement.id] = diagram;
+  });
+
+  var newDiagrams = definitions.diagrams
+    .filter(diagram => diagram.plane)
+    .flatMap(diagram => self._createNewDiagrams(diagram.plane));
+
+  newDiagrams.forEach(function(diagram) {
+    self._movePlaneElementsToOrigin(diagram.plane);
+  });
+};
+
+
+/**
+ * Moves all DI elements from collapsed subprocesses to a new plane.
+ *
+ * @param {CanvasPlane} plane
+ *
+ * @return {ModdleElement[]} new diagrams created for the collapsed subprocesses
+ */
+SubprocessCompatibility.prototype._createNewDiagrams = function(plane) {
+  var self = this;
+
+  var collapsedElements = [];
+  var elementsToMove = [];
+
+  plane.get('planeElement').forEach(function(diElement) {
+    var businessObject = diElement.bpmnElement;
+
+    if (!businessObject) {
+      return;
+    }
+
+    var parent = businessObject.$parent;
+
+    if (is(businessObject, 'bpmn:SubProcess') && !diElement.isExpanded) {
+      collapsedElements.push(businessObject);
+    }
+
+    if (shouldMoveToPlane(businessObject, plane)) {
+
+      // don't change the array while we iterate over it
+      elementsToMove.push({ diElement: diElement, parent: parent });
+    }
+  });
+
+  var newDiagrams = [];
+
+  // create new planes for all collapsed subprocesses, even when they are empty
+  collapsedElements.forEach(function(element) {
+    if (!self._processToDiagramMap[ element.id ]) {
+      var diagram = self._createDiagram(element);
+
+      self._processToDiagramMap[element.id] = diagram;
+
+      newDiagrams.push(diagram);
+    }
+  });
+
+  elementsToMove.forEach(function(element) {
+    var diElement = element.diElement;
+    var parent = element.parent;
+
+    // parent is expanded, get nearest collapsed parent
+    while (parent && collapsedElements.indexOf(parent) === -1) {
+      parent = parent.$parent;
+    }
+
+    // false positive, all parents are expanded
+    if (!parent) {
+      return;
+    }
+
+    var diagram = self._processToDiagramMap[ parent.id ];
+
+    self._moveToDiPlane(diElement, diagram.plane);
+  });
+
+  return newDiagrams;
+};
+
+/**
+ * @param {CanvasPlane} plane
+ */
+SubprocessCompatibility.prototype._movePlaneElementsToOrigin = function(plane) {
+  var elements = plane.get('planeElement');
+
+  // get bounding box of all elements
+  var planeBounds = getPlaneBounds(plane);
+
+  var offset = {
+    x: planeBounds.x - DEFAULT_POSITION.x,
+    y: planeBounds.y - DEFAULT_POSITION.y
+  };
+
+  elements.forEach(function(diElement) {
+    if (diElement.waypoint) {
+      diElement.waypoint.forEach(function(waypoint) {
+        waypoint.x = waypoint.x - offset.x;
+        waypoint.y = waypoint.y - offset.y;
+      });
+    } else if (diElement.bounds) {
+      diElement.bounds.x = diElement.bounds.x - offset.x;
+      diElement.bounds.y = diElement.bounds.y - offset.y;
+    }
+  });
+};
+
+/**
+ * @param {ModdleElement} diElement
+ * @param {CanvasPlane} newPlane
+ */
+SubprocessCompatibility.prototype._moveToDiPlane = function(diElement, newPlane) {
+  var containingDiagram = findRootDiagram(diElement);
+
+  // remove DI from old Plane and add it to the new one
+  var parentPlaneElement = containingDiagram.plane.get('planeElement');
+
+  parentPlaneElement.splice(parentPlaneElement.indexOf(diElement), 1);
+
+  newPlane.get('planeElement').push(diElement);
+};
+
+/**
+ * @param {ModdleElement} businessObject
+ *
+ * @return {ModdleElement}
+ */
+SubprocessCompatibility.prototype._createDiagram = function(businessObject) {
+  var plane = this._moddle.create('bpmndi:BPMNPlane', {
+    bpmnElement: businessObject
+  });
+
+  var diagram = this._moddle.create('bpmndi:BPMNDiagram', {
+    plane: plane
+  });
+
+  plane.$parent = diagram;
+
+  plane.bpmnElement = businessObject;
+
+  diagram.$parent = this._definitions;
+
+  this._definitions.diagrams.push(diagram);
+
+  return diagram;
+};
+
+SubprocessCompatibility.$inject = [ 'eventBus', 'moddle' ];
+
+
+// helpers //////////
+
+function findRootDiagram(element) {
+  if (is(element, 'bpmndi:BPMNDiagram')) {
+    return element;
+  } else {
+    return findRootDiagram(element.$parent);
+  }
+}
+
+/**
+ * @param {CanvasPlane} plane
+ *
+ * @return {Rect}
+ */
+function getPlaneBounds(plane) {
+  var planeTrbl = {
+    top: Infinity,
+    right: -Infinity,
+    bottom: -Infinity,
+    left: Infinity
+  };
+
+  plane.planeElement.forEach(function(element) {
+    if (!element.bounds) {
+      return;
+    }
+
+    var trbl = asTRBL(element.bounds);
+
+    planeTrbl.top = Math.min(trbl.top, planeTrbl.top);
+    planeTrbl.left = Math.min(trbl.left, planeTrbl.left);
+  });
+
+  return asBounds(planeTrbl);
+}
+
+/**
+ * @param {ModdleElement} businessObject
+ * @param {CanvasPlane} plane
+ *
+ * @return {boolean}
+ */
+function shouldMoveToPlane(businessObject, plane) {
+  var parent = businessObject.$parent;
+
+  // don't move elements that are already on the plane
+  if (!is(parent, 'bpmn:SubProcess') || parent === plane.bpmnElement) {
+    return false;
+  }
+
+  // dataAssociations are children of the subprocess but rendered on process level
+  // cf. https://github.com/bpmn-io/bpmn-js/issues/1619
+  if (isAny(businessObject, [ 'bpmn:DataInputAssociation', 'bpmn:DataOutputAssociation' ])) {
+    return false;
+  }
+
+  return true;
+}

package/lib/features/drilldown/index.d.ts

@@ -1,13 +1,13 @@
-declare namespace _default {
-    const __depends__: import("didi").ModuleDeclaration[];
-    const __init__: string[];
-    const drilldownBreadcrumbs: (string | typeof DrilldownBreadcrumbs)[];
-    const drilldownCentering: (string | typeof DrilldownCentering)[];
-    const drilldownOverlayBehavior: (string | typeof DrilldownOverlayBehavior)[];
-    const subprocessCompatibility: (string | typeof SubprocessCompatibility)[];
-}
-export default _default;
-import DrilldownBreadcrumbs from './DrilldownBreadcrumbs';
-import DrilldownCentering from './DrilldownCentering';
-import DrilldownOverlayBehavior from './DrilldownOverlayBehavior';
-import SubprocessCompatibility from './SubprocessCompatibility';
+declare namespace _default {
+    const __depends__: import("didi").ModuleDeclaration[];
+    const __init__: string[];
+    const drilldownBreadcrumbs: (string | typeof DrilldownBreadcrumbs)[];
+    const drilldownCentering: (string | typeof DrilldownCentering)[];
+    const drilldownOverlayBehavior: (string | typeof DrilldownOverlayBehavior)[];
+    const subprocessCompatibility: (string | typeof SubprocessCompatibility)[];
+}
+export default _default;
+import DrilldownBreadcrumbs from './DrilldownBreadcrumbs';
+import DrilldownCentering from './DrilldownCentering';
+import DrilldownOverlayBehavior from './DrilldownOverlayBehavior';
+import SubprocessCompatibility from './SubprocessCompatibility';

package/lib/features/drilldown/index.js

@@ -1,17 +1,17 @@
-import OverlaysModule from 'diagram-js/lib/features/overlays';
-import ChangeSupportModule from 'diagram-js/lib/features/change-support';
-import RootElementsModule from 'diagram-js/lib/features/root-elements';
-
-import DrilldownBreadcrumbs from './DrilldownBreadcrumbs';
-import DrilldownCentering from './DrilldownCentering';
-import SubprocessCompatibility from './SubprocessCompatibility';
-import DrilldownOverlayBehavior from './DrilldownOverlayBehavior';
-
-export default {
-  __depends__: [ OverlaysModule, ChangeSupportModule, RootElementsModule ],
-  __init__: [ 'drilldownBreadcrumbs', 'drilldownOverlayBehavior', 'drilldownCentering', 'subprocessCompatibility' ],
-  drilldownBreadcrumbs: [ 'type', DrilldownBreadcrumbs ],
-  drilldownCentering: [ 'type', DrilldownCentering ],
-  drilldownOverlayBehavior: [ 'type', DrilldownOverlayBehavior ],
-  subprocessCompatibility: [ 'type', SubprocessCompatibility ]
+import OverlaysModule from 'diagram-js/lib/features/overlays';
+import ChangeSupportModule from 'diagram-js/lib/features/change-support';
+import RootElementsModule from 'diagram-js/lib/features/root-elements';
+
+import DrilldownBreadcrumbs from './DrilldownBreadcrumbs';
+import DrilldownCentering from './DrilldownCentering';
+import SubprocessCompatibility from './SubprocessCompatibility';
+import DrilldownOverlayBehavior from './DrilldownOverlayBehavior';
+
+export default {
+  __depends__: [ OverlaysModule, ChangeSupportModule, RootElementsModule ],
+  __init__: [ 'drilldownBreadcrumbs', 'drilldownOverlayBehavior', 'drilldownCentering', 'subprocessCompatibility' ],
+  drilldownBreadcrumbs: [ 'type', DrilldownBreadcrumbs ],
+  drilldownCentering: [ 'type', DrilldownCentering ],
+  drilldownOverlayBehavior: [ 'type', DrilldownOverlayBehavior ],
+  subprocessCompatibility: [ 'type', SubprocessCompatibility ]
 };

package/lib/features/editor-actions/BpmnEditorActions.d.ts

@@ -1,13 +1,13 @@
-/**
- * Registers and executes BPMN specific editor actions.
- *
- */
-export default class BpmnEditorActions extends EditorActions {
-  /**
-   * @param injector
-   */
-  constructor(injector: Injector);
-}
-
-type Injector = import('didi').Injector;
-import EditorActions from 'diagram-js/lib/features/editor-actions/EditorActions';
+/**
+ * Registers and executes BPMN specific editor actions.
+ *
+ */
+export default class BpmnEditorActions extends EditorActions {
+  /**
+   * @param injector
+   */
+  constructor(injector: Injector);
+}
+
+type Injector = import('didi').Injector;
+import EditorActions from 'diagram-js/lib/features/editor-actions/EditorActions';