@eclipse-glsp/client 1.1.0-next.0d35bd0.205 → 1.1.0-next.0e4a7fc.263

package/src/features/{layout/tests → bounds}/hbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, STMicroelectronics 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,12 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable deprecation/deprecation */
-import { Dimension } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
-import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { BoundsData, ConsoleLogger, Dimension, SModelElement, SNode } from '~glsp-sprotty';
+import { layout, sLabel, sNode, setupLayoutRegistry } from './layouter-test-util.spec';
 
 describe('HBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/hbox-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-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,20 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, Dimension, Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import {
+    Bounds,
     BoundsData,
-    isBoundsAware,
-    isLayoutableChild,
+    Dimension,
+    HBoxLayoutOptions,
+    HBoxLayouter,
     LayoutContainer,
+    Point,
     SChildElement,
     SModelElement,
     SParentElement,
     StatefulLayouter,
-    HBoxLayouter,
-    HBoxLayoutOptions
-} from 'sprotty';
+    isBoundsAware,
+    isLayoutableChild
+} from '~glsp-sprotty';
 
 export interface HBoxLayoutOptionsExt extends HBoxLayoutOptions {
     hGrab: boolean;

package/src/features/{layout/tests/layouter-test-util.ts → bounds/layouter-test-util.spec.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 STMicroelectronics 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,25 +14,26 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { Dimension, Point } from '@eclipse-glsp/protocol';
+import { Container } from 'inversify';
 import 'mocha';
-import 'reflect-metadata';
 import {
     BoundsData,
     ConsoleLogger,
-    createFeatureSet,
-    layoutableChildFeature,
+    Dimension,
     LayoutRegistry,
+    Point,
     SCompartment,
     SLabel,
     SModelElement,
     SNode,
     SParentElement,
-    TYPES
-} from 'sprotty';
-import { createClientContainer } from '../../../base/container-modules';
-import { GLSPGraph } from '../../../lib/model';
-import { StatefulLayouterExt } from '../layouter';
+    TYPES,
+    createFeatureSet,
+    layoutableChildFeature
+} from '~glsp-sprotty';
+import { initializeDiagramContainer } from '../../default-modules';
+import { GLSPGraph } from '../../lib/model';
+import { StatefulLayouterExt } from './layouter';
 
 export function gModel(): GLSPGraph {
     return new GLSPGraph();
@@ -117,6 +118,6 @@ export function layout(
 export function setupLayoutRegistry(): LayoutRegistry {
     // Generic Test setup
     // create client container that registers all default modules including the layoutModule
-    const layoutContainer = createClientContainer();
+    const layoutContainer = initializeDiagramContainer(new Container());
     return layoutContainer.get<LayoutRegistry>(TYPES.LayoutRegistry);
 }

package/src/features/{layout → bounds}/layouter.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,19 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { injectable } from 'inversify';
 import {
+    Bounds,
     BoundsData,
     ILogger,
+    LayoutContainer,
     LayoutRegistry,
-    StatefulLayouter,
-    SModelElement,
     Layouter,
+    SModelElement,
     SParentElement,
-    LayoutContainer,
+    StatefulLayouter,
     isLayoutContainer
-} from 'sprotty';
-import { injectable } from 'inversify';
-import { Bounds } from 'sprotty-protocol/lib/utils/geometry';
+} from '~glsp-sprotty';
 
 @injectable()
 export class LayouterExt extends Layouter {

package/src/features/{layout/tests → bounds}/vbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, STMicroelectronics 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,12 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable deprecation/deprecation */
-import { Dimension } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
-import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { BoundsData, ConsoleLogger, Dimension, SModelElement, SNode } from '~glsp-sprotty';
+import { layout, sLabel, sNode, setupLayoutRegistry } from './layouter-test-util.spec';
 
 describe('VBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/vbox-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-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,20 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, Dimension, Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import {
+    Bounds,
     BoundsData,
-    isBoundsAware,
-    isLayoutableChild,
+    Dimension,
     LayoutContainer,
+    Point,
     SChildElement,
     SModelElement,
     SParentElement,
     StatefulLayouter,
+    VBoxLayoutOptions,
     VBoxLayouter,
-    VBoxLayoutOptions
-} from 'sprotty';
+    isBoundsAware,
+    isLayoutableChild
+} from '~glsp-sprotty';
 
 export interface VBoxLayoutOptionsExt extends VBoxLayoutOptions {
     hGrab: boolean;

package/src/features/change-bounds/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
@@ -25,7 +25,7 @@ import {
     Selectable,
     SModelElement,
     SParentElement
-} from 'sprotty';
+} from '~glsp-sprotty';
 
 export const resizeFeature = Symbol('resizeFeature');
 

package/src/features/change-bounds/movement-restrictor.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,11 @@
  *
  * 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 { BoundsAware, SModelElement, SNode, SParentElement } from 'sprotty';
+import { BoundsAware, Point, SModelElement, SNode, SParentElement } from '~glsp-sprotty';
+import { ModifyCSSFeedbackAction } from '../../base/feedback/css-feedback';
 import { toAbsoluteBounds } from '../../utils/viewpoint-util';
-import { ModifyCSSFeedbackAction } from '../tool-feedback/css-feedback';
-import { isBoundsAwareMoveable, SResizeHandle } from './model';
+import { SResizeHandle, isBoundsAwareMoveable } from './model';
 
 /**
  * A `MovementRestrictor` is an optional service that can be used by tools to validate

package/src/features/change-bounds/snap.spec.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
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { expect } from 'chai';
-import { SModelElement } from 'sprotty';
+import { SModelElement } from '~glsp-sprotty';
 import { GridSnapper, PointPositionUpdater } from './snap';
 
 describe('GridSnapper', () => {

package/src/features/change-bounds/snap.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,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Point, Writable } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { findParentByFeature, ISnapper, isViewport, SModelElement } from 'sprotty';
+import { ISnapper, Point, SModelElement, Writable, findParentByFeature, isViewport } from '~glsp-sprotty';
 
 /**
  * A {@link ISnapper} implementation that snaps all elements onto a fixed gride size.

package/src/features/command-palette/{di.config.ts → command-palette-module.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,20 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { CommandPalette, CommandPaletteActionProviderRegistry } from 'sprotty';
+import { CommandPalette, CommandPaletteActionProviderRegistry, FeatureModule, TYPES, bindAsService } from '~glsp-sprotty';
 import '../../../css/command-palette.css';
-import { TYPES } from '../../base/types';
 import { CommandPaletteTool } from './command-palette-tool';
 import { ServerCommandPaletteActionProvider } from './server-command-palette-provider';
 
-const glspCommandPaletteModule = new ContainerModule(bind => {
-    bind(CommandPalette).toSelf().inSingletonScope();
-    bind(TYPES.IUIExtension).toService(CommandPalette);
-    bind(CommandPaletteActionProviderRegistry).toSelf().inSingletonScope();
-    bind(TYPES.ICommandPaletteActionProviderRegistry).toService(CommandPaletteActionProviderRegistry);
-    bind(TYPES.ICommandPaletteActionProvider).to(ServerCommandPaletteActionProvider);
-    bind(TYPES.IDefaultTool).to(CommandPaletteTool);
+export const commandPaletteModule = new FeatureModule(bind => {
+    bindAsService(bind, TYPES.IUIExtension, CommandPalette);
+    bind(TYPES.ICommandPaletteActionProviderRegistry).to(CommandPaletteActionProviderRegistry).inSingletonScope();
+    bindAsService(bind, TYPES.ICommandPaletteActionProvider, ServerCommandPaletteActionProvider);
+    bindAsService(bind, TYPES.IDefaultTool, CommandPaletteTool);
 });
-
-export default glspCommandPaletteModule;

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { inject, injectable, postConstruct } from 'inversify';
-import { CommandPaletteKeyListener, KeyListener, KeyTool, Tool } from 'sprotty';
+import { CommandPaletteKeyListener, KeyListener, KeyTool, Tool } from '~glsp-sprotty';
 
 @injectable()
 export class CommandPaletteTool implements Tool {
@@ -25,7 +25,7 @@ export class CommandPaletteTool implements Tool {
 
     @postConstruct()
     protected postConstruct(): void {
-        this.commandPaletteKeyListener = this.createCommandPaleteKeyListener();
+        this.commandPaletteKeyListener = this.createCommandPaletteKeyListener();
     }
 
     get id(): string {
@@ -40,7 +40,7 @@ export class CommandPaletteTool implements Tool {
         this.keyTool.deregister(this.commandPaletteKeyListener);
     }
 
-    protected createCommandPaleteKeyListener(): KeyListener {
+    protected createCommandPaletteKeyListener(): KeyListener {
         return new CommandPaletteKeyListener();
     }
 }

package/src/features/command-palette/server-command-palette-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,19 @@
  *
  * 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 { ICommandPaletteActionProvider, SModelElement } from 'sprotty';
+import {
+    Action,
+    ICommandPaletteActionProvider,
+    LabeledAction,
+    Point,
+    RequestContextActions,
+    SModelElement,
+    SetContextActions,
+    TYPES
+} from '~glsp-sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
 import { EditorContextService } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 
 export namespace ServerCommandPalette {
     export const CONTEXT_ID = 'command-palette';

package/src/features/context-menu/{di.config.ts → context-menu-module.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,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { ContextMenuProviderRegistry, IContextMenuService } from 'sprotty';
-import { TYPES } from '../../base/types';
+import { ContextMenuProviderRegistry, FeatureModule, IContextMenuService, TYPES, bindAsService } from '~glsp-sprotty';
 import { SelectionServiceAwareContextMenuMouseListener } from './selection-service-aware-context-menu-mouse-listener';
 import { ServerContextMenuItemProvider } from './server-context-menu-provider';
 
-const glspContextMenuModule = new ContainerModule(bind => {
+export const contextMenuModule = new FeatureModule(bind => {
     bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(
         ctx => () =>
             new Promise<IContextMenuService>((resolve, reject) => {
@@ -30,9 +28,7 @@ const glspContextMenuModule = new ContainerModule(bind => {
                 }
             })
     );
-    bind(TYPES.MouseListener).to(SelectionServiceAwareContextMenuMouseListener);
+    bindAsService(bind, TYPES.MouseListener, SelectionServiceAwareContextMenuMouseListener);
     bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
-    bind(TYPES.IContextMenuItemProvider).to(ServerContextMenuItemProvider);
+    bindAsService(bind, TYPES.IContextMenuItemProvider, ServerContextMenuItemProvider);
 });
-
-export default glspContextMenuModule;

package/src/features/context-menu/delete-element-context-menu.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,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DeleteElementOperation, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IContextMenuItemProvider, MenuItem, SModelRoot } from 'sprotty';
+import { DeleteElementOperation, IContextMenuItemProvider, MenuItem, Point, SModelRoot, TYPES } from '~glsp-sprotty';
 import { EditorContextService, EditorContextServiceProvider } from '../../base/editor-context-service';
-import { TYPES } from '../../base/types';
 
 @injectable()
 export class DeleteElementContextMenuItemProvider implements IContextMenuItemProvider {

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,12 +13,10 @@
  *
  * 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';
+import { SelectionService } from '../../base/selection-service';
 
 @injectable()
 export class SelectionServiceAwareContextMenuMouseListener extends MouseListener {
@@ -30,7 +28,7 @@ export class SelectionServiceAwareContextMenuMouseListener extends MouseListener
     @optional()
     protected readonly menuProvider?: ContextMenuProviderRegistry;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     /**

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() }));
             }
@@ -134,19 +140,15 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
         }
     }
 
-    protected shouldCopy(_event: ClipboardEvent): boolean | null {
+    protected shouldCopy(_event: ClipboardEvent): boolean {
         return this.editorContext.get().selectedElementIds.length > 0 && this.isDiagramActive();
     }
 
-    protected shouldPaste(_event: ClipboardEvent): boolean | null {
+    protected shouldPaste(_event: ClipboardEvent): boolean {
         return this.isDiagramActive();
     }
 
-    private isDiagramActive(): boolean | null {
-        return (
-            document.activeElement instanceof SVGElement &&
-            document.activeElement.parentElement &&
-            document.activeElement.parentElement.id === this.viewerOptions.baseDiv
-        );
+    private isDiagramActive(): boolean {
+        return document.activeElement?.parentElement?.id === this.viewerOptions.baseDiv;
     }
 }