@eclipse-glsp/client 2.3.0-next.322 → 2.3.0-next.366

package/src/features/accessibility/element-navigation/local-element-navigator.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,13 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BoundsAware, EdgeRouterRegistry, GConnectableElement, GModelElement, GModelRoot, TYPES } from '@eclipse-glsp/sprotty';
+import { EdgeRouterRegistry, GConnectableElement, GModelElement, GModelRoot, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional } from 'inversify';
 import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
 import { applyCssClasses, deleteCssClasses } from '../../../base/feedback/css-feedback';
-import { SelectableBoundsAware } from '../../../utils/gmodel-util';
-import { ElementNavigator } from './element-navigator';
 import { GEdge } from '../../../model';
+import { BoundsAwareModelElement, SelectableBoundsAware } from '../../../utils/gmodel-util';
+import { ElementNavigator } from './element-navigator';
 
 @injectable()
 export class LocalElementNavigator implements ElementNavigator {
@@ -91,7 +91,7 @@ export class LocalElementNavigator implements ElementNavigator {
 
     protected getIterables(
         current: SelectableBoundsAware,
-        previousCurrent?: GModelElement & BoundsAware,
+        previousCurrent?: BoundsAwareModelElement,
         predicate: (element: GModelElement) => boolean = () => true
     ): GModelElement[] {
         const elements: GModelElement[] = [];

package/src/features/accessibility/focus-tracker/focus-tracker-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,19 +14,26 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
+import { BindingContext, FeatureModule, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 import { FocusTrackerTool } from './focus-tracker-tool';
-import { BindingContext, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 
 /**
  * Handles actions for tracking the focus of the cursor.
  */
 
-export const glspFocusTrackerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureFocusTrackerTool(context);
-});
+export const focusTrackerModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureFocusTrackerTool(context);
+    },
+    { featureId: Symbol('focusTracker') }
+);
 
 export function configureFocusTrackerTool(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, FocusTrackerTool);
 }
+
+export {
+    /** Deprecated use {@link focusTrackerModule} instead */
+    focusTrackerModule as glspFocusTrackerModule
+};

package/src/features/accessibility/key-shortcut/accessible-key-shortcut.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,9 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { Action, GModelRoot, IActionHandler, ICommand, matchesKeystroke } from '@eclipse-glsp/sprotty';
 import { injectable } from 'inversify';
 import { groupBy } from 'lodash';
-import { AbstractUIExtension, Action, IActionHandler, ICommand, matchesKeystroke, GModelRoot } from '@eclipse-glsp/sprotty';
+import { GLSPAbstractUIExtension } from '../../../base/ui-extension/ui-extension';
 
 export interface AccessibleKeyShortcutProvider {
     registerShortcutKey(): void;
@@ -48,7 +49,7 @@ export namespace SetAccessibleKeyShortcutAction {
 }
 
 @injectable()
-export class KeyShortcutUIExtension extends AbstractUIExtension implements IActionHandler {
+export class KeyShortcutUIExtension extends GLSPAbstractUIExtension implements IActionHandler {
     static readonly ID = 'key-shortcut';
     protected container: HTMLDivElement;
     protected shortcutsContainer: HTMLDivElement;

package/src/features/accessibility/key-shortcut/{di.config.ts → shortcut-help-module.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, configureActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import '../../../../css/key-shortcut.css';
 import { KeyShortcutUIExtension, SetAccessibleKeyShortcutAction } from './accessible-key-shortcut';
 import { AccessibleKeyShortcutTool } from './accessible-key-shortcut-tool';
@@ -23,13 +22,21 @@ import { AccessibleKeyShortcutTool } from './accessible-key-shortcut-tool';
 /**
  * Handles actions for displaying help/information about keyboard shortcuts.
  */
-export const glspShortcutHelpModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureShortcutHelpTool(context);
-});
+export const shortcutHelpModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureShortcutHelpTool(context);
+    },
+    { featureId: Symbol('shortcutHelp') }
+);
 
 export function configureShortcutHelpTool(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, AccessibleKeyShortcutTool);
     bindAsService(context, TYPES.IUIExtension, KeyShortcutUIExtension);
     configureActionHandler(context, SetAccessibleKeyShortcutAction.KIND, KeyShortcutUIExtension);
 }
+
+export {
+    /** Deprecated use {@link shortcutHelpModule} instead */
+    shortcutHelpModule as glspShortcutHelpModule
+};

package/src/features/accessibility/keyboard-grid/keyboard-grid.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,24 +15,24 @@
  ********************************************************************************/
 import '../../../../css/keyboard.css';
 
-import { inject, injectable } from 'inversify';
 import {
-    AbstractUIExtension,
+    Action,
     ActionDispatcher,
-    IActionHandler,
-    SetUIExtensionVisibilityAction,
     GModelRoot,
-    TYPES,
-    Action,
+    IActionHandler,
     ICommand,
-    Point
+    Point,
+    SetUIExtensionVisibilityAction,
+    TYPES
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
 import { KeyCode, matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-import { KeyboardGridMetadata } from './constants';
+import { GLSPAbstractUIExtension } from '../../../base/ui-extension/ui-extension';
 import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from './action';
+import { KeyboardGridMetadata } from './constants';
 
 @injectable()
-export class KeyboardGrid extends AbstractUIExtension implements IActionHandler {
+export class KeyboardGrid extends GLSPAbstractUIExtension implements IActionHandler {
     @inject(TYPES.IActionDispatcher) protected readonly actionDispatcher: ActionDispatcher;
 
     protected triggerActions: Action[] = [];

package/src/features/accessibility/keyboard-pointer/keyboard-pointer-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,10 @@ export class KeyboardPointerKeyboardListener {
         return this.keyboardPointer.getPosition;
     }
 
-    constructor(protected readonly keyboardPointer: KeyboardPointer, protected readonly actionDispatcher: IActionDispatcher) {}
+    constructor(
+        protected readonly keyboardPointer: KeyboardPointer,
+        protected readonly actionDispatcher: IActionDispatcher
+    ) {}
 
     keyDown(event: KeyboardEvent): void {
         this.moveIfArrows(event);

package/src/features/accessibility/keyboard-pointer/keyboard-pointer-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,32 +14,35 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import {
+    BindingContext,
+    FeatureModule,
     TYPES,
-    bindAsService,
-    configureActionHandler,
+    TriggerEdgeCreationAction,
     TriggerNodeCreationAction,
-    FeatureModule,
-    BindingContext,
-    TriggerEdgeCreationAction
+    bindAsService,
+    configureActionHandler
 } from '@eclipse-glsp/sprotty';
-import { GlobalKeyListenerTool } from '../global-keylistener-tool';
-import { KeyboardPointer } from './keyboard-pointer';
-import { KeyboardGrid } from '../keyboard-grid/keyboard-grid';
-import { SetKeyboardPointerRenderPositionAction } from './actions';
+import { SetEdgeTargetSelectionAction } from '../edge-autocomplete/action';
 import { EdgeAutocompletePalette } from '../edge-autocomplete/edge-autocomplete-palette';
 import { EdgeAutocompletePaletteTool } from '../edge-autocomplete/edge-autocomplete-tool';
-import { SetEdgeTargetSelectionAction } from '../edge-autocomplete/action';
+import { GlobalKeyListenerTool } from '../global-keylistener-tool';
+import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
+import { KeyboardGrid } from '../keyboard-grid/keyboard-grid';
 import { GridSearchPalette } from '../keyboard-grid/keyboard-grid-search-palette';
 import { KeyboardNodeGrid } from '../keyboard-grid/keyboard-node-grid';
-import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
+import { SetKeyboardPointerRenderPositionAction } from './actions';
+import { KeyboardPointer } from './keyboard-pointer';
 
 /**
  * Handles the pointer used via grid to position new elements.
  */
-export const keyboardControlModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureKeyboardControlTools(context);
-});
+export const keyboardControlModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureKeyboardControlTools(context);
+    },
+    { featureId: Symbol('keyboardControl') }
+);
 
 export function configureKeyboardControlTools(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, GlobalKeyListenerTool);

package/src/features/accessibility/keyboard-pointer/keyboard-pointer.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,26 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, GModelRoot, IActionDispatcher, IActionHandler, TYPES, TriggerNodeCreationAction } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
-import {
-    AbstractUIExtension,
-    IActionDispatcher,
-    IActionHandler,
-    GModelRoot,
-    TYPES,
-    Action,
-    TriggerNodeCreationAction
-} from '@eclipse-glsp/sprotty';
+import { EditorContextService } from '../../../base/editor-context-service';
+import { CursorCSS } from '../../../base/feedback/css-feedback';
+import { GLSPAbstractUIExtension } from '../../../base/ui-extension/ui-extension';
+import { KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
 import { SetKeyboardPointerRenderPositionAction } from './actions';
 import { KeyboardPointerMetadata } from './constants';
 import { KeyboardPointerKeyboardListener } from './keyboard-pointer-listener';
 import { KeyboardPointerPosition } from './keyboard-pointer-position';
-import { KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
-import { EditorContextService } from '../../../base/editor-context-service';
-import { CursorCSS } from '../../../base/feedback/css-feedback';
 
 @injectable()
-export class KeyboardPointer extends AbstractUIExtension implements IActionHandler {
+export class KeyboardPointer extends GLSPAbstractUIExtension implements IActionHandler {
     protected _triggerAction: TriggerNodeCreationAction = {
         elementTypeId: 'task:automated',
         kind: 'triggerNodeCreation'

package/src/features/accessibility/keyboard-tool-palette/keyboard-tool-palette-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,10 +29,13 @@ import { EnableToolPaletteAction } from '../../tool-palette/tool-palette';
 import { FocusDomAction } from '../actions';
 import { KeyboardToolPalette } from './keyboard-tool-palette';
 
-export const keyboardToolPaletteModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureKeyboardToolPaletteTool(context);
-});
+export const keyboardToolPaletteModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureKeyboardToolPaletteTool(context);
+    },
+    { featureId: Symbol('keyboardToolPalette') }
+);
 
 export function configureKeyboardToolPaletteTool(context: BindingContext): void {
     bindAsService(context, TYPES.IUIExtension, KeyboardToolPalette);

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@ import * as messages from '../toast/messages.json';
 import { ShowToastMessageAction } from '../toast/toast-handler';
 
 const SEARCH_ICON_ID = 'search';
-const PALETTE_ICON_ID = 'symbol-color';
+const PALETTE_ICON_ID = 'tools';
 const CHEVRON_DOWN_ICON_ID = 'chevron-right';
 const PALETTE_HEIGHT = '500px';
 const SELECTION_TOOL_KEY: KeyCode[] = ['Digit1', 'Numpad1'];
@@ -212,29 +212,46 @@ export class KeyboardToolPalette extends ToolPalette {
 
     protected override createHeaderTools(): HTMLElement {
         this.headerToolsButtonMapping.clear();
+        let mappingIndex = 0;
 
         const headerTools = document.createElement('div');
         headerTools.classList.add('header-tools');
 
         this.defaultToolsButton = this.createDefaultToolButton();
-        this.headerToolsButtonMapping.set(0, this.defaultToolsButton);
+        this.headerToolsButtonMapping.set(mappingIndex++, this.defaultToolsButton);
         headerTools.appendChild(this.defaultToolsButton);
 
         this.deleteToolButton = this.createMouseDeleteToolButton();
-        this.headerToolsButtonMapping.set(1, this.deleteToolButton);
+        this.headerToolsButtonMapping.set(mappingIndex++, this.deleteToolButton);
         headerTools.appendChild(this.deleteToolButton);
 
         this.marqueeToolButton = this.createMarqueeToolButton();
-        this.headerToolsButtonMapping.set(2, this.marqueeToolButton);
+        this.headerToolsButtonMapping.set(mappingIndex++, this.marqueeToolButton);
         headerTools.appendChild(this.marqueeToolButton);
 
         this.validateToolButton = this.createValidateButton();
-        this.headerToolsButtonMapping.set(3, this.validateToolButton);
+        this.headerToolsButtonMapping.set(mappingIndex++, this.validateToolButton);
         headerTools.appendChild(this.validateToolButton);
 
+        const resetViewportButton = this.createResetViewportButton();
+        this.headerToolsButtonMapping.set(mappingIndex++, resetViewportButton);
+        headerTools.appendChild(resetViewportButton);
+
+        if (this.gridManager) {
+            const toggleGridButton = this.createToggleGridButton();
+            this.headerToolsButtonMapping.set(mappingIndex++, toggleGridButton);
+            headerTools.appendChild(toggleGridButton);
+        }
+
+        if (this.debugManager) {
+            const toggleDebugButton = this.createToggleDebugButton();
+            this.headerToolsButtonMapping.set(mappingIndex++, toggleDebugButton);
+            headerTools.appendChild(toggleDebugButton);
+        }
+
         // Create button for Search
         this.searchToolButton = this.createSearchButton();
-        this.headerToolsButtonMapping.set(4, this.searchToolButton);
+        this.headerToolsButtonMapping.set(mappingIndex++, this.searchToolButton);
         headerTools.appendChild(this.searchToolButton);
 
         return headerTools;
@@ -324,7 +341,7 @@ export class KeyboardToolPalette extends ToolPalette {
         searchField.tabIndex = 21;
         searchField.id = this.containerElement.id + '_search_field';
         searchField.type = 'text';
-        searchField.placeholder = ' Search...';
+        searchField.placeholder = 'Search...';
         searchField.style.display = 'none';
         searchField.onkeyup = ev => {
             this.requestFilterUpdate(this.searchField.value);

package/src/features/accessibility/move-zoom/move-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,7 +17,6 @@
 import {
     Action,
     ChangeBoundsOperation,
-    DisposableCollection,
     ElementAndBounds,
     ElementMove,
     GModelRoot,
@@ -34,10 +33,11 @@ import {
     isBoundsAware,
     isViewport
 } from '@eclipse-glsp/sprotty';
-import { inject, injectable, optional } from 'inversify';
+import { inject, injectable, optional, postConstruct } from 'inversify';
 import { DebouncedFunc, debounce } from 'lodash';
 import { EditorContextService } from '../../../base/editor-context-service';
 import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
+import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
 import { SelectableBoundsAware, getElements, isSelectableAndBoundsAware } from '../../../utils/gmodel-util';
 import { isValidMove } from '../../../utils/layout-utils';
 import { outsideOfViewport } from '../../../utils/viewpoint-util';
@@ -164,7 +164,12 @@ export class MoveElementHandler implements IActionHandler {
     readonly movementRestrictor?: IMovementRestrictor;
 
     protected debouncedChangeBounds?: DebouncedFunc<() => void>;
-    protected disposableFeedback = new DisposableCollection();
+    protected moveFeedback: FeedbackEmitter;
+
+    @postConstruct()
+    protected init(): void {
+        this.moveFeedback = this.feedbackDispatcher.createEmitter();
+    }
 
     handle(action: Action): void | Action | ICommand {
         if (MoveElementAction.is(action)) {
@@ -199,13 +204,13 @@ export class MoveElementHandler implements IActionHandler {
 
         this.dispatcher.dispatchAll(viewportActions);
         const moveAction = MoveAction.create(elementMoves, { animate: false });
-        this.disposableFeedback.push(this.feedbackDispatcher.registerFeedback(this, [moveAction]));
+        this.moveFeedback.add(moveAction).submit();
 
         this.scheduleChangeBounds(this.toElementAndBounds(elementMoves));
     }
 
     protected getTargetBounds(element: SelectableBoundsAware, action: MoveElementAction): Point {
-        let position = { x: element.bounds.x + action.moveX, y: element.bounds.y + action.moveY };
+        let position = Point.add(element.bounds, { x: action.moveX, y: action.moveY });
         if (this.snapper && action.snap) {
             position = this.snapper.snap(position, element);
         }
@@ -219,7 +224,7 @@ export class MoveElementHandler implements IActionHandler {
     protected scheduleChangeBounds(elementAndBounds: ElementAndBounds[]): void {
         this.debouncedChangeBounds?.cancel();
         this.debouncedChangeBounds = debounce(() => {
-            this.disposableFeedback.dispose();
+            this.moveFeedback.dispose();
             this.dispatcher.dispatchAll([ChangeBoundsOperation.create(elementAndBounds)]);
             this.debouncedChangeBounds = undefined;
         }, 300);

package/src/features/accessibility/move-zoom/move-zoom-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,10 +21,13 @@ import { ZoomElementAction, ZoomElementHandler, ZoomViewportAction, ZoomViewport
 /**
  * Handles move and zoom actions.
  */
-export const moveZoomModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureMoveZoom(context);
-});
+export const moveZoomModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureMoveZoom(context);
+    },
+    { featureId: Symbol('moveZoom') }
+);
 
 export function configureMoveZoom(context: BindingContext): void {
     context.bind(MoveViewportHandler).toSelf().inSingletonScope();

package/src/features/accessibility/resize-key-tool/resize-key-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,6 @@ import {
     Action,
     ChangeBoundsOperation,
     Dimension,
-    DisposableCollection,
     ElementAndBounds,
     GModelElement,
     GParentElement,
@@ -30,14 +29,14 @@ import {
     SetBoundsAction,
     TYPES
 } from '@eclipse-glsp/sprotty';
-import { inject, injectable, optional } from 'inversify';
+import { inject, injectable, optional, postConstruct } from 'inversify';
 import { DebouncedFunc, debounce } from 'lodash';
 import { EditorContextService } from '../../../base/editor-context-service';
 import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
-import { SelectableBoundsAware, getElements, isSelectableAndBoundsAware, toElementAndBounds } from '../../../utils/gmodel-util';
+import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
+import { Resizable, SelectableBoundsAware, getElements, isSelectableAndBoundsAware, toElementAndBounds } from '../../../utils/gmodel-util';
 import { isValidMove, isValidSize, minHeight, minWidth } from '../../../utils/layout-utils';
-import { Resizable } from '../../change-bounds/model';
-import { GridSnapper } from '../../change-bounds/snap';
+import { Grid } from '../../grid/grid';
 
 export enum ResizeType {
     Increase,
@@ -79,21 +78,26 @@ export class ResizeElementHandler implements IActionHandler {
     protected feedbackDispatcher: IFeedbackActionDispatcher;
 
     protected debouncedChangeBounds?: DebouncedFunc<() => void>;
-    protected disposableFeedback = new DisposableCollection();
+    protected resizeFeedback: FeedbackEmitter;
 
-    // Default x resize used if GridSnapper is not provided
+    // Default x resize used if grid is not provided
     static readonly defaultResizeX = 20;
 
-    // Default y resize used if GridSnapper is not provided
+    // Default y resize used if grid is not provided
     static readonly defaultResizeY = 20;
-    protected grid = { x: ResizeElementHandler.defaultResizeX, y: ResizeElementHandler.defaultResizeY };
+
+    @inject(TYPES.Grid) @optional() protected grid: Grid = {
+        x: ResizeElementHandler.defaultResizeX,
+        y: ResizeElementHandler.defaultResizeY
+    };
 
     protected isEditMode = false;
 
-    constructor(@inject(TYPES.ISnapper) @optional() protected readonly snapper?: ISnapper) {
-        if (snapper instanceof GridSnapper) {
-            this.grid = snapper.grid;
-        }
+    constructor(@inject(TYPES.ISnapper) @optional() protected readonly snapper?: ISnapper) {}
+
+    @postConstruct()
+    protected init(): void {
+        this.resizeFeedback = this.feedbackDispatcher.createEmitter();
     }
 
     handle(action: Action): void | Action | ICommand {
@@ -106,11 +110,11 @@ export class ResizeElementHandler implements IActionHandler {
         const elements = getElements(this.editorContextService.modelRoot.index, action.elementIds, isSelectableAndBoundsAware);
         const elementAndBounds = this.computeElementAndBounds(elements, action);
 
-        this.disposableFeedback.push(this.feedbackDispatcher.registerFeedback(this, [SetBoundsAction.create(elementAndBounds)]));
+        this.resizeFeedback.add(SetBoundsAction.create(elementAndBounds)).submit();
 
         this.debouncedChangeBounds?.cancel();
         this.debouncedChangeBounds = debounce(() => {
-            this.disposableFeedback.dispose();
+            this.resizeFeedback.dispose();
             this.dispatcher.dispatchAll([ChangeBoundsOperation.create(elementAndBounds)]);
             this.debouncedChangeBounds = undefined;
         }, 300);

package/src/features/accessibility/resize-key-tool/resize-key-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,10 +21,13 @@ import { ResizeKeyTool } from './resize-key-tool';
 /**
  * Handles resize actions.
  */
-export const resizeKeyModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureResizeTools(context);
-});
+export const resizeKeyModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureResizeTools(context);
+    },
+    { featureId: Symbol('resizeKey') }
+);
 
 export function configureResizeTools(context: BindingContext): void {
     context.bind(ResizeElementHandler).toSelf().inSingletonScope();

package/src/features/accessibility/search/search-palette-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,13 @@ import { bindAsService, BindingContext, FeatureModule, TYPES } from '@eclipse-gl
 import { SearchAutocompletePalette } from './search-palette';
 import { SearchAutocompletePaletteTool } from './search-tool';
 
-export const searchPaletteModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
-    const context = { bind, isBound, rebind };
-    configureSearchPaletteModule(context);
-});
+export const searchPaletteModule = new FeatureModule(
+    (bind, _unbind, isBound, rebind) => {
+        const context = { bind, isBound, rebind };
+        configureSearchPaletteModule(context);
+    },
+    { featureId: Symbol('searchPalette') }
+);
 
 export function configureSearchPaletteModule(context: Pick<BindingContext, 'bind'>): void {
     bindAsService(context, TYPES.IUIExtension, SearchAutocompletePalette);