@eclipse-glsp/client 2.4.0-next.409 → 2.4.0-next.413

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

@@ -31,6 +31,7 @@ import {
     GModelElement,
     GModelRoot,
     GParentElement,
+    KeyListener,
     MouseListener,
     Operation,
     Point,
@@ -40,6 +41,7 @@ import {
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
 import { ISelectionListener, SelectionService } from '../../../base/selection-service';
+import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import {
     BoundsAwareModelElement,
     ResizableModelElement,
@@ -52,7 +54,9 @@ import {
 import { LocalRequestBoundsAction } from '../../bounds/local-bounds';
 import { SetBoundsFeedbackAction } from '../../bounds/set-bounds-feedback-command';
 import { GResizeHandle, isResizable } from '../../change-bounds/model';
+import { MoveElementKeyListener } from '../../change-bounds/move-element-key-listener';
 import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
+import { Grid } from '../../grid/grid';
 import { BaseEditTool } from '../base-tools';
 import { CSS_ACTIVE_HANDLE, IChangeBoundsManager } from './change-bounds-manager';
 import {
@@ -84,12 +88,15 @@ export interface IMovementOptions {
 @injectable()
 export class ChangeBoundsTool extends BaseEditTool {
     static ID = 'glsp.change-bounds-tool';
+    static TOKEN = Symbol.for(ChangeBoundsTool.ID);
 
     @inject(SelectionService) protected selectionService: SelectionService;
     @inject(EdgeRouterRegistry) @optional() readonly edgeRouterRegistry?: EdgeRouterRegistry;
     @inject(TYPES.IMovementRestrictor) @optional() readonly movementRestrictor?: IMovementRestrictor;
     @inject(TYPES.IChangeBoundsManager) readonly changeBoundsManager: IChangeBoundsManager;
     @inject(TYPES.IMovementOptions) @optional() readonly movementOptions: IMovementOptions = { allElementsNeedToBeValid: true };
+    @inject(TYPES.Grid) @optional() readonly grid?: Grid;
+    @inject(TYPES.IShortcutManager) protected readonly shortcutManager: IShortcutManager;
 
     get id(): string {
         return ChangeBoundsTool.ID;
@@ -106,12 +113,25 @@ export class ChangeBoundsTool extends BaseEditTool {
             this.toDisposeOnDisable.push(this.selectionService.addListener(feedbackMoveMouseListener));
         }
 
+        // install move key listener for client-side move updates
+        const createMoveKeyListener = this.createMoveKeyListener();
+        this.toDisposeOnDisable.push(
+            this.keyTool.registerListener(createMoveKeyListener),
+            this.shortcutManager.register(ChangeBoundsTool.TOKEN, [
+                { shortcuts: ['⬅ ⬆ ➡ ⬇'], description: 'Move element', group: 'Move', position: 0 }
+            ])
+        );
+        if (Disposable.is(createMoveKeyListener)) {
+            this.toDisposeOnDisable.push(createMoveKeyListener);
+        }
+
         // install change bounds listener for client-side resize updates and server-side updates
         const changeBoundsListener = this.createChangeBoundsListener();
         this.toDisposeOnDisable.push(this.mouseTool.registerListener(changeBoundsListener));
         if (Disposable.is(changeBoundsListener)) {
             this.toDisposeOnDisable.push(changeBoundsListener);
         }
+
         if (ISelectionListener.is(changeBoundsListener)) {
             this.toDisposeOnDisable.push(this.selectionService.addListener(changeBoundsListener));
         }
@@ -125,7 +145,11 @@ export class ChangeBoundsTool extends BaseEditTool {
         return new FeedbackMoveMouseListener(this);
     }
 
-    protected createChangeBoundsListener(): MouseListener {
+    protected createMoveKeyListener(): KeyListener {
+        return new MoveElementKeyListener(this.selectionService, this.changeBoundsManager, this.grid);
+    }
+
+    protected createChangeBoundsListener(): MouseListener & ISelectionListener {
         return new ChangeBoundsListener(this);
     }
 }

package/src/features/viewport/viewport-handler.ts

@@ -13,13 +13,32 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, DOMHelper, IActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import {
+    Action,
+    Bounds,
+    DOMHelper,
+    findParentByFeature,
+    GChildElement,
+    GModelElement,
+    GModelRoot,
+    IActionDispatcher,
+    IActionHandler,
+    ICommand,
+    isViewport,
+    MoveViewportAction,
+    Point,
+    SetViewportAction,
+    TYPES,
+    Viewport
+} from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
 import { EditorContextService } from '../../base/editor-context-service';
 import { FocusTracker } from '../../base/focus/focus-tracker';
 import { IDiagramStartup } from '../../base/model/diagram-loader';
 import { EnableDefaultToolsAction } from '../../base/tool-manager/tool';
+import { getElements, isSelectableAndBoundsAware, SelectableBoundsAware } from '../../utils/gmodel-util';
 import { FocusDomAction } from '../accessibility/actions';
+import { ZoomAction } from './zoom-viewport-action';
 
 /**
  * Focuses the graph on different actions.
@@ -78,3 +97,104 @@ export class RestoreViewportHandler implements IActionHandler, IDiagramStartup {
         });
     }
 }
+
+/**
+ * Handles moving the viewport.
+ */
+@injectable()
+export class MoveViewportHandler implements IActionHandler {
+    @inject(EditorContextService)
+    protected readonly editorContextService: EditorContextService;
+
+    handle(action: MoveViewportAction): void | Action | ICommand {
+        return this.handleMoveViewport(action);
+    }
+
+    protected handleMoveViewport(action: MoveViewportAction): Action | undefined {
+        const viewport = findParentByFeature(this.editorContextService.modelRoot, isViewport);
+        if (!viewport) {
+            return;
+        }
+        const newViewport: Viewport = {
+            scroll: {
+                x: viewport.scroll.x + action.moveX,
+                y: viewport.scroll.y + action.moveY
+            },
+            zoom: viewport.zoom
+        };
+
+        return SetViewportAction.create(viewport.id, newViewport, { animate: false });
+    }
+}
+
+/*
+ * Handles zooming in and out of the viewport.
+ */
+@injectable()
+export class ZoomHandler implements IActionHandler {
+    @inject(EditorContextService)
+    protected readonly editorContextService: EditorContextService;
+    @inject(TYPES.IActionDispatcher)
+    protected readonly actionDispatcher: IActionDispatcher;
+
+    handle(action: ZoomAction): Action | void {
+        if (action.elementIds) {
+            return this.handleZoomElement(action.elementIds, action.zoomFactor);
+        } else {
+            return this.handleZoomViewport(action.zoomFactor);
+        }
+    }
+
+    protected handleZoomViewport(zoomFactor: number): Action | undefined {
+        const viewport = findParentByFeature(this.editorContextService.modelRoot, isViewport);
+        if (!viewport) {
+            return;
+        }
+
+        const newZoom = viewport.zoom * zoomFactor;
+
+        const newViewport = {
+            scroll: viewport.scroll,
+            zoom: newZoom
+        };
+
+        return SetViewportAction.create(viewport.id, newViewport, { animate: false });
+    }
+
+    protected handleZoomElement(elementIds: string[], zoomFactor: number): Action | undefined {
+        const viewport = findParentByFeature(this.editorContextService.modelRoot, isViewport);
+        if (!viewport) {
+            return;
+        }
+
+        const elements = getElements(this.editorContextService.modelRoot.index, elementIds, isSelectableAndBoundsAware);
+        const center = this.getCenter(viewport, elements);
+
+        const newZoom = viewport.zoom * zoomFactor;
+
+        const newViewport = {
+            scroll: {
+                x: center.x - (0.5 * viewport.canvasBounds.width) / newZoom,
+                y: center.y - (0.5 * viewport.canvasBounds.height) / newZoom
+            },
+            zoom: newZoom
+        };
+
+        return SetViewportAction.create(viewport.id, newViewport, { animate: false });
+    }
+
+    protected getCenter(viewport: GModelRoot & Viewport, selectedElements: SelectableBoundsAware[]): Point {
+        // Get bounds of elements based on the viewport
+        const allBounds = selectedElements.map(e => this.boundsInViewport(viewport, e, e.bounds));
+        const mergedBounds = allBounds.reduce((b0, b1) => Bounds.combine(b0, b1));
+        return Bounds.center(mergedBounds);
+    }
+
+    protected boundsInViewport(viewport: GModelRoot & Viewport, element: GModelElement, bounds: Bounds): Bounds {
+        if (element instanceof GChildElement && element.parent !== viewport) {
+            return this.boundsInViewport(viewport, element.parent, element.parent.localToParent(bounds) as Bounds);
+        } else {
+            return bounds;
+        }
+    }
+}

package/src/features/viewport/viewport-key-listener.ts

@@ -0,0 +1,121 @@
+/********************************************************************************
+ * Copyright (c) 2024 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
+ ********************************************************************************/
+
+import { Action, CenterAction, GModelElement, KeyListener, matchesKeystroke, MoveViewportAction, TYPES } from '@eclipse-glsp/sprotty';
+import { inject, injectable, optional } from 'inversify';
+import { SelectionService } from '../../base/selection-service';
+import { Grid } from '../grid/grid';
+import { IChangeBoundsManager } from '../tools/change-bounds/change-bounds-manager';
+import { ZoomAction, ZoomFactors } from './zoom-viewport-action';
+
+@injectable()
+export class MoveViewportKeyListener extends KeyListener {
+    @inject(SelectionService)
+    protected readonly selectionService: SelectionService;
+    @inject(TYPES.IChangeBoundsManager)
+    protected readonly changeBoundsManager: IChangeBoundsManager;
+    @inject(TYPES.Grid)
+    @optional()
+    protected readonly grid = Grid.DEFAULT;
+
+    override keyDown(_element: GModelElement, event: KeyboardEvent): Action[] {
+        const selectedElementIds = this.selectionService.getSelectedElementIDs();
+        const snap = this.changeBoundsManager.usePositionSnap(event);
+        const offsetX = snap ? this.grid.x : 1;
+        const offsetY = snap ? this.grid.y : 1;
+
+        if (selectedElementIds.length === 0) {
+            if (this.matchesMoveUpKeystroke(event)) {
+                return [MoveViewportAction.create({ moveX: 0, moveY: -offsetY })];
+            } else if (this.matchesMoveDownKeystroke(event)) {
+                return [MoveViewportAction.create({ moveX: 0, moveY: offsetY })];
+            } else if (this.matchesMoveRightKeystroke(event)) {
+                return [MoveViewportAction.create({ moveX: offsetX, moveY: 0 })];
+            } else if (this.matchesMoveLeftKeystroke(event)) {
+                return [MoveViewportAction.create({ moveX: -offsetX, moveY: 0 })];
+            }
+        }
+        return [];
+    }
+
+    protected matchesMoveUpKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'ArrowUp');
+    }
+
+    protected matchesMoveDownKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'ArrowDown');
+    }
+
+    protected matchesMoveRightKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'ArrowRight');
+    }
+
+    protected matchesMoveLeftKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'ArrowLeft');
+    }
+}
+
+@injectable()
+export class ZoomKeyListener extends KeyListener {
+    @inject(SelectionService)
+    protected readonly selectionService: SelectionService;
+
+    override keyDown(element: GModelElement, event: KeyboardEvent): Action[] {
+        const selectedElementIds = this.selectionService.getSelectedElementIDs();
+
+        if (selectedElementIds.length === 0) {
+            if (this.matchesZoomOutKeystroke(event)) {
+                return [ZoomAction.create({ zoomFactor: ZoomFactors.DEFAULT.out })];
+            } else if (this.matchesZoomInKeystroke(event)) {
+                return [ZoomAction.create({ zoomFactor: ZoomFactors.DEFAULT.in })];
+            } else if (this.matchesMinZoomLevelKeystroke(event)) {
+                return [CenterAction.create(selectedElementIds)];
+            }
+        } else {
+            if (this.matchesZoomOutKeystroke(event)) {
+                if (selectedElementIds.length > 0) {
+                    return [
+                        ZoomAction.create({
+                            elementIds: selectedElementIds,
+                            zoomFactor: ZoomFactors.DEFAULT.out
+                        })
+                    ];
+                }
+            } else if (this.matchesZoomInKeystroke(event)) {
+                if (selectedElementIds.length > 0) {
+                    return [ZoomAction.create({ elementIds: selectedElementIds, zoomFactor: ZoomFactors.DEFAULT.in })];
+                }
+            } else if (this.matchesMinZoomLevelKeystroke(event)) {
+                return [CenterAction.create(selectedElementIds)];
+            }
+        }
+
+        return [];
+    }
+
+    protected matchesZoomInKeystroke(event: KeyboardEvent): boolean {
+        /** here event.key is used for '+', as keycode 187 is already declared for 'Equals' in {@link matchesKeystroke}.*/
+        return !event.ctrlKey && (event.key === '+' || matchesKeystroke(event, 'NumpadAdd'));
+    }
+
+    protected matchesMinZoomLevelKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'Digit0', 'ctrl') || matchesKeystroke(event, 'Numpad0', 'ctrl');
+    }
+
+    protected matchesZoomOutKeystroke(event: KeyboardEvent): boolean {
+        return !event.ctrlKey && (matchesKeystroke(event, 'Minus') || matchesKeystroke(event, 'NumpadSubtract'));
+    }
+}

package/src/features/viewport/viewport-modules.ts

@@ -22,6 +22,7 @@ import {
     FeatureModule,
     FitToScreenCommand,
     GetViewportCommand,
+    MoveViewportAction,
     SetViewportCommand,
     TYPES,
     ZoomMouseListener
@@ -31,7 +32,10 @@ import { FocusDomAction } from '../accessibility/actions';
 import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
 import { OriginViewportCommand } from './origin-viewport';
 import { RepositionCommand } from './reposition';
-import { RestoreViewportHandler } from './viewport-handler';
+import { MoveViewportHandler, RestoreViewportHandler, ZoomHandler } from './viewport-handler';
+import { MoveViewportKeyListener, ZoomKeyListener } from './viewport-key-listener';
+import { ViewportKeyTool } from './viewport-tool';
+import { ZoomAction, ZoomFactors } from './zoom-viewport-action';
 
 export const viewportModule = new FeatureModule(
     (bind, _unbind, isBound) => {
@@ -52,6 +56,16 @@ export const viewportModule = new FeatureModule(
         bindAsService(context, TYPES.IDiagramStartup, RestoreViewportHandler);
         configureActionHandler(context, EnableDefaultToolsAction.KIND, RestoreViewportHandler);
         configureActionHandler(context, FocusDomAction.KIND, RestoreViewportHandler);
+
+        bind(TYPES.ZoomFactors).toConstantValue(ZoomFactors.DEFAULT);
+
+        bindAsService(context, TYPES.IDefaultTool, ViewportKeyTool);
+        bind(MoveViewportHandler).toSelf().inSingletonScope();
+        bind(MoveViewportKeyListener).toSelf();
+        configureActionHandler(context, MoveViewportAction.KIND, MoveViewportHandler);
+        bind(ZoomHandler).toSelf().inSingletonScope();
+        bind(ZoomKeyListener).toSelf();
+        configureActionHandler(context, ZoomAction.KIND, ZoomHandler);
     },
     { featureId: Symbol('viewport') }
 );

package/src/features/viewport/viewport-tool.ts

@@ -0,0 +1,54 @@
+/********************************************************************************
+ * Copyright (c) 2025 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
+ ********************************************************************************/
+
+import { TYPES } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+import type { IShortcutManager } from '../../base/shortcuts/shortcuts-manager';
+import { BaseTool } from '../tools/base-tools';
+import { MoveViewportKeyListener, ZoomKeyListener } from './viewport-key-listener';
+
+/**
+ * This only handles keyboard events for the viewport.
+ * Mouse specific events are handled directly by MouseListeners without any tool.
+ */
+@injectable()
+export class ViewportKeyTool extends BaseTool {
+    static readonly ID = 'glsp.viewport-key-tool';
+    static readonly TOKEN = Symbol.for(ViewportKeyTool.ID);
+
+    get id(): string {
+        return ViewportKeyTool.ID;
+    }
+
+    @inject(TYPES.IShortcutManager)
+    protected readonly shortcutManager: IShortcutManager;
+    @inject(ZoomKeyListener)
+    protected readonly zoomKeyListener: ZoomKeyListener;
+    @inject(MoveViewportKeyListener)
+    protected readonly moveKeyListener: MoveViewportKeyListener;
+
+    enable(): void {
+        this.toDisposeOnDisable.push(
+            this.keyTool.registerListener(this.moveKeyListener),
+            this.keyTool.registerListener(this.zoomKeyListener),
+            this.shortcutManager.register(ViewportKeyTool.TOKEN, [
+                { shortcuts: ['⬅ ⬆ ➡ ⬇'], description: 'Move viewport', group: 'Move', position: 0 },
+                { shortcuts: ['+ -'], description: 'Zoom viewport', group: 'Zoom', position: 0 },
+                { shortcuts: ['+ -'], description: 'Zoom element', group: 'Zoom', position: 0 }
+            ])
+        );
+    }
+}

package/src/features/viewport/zoom-viewport-action.ts

@@ -0,0 +1,54 @@
+/********************************************************************************
+ * Copyright (c) 2024 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
+ ********************************************************************************/
+
+import { Action } from '@eclipse-glsp/sprotty';
+
+export interface ZoomFactors {
+    in: number;
+    out: number;
+}
+
+export namespace ZoomFactors {
+    export const DEFAULT = { in: 1.2, out: 0.8 };
+}
+
+/**
+ * Zooms the diagram canvas.
+ * If `elementIds` is provided, the zoom is centered on the elements with the given identifiers.
+ */
+export interface ZoomAction extends Action {
+    kind: typeof ZoomAction.KIND;
+    /**
+     * Specifies the elements to be zoomed in/out
+     */
+    elementIds?: string[];
+    /**
+     * Specifies the amount by which the viewport should be zoomed
+     */
+    zoomFactor: number;
+}
+
+export namespace ZoomAction {
+    export const KIND = 'zoom';
+
+    export function is(object: any): object is ZoomAction {
+        return Action.hasKind(object, KIND);
+    }
+
+    export function create(options: { elementIds?: string[]; zoomFactor: number }): ZoomAction {
+        return { kind: KIND, ...options };
+    }
+}

package/src/index.ts

@@ -41,6 +41,10 @@ export * from './base/mouse-position-tracker';
 export * from './base/ranked';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/selection-service';
+export * from './base/shortcuts/available-shortcuts-extension';
+export * from './base/shortcuts/available-shortcuts-tool';
+export * from './base/shortcuts/shortcuts-manager';
+export * from './base/shortcuts/shortcuts-module';
 export * from './base/tool-manager/tool';
 export * from './base/tool-manager/tool-manager';
 export * from './base/ui-extension/ui-extension';
@@ -64,9 +68,6 @@ export * from './features/accessibility/element-navigation/position-navigator';
 export * from './features/accessibility/focus-tracker/focus-tracker-module';
 export * from './features/accessibility/focus-tracker/focus-tracker-tool';
 export * from './features/accessibility/global-keylistener-tool';
-export * from './features/accessibility/key-shortcut/accessible-key-shortcut';
-export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
-export * from './features/accessibility/key-shortcut/shortcut-help-module';
 export * from './features/accessibility/keyboard-grid/action';
 export * from './features/accessibility/keyboard-grid/constants';
 export * from './features/accessibility/keyboard-grid/keyboard-grid';
@@ -80,12 +81,6 @@ export * from './features/accessibility/keyboard-pointer/keyboard-pointer-module
 export * from './features/accessibility/keyboard-pointer/keyboard-pointer-position';
 export * from './features/accessibility/keyboard-tool-palette/keyboard-tool-palette';
 export * from './features/accessibility/keyboard-tool-palette/keyboard-tool-palette-module';
-export * from './features/accessibility/move-zoom/move-handler';
-export * from './features/accessibility/move-zoom/move-zoom-module';
-export * from './features/accessibility/move-zoom/zoom-handler';
-export * from './features/accessibility/resize-key-tool/resize-key-handler';
-export * from './features/accessibility/resize-key-tool/resize-key-module';
-export * from './features/accessibility/resize-key-tool/resize-key-tool';
 export * from './features/accessibility/search/search-palette';
 export * from './features/accessibility/search/search-palette-module';
 export * from './features/accessibility/search/search-tool';
@@ -93,9 +88,8 @@ export * from './features/accessibility/toast/toast-handler';
 export * from './features/accessibility/toast/toast-module';
 export * from './features/accessibility/toast/toast-tool';
 export * from './features/accessibility/view-key-tools/deselect-key-tool';
-export * from './features/accessibility/view-key-tools/movement-key-tool';
+export * from './features/accessibility/view-key-tools/grid-cell-zoom-key-tool';
 export * from './features/accessibility/view-key-tools/view-key-tools-module';
-export * from './features/accessibility/view-key-tools/zoom-key-tool';
 export * from './features/bounds/bounds-module';
 export * from './features/bounds/freeform-layout';
 export * from './features/bounds/glsp-hidden-bounds-updater';
@@ -106,9 +100,15 @@ export * from './features/bounds/local-bounds';
 export * from './features/bounds/set-bounds-feedback-command';
 export * from './features/bounds/vbox-layout';
 export * from './features/change-bounds/model';
+export * from './features/change-bounds/move-element-action';
+export * from './features/change-bounds/move-element-handler';
 export * from './features/change-bounds/movement-restrictor';
 export * from './features/change-bounds/point-position-updater';
 export * from './features/change-bounds/position-snapper';
+export * from './features/change-bounds/resize/resize-default-tool';
+export * from './features/change-bounds/resize/resize-handler';
+export * from './features/change-bounds/resize/resize-module';
+export * from './features/change-bounds/resize/resize-tool';
 export * from './features/change-bounds/snap';
 export * from './features/change-bounds/tracker';
 export * from './features/command-palette/command-palette';
@@ -219,7 +219,9 @@ export * from './features/viewport/glsp-scroll-mouse-listener';
 export * from './features/viewport/origin-viewport';
 export * from './features/viewport/reposition';
 export * from './features/viewport/viewport-handler';
+export * from './features/viewport/viewport-key-listener';
 export * from './features/viewport/viewport-modules';
+export * from './features/viewport/zoom-viewport-action';
 export * from './model';
 export * from './re-exports';
 export * from './standalone-modules';

package/src/standalone-modules.ts

@@ -34,6 +34,8 @@ import {
     matchesKeystroke
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { standaloneShortcutsModule } from './base/shortcuts/shortcuts-module';
+import { standaloneResizeModule } from './features/change-bounds/resize/resize-module';
 import { standaloneCopyPasteModule } from './features/copy-paste/copy-paste-modules';
 import { standaloneExportModule } from './features/export/export-modules';
 import { saveModule } from './features/save/save-module';
@@ -97,6 +99,8 @@ export const STANDALONE_MODULES = [
     standaloneSelectModule,
     standaloneExportModule,
     standaloneDefaultModule,
+    standaloneShortcutsModule,
+    standaloneResizeModule,
     saveModule,
     undoRedoModule
 ] as const;

package/src/utils/viewpoint-util.ts

@@ -140,8 +140,8 @@ export function absoluteToLocal(element: BoundsAwareModelElement, absolutePoint:
 export function outsideOfViewport(point: Point, viewport: GModelRoot & Viewport): boolean {
     return (
         point.x < viewport.scroll.x ||
-        point.x > viewport.scroll.x + viewport.canvasBounds.width ||
+        point.x > viewport.scroll.x + viewport.canvasBounds.width / viewport.zoom ||
         point.y < viewport.scroll.y ||
-        point.y > viewport.scroll.y + viewport.canvasBounds.height
+        point.y > viewport.scroll.y + viewport.canvasBounds.height / viewport.zoom
     );
 }

package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"accessible-key-shortcut-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/accessible-key-shortcut-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAoD,MAAM,uBAAuB,CAAC;AACtI,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,qBACa,yBAA0B,SAAQ,YAAY;IACvD,MAAM,CAAC,EAAE,SAAkC;IAE1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAErD,SAAS,CAAC,mBAAmB,gCAAuC;IAEpE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAIL,OAAO,IAAI,IAAI;CAG3B;AAED,qBAAa,6BAA8B,SAAQ,WAAW;IAC1D,SAAS,CAAC,QAAQ,CAAC,KAAK,SAA8C;IAC7D,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAOxE,SAAS,CAAC,oCAAoC,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAGhF"}

package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"accessible-key-shortcut-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/accessible-key-shortcut-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAA+C;AAC/C,mDAAsI;AACtI,uDAAsD;AACtD,uEAAmE;AAG5D,IAAM,yBAAyB,iCAA/B,MAAM,yBAA0B,SAAQ,yBAAY;IAApD;;QAKO,wBAAmB,GAAG,IAAI,6BAA6B,EAAE,CAAC;IAaxE,CAAC;IAXG,IAAI,EAAE;QACF,OAAO,2BAAyB,CAAC,EAAE,CAAC;IACxC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAEQ,OAAO;QACZ,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtD,CAAC;;AAjBQ,8DAAyB;AAC3B,4BAAE,GAAG,8BAA8B,AAAjC,CAAkC;AAEP;IAAnC,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAA6B,iBAAO;0DAAC;oCAH5C,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAkBrC;AAED,MAAa,6BAA8B,SAAQ,qBAAW;IAA9D;;QACuB,UAAK,GAAG,MAAM,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAW1E,CAAC;IAVY,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,IAAI,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,CAAC,wCAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,gDAAsB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9G,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,oCAAoC,CAAC,KAAoB;QAC/D,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;CACJ;AAZD,sEAYC"}

package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"accessible-key-shortcut.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/accessible-key-shortcut.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAoB,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,MAAM,WAAW,6BAA6B;IAC1C,mBAAmB,IAAI,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,8BAA+B,SAAQ,MAAM;IAC1D,IAAI,EAAE,OAAO,8BAA8B,CAAC,IAAI,CAAC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,qBAAqB,EAAE,CAAC;CACjC;AAED,yBAAiB,8BAA8B,CAAC;IACrC,MAAM,IAAI,6BAA6B,CAAC;IAE/C,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,8BAA8B,CAExE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,qBAAqB,EAAE,CAAA;KAAE,GAAG,8BAA8B,CAEhH;CACJ;AAED,qBACa,sBAAuB,SAAQ,uBAAwB,YAAW,cAAc;IACzF,MAAM,CAAC,QAAQ,CAAC,EAAE,kBAAkB;IACpC,SAAS,CAAC,SAAS,EAAE,cAAc,CAAC;IACpC,SAAS,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAC7C,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAM;IAEtE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,EAAE,IAAI,MAAM;IAIZ,cAAc,IAAI,MAAM;IAIf,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IAK/E,SAAS,CAAC,SAAS,IAAI,IAAI;IAgD3B,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAcvD,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,WAAW;IAO3D,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,qBAAqB,GAAG,cAAc;IAe1E,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;CAmCpE"}

package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"accessible-key-shortcut.js","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/accessible-key-shortcut.ts"],"names":[],"mappings":"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"}

package/lib/features/accessibility/key-shortcut/shortcut-help-module.d.ts

@@ -1,26 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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
- ********************************************************************************/
-import { BindingContext, FeatureModule } from '@eclipse-glsp/sprotty';
-import '../../../../css/key-shortcut.css';
-/**
- * Handles actions for displaying help/information about keyboard shortcuts.
- */
-export declare const shortcutHelpModule: FeatureModule;
-export declare function configureShortcutHelpTool(context: BindingContext): void;
-export { 
-/** Deprecated use {@link shortcutHelpModule} instead */
-shortcutHelpModule as glspShortcutHelpModule };
-//# sourceMappingURL=shortcut-help-module.d.ts.map

package/lib/features/accessibility/key-shortcut/shortcut-help-module.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shortcut-help-module.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/key-shortcut/shortcut-help-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAiB,cAAc,EAA0B,aAAa,EAAS,MAAM,uBAAuB,CAAC;AACpH,OAAO,kCAAkC,CAAC;AAI1C;;GAEG;AACH,eAAO,MAAM,kBAAkB,eAM9B,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAIvE;AAED,OAAO;AACH,wDAAwD;AACxD,kBAAkB,IAAI,sBAAsB,EAC/C,CAAC"}