@eclipse-glsp/client 1.1.0-next.697cc23.237 → 1.1.0-next.69a77b0.259

package/src/features/layout/layout-elements-action.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,33 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { inject, injectable, optional } from 'inversify';
 import {
     Action,
     ChangeBoundsOperation,
     ElementAndBounds,
+    ElementMove,
+    IActionDispatcher,
+    IActionHandler,
+    ICommand,
+    MoveAction,
+    SModelElement,
+    SetBoundsAction,
+    TYPES,
+    Writable,
     hasArrayProp,
     hasNumberProp,
-    hasStringProp,
-    SetBoundsAction,
-    Writable
-} from '@eclipse-glsp/protocol';
-import { inject, injectable, optional } from 'inversify';
-import { ElementMove, IActionDispatcher, IActionHandler, ICommand, SModelElement } from 'sprotty';
-import { MoveAction } from 'sprotty-protocol/lib/actions';
-import { TYPES } from '../../base/types';
+    hasStringProp
+} from '~glsp-sprotty';
+import { SelectionService } from '../../base/selection-service';
 import { toValidElementAndBounds, toValidElementMove } from '../../utils/layout-utils';
 import { BoundsAwareModelElement, getElements } from '../../utils/smodel-util';
 import { isBoundsAwareMoveable, isResizable } from '../change-bounds/model';
 import { IMovementRestrictor } from '../change-bounds/movement-restrictor';
-import { SelectionService } from '../select/selection-service';
 
 /**
  * Used to specify the desired resize dimension for a {@link ResizeElementsCommand}.
  */
-// eslint-disable-next-line no-shadow
 export enum ResizeDimension {
     Width,
     Height,
@@ -158,7 +161,7 @@ export abstract class LayoutElementsActionHandler implements IActionHandler {
     @inject(TYPES.IActionDispatcher)
     protected actionDispatcher: IActionDispatcher;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     @inject(TYPES.IMovementRestrictor)
@@ -272,7 +275,6 @@ export class ResizeElementsActionHandler extends LayoutElementsActionHandler {
     }
 }
 
-// eslint-disable-next-line no-shadow
 export enum Alignment {
     Left,
     Center,

package/src/features/navigation/di.config.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { NavigateToExternalTargetAction, NavigateToTargetAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty';
+import { NavigateToExternalTargetAction, NavigateToTargetAction, configureActionHandler } from '~glsp-sprotty';
 import { NavigateAction, NavigationActionHandler, ProcessNavigationArgumentsAction } from './navigation-action-handler';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 

package/src/features/navigation/navigation-action-handler.ts

@@ -13,12 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { inject, injectable } from 'inversify';
 import {
     Action,
+    ActionHandlerRegistry,
     Args,
     CenterAction,
-    hasObjectProp,
-    hasStringProp,
+    IActionDispatcher,
+    IActionHandler,
+    ICommand,
+    ILogger,
     NavigateToExternalTargetAction,
     NavigateToTargetAction,
     NavigationTarget,
@@ -29,12 +33,12 @@ import {
     ServerSeverity,
     ServerStatusAction,
     SetNavigationTargetsAction,
-    SetResolvedNavigationTargetAction
-} from '@eclipse-glsp/protocol';
-import { inject, injectable } from 'inversify';
-import { ActionHandlerRegistry, IActionDispatcher, IActionHandler, ICommand, ILogger } from 'sprotty';
+    SetResolvedNavigationTargetAction,
+    TYPES,
+    hasObjectProp,
+    hasStringProp
+} from '~glsp-sprotty';
 import { EditorContextServiceProvider } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 
 /**
@@ -264,7 +268,7 @@ export class NavigationActionHandler implements IActionHandler {
         const timeout = this.notificationTimeout;
         this.dispatcher.dispatchAll([
             ServerStatusAction.create(message, { severity, timeout }),
-            ServerMessageAction.create(message, { severity, timeout })
+            ServerMessageAction.create(message, { severity })
         ]);
     }
 }

package/src/features/navigation/navigation-target-resolver.spec.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,11 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable no-unused-expressions */
-import { NavigationTarget } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
+import { NavigationTarget } from '~glsp-sprotty';
 
 describe('NavigationTarget', () => {
     it('should be able to set and get element IDs', () => {

package/src/features/navigation/navigation-target-resolver.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,11 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { NavigationTarget, ResolveNavigationTargetAction, ResponseAction, SetResolvedNavigationTargetAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IActionDispatcher, ILogger } from 'sprotty';
+import {
+    IActionDispatcher,
+    ILogger,
+    NavigationTarget,
+    ResolveNavigationTargetAction,
+    ResponseAction,
+    SetResolvedNavigationTargetAction,
+    TYPES
+} from '~glsp-sprotty';
 import { EditorContextServiceProvider } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 
 /**
  * Resolves `NavigationTargets` to element ids.

package/src/features/reconnect/model.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
@@ -22,7 +22,7 @@ import {
     SModelExtension,
     SRoutableElement,
     SRoutingHandle
-} from 'sprotty';
+} from '~glsp-sprotty';
 
 export const reconnectFeature = Symbol('reconnectFeature');
 

package/src/features/routing/di.config.ts

@@ -0,0 +1,82 @@
+/********************************************************************************
+ * 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 { ContainerModule } from 'inversify';
+import {
+    AddRemoveBezierSegmentCommand,
+    AnchorComputerRegistry,
+    BezierDiamondAnchor,
+    BezierEdgeRouter,
+    BezierEllipseAnchor,
+    BezierRectangleAnchor,
+    DiamondAnchor,
+    EdgeRouterRegistry,
+    EllipseAnchor,
+    ManhattanDiamondAnchor,
+    ManhattanEdgeRouter,
+    ManhattanEllipticAnchor,
+    ManhattanRectangularAnchor,
+    PolylineEdgeRouter,
+    RectangleAnchor,
+    TYPES,
+    bindOrRebind,
+    configureCommand
+} from '~glsp-sprotty';
+import { GLSPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
+
+/**
+ * Customization of the routing module for GLSP.
+ */
+const glspRoutingModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
+    const context = { bind, isBound, rebind };
+
+    bind(EdgeRouterRegistry).toSelf().inSingletonScope();
+
+    bind(AnchorComputerRegistry).toSelf().inSingletonScope();
+
+    bind(GLSPManhattanEdgeRouter).toSelf().inSingletonScope();
+    bind(ManhattanEdgeRouter).toService(GLSPManhattanEdgeRouter);
+    bind(TYPES.IEdgeRouter).toService(ManhattanEdgeRouter);
+    bind(ManhattanEllipticAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(ManhattanEllipticAnchor);
+    bind(ManhattanRectangularAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(ManhattanRectangularAnchor);
+    bind(ManhattanDiamondAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(ManhattanDiamondAnchor);
+
+    bind(PolylineEdgeRouter).toSelf().inSingletonScope();
+    bind(TYPES.IEdgeRouter).toService(PolylineEdgeRouter);
+    bind(EllipseAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(EllipseAnchor);
+    bind(RectangleAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(RectangleAnchor);
+    bind(DiamondAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(DiamondAnchor);
+
+    bind(BezierEdgeRouter).toSelf().inSingletonScope();
+    bind(TYPES.IEdgeRouter).toService(BezierEdgeRouter);
+    bind(BezierEllipseAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(BezierEllipseAnchor);
+    bind(BezierRectangleAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(BezierRectangleAnchor);
+    bind(BezierDiamondAnchor).toSelf().inSingletonScope();
+    bind(TYPES.IAnchorComputer).toService(BezierDiamondAnchor);
+
+    configureCommand({ bind, isBound }, AddRemoveBezierSegmentCommand);
+
+    bindOrRebind(context, ManhattanEdgeRouter).toService(GLSPManhattanEdgeRouter);
+});
+
+export default glspRoutingModule;

package/src/features/{tools → routing}/glsp-manhattan-edge-router.ts

@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { almostEquals } from '@eclipse-glsp/protocol';
-import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement } from 'sprotty';
+import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement, almostEquals } from '~glsp-sprotty';
 
 export class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
     protected override applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void {

package/src/features/save/di.config.ts

@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { TYPES } from '../../base/types';
+import { TYPES, bindAsService } from '~glsp-sprotty';
 import { SaveModelKeyboardListener } from './save-keylistener';
 
 /**

package/src/features/save/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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElement, SModelExtension, SModelRoot } from 'sprotty';
+import { SModelElement, SModelExtension, SModelRoot } from '~glsp-sprotty';
 
 export const saveFeature = Symbol.for('saveFeature');
 

package/src/features/save/save-keylistener.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,9 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, SaveModelAction } from '@eclipse-glsp/protocol';
-import { KeyListener, SModelRoot } from 'sprotty';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+import { Action, KeyListener, SModelRoot, SaveModelAction, matchesKeystroke } from '~glsp-sprotty';
 
 export class SaveModelKeyboardListener extends KeyListener {
     override keyDown(_element: SModelRoot, event: KeyboardEvent): Action[] {

package/src/features/select/di.config.ts

@@ -13,22 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
-import { SelectFeedbackCommand } from './select-feedback-action';
+import { TYPES, bindAsService, configureCommand } from '~glsp-sprotty';
+import { SelectAllCommand, SelectCommand } from '../../base/selection-service';
+import { SelectFeedbackCommand } from './select-feedback-command';
 import { RankedSelectMouseListener } from './select-mouse-listener';
-import { SelectAllCommand, SelectCommand, SelectionService } from './selection-service';
 
 const glspSelectModule = new ContainerModule((bind, _unbind, isBound) => {
     const context = { bind, isBound };
-    bindAsService(context, TYPES.SelectionService, SelectionService);
     configureCommand(context, SelectCommand);
     configureCommand(context, SelectAllCommand);
     configureCommand(context, SelectFeedbackCommand);
     bindAsService(context, TYPES.MouseListener, RankedSelectMouseListener);
-    bind(TYPES.SModelRootListener).toService(SelectionService);
 });
 
 export default glspSelectModule;

package/src/features/select/{select-feedback-action.ts → select-feedback-command.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,26 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, hasArrayProp, SelectAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Command, CommandExecutionContext, SelectCommand as SprottySelectCommand, SModelRoot } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { Command, CommandExecutionContext, SModelRoot, SelectAction, SprottySelectCommand, TYPES } from '~glsp-sprotty';
+import { SelectFeedbackAction } from '../../base/selection-service';
 
-export interface SelectFeedbackAction extends Omit<SelectAction, 'kind'>, Action {
-    kind: typeof SelectFeedbackAction.KIND;
-}
-
-export namespace SelectFeedbackAction {
-    export const KIND = 'selectFeedback';
-
-    export function is(object: any): object is SelectFeedbackAction {
-        return Action.hasKind(object, KIND) && hasArrayProp(object, 'selectedElementsIDs') && hasArrayProp(object, 'deselectedElementsIDs');
-    }
-
-    export function create(options?: { selectedElementsIDs?: string[]; deselectedElementsIDs?: string[] }): SelectFeedbackAction {
-        return { ...SelectAction.create(options), kind: KIND };
-    }
-}
 @injectable()
 export class SelectFeedbackCommand extends Command {
     static readonly KIND = SelectFeedbackAction.KIND;

package/src/features/select/select-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,29 +13,30 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, SelectAction } from '@eclipse-glsp/protocol';
 import {
-    findParentByFeature,
-    isCtrlOrCmd,
-    isSelectable,
+    Action,
+    BringToFrontAction,
     SButton,
-    SelectMouseListener,
     SModelElement,
     SModelRoot,
     SRoutableElement,
     SRoutingHandle,
-    SwitchEditModeAction
-} from 'sprotty';
-import { BringToFrontAction } from 'sprotty-protocol/lib/actions';
-import { toArray } from 'sprotty/lib/utils/iterable';
-import { DEFAULT_RANK, Ranked } from '../rank/model';
+    SelectAction,
+    SelectMouseListener,
+    SwitchEditModeAction,
+    findParentByFeature,
+    isCtrlOrCmd,
+    isSelectable,
+    toArray
+} from '~glsp-sprotty';
+import { Ranked } from '../../base/ranked';
 
 /**
  * Ranked select mouse listener that is executed before default mouse listeners when using the RankedMouseTool.
  * This ensures that default mouse listeners are working on a model that has selection changes already applied.
  */
 export class RankedSelectMouseListener extends SelectMouseListener implements Ranked {
-    rank: number = DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
+    rank: number = Ranked.DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
 
     override mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
         const result: Action[] = [];

package/src/features/source-model-watcher/di.config.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,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SourceModelChangedAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty';
+import { SourceModelChangedAction, configureActionHandler } from '~glsp-sprotty';
 import { SourceModelChangedActionHandler } from './source-model-changed-action-handler';
 
 const sourceModelWatcherModule = new ContainerModule((bind, _unbind, isBound) => {

package/src/features/source-model-watcher/source-model-changed-action-handler.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,10 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ServerMessageAction, ServerStatusAction, SourceModelChangedAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { IActionDispatcher, IActionHandler, ViewerOptions } from 'sprotty';
-import { TYPES } from '../../base/types';
+import {
+    Action,
+    IActionDispatcher,
+    IActionHandler,
+    ServerMessageAction,
+    ServerStatusAction,
+    SourceModelChangedAction,
+    TYPES,
+    ViewerOptions
+} from '~glsp-sprotty';
 
 /**
  * An external handler of the source model change event.
@@ -63,7 +70,7 @@ export class SourceModelChangedActionHandler 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/svg-metadata/di.config.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { ContainerModule } from 'inversify';
-import { TYPES } from '../../base/types';
+import { TYPES } from '~glsp-sprotty';
 import { MetadataPlacer } from './metadata-placer';
 
 const svgMetadataModule = new ContainerModule(bind => {

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

@@ -14,11 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { injectable, inject } from 'inversify';
+import { inject, injectable } from 'inversify';
 import { VNode } from 'snabbdom';
-import { IVNodePostprocessor, SChildElement, SEdge, setAttr, SModelElement, SModelRoot } from 'sprotty';
-import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
-import { TYPES } from '../../base/types';
+import { DOMHelper, IVNodePostprocessor, SChildElement, SEdge, SModelElement, SModelRoot, TYPES, setAttr } from '~glsp-sprotty';
 
 @injectable()
 export class MetadataPlacer implements IVNodePostprocessor {

package/src/features/tool-palette/di.config.ts

@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler, EnableDefaultToolsAction } from 'sprotty';
+import { bindAsService, configureActionHandler, EnableDefaultToolsAction, TYPES } from '~glsp-sprotty';
 import '../../../css/tool-palette.css';
-import { TYPES } from '../../base/types';
 import { EnableToolPaletteAction, ToolPalette } from './tool-palette';
 
 const toolPaletteModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {

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

@@ -13,25 +13,31 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, MarkersReason, PaletteItem, RequestContextActions, RequestMarkersAction, SetContextActions } from '@eclipse-glsp/protocol';
 import { inject, injectable, postConstruct } from 'inversify';
 import {
     AbstractUIExtension,
+    Action,
     EnableDefaultToolsAction,
     EnableToolsAction,
     IActionHandler,
     ICommand,
     IToolManager,
+    MarkersReason,
+    PaletteItem,
+    RequestContextActions,
+    RequestMarkersAction,
     SModelRoot,
+    SetContextActions,
     SetUIExtensionVisibilityAction,
-    TYPES
-} from 'sprotty';
-import { codiconCSSClasses } from 'sprotty/lib/utils/codicon';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+    TYPES,
+    codiconCSSClasses,
+    matchesKeystroke
+} from '~glsp-sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { EditModeListener, EditorContextService } from '../../base/editor-context-service';
-import { MouseDeleteTool } from '../tools/delete-tool';
-import { MarqueeMouseTool } from '../tools/marquee-mouse-tool';
+import { EditorContextService, IEditModeListener } from '../../base/editor-context-service';
+import { FocusTracker } from '../../base/focus-tracker';
+import { MouseDeleteTool } from '../tools/deletion/delete-tool';
+import { MarqueeMouseTool } from '../tools/marquee-selection/marquee-mouse-tool';
 
 const CLICKED_CSS_CLASS = 'clicked';
 const SEARCH_ICON_ID = 'search';
@@ -55,17 +61,18 @@ export namespace EnableToolPaletteAction {
     }
 }
 @injectable()
-export class ToolPalette extends AbstractUIExtension implements IActionHandler, EditModeListener {
+export class ToolPalette extends AbstractUIExtension implements IActionHandler, IEditModeListener {
     static readonly ID = 'tool-palette';
 
     @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: GLSPActionDispatcher;
     @inject(TYPES.IToolManager) protected readonly toolManager: IToolManager;
     @inject(EditorContextService) protected readonly editorContext: EditorContextService;
+    @inject(FocusTracker) protected readonly focusTracker: FocusTracker;
 
     protected paletteItems: PaletteItem[];
     protected paletteItemsCopy: PaletteItem[] = [];
     protected bodyDiv?: HTMLElement;
-    protected lastActivebutton?: HTMLElement;
+    protected lastActiveButton?: HTMLElement;
     protected defaultToolsButton: HTMLElement;
     protected searchField: HTMLInputElement;
     modelRootId: string;
@@ -79,7 +86,7 @@ export class ToolPalette extends AbstractUIExtension implements IActionHandler,
 
     @postConstruct()
     postConstruct(): void {
-        this.editorContext.register(this);
+        this.editorContext.onEditModeChanged(change => this.editModeChanged(change.newValue, change.oldValue));
     }
 
     override initialize(): boolean {
@@ -92,7 +99,7 @@ export class ToolPalette extends AbstractUIExtension implements IActionHandler,
     protected initializeContents(_containerElement: HTMLElement): void {
         this.createHeader();
         this.createBody();
-        this.lastActivebutton = this.defaultToolsButton;
+        this.lastActiveButton = this.defaultToolsButton;
     }
 
     protected override onBeforeShow(_containerElement: HTMLElement, root: Readonly<SModelRoot>): void {
@@ -300,15 +307,15 @@ export class ToolPalette extends AbstractUIExtension implements IActionHandler,
     }
 
     changeActiveButton(button?: HTMLElement): void {
-        if (this.lastActivebutton) {
-            this.lastActivebutton.classList.remove(CLICKED_CSS_CLASS);
+        if (this.lastActiveButton) {
+            this.lastActiveButton.classList.remove(CLICKED_CSS_CLASS);
         }
         if (button) {
             button.classList.add(CLICKED_CSS_CLASS);
-            this.lastActivebutton = button;
-        } else {
+            this.lastActiveButton = button;
+        } else if (this.defaultToolsButton) {
             this.defaultToolsButton.classList.add(CLICKED_CSS_CLASS);
-            this.lastActivebutton = this.defaultToolsButton;
+            this.lastActiveButton = this.defaultToolsButton;
         }
     }
 
@@ -330,11 +337,14 @@ export class ToolPalette extends AbstractUIExtension implements IActionHandler,
             });
         } else if (action.kind === EnableDefaultToolsAction.KIND) {
             this.changeActiveButton();
-            this.restoreFocus();
+            if (this.focusTracker.hasFocus) {
+                // if focus was deliberately taken do not restore focus to the palette
+                this.restoreFocus();
+            }
         }
     }
 
-    editModeChanged(_oldValue: string, _newValue: string): void {
+    editModeChanged(_newValue: string, _oldValue: string): void {
         this.actionDispatcher.dispatch(
             SetUIExtensionVisibilityAction.create({ extensionId: ToolPalette.ID, visible: !this.editorContext.isReadonly })
         );