bpmn-js 16.4.0 → 16.5.0

package/lib/draw/BpmnRenderer.js

@@ -720,7 +720,7 @@ export default function BpmnRenderer(
       });
 
       return drawPath(parentGfx, pathData, {
-        fill: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
+        fill: getFillColor(event, defaultFillColor, attrs.fill),
         stroke: getStrokeColor(event, defaultStrokeColor, attrs.stroke),
         strokeWidth: 1
       });

package/lib/features/context-pad/ContextPadProvider.js

@@ -420,8 +420,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         'append.gateway': appendAction(
           'bpmn:ExclusiveGateway',
           'bpmn-icon-gateway-none',
-          translate('Append gateway'),
-          { isMarkerVisible: true }
+          translate('Append gateway')
         ),
         'append.append-task': appendAction(
           'bpmn:Task',

package/lib/features/modeling/ElementFactory.js

@@ -207,6 +207,10 @@ ElementFactory.prototype.createElement = function(elementType, attrs) {
     attrs = applyAttribute(di, attrs, 'isExpanded');
   }
 
+  if (isAny(businessObject, [ 'bpmn:Lane', 'bpmn:Participant' ])) {
+    attrs = applyAttribute(di, attrs, 'isHorizontal');
+  }
+
   if (is(businessObject, 'bpmn:SubProcess')) {
     attrs.collapsed = !isExpanded(businessObject, di);
   }

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

@@ -12,6 +12,10 @@ import {
   LANE_INDENTATION
 } from '../util/LaneUtil';
 
+import {
+  isHorizontal
+} from '../../../util/DiUtil';
+
 /**
  * @typedef {import('diagram-js/lib/command/CommandHandler').default} CommandHandler
  *
@@ -54,14 +58,47 @@ AddLaneHandler.prototype.preExecute = function(context) {
 
   var existingChildLanes = getChildLanes(laneParent);
 
+  var isHorizontalLane = isHorizontal(shape);
+
+  // never mix up horizontal/vertical lanes
+  if (isHorizontalLane) {
+    if (location === 'left') {
+      location = 'top';
+    } else
+    if (location === 'right') {
+      location = 'bottom';
+    }
+  } else {
+    if (location === 'top') {
+      location = 'left';
+    } else
+    if (location === 'bottom') {
+      location = 'right';
+    }
+  }
+
   // (0) add a lane if we currently got none and are adding to root
   if (!existingChildLanes.length) {
-    modeling.createShape({ type: 'bpmn:Lane' }, {
+    var siblingPosition = isHorizontalLane ? {
       x: shape.x + LANE_INDENTATION,
       y: shape.y,
       width: shape.width - LANE_INDENTATION,
       height: shape.height
-    }, laneParent);
+    } : {
+      x: shape.x,
+      y: shape.y + LANE_INDENTATION,
+      width: shape.width,
+      height: shape.height - LANE_INDENTATION
+    };
+
+    modeling.createShape(
+      {
+        type: 'bpmn:Lane',
+        isHorizontal: isHorizontalLane
+      },
+      siblingPosition,
+      laneParent
+    );
   }
 
   // (1) collect affected elements to create necessary space
@@ -84,26 +121,72 @@ AddLaneHandler.prototype.preExecute = function(context) {
     });
   });
 
-  var offset = location === 'top' ? -120 : 120,
-      lanePosition = location === 'top' ? shape.y : shape.y + shape.height,
-      spacePos = lanePosition + (location === 'top' ? 10 : -10),
-      direction = location === 'top' ? 'n' : 's';
+  var offset,
+      lanePosition,
+      spacePos,
+      direction,
+      axis;
+
+  if (location === 'top') {
+    offset = -120;
+    lanePosition = shape.y;
+    spacePos = lanePosition + 10;
+    direction = 'n';
+    axis = 'y';
+  } else
+  if (location === 'left') {
+    offset = -120;
+    lanePosition = shape.x;
+    spacePos = lanePosition + 10;
+    direction = 'w';
+    axis = 'x';
+  } else
+  if (location === 'bottom') {
+    offset = 120;
+    lanePosition = shape.y + shape.height;
+    spacePos = lanePosition - 10;
+    direction = 's';
+    axis = 'y';
+  } else
+  if (location === 'right') {
+    offset = 120;
+    lanePosition = shape.x + shape.width;
+    spacePos = lanePosition - 10;
+    direction = 'e';
+    axis = 'x';
+  }
 
-  var adjustments = spaceTool.calculateAdjustments(allAffected, 'y', offset, spacePos);
+  var adjustments = spaceTool.calculateAdjustments(allAffected, axis, offset, spacePos);
+
+  var delta = isHorizontalLane ? { x: 0, y: offset } : { x: offset, y: 0 };
 
   spaceTool.makeSpace(
     adjustments.movingShapes,
     adjustments.resizingShapes,
-    { x: 0, y: offset },
+    delta,
     direction,
     spacePos
   );
 
   // (2) create new lane at open space
-  context.newLane = modeling.createShape({ type: 'bpmn:Lane' }, {
+  var newLanePosition = isHorizontalLane ? {
     x: shape.x + (isRoot ? LANE_INDENTATION : 0),
     y: lanePosition - (location === 'top' ? 120 : 0),
     width: shape.width - (isRoot ? LANE_INDENTATION : 0),
     height: 120
-  }, laneParent);
+  } : {
+    x: lanePosition - (location === 'left' ? 120 : 0),
+    y: shape.y + (isRoot ? LANE_INDENTATION : 0),
+    width: 120,
+    height: shape.height - (isRoot ? LANE_INDENTATION : 0)
+  };
+
+  context.newLane = modeling.createShape(
+    {
+      type: 'bpmn:Lane',
+      isHorizontal: isHorizontalLane
+    },
+    newLanePosition,
+    laneParent
+  );
 };

package/lib/model/Types.d.ts

@@ -7,6 +7,7 @@ export type BpmnAttributes = {
     cancelActivity: boolean;
     eventDefinitionType: string;
     isExpanded: boolean;
+    isHorizontal: boolean;
     isForCompensation: boolean;
     isInterrupting: boolean;
     processRef: ModdleElement;

package/lib/model/Types.ts

@@ -17,6 +17,7 @@ export type BpmnAttributes = {
   cancelActivity: boolean;
   eventDefinitionType: string;
   isExpanded: boolean;
+  isHorizontal: boolean;
   isForCompensation: boolean;
   isInterrupting: boolean;
   processRef: ModdleElement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "16.4.0",
+  "version": "16.5.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -97,7 +97,7 @@
     "karma-webpack": "^5.0.0",
     "mocha": "^10.1.0",
     "mocha-test-container-support": "0.2.0",
-    "npm-run-all": "^4.1.2",
+    "npm-run-all2": "^5.0.0",
     "puppeteer": "^21.3.8",
     "remark-cli": "^12.0.0",
     "remark-preset-bpmn-io": "^0.2.1",