bpmn-js 17.9.2 → 17.10.0

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

@@ -160,10 +160,25 @@ export function getParticipantResizeConstraints(laneShape, resizeDirection, bala
 
     var otherTrbl = asTRBL(other);
 
-    if (/n/.test(resizeDirection)) {
-      if (isHorizontalLane && otherTrbl.top < (laneTrbl.top - 10)) {
+    // lane flags
+    if (isHorizontalLane) {
+      if (otherTrbl.top < (laneTrbl.top - 10)) {
+        isFirst = false;
+      }
+      if (otherTrbl.bottom > (laneTrbl.bottom + 10)) {
+        isLast = false;
+      }
+    }
+    else {
+      if (otherTrbl.left < (laneTrbl.left - 10)) {
         isFirst = false;
       }
+      if (otherTrbl.right > (laneTrbl.right + 10)) {
+        isLast = false;
+      }
+    }
+
+    if (/n/.test(resizeDirection)) {
 
       // max top size (based on next element)
       if (balanced && abs(laneTrbl.top - otherTrbl.bottom) < 10) {
@@ -178,10 +193,6 @@ export function getParticipantResizeConstraints(laneShape, resizeDirection, bala
 
     if (/e/.test(resizeDirection)) {
 
-      if (!isHorizontalLane && otherTrbl.right > (laneTrbl.right + 10)) {
-        isLast = false;
-      }
-
       // max right size (based on previous element)
       if (balanced && abs(laneTrbl.right - otherTrbl.left) < 10) {
         addMin(maxTrbl, 'right', otherTrbl.right - minDimensions.width);
@@ -195,10 +206,6 @@ export function getParticipantResizeConstraints(laneShape, resizeDirection, bala
 
     if (/s/.test(resizeDirection)) {
 
-      if (isHorizontalLane && otherTrbl.bottom > (laneTrbl.bottom + 10)) {
-        isLast = false;
-      }
-
       // max bottom size (based on previous element)
       if (balanced && abs(laneTrbl.bottom - otherTrbl.top) < 10) {
         addMin(maxTrbl, 'bottom', otherTrbl.bottom - minDimensions.height);
@@ -212,10 +219,6 @@ export function getParticipantResizeConstraints(laneShape, resizeDirection, bala
 
     if (/w/.test(resizeDirection)) {
 
-      if (!isHorizontalLane && otherTrbl.left < (laneTrbl.left - 10)) {
-        isFirst = false;
-      }
-
       // max left size (based on next element)
       if (balanced && abs(laneTrbl.left - otherTrbl.right) < 10) {
         addMax(maxTrbl, 'left', otherTrbl.left + minDimensions.width);
@@ -239,23 +242,26 @@ export function getParticipantResizeConstraints(laneShape, resizeDirection, bala
 
     var flowElementTrbl = asTRBL(flowElement);
 
-    if (isFirst && /n/.test(resizeDirection)) {
+    // vertical lane will resize from top with respect to flow element irrespective of first or last lane
+    if (/n/.test(resizeDirection) && (!isHorizontalLane || isFirst)) {
       addMin(minTrbl, 'top', flowElementTrbl.top - padding.top);
     }
 
-    if (isLast && /e/.test(resizeDirection)) {
+    // horizonal lane will resize from right with respect to flow element irrespective of first or last lane
+    if (/e/.test(resizeDirection) && (isHorizontalLane || isLast)) {
       addMax(minTrbl, 'right', flowElementTrbl.right + padding.right);
     }
 
-    if (isLast && /s/.test(resizeDirection)) {
+    // vertical lane will resize from bottom with respect to flow element irrespective of first or last lane
+    if (/s/.test(resizeDirection) && (!isHorizontalLane || isLast)) {
       addMax(minTrbl, 'bottom', flowElementTrbl.bottom + padding.bottom);
     }
 
-    if (isFirst && /w/.test(resizeDirection)) {
+    // horizonal lane will resize from left with respect to flow element irrespective of first or last lane
+    if (/w/.test(resizeDirection) && (isHorizontalLane || isFirst)) {
       addMin(minTrbl, 'left', flowElementTrbl.left - padding.left);
     }
   });
-
   return {
     min: minTrbl,
     max: maxTrbl

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

@@ -0,0 +1,16 @@
+/**
+ * A behavior that sets the property of Compensation Activity after paste operation
+ *
+ */
+export default class SetCompensationActivityAfterPasteBehavior extends CommandInterceptor {
+    /**
+     * @param eventBus
+     * @param modeling
+     */
+    constructor(eventBus: EventBus, modeling: Modeling);
+}
+
+type EventBus = import('diagram-js/lib/core/EventBus').default;
+type BpmnRules = import('../../rules/BpmnRules').default;
+type Modeling = import('../Modeling').default;
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';

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

@@ -0,0 +1,67 @@
+import inherits from 'inherits-browser';
+
+import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
+
+import { getBusinessObject, is } from '../../../util/ModelUtil';
+
+import { hasEventDefinition } from '../../../util/DiUtil';
+
+/**
+ * @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
+ * @typedef {import('../../rules/BpmnRules').default} BpmnRules
+ * @typedef {import('../Modeling').default} Modeling
+ */
+
+
+/**
+ * A behavior that sets the property of Compensation Activity after paste operation
+ *
+ * @param {EventBus} eventBus
+ * @param {Modeling} modeling
+ */
+export default function SetCompensationActivityAfterPasteBehavior(eventBus, modeling) {
+
+  CommandInterceptor.call(this, eventBus);
+
+  this.postExecuted('elements.create', function(event) {
+    const context = event.context,
+          elements = context.elements;
+
+    // check if compensation activity is connected to compensation boundary event
+    for (const element of elements) {
+      if (isForCompensation(element) && !isConnectedToCompensationBoundaryEvent(element)) {
+        modeling.updateProperties(element, { isForCompensation: undefined });
+      }
+    }
+  });
+}
+
+inherits(SetCompensationActivityAfterPasteBehavior, CommandInterceptor);
+
+SetCompensationActivityAfterPasteBehavior.$inject = [
+  'eventBus',
+  'modeling'
+];
+
+
+// helpers //////////////////////
+
+function isForCompensation(element) {
+  const bo = getBusinessObject(element);
+  return bo && bo.isForCompensation;
+}
+
+function isCompensationBoundaryEvent(element) {
+  return element && is(element, 'bpmn:BoundaryEvent') &&
+      hasEventDefinition(element, 'bpmn:CompensateEventDefinition');
+}
+
+function isConnectedToCompensationBoundaryEvent(element) {
+  const compensationAssociations = element.incoming.filter(
+    connection => isCompensationBoundaryEvent(connection.source)
+  );
+  if (compensationAssociations.length > 0) {
+    return true;
+  }
+  return false;
+}

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

@@ -38,6 +38,7 @@ import ToggleElementCollapseBehaviour from './ToggleElementCollapseBehaviour';
 import UnclaimIdBehavior from './UnclaimIdBehavior';
 import UnsetDefaultFlowBehavior from './UnsetDefaultFlowBehavior';
 import UpdateFlowNodeRefsBehavior from './UpdateFlowNodeRefsBehavior';
+import SetCompensationActivityAfterPasteBehavior from './SetCompensationActivityAfterPasteBehavior';
 
 /**
  * @type { import('didi').ModuleDeclaration }
@@ -83,7 +84,8 @@ export default {
     'toggleElementCollapseBehaviour',
     'unclaimIdBehavior',
     'updateFlowNodeRefsBehavior',
-    'unsetDefaultFlowBehavior'
+    'unsetDefaultFlowBehavior',
+    'setCompensationActivityAfterPasteBehavior'
   ],
   adaptiveLabelPositioningBehavior: [ 'type', AdaptiveLabelPositioningBehavior ],
   appendBehavior: [ 'type', AppendBehavior ],
@@ -124,5 +126,6 @@ export default {
   toggleElementCollapseBehaviour : [ 'type', ToggleElementCollapseBehaviour ],
   unclaimIdBehavior: [ 'type', UnclaimIdBehavior ],
   unsetDefaultFlowBehavior: [ 'type', UnsetDefaultFlowBehavior ],
-  updateFlowNodeRefsBehavior: [ 'type', UpdateFlowNodeRefsBehavior ]
+  updateFlowNodeRefsBehavior: [ 'type', UpdateFlowNodeRefsBehavior ],
+  setCompensationActivityAfterPasteBehavior: [ 'type', SetCompensationActivityAfterPasteBehavior ]
 };

package/lib/features/modeling/util/ModelingUtil.d.ts

@@ -12,10 +12,12 @@ export function getParent(element: Element, anyType: string | string[]): Element
  * Determines if the local modeling direction is vertical or horizontal.
  *
  * @param element
+ * @param elementRegistry - provide to consider parent diagram direction
  *
  * @return false for vertical pools, lanes and their children. true otherwise
  */
-export function isDirectionHorizontal(element: Element): boolean;
+export function isDirectionHorizontal(element: Element, elementRegistry?: ElementRegistry): boolean;
 
+type ElementRegistry = import('diagram-js/lib/core/ElementRegistry').default;
 type Element = import('../../../model/Types').Element;
 export { is, isAny } from "../../../util/ModelUtil";

package/lib/features/modeling/util/ModelingUtil.js

@@ -2,11 +2,16 @@ import { isString } from 'min-dash';
 
 export { is, isAny } from '../../../util/ModelUtil';
 
-import { isAny } from '../../../util/ModelUtil';
+import {
+  is,
+  isAny,
+  getBusinessObject
+} from '../../../util/ModelUtil';
 
 import { isHorizontal } from '../../../util/DiUtil';
 
 /**
+ * @typedef {import('diagram-js/lib/core/ElementRegistry').default} ElementRegistry
  * @typedef {import('../../../model/Types').Element} Element
  */
 
@@ -37,19 +42,48 @@ export function getParent(element, anyType) {
  * Determines if the local modeling direction is vertical or horizontal.
  *
  * @param {Element} element
+ * @param {ElementRegistry} [elementRegistry] - provide to consider parent diagram direction
  *
  * @return {boolean} false for vertical pools, lanes and their children. true otherwise
  */
-export function isDirectionHorizontal(element) {
+export function isDirectionHorizontal(element, elementRegistry) {
+
+  var parent = getParent(element, 'bpmn:Process');
+  if (parent) {
+    return true;
+  }
 
   var types = [ 'bpmn:Participant', 'bpmn:Lane' ];
 
-  var parent = getParent(element, types);
+  parent = getParent(element, types);
   if (parent) {
     return isHorizontal(parent);
   } else if (isAny(element, types)) {
     return isHorizontal(element);
   }
 
-  return true;
+  var process;
+  for (process = getBusinessObject(element); process; process = process.$parent) {
+    if (is(process, 'bpmn:Process')) {
+      break;
+    }
+  }
+
+  if (!elementRegistry) {
+    return true;
+  }
+
+  // The direction may be specified in another diagram. We ignore that there
+  // could be multiple diagrams with contradicting properties based on the
+  // assumption that such BPMN files are unusual.
+  var pool = elementRegistry.find(function(shape) {
+    var businessObject = getBusinessObject(shape);
+    return businessObject && businessObject.get('processRef') === process;
+  });
+
+  if (!pool) {
+    return true;
+  }
+
+  return isHorizontal(pool);
 }

package/lib/features/outline/OutlineProvider.d.ts

@@ -32,3 +32,8 @@ export default class OutlineProvider implements BaseOutlineProvider {
    */
   updateOutline(element: Element, outline: Outline): boolean;
 }
+
+type BaseOutlineProvider = import('diagram-js/lib/features/outline/OutlineProvider').default;
+type Outline = import('diagram-js/lib/features/outline/OutlineProvider').Outline;
+type Styles = import('diagram-js/lib/draw/Styles').default;
+type Element = import('diagram-js/lib/model/Types').Element;

package/lib/features/outline/OutlineProvider.js

@@ -20,6 +20,16 @@ import {
   createPath
 } from './OutlineUtil';
 
+/**
+ * @typedef { import('diagram-js/lib/features/outline/OutlineProvider').default } BaseOutlineProvider
+ *
+ * @typedef { import('diagram-js/lib/features/outline/OutlineProvider').Outline } Outline
+ *
+ * @typedef { import('diagram-js/lib/draw/Styles').default } Styles
+ *
+ * @typedef { import('diagram-js/lib/model/Types').Element } Element
+ */
+
 const DEFAULT_OFFSET = 5;
 
 /**

package/lib/features/outline/OutlineUtil.d.ts

@@ -6,13 +6,18 @@
  * @return
  */
 export function createPath(path: string, attrs: any, OUTLINE_STYLE: any): SVGElement;
+
 export const DATA_OBJECT_REFERENCE_OUTLINE_PATH: "M44.7648 11.3263L36.9892 2.64074C36.0451 1.58628 34.5651 0.988708 33.1904 0.988708H5.98667C3.22688 0.988708 0.989624 3.34892 0.989624 6.26039V55.0235C0.989624 57.9349 3.22688 60.2952 5.98667 60.2952H40.966C43.7257 60.2952 45.963 57.9349 45.963 55.0235V14.9459C45.963 13.5998 45.6407 12.3048 44.7648 11.3263Z";
 export const DATA_STORE_REFERENCE_OUTLINE_PATH: "M1.03845 48.1347C1.03845 49.3511 1.07295 50.758 1.38342 52.064C1.69949 53.3938 2.32428 54.7154 3.56383 55.6428C6.02533 57.4841 10.1161 58.7685 14.8212 59.6067C19.5772 60.4538 25.1388 60.8738 30.6831 60.8738C36.2276 60.8738 41.7891 60.4538 46.545 59.6067C51.2504 58.7687 55.3412 57.4842 57.8028 55.6429C59.0424 54.7156 59.6673 53.3938 59.9834 52.064C60.2938 50.7579 60.3285 49.351 60.3285 48.1344V13.8415C60.3285 12.6249 60.2938 11.218 59.9834 9.91171C59.6673 8.58194 59.0423 7.2602 57.8027 6.33294C55.341 4.49168 51.2503 3.20723 46.545 2.36914C41.7891 1.522 36.2276 1.10204 30.6831 1.10205C25.1388 1.10206 19.5772 1.52206 14.8213 2.36923C10.1162 3.20734 6.02543 4.49183 3.5639 6.33314C2.32433 7.26038 1.69951 8.58206 1.38343 9.91181C1.07295 11.2179 1.03845 12.6247 1.03845 13.8411V48.1347Z";
+
 /**
  * @type {Dimensions}
  */
 export const DATA_OBJECT_REFERENCE_STANDARD_SIZE: Dimensions;
+
 /**
  * @type {Dimensions}
  */
 export const DATA_STORE_REFERENCE_STANDARD_SIZE: Dimensions;
+
+type Dimensions = import('diagram-js/lib/util/Types').Dimensions;

package/lib/features/outline/OutlineUtil.js

@@ -5,6 +5,10 @@ import {
 export const DATA_OBJECT_REFERENCE_OUTLINE_PATH = 'M44.7648 11.3263L36.9892 2.64074C36.0451 1.58628 34.5651 0.988708 33.1904 0.988708H5.98667C3.22688 0.988708 0.989624 3.34892 0.989624 6.26039V55.0235C0.989624 57.9349 3.22688 60.2952 5.98667 60.2952H40.966C43.7257 60.2952 45.963 57.9349 45.963 55.0235V14.9459C45.963 13.5998 45.6407 12.3048 44.7648 11.3263Z';
 export const DATA_STORE_REFERENCE_OUTLINE_PATH = 'M1.03845 48.1347C1.03845 49.3511 1.07295 50.758 1.38342 52.064C1.69949 53.3938 2.32428 54.7154 3.56383 55.6428C6.02533 57.4841 10.1161 58.7685 14.8212 59.6067C19.5772 60.4538 25.1388 60.8738 30.6831 60.8738C36.2276 60.8738 41.7891 60.4538 46.545 59.6067C51.2504 58.7687 55.3412 57.4842 57.8028 55.6429C59.0424 54.7156 59.6673 53.3938 59.9834 52.064C60.2938 50.7579 60.3285 49.351 60.3285 48.1344V13.8415C60.3285 12.6249 60.2938 11.218 59.9834 9.91171C59.6673 8.58194 59.0423 7.2602 57.8027 6.33294C55.341 4.49168 51.2503 3.20723 46.545 2.36914C41.7891 1.522 36.2276 1.10204 30.6831 1.10205C25.1388 1.10206 19.5772 1.52206 14.8213 2.36923C10.1162 3.20734 6.02543 4.49183 3.5639 6.33314C2.32433 7.26038 1.69951 8.58206 1.38343 9.91181C1.07295 11.2179 1.03845 12.6247 1.03845 13.8411V48.1347Z';
 
+/**
+ * @typedef { import('diagram-js/lib/util/Types').Dimensions} Dimensions
+ */
+
 /**
  * @type {Dimensions}
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "17.9.2",
+  "version": "17.10.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -71,7 +71,7 @@
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-terser": "^0.4.4",
     "babel-loader": "^9.1.0",
-    "babel-plugin-istanbul": "^6.1.1",
+    "babel-plugin-istanbul": "^7.0.0",
     "bio-dts": "^0.11.0",
     "bpmn-font": "^0.12.1",
     "camunda-bpmn-moddle": "^4.0.1",
@@ -99,7 +99,7 @@
     "mocha": "^10.1.0",
     "mocha-test-container-support": "0.2.0",
     "npm-run-all2": "^6.0.0",
-    "puppeteer": "^22.0.0",
+    "puppeteer": "^23.0.0",
     "remark-cli": "^12.0.0",
     "remark-preset-bpmn-io": "^0.2.1",
     "rollup": "^4.0.0",
@@ -112,7 +112,7 @@
   },
   "dependencies": {
     "bpmn-moddle": "^8.1.0",
-    "diagram-js": "^14.7.2",
+    "diagram-js": "^14.9.0",
     "diagram-js-direct-editing": "^3.0.1",
     "ids": "^1.0.5",
     "inherits-browser": "^0.1.0",