improved grid snapping for waypoints

Issue #319
imixs · Feb 7, 2024 · 33d2083 · 33d2083
1 parent 85cdb27
commit 33d2083
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx b/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx
@@ -29,7 +29,6 @@ import {
 import {
   isBPMNLabelNode,
   isBoundaryEvent,
-  isEventNode,
   isLaneNode,
   isPoolNode,
   isTaskNode
@@ -41,8 +40,6 @@ import { inject, injectable } from 'inversify';
  *
  ****************************************************************************/
 
-
-
 /**
  * A {@link ISnapper} implementation that snaps BPMN elements onto a fixed gride size.
  * This snapper calulates the grid size based on the selected element to allign tasks, gateways and events.
@@ -53,11 +50,13 @@ export class BPMNElementSnapper implements ISnapper {
   constructor(public grid: { x: number; y: number } = { x: 10, y: 10 }) { }
 
   snap(position: Point, _element: GModelElement): Point {
-    // events are moved by 1x1
-    if (isEventNode(_element)) {
+
+    // move routing-points by 5x5 
+    if ('volatile-routing-point' === _element.type) {
+      //console.log(' --bin drin im routingpoint');
       return {
-        x: Math.round(position.x / 1) * 1,
-        y: Math.round(position.y / 1) * 1
+        x: Math.round(position.x / 5) * 5,
+        y: Math.round(position.y / 5) * 5
       };
     }
 
@@ -69,7 +68,6 @@ export class BPMNElementSnapper implements ISnapper {
   }
 }
 
-
 /**
  * This selectionListener selects additional associated BoundaryEvents and BPMNLabels.
  * This allows to move both independent Nodes (TaskNode and BoundaryEvent, Event|Gateway and BPMNLabel)
@@ -154,4 +152,4 @@ export class BPMNMultiNodeSelectionListener implements ISelectionListener {
     // finally dispatch the updated selected and unselected IDs...
     this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: selectedElements, deselectedElementsIDs: containerIDs }));
   }
-}
+}
diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts b/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts
@@ -50,7 +50,8 @@ import {
     MultiLineTextNode,
     PoolNode, TaskNode,
     TextAnnotationNode,
-    isBPMNNode
+    isBPMNNode,
+    isBoundaryEvent
 } from '@open-bpmn/open-bpmn-model';
 import 'balloon-css/balloon.min.css';
 import { Container, ContainerModule } from 'inversify';
@@ -105,7 +106,7 @@ const bpmnDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) =>
     //bind(TYPES.ISnapper).toConstantValue(new GridSnapper({ x: 5, y: 5 }));
     bind<IHelperLineOptions>(TYPES.IHelperLineOptions).toConstantValue({
         alignmentElementFilter: element =>
-            isBPMNNode(element),
+            isBPMNNode(element) && !isBoundaryEvent(element),
         minimumMoveDelta: { x: 10, y: 10 }
     });