bpmn-js 18.2.0 → 18.3.0

package/lib/features/modeling/cmd/UpdateCanvasRootHandler.js

@@ -1,100 +1,100 @@
-import {
-  add as collectionAdd,
-  remove as collectionRemove
-} from 'diagram-js/lib/util/Collections';
-
-import { getDi } from '../../../util/ModelUtil';
-
-/**
- * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
- *
- * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
- * @typedef {import('../Modeling').default} Modeling
- */
-
-/**
- * @implements {CommandHandler}
- *
- * @param {Canvas} canvas
- * @param {Modeling} modeling
- */
-export default function UpdateCanvasRootHandler(canvas, modeling) {
-  this._canvas = canvas;
-  this._modeling = modeling;
-}
-
-UpdateCanvasRootHandler.$inject = [
-  'canvas',
-  'modeling'
-];
-
-
-UpdateCanvasRootHandler.prototype.execute = function(context) {
-
-  var canvas = this._canvas;
-
-  var newRoot = context.newRoot,
-      newRootBusinessObject = newRoot.businessObject,
-      oldRoot = canvas.getRootElement(),
-      oldRootBusinessObject = oldRoot.businessObject,
-      bpmnDefinitions = oldRootBusinessObject.$parent,
-      diPlane = getDi(oldRoot);
-
-  // (1) replace process old <> new root
-  canvas.setRootElement(newRoot);
-  canvas.removeRootElement(oldRoot);
-
-  // (2) update root elements
-  collectionAdd(bpmnDefinitions.rootElements, newRootBusinessObject);
-  newRootBusinessObject.$parent = bpmnDefinitions;
-
-  collectionRemove(bpmnDefinitions.rootElements, oldRootBusinessObject);
-  oldRootBusinessObject.$parent = null;
-
-  // (3) wire di
-  oldRoot.di = null;
-
-  diPlane.bpmnElement = newRootBusinessObject;
-  newRoot.di = diPlane;
-
-  context.oldRoot = oldRoot;
-
-  // TODO(nikku): return changed elements?
-  // return [ newRoot, oldRoot ];
-  return [];
-};
-
-
-UpdateCanvasRootHandler.prototype.revert = function(context) {
-
-  var canvas = this._canvas;
-
-  var newRoot = context.newRoot,
-      newRootBusinessObject = newRoot.businessObject,
-      oldRoot = context.oldRoot,
-      oldRootBusinessObject = oldRoot.businessObject,
-      bpmnDefinitions = newRootBusinessObject.$parent,
-      diPlane = getDi(newRoot);
-
-  // (1) replace process old <> new root
-  canvas.setRootElement(oldRoot);
-  canvas.removeRootElement(newRoot);
-
-  // (2) update root elements
-  collectionRemove(bpmnDefinitions.rootElements, newRootBusinessObject);
-  newRootBusinessObject.$parent = null;
-
-  collectionAdd(bpmnDefinitions.rootElements, oldRootBusinessObject);
-  oldRootBusinessObject.$parent = bpmnDefinitions;
-
-  // (3) wire di
-  newRoot.di = null;
-
-  diPlane.bpmnElement = oldRootBusinessObject;
-  oldRoot.di = diPlane;
-
-  // TODO(nikku): return changed elements?
-  // return [ newRoot, oldRoot ];
-
-  return [];
+import {
+  add as collectionAdd,
+  remove as collectionRemove
+} from 'diagram-js/lib/util/Collections';
+
+import { getDi } from '../../../util/ModelUtil';
+
+/**
+ * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
+ *
+ * @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
+ * @typedef {import('../Modeling').default} Modeling
+ */
+
+/**
+ * @implements {CommandHandler}
+ *
+ * @param {Canvas} canvas
+ * @param {Modeling} modeling
+ */
+export default function UpdateCanvasRootHandler(canvas, modeling) {
+  this._canvas = canvas;
+  this._modeling = modeling;
+}
+
+UpdateCanvasRootHandler.$inject = [
+  'canvas',
+  'modeling'
+];
+
+
+UpdateCanvasRootHandler.prototype.execute = function(context) {
+
+  var canvas = this._canvas;
+
+  var newRoot = context.newRoot,
+      newRootBusinessObject = newRoot.businessObject,
+      oldRoot = canvas.getRootElement(),
+      oldRootBusinessObject = oldRoot.businessObject,
+      bpmnDefinitions = oldRootBusinessObject.$parent,
+      diPlane = getDi(oldRoot);
+
+  // (1) replace process old <> new root
+  canvas.setRootElement(newRoot);
+  canvas.removeRootElement(oldRoot);
+
+  // (2) update root elements
+  collectionAdd(bpmnDefinitions.rootElements, newRootBusinessObject);
+  newRootBusinessObject.$parent = bpmnDefinitions;
+
+  collectionRemove(bpmnDefinitions.rootElements, oldRootBusinessObject);
+  oldRootBusinessObject.$parent = null;
+
+  // (3) wire di
+  oldRoot.di = null;
+
+  diPlane.bpmnElement = newRootBusinessObject;
+  newRoot.di = diPlane;
+
+  context.oldRoot = oldRoot;
+
+  // TODO(nikku): return changed elements?
+  // return [ newRoot, oldRoot ];
+  return [];
+};
+
+
+UpdateCanvasRootHandler.prototype.revert = function(context) {
+
+  var canvas = this._canvas;
+
+  var newRoot = context.newRoot,
+      newRootBusinessObject = newRoot.businessObject,
+      oldRoot = context.oldRoot,
+      oldRootBusinessObject = oldRoot.businessObject,
+      bpmnDefinitions = newRootBusinessObject.$parent,
+      diPlane = getDi(newRoot);
+
+  // (1) replace process old <> new root
+  canvas.setRootElement(oldRoot);
+  canvas.removeRootElement(newRoot);
+
+  // (2) update root elements
+  collectionRemove(bpmnDefinitions.rootElements, newRootBusinessObject);
+  newRootBusinessObject.$parent = null;
+
+  collectionAdd(bpmnDefinitions.rootElements, oldRootBusinessObject);
+  oldRootBusinessObject.$parent = bpmnDefinitions;
+
+  // (3) wire di
+  newRoot.di = null;
+
+  diPlane.bpmnElement = oldRootBusinessObject;
+  oldRoot.di = diPlane;
+
+  // TODO(nikku): return changed elements?
+  // return [ newRoot, oldRoot ];
+
+  return [];
 };

package/lib/features/modeling/cmd/UpdateFlowNodeRefsHandler.d.ts

@@ -1,21 +1,21 @@
-/**
- * A handler that updates lane refs on changed elements.
- *
- * @implements {CommandHandler}
- *
- */
-export default class UpdateFlowNodeRefsHandler implements CommandHandler {
-  static $inject: string[];
-
-  /**
-   * @param elementRegistry
-   */
-  constructor(elementRegistry: ElementRegistry);
-
-  execute(context: any): any[];
-  revert(context: any): any[];
-}
-
-type CommandHandler = import("diagram-js/lib/command/CommandHandler").default;
-type ElementRegistry = import("diagram-js/lib/core/ElementRegistry").default;
-type Shape = import("../../../model/Types").Shape;
+/**
+ * A handler that updates lane refs on changed elements.
+ *
+ * @implements {CommandHandler}
+ *
+ */
+export default class UpdateFlowNodeRefsHandler implements CommandHandler {
+  static $inject: string[];
+
+  /**
+   * @param elementRegistry
+   */
+  constructor(elementRegistry: ElementRegistry);
+
+  execute(context: any): any[];
+  revert(context: any): any[];
+}
+
+type CommandHandler = import("diagram-js/lib/command/CommandHandler").default;
+type ElementRegistry = import("diagram-js/lib/core/ElementRegistry").default;
+type Shape = import("../../../model/Types").Shape;

package/lib/features/modeling/cmd/UpdateFlowNodeRefsHandler.js

@@ -1,218 +1,218 @@
-import {
-  collectLanes,
-  getLanesRoot
-} from '../util/LaneUtil';
-
-import {
-  is
-} from '../../../util/ModelUtil';
-
-import {
-  add as collectionAdd,
-  remove as collectionRemove
-} from 'diagram-js/lib/util/Collections';
-
-import {
-  asTRBL
-} from 'diagram-js/lib/layout/LayoutUtil';
-
-/**
- * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
- *
- * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
- *
- * @typedef {import('../../../model/Types').Shape} Shape
- */
-
-var FLOW_NODE_REFS_ATTR = 'flowNodeRef',
-    LANES_ATTR = 'lanes';
-
-
-/**
- * A handler that updates lane refs on changed elements.
- *
- * @implements {CommandHandler}
- *
- * @param {ElementRegistry} elementRegistry
- */
-export default function UpdateFlowNodeRefsHandler(elementRegistry) {
-  this._elementRegistry = elementRegistry;
-}
-
-UpdateFlowNodeRefsHandler.$inject = [
-  'elementRegistry'
-];
-
-/**
- * @param {Shape} flowNodeShapes
- * @param {Shape} laneShapes
- *
- * @return { {
- *   flowNode: Shape;
- *   add: Shape[];
- *   remove: Shape[];
- * }[] }
- */
-UpdateFlowNodeRefsHandler.prototype._computeUpdates = function(flowNodeShapes, laneShapes) {
-
-  var handledNodes = [];
-
-  var updates = [];
-
-  var participantCache = {};
-
-  var allFlowNodeShapes = [];
-
-  function isInLaneShape(element, laneShape) {
-
-    var laneTrbl = asTRBL(laneShape);
-
-    var elementMid = {
-      x: element.x + element.width / 2,
-      y: element.y + element.height / 2
-    };
-
-    return elementMid.x > laneTrbl.left &&
-           elementMid.x < laneTrbl.right &&
-           elementMid.y > laneTrbl.top &&
-           elementMid.y < laneTrbl.bottom;
-  }
-
-  function addFlowNodeShape(flowNodeShape) {
-    if (handledNodes.indexOf(flowNodeShape) === -1) {
-      allFlowNodeShapes.push(flowNodeShape);
-      handledNodes.push(flowNodeShape);
-    }
-  }
-
-  function getAllLaneShapes(flowNodeShape) {
-
-    var root = getLanesRoot(flowNodeShape);
-
-    if (!participantCache[root.id]) {
-      participantCache[root.id] = collectLanes(root);
-    }
-
-    return participantCache[root.id];
-  }
-
-  function getNewLanes(flowNodeShape) {
-    if (!flowNodeShape.parent) {
-      return [];
-    }
-
-    var allLaneShapes = getAllLaneShapes(flowNodeShape);
-
-    return allLaneShapes.filter(function(l) {
-      return isInLaneShape(flowNodeShape, l);
-    }).map(function(shape) {
-      return shape.businessObject;
-    });
-  }
-
-  laneShapes.forEach(function(laneShape) {
-    var root = getLanesRoot(laneShape);
-
-    if (!root || handledNodes.indexOf(root) !== -1) {
-      return;
-    }
-
-    var children = root.children.filter(function(c) {
-      return is(c, 'bpmn:FlowNode');
-    });
-
-    children.forEach(addFlowNodeShape);
-
-    handledNodes.push(root);
-  });
-
-  flowNodeShapes.forEach(addFlowNodeShape);
-
-
-  allFlowNodeShapes.forEach(function(flowNodeShape) {
-
-    var flowNode = flowNodeShape.businessObject;
-
-    var lanes = flowNode.get(LANES_ATTR),
-        remove = lanes.slice(),
-        add = getNewLanes(flowNodeShape);
-
-    updates.push({ flowNode: flowNode, remove: remove, add: add });
-  });
-
-  laneShapes.forEach(function(laneShape) {
-
-    var lane = laneShape.businessObject;
-
-    // lane got removed XX-)
-    if (!laneShape.parent) {
-      lane.get(FLOW_NODE_REFS_ATTR).forEach(function(flowNode) {
-        updates.push({ flowNode: flowNode, remove: [ lane ], add: [] });
-      });
-    }
-  });
-
-  return updates;
-};
-
-UpdateFlowNodeRefsHandler.prototype.execute = function(context) {
-
-  var updates = context.updates;
-
-  if (!updates) {
-    updates = context.updates = this._computeUpdates(context.flowNodeShapes, context.laneShapes);
-  }
-
-
-  updates.forEach(function(update) {
-
-    var flowNode = update.flowNode,
-        lanes = flowNode.get(LANES_ATTR);
-
-    // unwire old
-    update.remove.forEach(function(oldLane) {
-      collectionRemove(lanes, oldLane);
-      collectionRemove(oldLane.get(FLOW_NODE_REFS_ATTR), flowNode);
-    });
-
-    // wire new
-    update.add.forEach(function(newLane) {
-      collectionAdd(lanes, newLane);
-      collectionAdd(newLane.get(FLOW_NODE_REFS_ATTR), flowNode);
-    });
-  });
-
-  // TODO(nikku): return changed elements
-  // return [ ... ];
-
-  return [];
-};
-
-
-UpdateFlowNodeRefsHandler.prototype.revert = function(context) {
-
-  var updates = context.updates;
-
-  updates.forEach(function(update) {
-
-    var flowNode = update.flowNode,
-        lanes = flowNode.get(LANES_ATTR);
-
-    // unwire new
-    update.add.forEach(function(newLane) {
-      collectionRemove(lanes, newLane);
-      collectionRemove(newLane.get(FLOW_NODE_REFS_ATTR), flowNode);
-    });
-
-    // wire old
-    update.remove.forEach(function(oldLane) {
-      collectionAdd(lanes, oldLane);
-      collectionAdd(oldLane.get(FLOW_NODE_REFS_ATTR), flowNode);
-    });
-  });
-
-  // TODO(nikku): return changed elements
-  // return [ ... ];
-
-  return [];
-};
+import {
+  collectLanes,
+  getLanesRoot
+} from '../util/LaneUtil';
+
+import {
+  is
+} from '../../../util/ModelUtil';
+
+import {
+  add as collectionAdd,
+  remove as collectionRemove
+} from 'diagram-js/lib/util/Collections';
+
+import {
+  asTRBL
+} from 'diagram-js/lib/layout/LayoutUtil';
+
+/**
+ * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
+ *
+ * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
+ *
+ * @typedef {import('../../../model/Types').Shape} Shape
+ */
+
+var FLOW_NODE_REFS_ATTR = 'flowNodeRef',
+    LANES_ATTR = 'lanes';
+
+
+/**
+ * A handler that updates lane refs on changed elements.
+ *
+ * @implements {CommandHandler}
+ *
+ * @param {ElementRegistry} elementRegistry
+ */
+export default function UpdateFlowNodeRefsHandler(elementRegistry) {
+  this._elementRegistry = elementRegistry;
+}
+
+UpdateFlowNodeRefsHandler.$inject = [
+  'elementRegistry'
+];
+
+/**
+ * @param {Shape} flowNodeShapes
+ * @param {Shape} laneShapes
+ *
+ * @return { {
+ *   flowNode: Shape;
+ *   add: Shape[];
+ *   remove: Shape[];
+ * }[] }
+ */
+UpdateFlowNodeRefsHandler.prototype._computeUpdates = function(flowNodeShapes, laneShapes) {
+
+  var handledNodes = [];
+
+  var updates = [];
+
+  var participantCache = {};
+
+  var allFlowNodeShapes = [];
+
+  function isInLaneShape(element, laneShape) {
+
+    var laneTrbl = asTRBL(laneShape);
+
+    var elementMid = {
+      x: element.x + element.width / 2,
+      y: element.y + element.height / 2
+    };
+
+    return elementMid.x > laneTrbl.left &&
+           elementMid.x < laneTrbl.right &&
+           elementMid.y > laneTrbl.top &&
+           elementMid.y < laneTrbl.bottom;
+  }
+
+  function addFlowNodeShape(flowNodeShape) {
+    if (handledNodes.indexOf(flowNodeShape) === -1) {
+      allFlowNodeShapes.push(flowNodeShape);
+      handledNodes.push(flowNodeShape);
+    }
+  }
+
+  function getAllLaneShapes(flowNodeShape) {
+
+    var root = getLanesRoot(flowNodeShape);
+
+    if (!participantCache[root.id]) {
+      participantCache[root.id] = collectLanes(root);
+    }
+
+    return participantCache[root.id];
+  }
+
+  function getNewLanes(flowNodeShape) {
+    if (!flowNodeShape.parent) {
+      return [];
+    }
+
+    var allLaneShapes = getAllLaneShapes(flowNodeShape);
+
+    return allLaneShapes.filter(function(l) {
+      return isInLaneShape(flowNodeShape, l);
+    }).map(function(shape) {
+      return shape.businessObject;
+    });
+  }
+
+  laneShapes.forEach(function(laneShape) {
+    var root = getLanesRoot(laneShape);
+
+    if (!root || handledNodes.indexOf(root) !== -1) {
+      return;
+    }
+
+    var children = root.children.filter(function(c) {
+      return is(c, 'bpmn:FlowNode');
+    });
+
+    children.forEach(addFlowNodeShape);
+
+    handledNodes.push(root);
+  });
+
+  flowNodeShapes.forEach(addFlowNodeShape);
+
+
+  allFlowNodeShapes.forEach(function(flowNodeShape) {
+
+    var flowNode = flowNodeShape.businessObject;
+
+    var lanes = flowNode.get(LANES_ATTR),
+        remove = lanes.slice(),
+        add = getNewLanes(flowNodeShape);
+
+    updates.push({ flowNode: flowNode, remove: remove, add: add });
+  });
+
+  laneShapes.forEach(function(laneShape) {
+
+    var lane = laneShape.businessObject;
+
+    // lane got removed XX-)
+    if (!laneShape.parent) {
+      lane.get(FLOW_NODE_REFS_ATTR).forEach(function(flowNode) {
+        updates.push({ flowNode: flowNode, remove: [ lane ], add: [] });
+      });
+    }
+  });
+
+  return updates;
+};
+
+UpdateFlowNodeRefsHandler.prototype.execute = function(context) {
+
+  var updates = context.updates;
+
+  if (!updates) {
+    updates = context.updates = this._computeUpdates(context.flowNodeShapes, context.laneShapes);
+  }
+
+
+  updates.forEach(function(update) {
+
+    var flowNode = update.flowNode,
+        lanes = flowNode.get(LANES_ATTR);
+
+    // unwire old
+    update.remove.forEach(function(oldLane) {
+      collectionRemove(lanes, oldLane);
+      collectionRemove(oldLane.get(FLOW_NODE_REFS_ATTR), flowNode);
+    });
+
+    // wire new
+    update.add.forEach(function(newLane) {
+      collectionAdd(lanes, newLane);
+      collectionAdd(newLane.get(FLOW_NODE_REFS_ATTR), flowNode);
+    });
+  });
+
+  // TODO(nikku): return changed elements
+  // return [ ... ];
+
+  return [];
+};
+
+
+UpdateFlowNodeRefsHandler.prototype.revert = function(context) {
+
+  var updates = context.updates;
+
+  updates.forEach(function(update) {
+
+    var flowNode = update.flowNode,
+        lanes = flowNode.get(LANES_ATTR);
+
+    // unwire new
+    update.add.forEach(function(newLane) {
+      collectionRemove(lanes, newLane);
+      collectionRemove(newLane.get(FLOW_NODE_REFS_ATTR), flowNode);
+    });
+
+    // wire old
+    update.remove.forEach(function(oldLane) {
+      collectionAdd(lanes, oldLane);
+      collectionAdd(oldLane.get(FLOW_NODE_REFS_ATTR), flowNode);
+    });
+  });
+
+  // TODO(nikku): return changed elements
+  // return [ ... ];
+
+  return [];
+};