@eclipse-glsp/client 1.1.0-next.383e4e9.264 → 1.1.0-next.3d1b3e6.280

package/src/features/tools/{base-glsp-tool.ts → base-tools.ts}

@@ -14,15 +14,18 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { inject, injectable } from 'inversify';
-import { Action, Disposable, DisposableCollection, IActionDispatcher, TYPES } from '~glsp-sprotty';
+import { Action, Disposable, DisposableCollection, IActionDispatcher, IActionHandler, TYPES } from '~glsp-sprotty';
 import { EditorContextService } from '../../base/editor-context-service';
 import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
-import { GLSPTool } from '../../base/tool-manager/glsp-tool-manager';
+import { EnableToolsAction, Tool } from '../../base/tool-manager/tool';
 import { GLSPKeyTool } from '../../base/view/key-tool';
 import { GLSPMouseTool } from '../../base/view/mouse-tool';
 
+/**
+ *  A reusable base implementation for edit {@link Tool}s.
+ */
 @injectable()
-export abstract class BaseGLSPTool implements GLSPTool {
+export abstract class BaseEditTool implements Tool {
     @inject(TYPES.IFeedbackActionDispatcher) protected feedbackDispatcher: IFeedbackActionDispatcher;
     @inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
     @inject(GLSPMouseTool) protected mouseTool: GLSPMouseTool;
@@ -71,3 +74,25 @@ export abstract class BaseGLSPTool implements GLSPTool {
         this.feedbackDispatcher.deregisterFeedback(feedbackEmitter ?? this, cleanupActions);
     }
 }
+
+@injectable()
+export abstract class BaseCreationTool<T extends Action> extends BaseEditTool implements IActionHandler {
+    protected abstract isTriggerAction: (obj: any) => obj is T;
+    protected triggerAction: T;
+
+    handle(action: Action): Action | void {
+        if (this.isTriggerAction(action)) {
+            this.triggerAction = action;
+            return EnableToolsAction.create([this.id]);
+        }
+    }
+
+    override enable(): void {
+        if (this.triggerAction === undefined) {
+            throw new TypeError(`Could not enable tool ${this.id}. The triggerAction cannot be undefined.`);
+        }
+        this.doEnable();
+    }
+
+    protected abstract doEnable(): void;
+}

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

@@ -58,7 +58,7 @@ import {
     createMovementRestrictionFeedback,
     removeMovementRestrictionFeedback
 } from '../../change-bounds/movement-restrictor';
-import { BaseGLSPTool } from '../base-glsp-tool';
+import { BaseEditTool } from '../base-tools';
 import {
     FeedbackMoveMouseListener,
     HideChangeBoundsToolResizeFeedbackAction,
@@ -79,7 +79,7 @@ import {
  * resize and send the server updates we install the `ChangeBoundsListener`.
  */
 @injectable()
-export class ChangeBoundsTool extends BaseGLSPTool {
+export class ChangeBoundsTool extends BaseEditTool {
     static ID = 'glsp.change-bounds-tool';
 
     @inject(SelectionService) protected selectionService: SelectionService;

package/src/features/tools/deletion/delete-tool.ts

@@ -17,7 +17,6 @@ import { inject, injectable } from 'inversify';
 import {
     Action,
     DeleteElementOperation,
-    EnableDefaultToolsAction,
     KeyListener,
     KeyTool,
     MouseListener,
@@ -29,14 +28,14 @@ import {
     matchesKeystroke
 } from '~glsp-sprotty';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
-import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
-import { BaseGLSPTool } from '../base-glsp-tool';
+import { EnableDefaultToolsAction, Tool } from '../../../base/tool-manager/tool';
+import { BaseEditTool } from '../base-tools';
 
 /**
  * Deletes selected elements when hitting the `Del` key.
  */
 @injectable()
-export class DelKeyDeleteTool implements GLSPTool {
+export class DelKeyDeleteTool implements Tool {
     static ID = 'glsp.delete-keyboard';
 
     isEditTool = true;
@@ -80,7 +79,7 @@ export class DeleteKeyListener extends KeyListener {
  * Deletes selected elements when clicking on them.
  */
 @injectable()
-export class MouseDeleteTool extends BaseGLSPTool {
+export class MouseDeleteTool extends BaseEditTool {
     static ID = 'glsp.delete-mouse';
 
     protected deleteToolMouseListener: DeleteToolMouseListener = new DeleteToolMouseListener();

package/src/features/tools/edge-creation/edge-creation-tool.ts

@@ -18,7 +18,6 @@ import {
     Action,
     AnchorComputerRegistry,
     CreateEdgeOperation,
-    EnableDefaultToolsAction,
     SEdge,
     SModelElement,
     TriggerEdgeCreationAction,
@@ -29,7 +28,8 @@ import {
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
-import { BaseGLSPCreationTool } from '../base-glsp-creation-tool';
+import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
+import { BaseCreationTool } from '../base-tools';
 import { DrawFeedbackEdgeAction, RemoveFeedbackEdgeAction } from './dangling-edge-feedback';
 import { FeedbackEdgeEndMovingMouseListener } from './edge-creation-tool-feedback';
 
@@ -37,7 +37,7 @@ import { FeedbackEdgeEndMovingMouseListener } from './edge-creation-tool-feedbac
  * Tool to create connections in a Diagram, by selecting a source and target node.
  */
 @injectable()
-export class EdgeCreationTool extends BaseGLSPCreationTool<TriggerEdgeCreationAction> {
+export class EdgeCreationTool extends BaseCreationTool<TriggerEdgeCreationAction> {
     static ID = 'tool_create_edge';
 
     @inject(AnchorComputerRegistry) protected anchorRegistry: AnchorComputerRegistry;

package/src/features/tools/edge-edit/edge-edit-tool.ts

@@ -38,7 +38,7 @@ import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feed
 import { ISelectionListener, SelectionService } from '../../../base/selection-service';
 import { calcElementAndRoutingPoints, isRoutable, isRoutingHandle } from '../../../utils/smodel-util';
 import { SReconnectHandle, isReconnectHandle, isReconnectable, isSourceRoutingHandle, isTargetRoutingHandle } from '../../reconnect/model';
-import { BaseGLSPTool } from '../base-glsp-tool';
+import { BaseEditTool } from '../base-tools';
 import { DrawFeedbackEdgeAction, RemoveFeedbackEdgeAction, feedbackEdgeId } from '../edge-creation/dangling-edge-feedback';
 import {
     DrawFeedbackEdgeSourceAction,
@@ -51,7 +51,7 @@ import {
 } from './edge-edit-tool-feedback';
 
 @injectable()
-export class EdgeEditTool extends BaseGLSPTool {
+export class EdgeEditTool extends BaseEditTool {
     static ID = 'glsp.edge-edit-tool';
 
     @inject(SelectionService) protected selectionService: SelectionService;

package/src/features/tools/marquee-selection/marquee-mouse-tool.ts

@@ -18,7 +18,6 @@ import {
     Action,
     BoundsAware,
     DOMHelper,
-    EnableDefaultToolsAction,
     KeyListener,
     SEdge,
     SModelElement,
@@ -31,13 +30,14 @@ import {
 } from '~glsp-sprotty';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
+import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
 import { getAbsolutePosition, toAbsoluteBounds } from '../../../utils/viewpoint-util';
-import { BaseGLSPTool } from '../base-glsp-tool';
+import { BaseEditTool } from '../base-tools';
 import { IMarqueeBehavior, MarqueeUtil } from './marquee-behavior';
 import { RemoveMarqueeAction } from './marquee-tool-feedback';
 
 @injectable()
-export class MarqueeMouseTool extends BaseGLSPTool {
+export class MarqueeMouseTool extends BaseEditTool {
     static ID = 'glsp.marquee-mouse-tool';
 
     @inject(TYPES.DOMHelper) protected domHelper: DOMHelper;

package/src/features/tools/marquee-selection/marquee-tool.ts

@@ -14,12 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import { Action, EnableToolsAction, KeyListener, SModelElement } from '~glsp-sprotty';
-import { BaseGLSPTool } from '../base-glsp-tool';
+import { Action, KeyListener, SModelElement } from '~glsp-sprotty';
+import { EnableToolsAction } from '../../../base/tool-manager/tool';
+import { BaseEditTool } from '../base-tools';
 import { MarqueeMouseTool } from './marquee-mouse-tool';
 
 @injectable()
-export class MarqueeTool extends BaseGLSPTool {
+export class MarqueeTool extends BaseEditTool {
     static ID = 'glsp.marquee-tool';
 
     protected marqueeKeyListener: MarqueeKeyListener = new MarqueeKeyListener();

package/src/features/tools/node-creation/node-creation-tool.ts

@@ -17,7 +17,6 @@ import { inject, injectable, optional } from 'inversify';
 import {
     Action,
     CreateNodeOperation,
-    EnableDefaultToolsAction,
     ISnapper,
     SModelElement,
     SNode,
@@ -28,12 +27,13 @@ import {
 } from '~glsp-sprotty';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
+import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
 import { getAbsolutePosition } from '../../../utils/viewpoint-util';
 import { Containable, isContainable } from '../../hints/model';
-import { BaseGLSPCreationTool } from '../base-glsp-creation-tool';
+import { BaseCreationTool } from '../base-tools';
 
 @injectable()
-export class NodeCreationTool extends BaseGLSPCreationTool<TriggerNodeCreationAction> {
+export class NodeCreationTool extends BaseCreationTool<TriggerNodeCreationAction> {
     static ID = 'tool_create_node';
 
     protected isTriggerAction = TriggerNodeCreationAction.is;

package/src/features/tools/tool-focus-loss-module.ts

@@ -14,8 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import { Action, EnableDefaultToolsAction, FeatureModule, IActionHandler, ICommand, configureActionHandler } from '~glsp-sprotty';
+import { Action, FeatureModule, IActionHandler, ICommand, configureActionHandler } from '~glsp-sprotty';
 import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { EnableDefaultToolsAction } from '../../base/tool-manager/tool';
 
 /**
  * Action handler that enables the default tools when the diagram lost focus.

package/src/features/validation/validate.ts

@@ -110,7 +110,7 @@ export class SetMarkersActionHandler implements IActionHandler {
     }
 
     async setMarkers(markers: Marker[], reason: string | undefined): Promise<void> {
-        const uri = await this.editorContextService.getSourceUri();
+        const uri = this.editorContextService.sourceUri;
         this.externalMarkerManager?.setMarkers(markers, reason, uri);
         const applyMarkersAction = ApplyMarkersAction.create(markers);
         this.validationFeedbackEmitter.registerValidationFeedbackAction(applyMarkersAction, reason);

package/src/features/viewport/glsp-scroll-mouse-listener.ts

@@ -14,15 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import {
-    Action,
-    EnableDefaultToolsAction,
-    EnableToolsAction,
-    IActionHandler,
-    ICommand,
-    ScrollMouseListener,
-    SModelElement
-} from '~glsp-sprotty';
+import { Action, IActionHandler, ICommand, ScrollMouseListener, SModelElement } from '~glsp-sprotty';
+import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
 import { MarqueeMouseTool } from '../tools/marquee-selection/marquee-mouse-tool';
 
 @injectable()

package/src/features/viewport/reposition.ts

@@ -0,0 +1,119 @@
+/********************************************************************************
+ * Copyright (c) 2023 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 {
+    Action,
+    Bounds,
+    Dimension,
+    hasArrayProp,
+    Viewport,
+    BoundsAwareViewportCommand,
+    getRouteBounds,
+    isViewport,
+    SChildElement,
+    SEdge,
+    SModelElement,
+    SModelRoot,
+    TYPES
+} from '~glsp-sprotty';
+import { inject, injectable } from 'inversify';
+import { calcElementAndRoute } from '../../utils/smodel-util';
+
+export interface RepositionAction extends Action {
+    kind: typeof RepositionAction.KIND;
+    elementIDs: string[];
+}
+
+export namespace RepositionAction {
+    export const KIND = 'repositionAction';
+
+    export function is(object: any): object is RepositionAction {
+        return Action.hasKind(object, KIND) && hasArrayProp(object, 'elementIDs');
+    }
+
+    export function create(elementIDs: string[]): RepositionAction {
+        return {
+            kind: KIND,
+            elementIDs
+        };
+    }
+}
+
+/**
+ * Moves the viewport to an unvisible element, while maintaining the current zoom level.
+ */
+@injectable()
+export class RepositionCommand extends BoundsAwareViewportCommand {
+    static readonly KIND = RepositionAction.KIND;
+
+    constructor(@inject(TYPES.Action) protected action: RepositionAction) {
+        super(true);
+    }
+
+    protected override boundsInViewport(element: SModelElement, bounds: Bounds, viewport: SModelRoot & Viewport): Bounds {
+        if (element instanceof SChildElement && element.parent !== viewport) {
+            return this.boundsInViewport(element.parent, element.parent.localToParent(bounds) as Bounds, viewport);
+        } else if (element instanceof SEdge) {
+            const edgeBounds = getRouteBounds(calcElementAndRoute(element).newRoutingPoints ?? []);
+
+            if (element instanceof SChildElement && element.parent !== viewport) {
+                return this.boundsInViewport(element.parent, element.parent.localToParent(edgeBounds), viewport);
+            }
+
+            return edgeBounds;
+        }
+
+        return bounds;
+    }
+
+    getElementIds(): string[] {
+        return this.action.elementIDs;
+    }
+
+    getNewViewport(bounds: Bounds, model: SModelRoot): Viewport | undefined {
+        if (!Dimension.isValid(model.canvasBounds)) {
+            return undefined;
+        }
+
+        if (isViewport(model)) {
+            const zoom = model.zoom;
+            const c = Bounds.center(bounds);
+
+            if (this.isFullyVisible(bounds, model)) {
+                return undefined;
+            } else {
+                return {
+                    scroll: {
+                        x: c.x - (0.5 * model.canvasBounds.width) / zoom,
+                        y: c.y - (0.5 * model.canvasBounds.height) / zoom
+                    },
+                    zoom: zoom
+                };
+            }
+        }
+
+        return undefined;
+    }
+
+    protected isFullyVisible(bounds: Bounds, viewport: SModelRoot & Viewport): boolean {
+        return (
+            bounds.x >= viewport.scroll.x &&
+            bounds.x + bounds.width <= viewport.scroll.x + viewport.canvasBounds.width / viewport.zoom &&
+            bounds.y >= viewport.scroll.y &&
+            bounds.y + bounds.height <= viewport.scroll.y + viewport.canvasBounds.height / viewport.zoom
+        );
+    }
+}

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

@@ -19,8 +19,6 @@ import {
     CenterKeyboardListener,
     configureActionHandler,
     configureCommand,
-    EnableDefaultToolsAction,
-    EnableToolsAction,
     FeatureModule,
     FitToScreenCommand,
     GetViewportCommand,
@@ -28,7 +26,9 @@ import {
     TYPES,
     ZoomMouseListener
 } from '~glsp-sprotty';
+import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
 import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
+import { RepositionCommand } from './reposition';
 
 export const viewportModule = new FeatureModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
@@ -36,6 +36,7 @@ export const viewportModule = new FeatureModule((bind, _unbind, isBound) => {
     configureCommand(context, FitToScreenCommand);
     configureCommand(context, GetViewportCommand);
     configureCommand(context, SetViewportCommand);
+    configureCommand(context, RepositionCommand);
 
     bindAsService(context, TYPES.MouseListener, ZoomMouseListener);
     bindAsService(context, TYPES.MouseListener, GLSPScrollMouseListener);

package/src/glsp-sprotty/augmented-actions.ts

@@ -17,7 +17,6 @@
 /* eslint-disable-next-line no-restricted-imports*/
 import { Action, hasArrayProp } from '@eclipse-glsp/protocol';
 import { SetBoundsAction } from 'sprotty-protocol/lib/actions';
-import { EnableDefaultToolsAction, EnableToolsAction } from 'sprotty/lib/base/tool-manager/tool';
 
 /**
  * Use module augmentation to add namespaces and  the `is` utility function to sprotty actions that directly reused by GLSP
@@ -31,18 +30,4 @@ declare module 'sprotty-protocol/lib/actions' {
 SetBoundsAction.is = (object: any): object is SetBoundsAction =>
     Action.hasKind(object, SetBoundsAction.KIND) && hasArrayProp(object, 'bounds');
 
-declare module 'sprotty/lib/base/tool-manager/tool' {
-    export namespace EnableDefaultToolsAction {
-        export function is(object: any): object is EnableDefaultToolsAction;
-    }
-    export namespace EnableToolsAction {
-        export function is(object: any): object is EnableToolsAction;
-    }
-}
-
-EnableDefaultToolsAction.is = (object: any): object is EnableDefaultToolsAction => Action.hasKind(object, EnableDefaultToolsAction.KIND);
-
-EnableToolsAction.is = (object: any): object is EnableToolsAction =>
-    Action.hasKind(object, EnableToolsAction.KIND) && hasArrayProp(object, 'toolIds');
-
-export { EnableDefaultToolsAction, EnableToolsAction };
+export { SetBoundsAction };

package/src/glsp-sprotty/index.ts

@@ -13,13 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+/* eslint-disable no-restricted-imports */
 /**
- * Sprotty still keeps the old class based action definitions as deprecated API.
- * This causes name clashes with the GLSP protocol actions when reexport sprotty.
- * The deprecated definitions are planned to be removed with Sprotty 1.0.0.
- * Until then we have to manually reexport the sprotty main index and exclude the clashing types.
+ * Selective custom reexport of the sprotty API. Also provides augmentations/adaptions
+ * of certain type definitions for GLSP. Using this custom reexport allows us to gracefully
+ * update to newer sprotty versions without hard API breaks.
  */
-/* eslint-disable no-restricted-imports */
 
 /**
  * @eclipse-glsp/protocol
@@ -79,8 +78,6 @@ export {
     translateBounds,
     translatePoint
 } from 'sprotty/lib/base/model/smodel-utils';
-export * from 'sprotty/lib/base/tool-manager/tool';
-export * from 'sprotty/lib/base/tool-manager/tool-manager';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension';
 export * from 'sprotty/lib/base/ui-extensions/ui-extension-registry';
 export * from 'sprotty/lib/base/views/dom-helper';

package/src/glsp-sprotty/types.ts

@@ -34,12 +34,10 @@ export const TYPES = {
     ITool: Symbol('ITool'),
     IDefaultTool: Symbol('IDefaultTool'),
     IEditModeListener: Symbol('IEditModeListener'),
-    IMarqueeBehavior: Symbol('IMarqueeBehavior')
+    IMarqueeBehavior: Symbol('IMarqueeBehavior'),
+    IElementNavigator: Symbol('IElementNavigator'),
+    ILocalElementNavigator: Symbol('ILocalElementNavigator'),
+    IDiagramOptions: Symbol('IDiagramOptions'),
+    IDiagramStartup: Symbol('IDiagramStartup'),
+    IToolManager: Symbol('IToolManager')
 };
-
-/**
- * Keep a reexport under the old deprecated namespace to avoid hard API breaks.
- * This gives adopters a grace period but all deprecated API will be removed before the 1.0.0 release.
- * @deprecated Please use `TYPES` from `@eclipse-glsp/client` instead
- */
-export const GLSP_TYPES = TYPES;

package/src/index.ts

@@ -16,6 +16,7 @@
 
 // ------------------ Base ------------------
 export * from './base/action-dispatcher';
+export * from './base/action-handler-registry';
 export * from './base/argumentable';
 export * from './base/auto-complete/auto-complete-actions';
 export * from './base/auto-complete/auto-complete-widget';
@@ -28,13 +29,15 @@ export * from './base/feedback/feedback-command';
 export * from './base/feedback/update-model-command';
 export * from './base/focus/focus-state-change-action';
 export * from './base/focus/focus-tracker';
-export * from './base/model-initialization-constraint';
+export * from './base/model/diagram-loader';
+export * from './base/model/glsp-model-source';
+export * from './base/model/model-initialization-constraint';
 export * from './base/model/model-registry';
 export * from './base/ranked';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/selection-service';
-export * from './base/source-uri-aware';
-export * from './base/tool-manager/glsp-tool-manager';
+export * from './base/tool-manager/tool';
+export * from './base/tool-manager/tool-manager';
 export * from './base/view/mouse-tool';
 export * from './base/view/view-registry';
 
@@ -42,11 +45,14 @@ export * from './base/view/view-registry';
 // ------------------ Features ------------------
 export * from './base/feedback/css-feedback';
 export * from './base/view/mouse-tool';
+export * from './features/accessibility/element-navigation/diagram-navigation-tool';
+export * from './features/accessibility/focus-tracker/focus-tracker-tool';
+export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
 export * from './features/accessibility/resize-key-tool/resize-key-tool';
+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/zoom-key-tool';
-export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
 export * from './features/bounds/freeform-layout';
 export * from './features/bounds/glsp-hidden-bounds-updater';
 export * from './features/bounds/hbox-layout';
@@ -58,7 +64,7 @@ export * from './features/change-bounds/snap';
 export * from './features/command-palette/command-palette-tool';
 export * from './features/command-palette/server-command-palette-provider';
 export * from './features/context-menu/delete-element-context-menu';
-export * from './features/context-menu/selection-service-aware-context-menu-mouse-listener';
+export * from './features/context-menu/glsp-context-menu-mouse-listener';
 export * from './features/context-menu/server-context-menu-provider';
 export * from './features/copy-paste/copy-paste-context-menu';
 export * from './features/copy-paste/copy-paste-handler';
@@ -78,9 +84,10 @@ export * from './features/save/save-keylistener';
 export * from './features/select/select-feedback-command';
 export * from './features/select/select-mouse-listener';
 export * from './features/source-model-watcher/source-model-changed-action-handler';
+export * from './features/status/status-overlay';
 export * from './features/svg-metadata/metadata-placer';
 export * from './features/tool-palette/tool-palette';
-export * from './features/tools/base-glsp-tool';
+export * from './features/tools/base-tools';
 export * from './features/tools/change-bounds/change-bounds-tool';
 export * from './features/tools/change-bounds/change-bounds-tool-feedback';
 export * from './features/tools/change-bounds/view';
@@ -108,7 +115,6 @@ export * from './glsp-sprotty/types';
 // ------------------ Misc ------------------
 export * from './default-modules';
 export * from './lib/model';
-export * from './model-source/glsp-diagram-server';
 export * from './standalone-modules';
 export * from './utils/argument-utils';
 export * from './utils/html-utils';
@@ -120,9 +126,12 @@ export * from './views';
 // ------------------ DI Modules ------------------
 export * from './base/default.module';
 export * from './features/accessibility/accessibility-module';
+export * from './features/accessibility/element-navigation/element-navigation-module';
+export * from './features/accessibility/focus-tracker/focus-tracker-module';
 export * from './features/accessibility/move-zoom/move-zoom-module';
 export * from './features/accessibility/resize-key-tool/resize-key-module';
 export * from './features/accessibility/search/search-palette-module';
+export * from './features/accessibility/toast/toast-module';
 export * from './features/accessibility/view-key-tools/view-key-tools-module';
 export * from './features/command-palette/command-palette-module';
 export * from './features/context-menu/context-menu-module';
@@ -138,6 +147,7 @@ export * from './features/routing/routing-module';
 export * from './features/save/save-module';
 export * from './features/select/select-module';
 export * from './features/source-model-watcher/source-model-wacher-module';
+export * from './features/status/status-module';
 export * from './features/svg-metadata/svg-metadata-module';
 export * from './features/tool-palette/tool-palette-module';
 export * from './features/tools/change-bounds/change-boounds-tool-module';

package/src/standalone-modules.ts

@@ -14,7 +14,21 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ModuleConfiguration } from '~glsp-sprotty';
+import { inject, injectable } from 'inversify';
+import {
+    Action,
+    EndProgressAction,
+    FeatureModule,
+    IActionHandler,
+    ICommand,
+    ILogger,
+    ModuleConfiguration,
+    MessageAction,
+    StartProgressAction,
+    TYPES,
+    UpdateProgressAction,
+    configureActionHandler
+} from '~glsp-sprotty';
 import { standaloneCopyPasteModule } from './features/copy-paste/copy-paste-modules';
 import { standaloneExportModule } from './features/export/export-modules';
 import { saveModule } from './features/save/save-module';
@@ -22,6 +36,30 @@ import { standaloneSelectModule } from './features/select/select-module';
 import { undoRedoModule } from './features/undo-redo/undo-redo-module';
 import { standaloneMarkerNavigatorModule } from './features/validation/validation-modules';
 import { standaloneViewportModule } from './features/viewport/viewport-modules';
+
+export const standaloneFallbackModule = new FeatureModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    bind(FallbackActionHandler).toSelf().inSingletonScope();
+    configureActionHandler(context, MessageAction.KIND, FallbackActionHandler);
+    configureActionHandler(context, StartProgressAction.KIND, FallbackActionHandler);
+    configureActionHandler(context, UpdateProgressAction.KIND, FallbackActionHandler);
+    configureActionHandler(context, EndProgressAction.KIND, FallbackActionHandler);
+});
+
+/**
+ * A fallback action handler for actions sent by features that are currently not supported by
+ * default in the standalone context. Unhandled actions will be simply forwarded to the {@link ILogger}.
+ */
+@injectable()
+export class FallbackActionHandler implements IActionHandler {
+    @inject(TYPES.ILogger)
+    protected logger: ILogger;
+
+    handle(action: Action): void | Action | ICommand {
+        this.logger.log(this, 'Unhandled action received:', action);
+    }
+}
+
 /**
  * Configuration of all `standalone` modules.
  *
@@ -39,6 +77,7 @@ export const STANDALONE_MODULES = [
     standaloneMarkerNavigatorModule,
     standaloneSelectModule,
     standaloneExportModule,
+    standaloneFallbackModule,
     saveModule,
     undoRedoModule
 ] as const;