@eclipse-glsp/client 2.1.0-next.301 → 2.1.0-next.303

package/src/features/hints/index.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './model';
+export * from './type-hint-provider';
+export * from './type-hints-module';

package/src/features/hover/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './hover-module';
+export * from './hover';

package/src/features/index.ts

@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './accessibility';
+export * from './bounds';
+export * from './change-bounds';
+export * from './command-palette';
+export * from './context-menu';
+export * from './copy-paste';
+export * from './decoration';
+export * from './element-template';
+export * from './export';
+export * from './helper-lines';
+export * from './hints';
+export * from './hover';
+export * from './label-edit';
+export * from './layout';
+export * from './navigation';
+export * from './reconnect';
+export * from './routing';
+export * from './save';
+export * from './select';
+export * from './source-model-watcher';
+export * from './status';
+export * from './svg-metadata';
+export * from './tool-palette';
+export * from './tools';
+export * from './undo-redo';
+export * from './validation';
+export * from './viewport';

package/src/features/label-edit/index.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './edit-label-tool';
+export * from './edit-label-validator';
+export * from './label-edit-module';

package/src/features/layout/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './layout-elements-action';
+export * from './layout-module';

package/src/features/navigation/index.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './navigation-action-handler';
+export * from './navigation-module';
+export * from './navigation-target-resolver';

package/src/features/reconnect/index.ts

@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './model';

package/src/features/routing/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './glsp-manhattan-edge-router';
+export * from './routing-module';

package/src/features/save/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './save-keylistener';
+export * from './save-module';

package/src/features/select/index.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './select-feedback-command';
+export * from './select-module';
+export * from './select-mouse-listener';

package/src/features/source-model-watcher/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './source-model-changed-action-handler';
+export * from './source-model-watcher-module';

package/src/features/status/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './status-module';
+export * from './status-overlay';

package/src/features/svg-metadata/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './metadata-placer';
+export * from './svg-metadata-module';

package/src/features/tool-palette/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './tool-palette-module';
+export * from './tool-palette';

package/src/features/tools/change-bounds/change-bounds-tool-feedback.ts

@@ -22,24 +22,24 @@ import {
     GChildElement,
     GModelElement,
     GModelRoot,
-    MouseListener,
     MoveAction,
     Point,
     TYPES,
     findParentByFeature,
     hasStringProp,
     isMoveable,
-    isSelectable,
-    isViewport
+    isSelectable
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import { VNode } from 'snabbdom';
 
+import { DebouncedFunc, debounce } from 'lodash';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
 import { FeedbackCommand } from '../../../base/feedback/feedback-command';
 import { forEachElement } from '../../../utils/gmodel-util';
 import { SResizeHandle, addResizeHandles, isResizable, removeResizeHandles } from '../../change-bounds/model';
 import { createMovementRestrictionFeedback, removeMovementRestrictionFeedback } from '../../change-bounds/movement-restrictor';
+import { PointPositionUpdater } from '../../change-bounds/point-position-updater';
 import { ChangeBoundsTool } from './change-bounds-tool';
 
 export interface ShowChangeBoundsToolResizeFeedbackAction extends Action {
@@ -113,6 +113,38 @@ export class HideChangeBoundsToolResizeFeedbackCommand extends FeedbackCommand {
     }
 }
 
+export interface MoveInitializedEventAction extends Action {
+    kind: typeof MoveInitializedEventAction.KIND;
+}
+
+export namespace MoveInitializedEventAction {
+    export const KIND = 'move-initialized-event';
+
+    export function is(object: any): object is MoveInitializedEventAction {
+        return Action.hasKind(object, KIND);
+    }
+
+    export function create(): MoveInitializedEventAction {
+        return { kind: KIND };
+    }
+}
+
+export interface MoveFinishedEventAction extends Action {
+    kind: typeof MoveFinishedEventAction.KIND;
+}
+
+export namespace MoveFinishedEventAction {
+    export const KIND = 'move-finished-event';
+
+    export function is(object: any): object is MoveFinishedEventAction {
+        return Action.hasKind(object, KIND);
+    }
+
+    export function create(): MoveFinishedEventAction {
+        return { kind: KIND };
+    }
+}
+
 /**
  * This mouse listener provides visual feedback for moving by sending client-side
  * `MoveAction`s while elements are selected and dragged. This will also update
@@ -120,45 +152,57 @@ export class HideChangeBoundsToolResizeFeedbackCommand extends FeedbackCommand {
  * the visual feedback but also the basis for sending the change to the server
  * (see also `tools/MoveTool`).
  */
-export class FeedbackMoveMouseListener extends MouseListener implements Disposable {
-    protected hasDragged = false;
+export class FeedbackMoveMouseListener extends DragAwareMouseListener implements Disposable {
     protected rootElement?: GModelRoot;
-    protected startDragPosition?: Point;
+    protected positionUpdater;
     protected elementId2startPos = new Map<string, Point>();
+    protected pendingMoveInitialized?: DebouncedFunc<() => void>;
 
     constructor(protected tool: ChangeBoundsTool) {
         super();
+        this.positionUpdater = new PointPositionUpdater(tool.positionSnapper);
     }
 
     override mouseDown(target: GModelElement, event: MouseEvent): Action[] {
         if (event.button === 0 && !(target instanceof SResizeHandle)) {
             const moveable = findParentByFeature(target, isMoveable);
-            if (moveable !== undefined) {
-                this.startDragPosition = { x: event.pageX, y: event.pageY };
+            if (moveable !== undefined && !(target instanceof SResizeHandle)) {
+                this.positionUpdater.updateLastDragPosition(event);
+                this.scheduleMoveInitialized();
             } else {
-                this.startDragPosition = undefined;
+                this.positionUpdater.resetPosition();
             }
-            this.hasDragged = false;
+            this._isMouseDrag = false;
         }
         return [];
     }
 
+    protected scheduleMoveInitialized(): void {
+        this.pendingMoveInitialized?.cancel();
+        this.pendingMoveInitialized = debounce(() => {
+            this.tool.registerFeedback([MoveInitializedEventAction.create()], this);
+            this.pendingMoveInitialized = undefined;
+        }, 750);
+        this.pendingMoveInitialized();
+    }
+
     override mouseMove(target: GModelElement, event: MouseEvent): Action[] {
         const result: Action[] = [];
         if (event.buttons === 0) {
             this.mouseUp(target, event);
-        } else if (this.startDragPosition) {
+        } else if (!this.positionUpdater.isLastDragPositionUndefined()) {
+            this.pendingMoveInitialized?.cancel();
             if (this.elementId2startPos.size === 0) {
                 this.collectStartPositions(target.root);
             }
-            this.hasDragged = true;
+            this._isMouseDrag = true;
             const moveAction = this.getElementMoves(target, event, false);
             if (moveAction) {
                 result.push(moveAction);
                 result.push(cursorFeedbackAction(CursorCSS.MOVE));
+                this.tool.registerFeedback(result, this);
             }
         }
-        this.tool.registerFeedback(result, this);
         return [];
     }
 
@@ -186,18 +230,11 @@ export class FeedbackMoveMouseListener extends MouseListener implements Disposab
     }
 
     protected getElementMoves(target: GModelElement, event: MouseEvent, finished: boolean): MoveAction | undefined {
-        if (!this.startDragPosition) {
+        const delta = this.positionUpdater.updatePosition(target, event);
+        if (!delta) {
             return undefined;
         }
-
-        const viewport = findParentByFeature(target, isViewport);
-        const zoom = viewport ? viewport.zoom : 1;
-        const delta = {
-            x: (event.pageX - this.startDragPosition.x) / zoom,
-            y: (event.pageY - this.startDragPosition.y) / zoom
-        };
-
-        const elementMoves: ElementMove[] = this.getElementMovesForDelta(target, delta, !event.altKey, finished);
+        const elementMoves: ElementMove[] = this.getElementMovesForDelta(target, delta, finished);
         if (elementMoves.length > 0) {
             return MoveAction.create(elementMoves, { animate: false, finished });
         } else {
@@ -205,35 +242,15 @@ export class FeedbackMoveMouseListener extends MouseListener implements Disposab
         }
     }
 
-    protected getElementMovesForDelta(
-        target: GModelElement,
-        delta: { x: number; y: number },
-        isSnap: boolean,
-        finished: boolean
-    ): ElementMove[] {
+    protected getElementMovesForDelta(target: GModelElement, delta: Point, finished: boolean): ElementMove[] {
         const elementMoves: ElementMove[] = [];
         this.elementId2startPos.forEach((startPosition, elementId) => {
             const element = target.root.index.getById(elementId);
             if (element) {
-                let toPosition = this.snap(
-                    {
-                        x: startPosition.x + delta.x,
-                        y: startPosition.y + delta.y
-                    },
-                    element,
-                    isSnap
-                );
-
                 if (isMoveable(element)) {
-                    toPosition = this.validateMove(startPosition, toPosition, element, finished);
-                    elementMoves.push({
-                        elementId: element.id,
-                        fromPosition: {
-                            x: element.position.x,
-                            y: element.position.y
-                        },
-                        toPosition
-                    });
+                    const targetPosition = Point.add(element.position, delta);
+                    const toPosition = this.validateMove(startPosition, targetPosition, element, finished);
+                    elementMoves.push({ elementId: element.id, fromPosition: element.position, toPosition });
                 }
             }
         });
@@ -247,7 +264,6 @@ export class FeedbackMoveMouseListener extends MouseListener implements Disposab
             let action;
             if (!valid) {
                 action = createMovementRestrictionFeedback(element, this.tool.movementRestrictor);
-
                 if (isFinished) {
                     newPosition = startPosition;
                 }
@@ -259,24 +275,24 @@ export class FeedbackMoveMouseListener extends MouseListener implements Disposab
         return newPosition;
     }
 
-    protected snap(position: Point, element: GModelElement, isSnap: boolean): Point {
-        if (isSnap && this.tool.snapper) {
-            return this.tool.snapper.snap(position, element);
-        } else {
-            return position;
-        }
-    }
-
     override mouseEnter(target: GModelElement, event: MouseEvent): Action[] {
-        if (target instanceof GModelRoot && event.buttons === 0 && !this.startDragPosition) {
+        if (target instanceof GModelRoot && event.buttons === 0 && this.positionUpdater.isLastDragPositionUndefined()) {
             this.mouseUp(target, event);
         }
         return [];
     }
 
-    override mouseUp(target: GModelElement, event: MouseEvent): Action[] {
+    override nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[] {
+        this.reset(true);
+        return [];
+    }
+
+    override draggingMouseUp(target: GModelElement, event: MouseEvent): Action[] {
         const result: Action[] = [];
-        if (this.startDragPosition) {
+        if (this.positionUpdater.isLastDragPositionUndefined()) {
+            this.reset(true);
+            return result;
+        } else {
             const moveAction = this.getElementMoves(target, event, true);
             if (moveAction) {
                 result.push(moveAction);
@@ -292,22 +308,36 @@ export class FeedbackMoveMouseListener extends MouseListener implements Disposab
         return result;
     }
 
+    protected resetMoveFeedback(): ElementMove[] {
+        const elementMoves: ElementMove[] = [];
+        this.elementId2startPos.forEach((startPosition, elementId) => {
+            const element = this.rootElement!.index.getById(elementId);
+            if (element) {
+                if (isMoveable(element)) {
+                    elementMoves.push({ elementId: element.id, fromPosition: element.position, toPosition: startPosition });
+                }
+            }
+        });
+        return elementMoves;
+    }
+
     protected reset(resetFeedback = false): void {
+        this.pendingMoveInitialized?.cancel();
         if (this.rootElement && resetFeedback) {
-            const elementMoves: ElementMove[] = this.getElementMovesForDelta(this.rootElement, { x: 0, y: 0 }, true, true);
-            const moveAction = MoveAction.create(elementMoves, { animate: false, finished: true });
-            this.tool.deregisterFeedback(this, [moveAction]);
+            const elementMoves: ElementMove[] = this.resetMoveFeedback();
+            if (elementMoves.length > 0) {
+                const moveAction = MoveAction.create(elementMoves, { animate: false, finished: true });
+                this.tool.deregisterFeedback(this, [moveAction]);
+            }
+        } else if (resetFeedback) {
+            this.tool.deregisterFeedback(this, [MoveFinishedEventAction.create()]);
         }
-        this.hasDragged = false;
-        this.startDragPosition = undefined;
+        this.positionUpdater.resetPosition();
+        this._isMouseDrag = false;
         this.rootElement = undefined;
         this.elementId2startPos.clear();
     }
 
-    override decorate(vnode: VNode, _element: GModelElement): VNode {
-        return vnode;
-    }
-
     dispose(): void {
         this.reset(true);
     }

package/src/features/tools/change-bounds/change-bounds-tool.ts

@@ -32,7 +32,6 @@ import {
     GModelElement,
     GModelRoot,
     GParentElement,
-    ISnapper,
     MouseListener,
     Operation,
     Point,
@@ -43,7 +42,7 @@ import {
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, applyCssClasses, cursorFeedbackAction, deleteCssClasses } from '../../../base/feedback/css-feedback';
 import { ISelectionListener, SelectionService } from '../../../base/selection-service';
-import { PointPositionUpdater } from '../../../features/change-bounds/snap';
+import { PointPositionUpdater } from '../../../features/change-bounds/point-position-updater';
 import {
     calcElementAndRoutingPoints,
     forEachElement,
@@ -58,6 +57,8 @@ import {
     createMovementRestrictionFeedback,
     removeMovementRestrictionFeedback
 } from '../../change-bounds/movement-restrictor';
+import { PositionSnapper } from '../../change-bounds/position-snapper';
+import { getDirectionFrom } from '../../helper-lines/model';
 import { BaseEditTool } from '../base-tools';
 import {
     FeedbackMoveMouseListener,
@@ -84,8 +85,8 @@ export class ChangeBoundsTool extends BaseEditTool {
 
     @inject(SelectionService) protected selectionService: SelectionService;
     @inject(EdgeRouterRegistry) @optional() readonly edgeRouterRegistry?: EdgeRouterRegistry;
-    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
     @inject(TYPES.IMovementRestrictor) @optional() readonly movementRestrictor?: IMovementRestrictor;
+    @inject(PositionSnapper) readonly positionSnapper: PositionSnapper;
 
     get id(): string {
         return ChangeBoundsTool.ID;
@@ -135,7 +136,7 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements ISel
 
     constructor(protected tool: ChangeBoundsTool) {
         super();
-        this.pointPositionUpdater = new PointPositionUpdater(tool.snapper);
+        this.pointPositionUpdater = new PointPositionUpdater(tool.positionSnapper);
     }
 
     override mouseDown(target: GModelElement, event: MouseEvent): Action[] {
@@ -168,7 +169,11 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements ISel
                 cursorFeedbackAction(this.activeResizeHandle.isNwSeResize() ? CursorCSS.RESIZE_NWSE : CursorCSS.RESIZE_NESW),
                 applyCssClasses(this.activeResizeHandle, ChangeBoundsListener.CSS_CLASS_ACTIVE)
             ];
-            const positionUpdate = this.pointPositionUpdater.updatePosition(target, { x: event.pageX, y: event.pageY }, !event.altKey);
+            const positionUpdate = this.pointPositionUpdater.updatePosition(
+                target,
+                event,
+                getDirectionFrom(this.activeResizeHandle.location)
+            );
             if (positionUpdate) {
                 const resizeActions = this.handleResizeOnClient(positionUpdate);
                 actions.push(...resizeActions);
@@ -242,7 +247,7 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements ISel
         const newRoutingPoints: ElementAndRoutingPoints[] = [];
         const routerRegistry = this.tool.edgeRouterRegistry;
         if (routerRegistry) {
-            //  If client routing is enabled -> delegate routingpoints of connected edges to server
+            //  If client routing is enabled -> delegate routing points of connected edges to server
             forEachElement(target.index, isNonRoutableSelectedMovableBoundsAware, element => {
                 if (element instanceof GConnectableElement) {
                     element.incomingEdges
@@ -308,7 +313,7 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements ISel
     }
 
     protected initPosition(event: MouseEvent): void {
-        this.pointPositionUpdater.updateLastDragPosition({ x: event.pageX, y: event.pageY });
+        this.pointPositionUpdater.updateLastDragPosition(event);
         if (this.activeResizeHandle) {
             const resizeElement = findParentByFeature(this.activeResizeHandle, isResizable);
             this.initialBounds = {
@@ -459,10 +464,6 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements ISel
         return result;
     }
 
-    protected snap(position: Point, element: GModelElement, isSnap: boolean): Point {
-        return isSnap && this.tool.snapper ? this.tool.snapper.snap(position, element) : { x: position.x, y: position.y };
-    }
-
     protected isValidBoundChange(element: GModelElement & BoundsAware, newPosition: Point, newSize: Dimension): boolean {
         return this.isValidSize(element, newSize) && this.isValidMove(element, newPosition);
     }