bpmn-js 18.1.2 → 18.2.0

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

@@ -1,288 +1,288 @@
-import inherits from 'inherits-browser';
-
-import {
-  getOrientation,
-  getMid,
-  asTRBL
-} from 'diagram-js/lib/layout/LayoutUtil';
-
-import {
-  substract
-} from 'diagram-js/lib/util/Math';
-
-import {
-  hasExternalLabel
-} from '../../../util/LabelUtil';
-
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-import { isConnection } from 'diagram-js/lib/util/ModelUtil';
-
-/**
- * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- * @typedef {import('../Modeling').default} Modeling
- *
- * @typedef {import('../../../model/Types').Element} Element
- * @typedef {import('../../../model/Types').Shape} Shape
- *
- * @typedef {import('diagram-js/lib/util/Types').DirectionTRBL} DirectionTRBL
- */
-
-var ALIGNMENTS = [
-  'top',
-  'bottom',
-  'left',
-  'right'
-];
-
-var ELEMENT_LABEL_DISTANCE = 10;
-
-/**
- * A behavior that ensures that labels are positioned in a way that they do not
- * overlap with other elements or connections.
- *
- * @param {EventBus} eventBus
- * @param {Modeling} modeling
- */
-export default function AdaptiveLabelPositioningBehavior(eventBus, modeling) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  this.postExecuted([
-    'connection.create',
-    'connection.layout',
-    'connection.updateWaypoints'
-  ], function(event) {
-    var context = event.context,
-        connection = context.connection,
-        source = connection.source,
-        target = connection.target,
-        hints = context.hints || {};
-
-    if (hints.createElementsBehavior !== false) {
-      checkLabelAdjustment(source);
-      checkLabelAdjustment(target);
-    }
-  });
-
-
-  this.postExecuted([
-    'label.create'
-  ], function(event) {
-    var context = event.context,
-        shape = context.shape,
-        hints = context.hints || {};
-
-    if (hints.createElementsBehavior !== false) {
-      checkLabelAdjustment(shape.labelTarget);
-    }
-  });
-
-
-  this.postExecuted([
-    'elements.create'
-  ], function(event) {
-    var context = event.context,
-        elements = context.elements,
-        hints = context.hints || {};
-
-    if (hints.createElementsBehavior !== false) {
-      elements.forEach(function(element) {
-        checkLabelAdjustment(element);
-      });
-    }
-  });
-
-  function checkLabelAdjustment(element) {
-
-    // skip non-existing labels
-    if (!hasExternalLabel(element)) {
-      return;
-    }
-
-    if (isConnection(element)) {
-      return;
-    }
-
-    var optimalPosition = getOptimalPosition(element);
-
-    // no optimal position found
-    if (!optimalPosition) {
-      return;
-    }
-
-    adjustLabelPosition(element, optimalPosition);
-  }
-
-  function adjustLabelPosition(element, orientation) {
-
-    var elementMid = getMid(element),
-        label = element.label,
-        labelMid = getMid(label);
-
-    // ignore labels that are being created
-    if (!label.parent) {
-      return;
-    }
-
-    var elementTrbl = asTRBL(element);
-
-    var newLabelMid;
-
-    switch (orientation) {
-    case 'top':
-      newLabelMid = {
-        x: elementMid.x,
-        y: elementTrbl.top - ELEMENT_LABEL_DISTANCE - label.height / 2
-      };
-
-      break;
-
-    case 'left':
-
-      newLabelMid = {
-        x: elementTrbl.left - ELEMENT_LABEL_DISTANCE - label.width / 2,
-        y: elementMid.y
-      };
-
-      break;
-
-    case 'bottom':
-
-      newLabelMid = {
-        x: elementMid.x,
-        y: elementTrbl.bottom + ELEMENT_LABEL_DISTANCE + label.height / 2
-      };
-
-      break;
-
-    case 'right':
-
-      newLabelMid = {
-        x: elementTrbl.right + ELEMENT_LABEL_DISTANCE + label.width / 2,
-        y: elementMid.y
-      };
-
-      break;
-    }
-
-    var delta = substract(newLabelMid, labelMid);
-
-    modeling.moveShape(label, delta);
-  }
-
-}
-
-inherits(AdaptiveLabelPositioningBehavior, CommandInterceptor);
-
-AdaptiveLabelPositioningBehavior.$inject = [
-  'eventBus',
-  'modeling'
-];
-
-
-// helpers //////////////////////
-
-/**
- * Return alignments which are taken by a boundary's host element
- *
- * @param {Shape} element
- *
- * @return {DirectionTRBL[]}
- */
-function getTakenHostAlignments(element) {
-
-  var hostElement = element.host,
-      elementMid = getMid(element),
-      hostOrientation = getOrientation(elementMid, hostElement);
-
-  var freeAlignments;
-
-  // check whether there is a multi-orientation, e.g. 'top-left'
-  if (hostOrientation.indexOf('-') >= 0) {
-    freeAlignments = hostOrientation.split('-');
-  } else {
-    freeAlignments = [ hostOrientation ];
-  }
-
-  var takenAlignments = ALIGNMENTS.filter(function(alignment) {
-
-    return freeAlignments.indexOf(alignment) === -1;
-  });
-
-  return takenAlignments;
-
-}
-
-/**
- * Return alignments which are taken by related connections
- *
- * @param {Element} element
- *
- * @return {DirectionTRBL[]}
- */
-function getTakenConnectionAlignments(element) {
-
-  var elementMid = getMid(element);
-
-  var takenAlignments = [].concat(
-    element.incoming.map(function(c) {
-      return c.waypoints[c.waypoints.length - 2 ];
-    }),
-    element.outgoing.map(function(c) {
-      return c.waypoints[1];
-    })
-  ).map(function(point) {
-    return getApproximateOrientation(elementMid, point);
-  });
-
-  return takenAlignments;
-}
-
-/**
- * Return the optimal label position around an element
- * or `undefined`, if none was found.
- *
- * @param  {Element} element
- *
- * @return {DirectionTRBL|undefined}
- */
-function getOptimalPosition(element) {
-
-  var labelMid = getMid(element.label);
-
-  var elementMid = getMid(element);
-
-  var labelOrientation = getApproximateOrientation(elementMid, labelMid);
-
-  if (!isAligned(labelOrientation)) {
-    return;
-  }
-
-  var takenAlignments = getTakenConnectionAlignments(element);
-
-  if (element.host) {
-    var takenHostAlignments = getTakenHostAlignments(element);
-
-    takenAlignments = takenAlignments.concat(takenHostAlignments);
-  }
-
-  var freeAlignments = ALIGNMENTS.filter(function(alignment) {
-
-    return takenAlignments.indexOf(alignment) === -1;
-  });
-
-  // NOTHING TO DO; label already aligned a.O.K.
-  if (freeAlignments.indexOf(labelOrientation) !== -1) {
-    return;
-  }
-
-  return freeAlignments[0];
-}
-
-function getApproximateOrientation(p0, p1) {
-  return getOrientation(p1, p0, 5);
-}
-
-function isAligned(orientation) {
-  return ALIGNMENTS.indexOf(orientation) !== -1;
-}
+import inherits from 'inherits-browser';
+
+import {
+  getOrientation,
+  getMid,
+  asTRBL
+} from 'diagram-js/lib/layout/LayoutUtil';
+
+import {
+  substract
+} from 'diagram-js/lib/util/Math';
+
+import {
+  hasExternalLabel
+} from '../../../util/LabelUtil';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+import { isConnection } from 'diagram-js/lib/util/ModelUtil';
+
+/**
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ * @typedef {import('../Modeling').default} Modeling
+ *
+ * @typedef {import('../../../model/Types').Element} Element
+ * @typedef {import('../../../model/Types').Shape} Shape
+ *
+ * @typedef {import('diagram-js/lib/util/Types').DirectionTRBL} DirectionTRBL
+ */
+
+var ALIGNMENTS = [
+  'top',
+  'bottom',
+  'left',
+  'right'
+];
+
+var ELEMENT_LABEL_DISTANCE = 10;
+
+/**
+ * A behavior that ensures that labels are positioned in a way that they do not
+ * overlap with other elements or connections.
+ *
+ * @param {EventBus} eventBus
+ * @param {Modeling} modeling
+ */
+export default function AdaptiveLabelPositioningBehavior(eventBus, modeling) {
+
+  CommandInterceptor.call(this, eventBus);
+
+  this.postExecuted([
+    'connection.create',
+    'connection.layout',
+    'connection.updateWaypoints'
+  ], function(event) {
+    var context = event.context,
+        connection = context.connection,
+        source = connection.source,
+        target = connection.target,
+        hints = context.hints || {};
+
+    if (hints.createElementsBehavior !== false) {
+      checkLabelAdjustment(source);
+      checkLabelAdjustment(target);
+    }
+  });
+
+
+  this.postExecuted([
+    'label.create'
+  ], function(event) {
+    var context = event.context,
+        shape = context.shape,
+        hints = context.hints || {};
+
+    if (hints.createElementsBehavior !== false) {
+      checkLabelAdjustment(shape.labelTarget);
+    }
+  });
+
+
+  this.postExecuted([
+    'elements.create'
+  ], function(event) {
+    var context = event.context,
+        elements = context.elements,
+        hints = context.hints || {};
+
+    if (hints.createElementsBehavior !== false) {
+      elements.forEach(function(element) {
+        checkLabelAdjustment(element);
+      });
+    }
+  });
+
+  function checkLabelAdjustment(element) {
+
+    // skip non-existing labels
+    if (!hasExternalLabel(element)) {
+      return;
+    }
+
+    if (isConnection(element)) {
+      return;
+    }
+
+    var optimalPosition = getOptimalPosition(element);
+
+    // no optimal position found
+    if (!optimalPosition) {
+      return;
+    }
+
+    adjustLabelPosition(element, optimalPosition);
+  }
+
+  function adjustLabelPosition(element, orientation) {
+
+    var elementMid = getMid(element),
+        label = element.label,
+        labelMid = getMid(label);
+
+    // ignore labels that are being created
+    if (!label.parent) {
+      return;
+    }
+
+    var elementTrbl = asTRBL(element);
+
+    var newLabelMid;
+
+    switch (orientation) {
+    case 'top':
+      newLabelMid = {
+        x: elementMid.x,
+        y: elementTrbl.top - ELEMENT_LABEL_DISTANCE - label.height / 2
+      };
+
+      break;
+
+    case 'left':
+
+      newLabelMid = {
+        x: elementTrbl.left - ELEMENT_LABEL_DISTANCE - label.width / 2,
+        y: elementMid.y
+      };
+
+      break;
+
+    case 'bottom':
+
+      newLabelMid = {
+        x: elementMid.x,
+        y: elementTrbl.bottom + ELEMENT_LABEL_DISTANCE + label.height / 2
+      };
+
+      break;
+
+    case 'right':
+
+      newLabelMid = {
+        x: elementTrbl.right + ELEMENT_LABEL_DISTANCE + label.width / 2,
+        y: elementMid.y
+      };
+
+      break;
+    }
+
+    var delta = substract(newLabelMid, labelMid);
+
+    modeling.moveShape(label, delta);
+  }
+
+}
+
+inherits(AdaptiveLabelPositioningBehavior, CommandInterceptor);
+
+AdaptiveLabelPositioningBehavior.$inject = [
+  'eventBus',
+  'modeling'
+];
+
+
+// helpers //////////////////////
+
+/**
+ * Return alignments which are taken by a boundary's host element
+ *
+ * @param {Shape} element
+ *
+ * @return {DirectionTRBL[]}
+ */
+function getTakenHostAlignments(element) {
+
+  var hostElement = element.host,
+      elementMid = getMid(element),
+      hostOrientation = getOrientation(elementMid, hostElement);
+
+  var freeAlignments;
+
+  // check whether there is a multi-orientation, e.g. 'top-left'
+  if (hostOrientation.indexOf('-') >= 0) {
+    freeAlignments = hostOrientation.split('-');
+  } else {
+    freeAlignments = [ hostOrientation ];
+  }
+
+  var takenAlignments = ALIGNMENTS.filter(function(alignment) {
+
+    return freeAlignments.indexOf(alignment) === -1;
+  });
+
+  return takenAlignments;
+
+}
+
+/**
+ * Return alignments which are taken by related connections
+ *
+ * @param {Element} element
+ *
+ * @return {DirectionTRBL[]}
+ */
+function getTakenConnectionAlignments(element) {
+
+  var elementMid = getMid(element);
+
+  var takenAlignments = [].concat(
+    element.incoming.map(function(c) {
+      return c.waypoints[c.waypoints.length - 2 ];
+    }),
+    element.outgoing.map(function(c) {
+      return c.waypoints[1];
+    })
+  ).map(function(point) {
+    return getApproximateOrientation(elementMid, point);
+  });
+
+  return takenAlignments;
+}
+
+/**
+ * Return the optimal label position around an element
+ * or `undefined`, if none was found.
+ *
+ * @param  {Element} element
+ *
+ * @return {DirectionTRBL|undefined}
+ */
+function getOptimalPosition(element) {
+
+  var labelMid = getMid(element.label);
+
+  var elementMid = getMid(element);
+
+  var labelOrientation = getApproximateOrientation(elementMid, labelMid);
+
+  if (!isAligned(labelOrientation)) {
+    return;
+  }
+
+  var takenAlignments = getTakenConnectionAlignments(element);
+
+  if (element.host) {
+    var takenHostAlignments = getTakenHostAlignments(element);
+
+    takenAlignments = takenAlignments.concat(takenHostAlignments);
+  }
+
+  var freeAlignments = ALIGNMENTS.filter(function(alignment) {
+
+    return takenAlignments.indexOf(alignment) === -1;
+  });
+
+  // NOTHING TO DO; label already aligned a.O.K.
+  if (freeAlignments.indexOf(labelOrientation) !== -1) {
+    return;
+  }
+
+  return freeAlignments[0];
+}
+
+function getApproximateOrientation(p0, p1) {
+  return getOrientation(p1, p0, 5);
+}
+
+function isAligned(orientation) {
+  return ALIGNMENTS.indexOf(orientation) !== -1;
+}

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

@@ -1,6 +1,6 @@
-export default class AppendBehavior extends CommandInterceptor {
-    constructor(eventBus: any);
-}
-
-type EventBus = import("diagram-js/lib/core/EventBus").default;
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+export default class AppendBehavior extends CommandInterceptor {
+    constructor(eventBus: any);
+}
+
+type EventBus = import("diagram-js/lib/core/EventBus").default;
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';

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

@@ -1,43 +1,43 @@
-import inherits from 'inherits-browser';
-
-import { is } from '../../../util/ModelUtil';
-
-import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
-
-/**
- * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- */
-
-export default function AppendBehavior(eventBus) {
-
-  CommandInterceptor.call(this, eventBus);
-
-  // assign correct shape position unless already set
-
-  this.preExecute('shape.append', function(context) {
-
-    var source = context.source,
-        shape = context.shape;
-
-    if (!context.position) {
-
-      if (is(shape, 'bpmn:TextAnnotation')) {
-        context.position = {
-          x: source.x + source.width / 2 + 75,
-          y: source.y - 50 - shape.height / 2
-        };
-      } else {
-        context.position = {
-          x: source.x + source.width + 80 + shape.width / 2,
-          y: source.y + source.height / 2
-        };
-      }
-    }
-  }, true);
-}
-
-inherits(AppendBehavior, CommandInterceptor);
-
-AppendBehavior.$inject = [
-  'eventBus'
+import inherits from 'inherits-browser';
+
+import { is } from '../../../util/ModelUtil';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+/**
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ */
+
+export default function AppendBehavior(eventBus) {
+
+  CommandInterceptor.call(this, eventBus);
+
+  // assign correct shape position unless already set
+
+  this.preExecute('shape.append', function(context) {
+
+    var source = context.source,
+        shape = context.shape;
+
+    if (!context.position) {
+
+      if (is(shape, 'bpmn:TextAnnotation')) {
+        context.position = {
+          x: source.x + source.width / 2 + 75,
+          y: source.y - 50 - shape.height / 2
+        };
+      } else {
+        context.position = {
+          x: source.x + source.width + 80 + shape.width / 2,
+          y: source.y + source.height / 2
+        };
+      }
+    }
+  }, true);
+}
+
+inherits(AppendBehavior, CommandInterceptor);
+
+AppendBehavior.$inject = [
+  'eventBus'
 ];