bpmn-js 17.6.1 → 17.6.2

package/lib/features/snapping/BpmnCreateMoveSnapping.js

@@ -1,289 +1,289 @@
-import inherits from 'inherits-browser';
-
-import CreateMoveSnapping from 'diagram-js/lib/features/snapping/CreateMoveSnapping';
-
-import {
-  isSnapped,
-  setSnapped,
-  topLeft,
-  bottomRight
-} from 'diagram-js/lib/features/snapping/SnapUtil';
-
-import { isExpanded } from '../../util/DiUtil';
-
-import { is } from '../../util/ModelUtil';
-
-import {
-  asTRBL,
-  getMid
-} from 'diagram-js/lib/layout/LayoutUtil';
-
-import { getBoundaryAttachment } from './BpmnSnappingUtil';
-
-import { forEach } from 'min-dash';
-
-/**
- * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
- * @typedef {import('didi').Injector} Injector
- *
- * @typedef {import('diagram-js/lib/features/snapping/SnapContext').default} SnapContext
- * @typedef {import('diagram-js/lib/features/snapping/SnapContext').SnapPoints} SnapPoints
- *
- * @typedef {import('diagram-js/lib/core/EventBus').Event} Event
- *
- * @typedef {import('../../model/Types').Element} Element
- * @typedef {import('../../model/Types').Shape} Shape
- */
-
-var HIGH_PRIORITY = 1500;
-
-
-/**
- * Snap during create and move.
- *
- * @param {EventBus} eventBus
- * @param {Injector} injector
- */
-export default function BpmnCreateMoveSnapping(eventBus, injector) {
-  injector.invoke(CreateMoveSnapping, this);
-
-  // creating first participant
-  eventBus.on([ 'create.move', 'create.end' ], HIGH_PRIORITY, setSnappedIfConstrained);
-
-  // snap boundary events
-  eventBus.on([
-    'create.move',
-    'create.end',
-    'shape.move.move',
-    'shape.move.end'
-  ], HIGH_PRIORITY, function(event) {
-    var context = event.context,
-        canExecute = context.canExecute,
-        target = context.target;
-
-    var canAttach = canExecute && (canExecute === 'attach' || canExecute.attach);
-
-    if (canAttach && !isSnapped(event)) {
-      snapBoundaryEvent(event, target);
-    }
-  });
-}
-
-inherits(BpmnCreateMoveSnapping, CreateMoveSnapping);
-
-BpmnCreateMoveSnapping.$inject = [
-  'eventBus',
-  'injector'
-];
-
-/**
- * @param {Event} event
- *
- * @return {SnapContext}
- */
-BpmnCreateMoveSnapping.prototype.initSnap = function(event) {
-  var snapContext = CreateMoveSnapping.prototype.initSnap.call(this, event);
-
-  var shape = event.shape;
-
-  var isMove = !!this._elementRegistry.get(shape.id);
-
-  // snap to docking points
-  forEach(shape.outgoing, function(connection) {
-    var docking = connection.waypoints[0];
-
-    docking = docking.original || docking;
-
-    snapContext.setSnapOrigin(connection.id + '-docking', getDockingSnapOrigin(docking, isMove, event));
-  });
-
-  forEach(shape.incoming, function(connection) {
-    var docking = connection.waypoints[connection.waypoints.length - 1];
-
-    docking = docking.original || docking;
-
-    snapContext.setSnapOrigin(connection.id + '-docking', getDockingSnapOrigin(docking, isMove, event));
-  });
-
-  if (is(shape, 'bpmn:Participant')) {
-
-    // snap to borders with higher priority
-    snapContext.setSnapLocations([ 'top-left', 'bottom-right', 'mid' ]);
-  }
-
-  return snapContext;
-};
-
-/**
- * @param {SnapPoints} snapPoints
- * @param {Shape} shape
- * @param {Shape} target
- *
- * @return {SnapPoints}
- */
-BpmnCreateMoveSnapping.prototype.addSnapTargetPoints = function(snapPoints, shape, target) {
-  CreateMoveSnapping.prototype.addSnapTargetPoints.call(this, snapPoints, shape, target);
-
-  var snapTargets = this.getSnapTargets(shape, target);
-
-  forEach(snapTargets, function(snapTarget) {
-
-    // handle TRBL alignment
-    //
-    // * with container elements
-    // * with text annotations
-    if (isContainer(snapTarget) || areAll([ shape, snapTarget ], 'bpmn:TextAnnotation')) {
-      snapPoints.add('top-left', topLeft(snapTarget));
-      snapPoints.add('bottom-right', bottomRight(snapTarget));
-    }
-  });
-
-  var elementRegistry = this._elementRegistry;
-
-  // snap to docking points if not create mode
-  forEach(shape.incoming, function(connection) {
-    if (elementRegistry.get(shape.id)) {
-
-      if (!includes(snapTargets, connection.source)) {
-        snapPoints.add('mid', getMid(connection.source));
-      }
-
-      var docking = connection.waypoints[0];
-      snapPoints.add(connection.id + '-docking', docking.original || docking);
-    }
-  });
-
-  forEach(shape.outgoing, function(connection) {
-    if (elementRegistry.get(shape.id)) {
-
-      if (!includes(snapTargets, connection.target)) {
-        snapPoints.add('mid', getMid(connection.target));
-      }
-
-      var docking = connection.waypoints[ connection.waypoints.length - 1 ];
-
-      snapPoints.add(connection.id + '-docking', docking.original || docking);
-    }
-  });
-
-  // add sequence flow parents as snap targets
-  if (is(target, 'bpmn:SequenceFlow')) {
-    snapPoints = this.addSnapTargetPoints(snapPoints, shape, target.parent);
-  }
-
-  return snapPoints;
-};
-
-/**
- * @param {Shape} shape
- * @param {Shape} target
- *
- * @return {Shape[]}
- */
-BpmnCreateMoveSnapping.prototype.getSnapTargets = function(shape, target) {
-  return CreateMoveSnapping.prototype.getSnapTargets.call(this, shape, target)
-    .filter(function(snapTarget) {
-
-      // do not snap to lanes
-      return !is(snapTarget, 'bpmn:Lane');
-    });
-};
-
-// helpers //////////
-
-/**
- * @param {Shape} event
- * @param {Shape} target
- */
-function snapBoundaryEvent(event, target) {
-  var targetTRBL = asTRBL(target);
-
-  var direction = getBoundaryAttachment(event, target);
-
-  var context = event.context,
-      shape = context.shape;
-
-  var offset;
-
-  if (shape.parent) {
-    offset = { x: 0, y: 0 };
-  } else {
-    offset = getMid(shape);
-  }
-
-  if (/top/.test(direction)) {
-    setSnapped(event, 'y', targetTRBL.top - offset.y);
-  } else if (/bottom/.test(direction)) {
-    setSnapped(event, 'y', targetTRBL.bottom - offset.y);
-  }
-
-  if (/left/.test(direction)) {
-    setSnapped(event, 'x', targetTRBL.left - offset.x);
-  } else if (/right/.test(direction)) {
-    setSnapped(event, 'x', targetTRBL.right - offset.x);
-  }
-}
-
-/**
- * @param {Element[]} elements
- * @param {string} type
- *
- * @return {boolean}
- */
-function areAll(elements, type) {
-  return elements.every(function(el) {
-    return is(el, type);
-  });
-}
-
-/**
- * @param {Element} element
- */
-function isContainer(element) {
-  if (is(element, 'bpmn:SubProcess') && isExpanded(element)) {
-    return true;
-  }
-
-  return is(element, 'bpmn:Participant');
-}
-
-/**
- * @param {Event} event
- */
-function setSnappedIfConstrained(event) {
-  var context = event.context,
-      createConstraints = context.createConstraints;
-
-  if (!createConstraints) {
-    return;
-  }
-
-  var top = createConstraints.top,
-      right = createConstraints.right,
-      bottom = createConstraints.bottom,
-      left = createConstraints.left;
-
-  if ((left && left >= event.x) || (right && right <= event.x)) {
-    setSnapped(event, 'x', event.x);
-  }
-
-  if ((top && top >= event.y) || (bottom && bottom <= event.y)) {
-    setSnapped(event, 'y', event.y);
-  }
-}
-
-function includes(array, value) {
-  return array.indexOf(value) !== -1;
-}
-
-function getDockingSnapOrigin(docking, isMove, event) {
-  return isMove ? (
-    {
-      x: docking.x - event.x,
-      y: docking.y - event.y
-    }
-  ) : {
-    x: docking.x,
-    y: docking.y
-  };
-}
+import inherits from 'inherits-browser';
+
+import CreateMoveSnapping from 'diagram-js/lib/features/snapping/CreateMoveSnapping';
+
+import {
+  isSnapped,
+  setSnapped,
+  topLeft,
+  bottomRight
+} from 'diagram-js/lib/features/snapping/SnapUtil';
+
+import { isExpanded } from '../../util/DiUtil';
+
+import { is } from '../../util/ModelUtil';
+
+import {
+  asTRBL,
+  getMid
+} from 'diagram-js/lib/layout/LayoutUtil';
+
+import { getBoundaryAttachment } from './BpmnSnappingUtil';
+
+import { forEach } from 'min-dash';
+
+/**
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ * @typedef {import('didi').Injector} Injector
+ *
+ * @typedef {import('diagram-js/lib/features/snapping/SnapContext').default} SnapContext
+ * @typedef {import('diagram-js/lib/features/snapping/SnapContext').SnapPoints} SnapPoints
+ *
+ * @typedef {import('diagram-js/lib/core/EventBus').Event} Event
+ *
+ * @typedef {import('../../model/Types').Element} Element
+ * @typedef {import('../../model/Types').Shape} Shape
+ */
+
+var HIGH_PRIORITY = 1500;
+
+
+/**
+ * Snap during create and move.
+ *
+ * @param {EventBus} eventBus
+ * @param {Injector} injector
+ */
+export default function BpmnCreateMoveSnapping(eventBus, injector) {
+  injector.invoke(CreateMoveSnapping, this);
+
+  // creating first participant
+  eventBus.on([ 'create.move', 'create.end' ], HIGH_PRIORITY, setSnappedIfConstrained);
+
+  // snap boundary events
+  eventBus.on([
+    'create.move',
+    'create.end',
+    'shape.move.move',
+    'shape.move.end'
+  ], HIGH_PRIORITY, function(event) {
+    var context = event.context,
+        canExecute = context.canExecute,
+        target = context.target;
+
+    var canAttach = canExecute && (canExecute === 'attach' || canExecute.attach);
+
+    if (canAttach && !isSnapped(event)) {
+      snapBoundaryEvent(event, target);
+    }
+  });
+}
+
+inherits(BpmnCreateMoveSnapping, CreateMoveSnapping);
+
+BpmnCreateMoveSnapping.$inject = [
+  'eventBus',
+  'injector'
+];
+
+/**
+ * @param {Event} event
+ *
+ * @return {SnapContext}
+ */
+BpmnCreateMoveSnapping.prototype.initSnap = function(event) {
+  var snapContext = CreateMoveSnapping.prototype.initSnap.call(this, event);
+
+  var shape = event.shape;
+
+  var isMove = !!this._elementRegistry.get(shape.id);
+
+  // snap to docking points
+  forEach(shape.outgoing, function(connection) {
+    var docking = connection.waypoints[0];
+
+    docking = docking.original || docking;
+
+    snapContext.setSnapOrigin(connection.id + '-docking', getDockingSnapOrigin(docking, isMove, event));
+  });
+
+  forEach(shape.incoming, function(connection) {
+    var docking = connection.waypoints[connection.waypoints.length - 1];
+
+    docking = docking.original || docking;
+
+    snapContext.setSnapOrigin(connection.id + '-docking', getDockingSnapOrigin(docking, isMove, event));
+  });
+
+  if (is(shape, 'bpmn:Participant')) {
+
+    // snap to borders with higher priority
+    snapContext.setSnapLocations([ 'top-left', 'bottom-right', 'mid' ]);
+  }
+
+  return snapContext;
+};
+
+/**
+ * @param {SnapPoints} snapPoints
+ * @param {Shape} shape
+ * @param {Shape} target
+ *
+ * @return {SnapPoints}
+ */
+BpmnCreateMoveSnapping.prototype.addSnapTargetPoints = function(snapPoints, shape, target) {
+  CreateMoveSnapping.prototype.addSnapTargetPoints.call(this, snapPoints, shape, target);
+
+  var snapTargets = this.getSnapTargets(shape, target);
+
+  forEach(snapTargets, function(snapTarget) {
+
+    // handle TRBL alignment
+    //
+    // * with container elements
+    // * with text annotations
+    if (isContainer(snapTarget) || areAll([ shape, snapTarget ], 'bpmn:TextAnnotation')) {
+      snapPoints.add('top-left', topLeft(snapTarget));
+      snapPoints.add('bottom-right', bottomRight(snapTarget));
+    }
+  });
+
+  var elementRegistry = this._elementRegistry;
+
+  // snap to docking points if not create mode
+  forEach(shape.incoming, function(connection) {
+    if (elementRegistry.get(shape.id)) {
+
+      if (!includes(snapTargets, connection.source)) {
+        snapPoints.add('mid', getMid(connection.source));
+      }
+
+      var docking = connection.waypoints[0];
+      snapPoints.add(connection.id + '-docking', docking.original || docking);
+    }
+  });
+
+  forEach(shape.outgoing, function(connection) {
+    if (elementRegistry.get(shape.id)) {
+
+      if (!includes(snapTargets, connection.target)) {
+        snapPoints.add('mid', getMid(connection.target));
+      }
+
+      var docking = connection.waypoints[ connection.waypoints.length - 1 ];
+
+      snapPoints.add(connection.id + '-docking', docking.original || docking);
+    }
+  });
+
+  // add sequence flow parents as snap targets
+  if (is(target, 'bpmn:SequenceFlow')) {
+    snapPoints = this.addSnapTargetPoints(snapPoints, shape, target.parent);
+  }
+
+  return snapPoints;
+};
+
+/**
+ * @param {Shape} shape
+ * @param {Shape} target
+ *
+ * @return {Shape[]}
+ */
+BpmnCreateMoveSnapping.prototype.getSnapTargets = function(shape, target) {
+  return CreateMoveSnapping.prototype.getSnapTargets.call(this, shape, target)
+    .filter(function(snapTarget) {
+
+      // do not snap to lanes
+      return !is(snapTarget, 'bpmn:Lane');
+    });
+};
+
+// helpers //////////
+
+/**
+ * @param {Shape} event
+ * @param {Shape} target
+ */
+function snapBoundaryEvent(event, target) {
+  var targetTRBL = asTRBL(target);
+
+  var direction = getBoundaryAttachment(event, target);
+
+  var context = event.context,
+      shape = context.shape;
+
+  var offset;
+
+  if (shape.parent) {
+    offset = { x: 0, y: 0 };
+  } else {
+    offset = getMid(shape);
+  }
+
+  if (/top/.test(direction)) {
+    setSnapped(event, 'y', targetTRBL.top - offset.y);
+  } else if (/bottom/.test(direction)) {
+    setSnapped(event, 'y', targetTRBL.bottom - offset.y);
+  }
+
+  if (/left/.test(direction)) {
+    setSnapped(event, 'x', targetTRBL.left - offset.x);
+  } else if (/right/.test(direction)) {
+    setSnapped(event, 'x', targetTRBL.right - offset.x);
+  }
+}
+
+/**
+ * @param {Element[]} elements
+ * @param {string} type
+ *
+ * @return {boolean}
+ */
+function areAll(elements, type) {
+  return elements.every(function(el) {
+    return is(el, type);
+  });
+}
+
+/**
+ * @param {Element} element
+ */
+function isContainer(element) {
+  if (is(element, 'bpmn:SubProcess') && isExpanded(element)) {
+    return true;
+  }
+
+  return is(element, 'bpmn:Participant');
+}
+
+/**
+ * @param {Event} event
+ */
+function setSnappedIfConstrained(event) {
+  var context = event.context,
+      createConstraints = context.createConstraints;
+
+  if (!createConstraints) {
+    return;
+  }
+
+  var top = createConstraints.top,
+      right = createConstraints.right,
+      bottom = createConstraints.bottom,
+      left = createConstraints.left;
+
+  if ((left && left >= event.x) || (right && right <= event.x)) {
+    setSnapped(event, 'x', event.x);
+  }
+
+  if ((top && top >= event.y) || (bottom && bottom <= event.y)) {
+    setSnapped(event, 'y', event.y);
+  }
+}
+
+function includes(array, value) {
+  return array.indexOf(value) !== -1;
+}
+
+function getDockingSnapOrigin(docking, isMove, event) {
+  return isMove ? (
+    {
+      x: docking.x - event.x,
+      y: docking.y - event.y
+    }
+  ) : {
+    x: docking.x,
+    y: docking.y
+  };
+}

package/lib/features/snapping/BpmnSnappingUtil.d.ts

@@ -1,11 +1,11 @@
-/**
- * @param position
- * @param targetBounds
- *
- * @return
- */
-export function getBoundaryAttachment(position: Point, targetBounds: Rect): DirectionTRBL | null;
-
-type DirectionTRBL = import('diagram-js/lib/util/Types').DirectionTRBL;
-type Point = import('diagram-js/lib/util/Types').Point;
-type Rect = import('diagram-js/lib/util/Types').Rect;
+/**
+ * @param position
+ * @param targetBounds
+ *
+ * @return
+ */
+export function getBoundaryAttachment(position: Point, targetBounds: Rect): DirectionTRBL | null;
+
+type DirectionTRBL = import('diagram-js/lib/util/Types').DirectionTRBL;
+type Point = import('diagram-js/lib/util/Types').Point;
+type Rect = import('diagram-js/lib/util/Types').Rect;

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

@@ -1,9 +1,9 @@
-declare namespace _default {
-    const __depends__: import("didi").ModuleDeclaration[];
-    const __init__: string[];
-    const connectSnapping: (string | typeof BpmnConnectSnapping)[];
-    const createMoveSnapping: (string | typeof BpmnCreateMoveSnapping)[];
-}
-export default _default;
-import BpmnConnectSnapping from './BpmnConnectSnapping';
-import BpmnCreateMoveSnapping from './BpmnCreateMoveSnapping';
+declare namespace _default {
+    const __depends__: import("didi").ModuleDeclaration[];
+    const __init__: string[];
+    const connectSnapping: (string | typeof BpmnConnectSnapping)[];
+    const createMoveSnapping: (string | typeof BpmnCreateMoveSnapping)[];
+}
+export default _default;
+import BpmnConnectSnapping from './BpmnConnectSnapping';
+import BpmnCreateMoveSnapping from './BpmnCreateMoveSnapping';

package/lib/features/snapping/index.js

@@ -1,13 +1,13 @@
-import BpmnConnectSnapping from './BpmnConnectSnapping';
-import BpmnCreateMoveSnapping from './BpmnCreateMoveSnapping';
-import SnappingModule from 'diagram-js/lib/features/snapping';
-
-export default {
-  __depends__: [ SnappingModule ],
-  __init__: [
-    'connectSnapping',
-    'createMoveSnapping'
-  ],
-  connectSnapping: [ 'type', BpmnConnectSnapping ],
-  createMoveSnapping: [ 'type', BpmnCreateMoveSnapping ]
+import BpmnConnectSnapping from './BpmnConnectSnapping';
+import BpmnCreateMoveSnapping from './BpmnCreateMoveSnapping';
+import SnappingModule from 'diagram-js/lib/features/snapping';
+
+export default {
+  __depends__: [ SnappingModule ],
+  __init__: [
+    'connectSnapping',
+    'createMoveSnapping'
+  ],
+  connectSnapping: [ 'type', BpmnConnectSnapping ],
+  createMoveSnapping: [ 'type', BpmnCreateMoveSnapping ]
 };