@eclipse-glsp/client 1.1.0-next.c40feb3.207 → 1.1.0-next.c5afbfa.273

package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,15 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { ContextMenuProviderRegistry, IContextMenuServiceProvider, MouseListener, SModelElement } from 'sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { TYPES } from '../../base/types';
-import { SelectionService } from '../select/selection-service';
+import { Action, ContextMenuProviderRegistry, IContextMenuServiceProvider, MouseListener, SModelElement, TYPES } from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
 
 @injectable()
-export class SelectionServiceAwareContextMenuMouseListener extends MouseListener {
+export class GLSPContextMenuMouseListener extends MouseListener {
     @inject(TYPES.IContextMenuServiceProvider)
     @optional()
     protected readonly contextMenuService?: IContextMenuServiceProvider;
@@ -30,9 +27,6 @@ export class SelectionServiceAwareContextMenuMouseListener extends MouseListener
     @optional()
     protected readonly menuProvider?: ContextMenuProviderRegistry;
 
-    @inject(TYPES.SelectionService)
-    protected selectionService: SelectionService;
-
     /**
      * Opens the context menu.
      */

package/src/features/context-menu/server-context-menu-provider.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,12 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, LabeledAction, Point, RequestContextActions, SetContextActions } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IContextMenuItemProvider, isSelected, SModelElement } from 'sprotty';
+import {
+    Action,
+    IContextMenuItemProvider,
+    LabeledAction,
+    Point,
+    RequestContextActions,
+    SModelElement,
+    SetContextActions,
+    TYPES,
+    isSelected
+} from '~glsp-sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 
 export namespace ServerContextMenu {
     export const CONTEXT_ID = 'context-menu';

package/src/features/copy-paste/copy-paste-context-menu.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -14,10 +14,21 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable deprecation/deprecation */
-import { Action, hasStringProp, Point, ServerMessageAction, ServerStatusAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IActionDispatcher, IActionHandler, IContextMenuItemProvider, isSelected, MenuItem, SModelRoot } from 'sprotty';
-import { TYPES } from '../../base/types';
+import {
+    Action,
+    IActionDispatcher,
+    IActionHandler,
+    IContextMenuItemProvider,
+    MenuItem,
+    Point,
+    SModelRoot,
+    ServerMessageAction,
+    ServerStatusAction,
+    TYPES,
+    hasStringProp,
+    isSelected
+} from '~glsp-sprotty';
 
 /**
  * An `InvokeCopyPasteAction` is dispatched by the client to initiate a cut, copy or paste operation.
@@ -74,7 +85,7 @@ export class InvokeCopyPasteActionHandler implements IActionHandler {
         const severity = 'WARNING';
         this.dispatcher.dispatchAll([
             ServerStatusAction.create(message, { severity, timeout }),
-            ServerMessageAction.create(message, { severity, timeout })
+            ServerMessageAction.create(message, { severity })
         ]);
     }
 }

package/src/features/copy-paste/copy-paste-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,13 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ClipboardData, CutOperation, PasteOperation, RequestClipboardDataAction, SetClipboardDataAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { ViewerOptions } from 'sprotty';
 import { v4 as uuid } from 'uuid';
+import {
+    ClipboardData,
+    CutOperation,
+    PasteOperation,
+    RequestClipboardDataAction,
+    SetClipboardDataAction,
+    TYPES,
+    ViewerOptions
+} from '~glsp-sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 
 export interface ICopyPasteHandler {
     handleCopy(event: ClipboardEvent): void;
@@ -96,7 +102,7 @@ const CLIPBOARD_DATA_FORMAT = 'text/plain';
 export class ServerCopyPasteHandler implements ICopyPasteHandler {
     @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
     @inject(TYPES.ViewerOptions) protected viewerOptions: ViewerOptions;
-    @inject(TYPES.IAsyncClipboardService) protected clipboadService: IAsyncClipboardService;
+    @inject(TYPES.IAsyncClipboardService) protected clipboardService: IAsyncClipboardService;
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     handleCopy(event: ClipboardEvent): void {
@@ -105,13 +111,13 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
             event.clipboardData.setData(CLIPBOARD_DATA_FORMAT, toClipboardId(clipboardId));
             this.actionDispatcher
                 .request<SetClipboardDataAction>(RequestClipboardDataAction.create(this.editorContext.get()))
-                .then(action => this.clipboadService.put(action.clipboardData, clipboardId));
+                .then(action => this.clipboardService.put(action.clipboardData, clipboardId));
             event.preventDefault();
         } else {
             if (event.clipboardData) {
                 event.clipboardData.clearData();
             }
-            this.clipboadService.clear();
+            this.clipboardService.clear();
         }
     }
 
@@ -126,7 +132,7 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
     handlePaste(event: ClipboardEvent): void {
         if (event.clipboardData && this.shouldPaste(event)) {
             const clipboardId = getClipboardIdFromDataTransfer(event.clipboardData);
-            const clipboardData = this.clipboadService.get(clipboardId);
+            const clipboardData = this.clipboardService.get(clipboardId);
             if (clipboardData) {
                 this.actionDispatcher.dispatch(PasteOperation.create({ clipboardData, editorContext: this.editorContext.get() }));
             }

package/src/features/copy-paste/copy-paste-modules.ts

@@ -0,0 +1,37 @@
+/********************************************************************************
+ * Copyright (c) 2019-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
+ ********************************************************************************/
+import { configureActionHandler, FeatureModule, TYPES } from '~glsp-sprotty';
+import { CopyPasteContextMenuItemProvider, InvokeCopyPasteAction, InvokeCopyPasteActionHandler } from './copy-paste-context-menu';
+import { LocalClipboardService, ServerCopyPasteHandler } from './copy-paste-handler';
+
+export const copyPasteModule = new FeatureModule((bind, _unbind, isBound) => {
+    bind(TYPES.ICopyPasteHandler).to(ServerCopyPasteHandler);
+    bind(TYPES.IAsyncClipboardService).to(LocalClipboardService).inSingletonScope();
+});
+
+/**
+ * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
+ * with an application native module.
+ */
+export const standaloneCopyPasteModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        bind(TYPES.IContextMenuProvider).to(CopyPasteContextMenuItemProvider).inSingletonScope();
+        bind(InvokeCopyPasteActionHandler).toSelf().inSingletonScope();
+        configureActionHandler({ bind, isBound }, InvokeCopyPasteAction.KIND, InvokeCopyPasteActionHandler);
+    },
+    { requires: copyPasteModule }
+);

package/src/features/decoration/decoration-module.ts

@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2019-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
+ ********************************************************************************/
+import { FeatureModule, TYPES, bindAsService } from '~glsp-sprotty';
+import '../../../css/decoration.css';
+import { GlspDecorationPlacer } from './decoration-placer';
+
+export const decorationModule = new FeatureModule(bind => {
+    bindAsService(bind, TYPES.IVNodePostprocessor, GlspDecorationPlacer);
+});

package/src/features/decoration/decoration-placer.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { Decoration, DecorationPlacer, isSizeable, SChildElement, SModelElement, SRoutableElement } from 'sprotty';
+import { Decoration, DecorationPlacer, isSizeable, Point, SChildElement, SModelElement, SRoutableElement } from '~glsp-sprotty';
 
 @injectable()
 export class GlspDecorationPlacer extends DecorationPlacer {

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

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * Copyright (c) 2019-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
+ ********************************************************************************/
+import {
+    bindAsService,
+    configureActionHandler,
+    configureCommand,
+    ExportSvgAction,
+    ExportSvgCommand,
+    ExportSvgKeyListener,
+    ExportSvgPostprocessor,
+    FeatureModule,
+    TYPES
+} from '~glsp-sprotty';
+import { ExportSvgActionHandler } from './export-svg-action-handler';
+import { GLSPSvgExporter } from './glsp-svg-exporter';
+
+export const exportModule = new FeatureModule((bind, _unbind, isBound) => {
+    const context = { bind, isBound };
+    bindAsService(context, TYPES.HiddenVNodePostprocessor, ExportSvgPostprocessor);
+    configureCommand(context, ExportSvgCommand);
+    bind(TYPES.SvgExporter).to(GLSPSvgExporter).inSingletonScope();
+});
+
+/**
+ * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
+ * with an application native module.
+ */
+export const standaloneExportModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        const context = { bind, isBound };
+        bindAsService(context, TYPES.KeyListener, ExportSvgKeyListener);
+        bind(ExportSvgActionHandler).toSelf().inSingletonScope();
+        configureActionHandler(context, ExportSvgAction.KIND, ExportSvgActionHandler);
+    },
+    { requires: exportModule }
+);

package/src/features/export/export-svg-action-handler.ts

@@ -0,0 +1,32 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { saveAs } from 'file-saver';
+import { injectable } from 'inversify';
+import { ExportSvgAction, IActionHandler } from '~glsp-sprotty';
+
+/**
+ * The default handler for {@link ExportSvgAction}s. This generic handler can be used in
+ * any GLSP project independent of the target platform. However, platform integration modules typically
+ *  * this handler is rebound to an application specific handler in platform integration modules
+ * (e.g. the Theia integration)
+ */
+@injectable()
+export class ExportSvgActionHandler implements IActionHandler {
+    handle(action: ExportSvgAction): void {
+        const blob = new Blob([action.svg], { type: 'text/plain;charset=utf-8' });
+        saveAs(blob, 'diagram.svg');
+    }
+}

package/src/features/export/glsp-svg-exporter.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-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
@@ -13,13 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { RequestAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { ExportSvgAction, SModelRoot, SvgExporter } from 'sprotty';
 import { v4 as uuid } from 'uuid';
+import { ExportSvgAction, RequestAction, SModelRoot, SvgExporter } from '~glsp-sprotty';
 
- @injectable()
- export class GLSPSvgExporter extends SvgExporter {
+@injectable()
+export class GLSPSvgExporter extends SvgExporter {
     override export(root: SModelRoot, _request?: RequestAction<ExportSvgAction>): void {
         if (typeof document !== 'undefined') {
             const svgElement = this.findSvgElement();
@@ -30,9 +29,10 @@ import { v4 as uuid } from 'uuid';
                     svgElement.id = originalId || uuid();
                     // provide generated svg code with respective sizing for proper viewing in browser and remove undesired border
                     const bounds = this.getBounds(root);
-                    const svg = this.createSvg(svgElement, root)
-                        .replace('style="',
-                            `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`);
+                    const svg = this.createSvg(svgElement, root).replace(
+                        'style="',
+                        `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`
+                    );
                     // do not give request/response id here as otherwise the action is treated as an unrequested response
                     this.actionDispatcher.dispatch(ExportSvgAction.create(svg, ''));
                 } finally {
@@ -47,4 +47,4 @@ import { v4 as uuid } from 'uuid';
         // search for first svg element as hierarchy within Sprotty might change
         return div && div.querySelector('svg');
     }
- }
+}

package/src/features/hints/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { SModelElement, SModelExtension } from 'sprotty';
+import { SModelElement, SModelElementSchema, SModelExtension } from '~glsp-sprotty';
 
 export const containerFeature = Symbol('containable');
 

package/src/features/hints/type-hints-module.ts

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 2019-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
+ ********************************************************************************/
+import { FeatureModule, SetTypeHintsAction, TYPES, bindAsService, configureActionHandler, configureCommand } from '~glsp-sprotty';
+import { ApplyTypeHintsCommand, TypeHintProvider } from './type-hints';
+
+export const typeHintsModule = new FeatureModule((bind, unbind, isBound) => {
+    const context = { bind, unbind, isBound };
+    bindAsService(context, TYPES.ITypeHintProvider, TypeHintProvider);
+    bind(TYPES.IDiagramStartup).toService(TypeHintProvider);
+    configureActionHandler(context, SetTypeHintsAction.KIND, TypeHintProvider);
+    configureCommand(context, ApplyTypeHintsCommand);
+});

package/src/features/hints/type-hints.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -13,30 +13,38 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, EdgeTypeHint, SetTypeHintsAction, ShapeTypeHint, TypeHint } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
+    Action,
     CommandExecutionContext,
     CommandReturn,
     Connectable,
-    connectableFeature,
-    deletableFeature,
-    editFeature,
+    EdgeTypeHint,
     FeatureSet,
     IActionHandler,
     ICommand,
-    moveFeature,
+    MaybePromise,
+    RequestTypeHintsAction,
     SEdge,
     SModelElement,
     SModelRoot,
-    SShapeElement
-} from 'sprotty';
-import { TYPES } from '../../base/types';
+    SShapeElement,
+    SetTypeHintsAction,
+    ShapeTypeHint,
+    TYPES,
+    TypeHint,
+    connectableFeature,
+    deletableFeature,
+    editFeature,
+    moveFeature
+} from '~glsp-sprotty';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { IFeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../../base/feedback/feedback-command';
+import { IDiagramStartup } from '../../base/model/diagram-loader';
 import { getElementTypeId, hasCompatibleType } from '../../utils/smodel-util';
 import { resizeFeature } from '../change-bounds/model';
 import { reconnectFeature } from '../reconnect/model';
-import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
 import { Containable, containerFeature, reparentFeature } from './model';
 
 /**
@@ -145,10 +153,13 @@ export interface ITypeHintProvider {
 }
 
 @injectable()
-export class TypeHintProvider implements IActionHandler, ITypeHintProvider {
+export class TypeHintProvider implements IActionHandler, ITypeHintProvider, IDiagramStartup {
     @inject(TYPES.IFeedbackActionDispatcher)
     protected feedbackActionDispatcher: IFeedbackActionDispatcher;
 
+    @inject(GLSPActionDispatcher)
+    protected actionDispatcher: GLSPActionDispatcher;
+
     protected shapeHints: Map<string, ShapeTypeHint> = new Map();
     protected edgeHints: Map<string, EdgeTypeHint> = new Map();
 
@@ -188,6 +199,10 @@ export class TypeHintProvider implements IActionHandler, ITypeHintProvider {
     getEdgeTypeHint(input: SModelElement | SModelElement | string): EdgeTypeHint | undefined {
         return getTypeHint(input, this.edgeHints);
     }
+
+    preRequestModel(): MaybePromise<void> {
+        this.actionDispatcher.dispatch(RequestTypeHintsAction.create());
+    }
 }
 
 function getTypeHint<T extends TypeHint>(input: SModelElement | SModelElement | string, hints: Map<string, T>): T | undefined {

package/src/features/hover/hover-module.ts

@@ -0,0 +1,64 @@
+/********************************************************************************
+ * Copyright (c) 2020-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
+ ********************************************************************************/
+import {
+    CenterCommand,
+    ClosePopupActionHandler,
+    FeatureModule,
+    FitToScreenCommand,
+    HoverFeedbackCommand,
+    HoverKeyListener,
+    HoverState,
+    MoveCommand,
+    PopupHoverMouseListener,
+    PopupPositionUpdater,
+    SetPopupModelCommand,
+    SetViewportCommand,
+    TYPES,
+    bindAsService,
+    configureActionHandler,
+    configureCommand
+} from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
+import { GlspHoverMouseListener } from './hover';
+
+export const hoverModule = new FeatureModule((bind, _unbind, isBound) => {
+    const context = { bind, isBound };
+    bindAsService(context, TYPES.PopupVNodePostprocessor, PopupPositionUpdater);
+    bindAsService(context, TYPES.MouseListener, GlspHoverMouseListener);
+    bindAsService(context, TYPES.PopupMouseListener, PopupHoverMouseListener);
+    bindAsService(context, TYPES.KeyListener, HoverKeyListener);
+
+    bind<HoverState>(TYPES.HoverState).toConstantValue({
+        mouseOverTimer: undefined,
+        mouseOutTimer: undefined,
+        popupOpen: false,
+        previousPopupElement: undefined
+    });
+    bind(ClosePopupActionHandler).toSelf().inSingletonScope();
+
+    configureCommand(context, HoverFeedbackCommand);
+    configureCommand(context, SetPopupModelCommand);
+    configureActionHandler(context, SetPopupModelCommand.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, FitToScreenCommand.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, CenterCommand.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, SetViewportCommand.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, MoveCommand.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, FocusStateChangedAction.KIND, ClosePopupActionHandler);
+    configureActionHandler(context, EnableToolsAction.KIND, GlspHoverMouseListener);
+    configureActionHandler(context, EnableDefaultToolsAction.KIND, GlspHoverMouseListener);
+    configureActionHandler(context, FocusStateChangedAction.KIND, GlspHoverMouseListener);
+});

package/src/features/hover/hover.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -13,21 +13,27 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { injectable } from 'inversify';
 import {
     Action,
     Bounds,
+    EMPTY_ROOT,
+    HoverFeedbackAction,
+    HoverMouseListener,
+    IActionHandler,
+    ICommand,
     PreRenderedElementSchema,
     RequestPopupModelAction,
-    SetPopupModelAction,
+    SModelElement,
     SModelElementSchema,
-    SModelRootSchema
-} from '@eclipse-glsp/protocol';
-import { injectable } from 'inversify';
-import { EMPTY_ROOT, HoverFeedbackAction, HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool-actions';
-import { EdgeCreationTool } from '../tools/edge-creation-tool';
-import { getSeverity, GIssueMarker } from '../validation/issue-marker';
+    SModelRootSchema,
+    SetPopupModelAction
+} from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { EnableDefaultToolsAction, EnableToolsAction } from '../../base/tool-manager/tool';
+import { EdgeCreationTool } from '../tools/edge-creation/edge-creation-tool';
+import { GIssueMarker, getSeverity } from '../validation/issue-marker';
+
 @injectable()
 export class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
     protected enableHover = true;

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

@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2020-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
+ ********************************************************************************/
+import { injectable } from 'inversify';
+import { EditLabelKeyListener, EditLabelMouseListener, KeyListener, MouseListener } from '~glsp-sprotty';
+import { BaseEditTool } from '../tools/base-tools';
+
+@injectable()
+export class DirectLabelEditTool extends BaseEditTool {
+    static readonly ID = 'glsp.direct-label-edit-tool';
+
+    get id(): string {
+        return DirectLabelEditTool.ID;
+    }
+
+    protected createEditLabelMouseListener(): MouseListener {
+        return new EditLabelMouseListener();
+    }
+
+    protected createEditLabelKeyListener(): KeyListener {
+        return new EditLabelKeyListener();
+    }
+
+    enable(): void {
+        this.toDisposeOnDisable.push(
+            this.mouseTool.registerListener(this.createEditLabelMouseListener()),
+            this.keyTool.registerListener(this.createEditLabelKeyListener())
+        );
+    }
+}