@eclipse-glsp/client 2.4.0-next.409 → 2.4.0-next.413

package/lib/features/accessibility/accessibility-module.js

@@ -19,11 +19,8 @@ exports.accessibilityModule = void 0;
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const element_navigation_module_1 = require("./element-navigation/element-navigation-module");
 const focus_tracker_module_1 = require("./focus-tracker/focus-tracker-module");
-const shortcut_help_module_1 = require("./key-shortcut/shortcut-help-module");
 const keyboard_pointer_module_1 = require("./keyboard-pointer/keyboard-pointer-module");
 const keyboard_tool_palette_module_1 = require("./keyboard-tool-palette/keyboard-tool-palette-module");
-const move_zoom_module_1 = require("./move-zoom/move-zoom-module");
-const resize_key_module_1 = require("./resize-key-tool/resize-key-module");
 const search_palette_module_1 = require("./search/search-palette-module");
 const toast_module_1 = require("./toast/toast-module");
 const view_key_tools_module_1 = require("./view-key-tools/view-key-tools-module");
@@ -32,11 +29,8 @@ const view_key_tools_module_1 = require("./view-key-tools/view-key-tools-module"
  */
 exports.accessibilityModule = new sprotty_1.FeatureModule((bind, unbind, isBound, rebind) => {
     const context = { bind, unbind, isBound, rebind };
-    (0, resize_key_module_1.configureResizeTools)(context);
     (0, view_key_tools_module_1.configureViewKeyTools)(context);
-    (0, move_zoom_module_1.configureMoveZoom)(context);
     (0, search_palette_module_1.configureSearchPaletteModule)(context);
-    (0, shortcut_help_module_1.configureShortcutHelpTool)(context);
     (0, keyboard_tool_palette_module_1.configureKeyboardToolPaletteTool)(context);
     (0, keyboard_pointer_module_1.configureKeyboardControlTools)(context);
     (0, element_navigation_module_1.configureElementNavigationTool)(context);

package/lib/features/accessibility/accessibility-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessibility-module.js","sourceRoot":"","sources":["../../../src/features/accessibility/accessibility-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,mDAAsD;AACtD,8FAAgG;AAChG,+EAAiF;AACjF,8EAAgF;AAChF,wFAA2F;AAC3F,uGAAwG;AACxG,mEAAiE;AACjE,2EAA2E;AAC3E,0EAA8E;AAC9E,uDAA0D;AAC1D,kFAA+E;AAE/E;;GAEG;AACU,QAAA,mBAAmB,GAAG,IAAI,uBAAa,CAChD,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,wCAAoB,EAAC,OAAO,CAAC,CAAC;IAC9B,IAAA,6CAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,oCAAiB,EAAC,OAAO,CAAC,CAAC;IAC3B,IAAA,oDAA4B,EAAC,OAAO,CAAC,CAAC;IACtC,IAAA,gDAAyB,EAAC,OAAO,CAAC,CAAC;IACnC,IAAA,+DAAgC,EAAC,OAAO,CAAC,CAAC;IAC1C,IAAA,uDAA6B,EAAC,OAAO,CAAC,CAAC;IACvC,IAAA,0DAA8B,EAAC,OAAO,CAAC,CAAC;IACxC,IAAA,gDAAyB,EAAC,OAAO,CAAC,CAAC;IACnC,IAAA,iCAAkB,EAAC,OAAO,CAAC,CAAC;AAChC,CAAC,EACD;IACI,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC;CACrC,CACJ,CAAC"}
+{"version":3,"file":"accessibility-module.js","sourceRoot":"","sources":["../../../src/features/accessibility/accessibility-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,mDAAsD;AACtD,8FAAgG;AAChG,+EAAiF;AACjF,wFAA2F;AAC3F,uGAAwG;AACxG,0EAA8E;AAC9E,uDAA0D;AAC1D,kFAA+E;AAE/E;;GAEG;AACU,QAAA,mBAAmB,GAAG,IAAI,uBAAa,CAChD,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,6CAAqB,EAAC,OAAO,CAAC,CAAC;IAC/B,IAAA,oDAA4B,EAAC,OAAO,CAAC,CAAC;IACtC,IAAA,+DAAgC,EAAC,OAAO,CAAC,CAAC;IAC1C,IAAA,uDAA6B,EAAC,OAAO,CAAC,CAAC;IACvC,IAAA,0DAA8B,EAAC,OAAO,CAAC,CAAC;IACxC,IAAA,gDAAyB,EAAC,OAAO,CAAC,CAAC;IACnC,IAAA,iCAAkB,EAAC,OAAO,CAAC,CAAC;AAChC,CAAC,EACD;IACI,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC;CACrC,CACJ,CAAC"}

package/lib/features/accessibility/element-navigation/diagram-navigation-tool.d.ts

@@ -13,21 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, GModelElement, GModelRoot, IActionDispatcher, KeyListener, KeyTool, Selectable } from '@eclipse-glsp/sprotty';
-import { Tool } from '../../../base/tool-manager/tool';
+import { Action, GModelElement, GModelRoot, KeyListener, Selectable } from '@eclipse-glsp/sprotty';
+import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import { SelectableBoundsAware } from '../../../utils/gmodel-util';
+import { BaseTool } from '../../tools/base-tools';
 import { ElementNavigator } from './element-navigator';
-export declare class ElementNavigatorTool implements Tool {
+export declare class ElementNavigatorTool extends BaseTool {
     static ID: string;
-    isEditTool: boolean;
-    protected elementNavigatorKeyListener: ElementNavigatorKeyListener;
-    protected readonly keytool: KeyTool;
+    static TOKEN: symbol;
+    get id(): string;
+    protected readonly shortcutManager: IShortcutManager;
     readonly elementNavigator: ElementNavigator;
     readonly localElementNavigator: ElementNavigator;
-    readonly actionDispatcher: IActionDispatcher;
-    get id(): string;
+    protected elementNavigatorKeyListener: ElementNavigatorKeyListener;
     enable(): void;
-    disable(): void;
 }
 declare enum NavigationMode {
     POSITION = "position",
@@ -41,7 +40,6 @@ export declare class ElementNavigatorKeyListener extends KeyListener {
     protected navigator?: ElementNavigator;
     protected readonly token: string;
     constructor(tool: ElementNavigatorTool);
-    registerShortcutKey(): void;
     keyDown(element: GModelElement, event: KeyboardEvent): Action[];
     protected resetOnEscape(event: KeyboardEvent, element: GModelElement): void;
     protected triggerPositionNavigationOnEvent(event: KeyboardEvent, element: GModelElement): boolean;

package/lib/features/accessibility/element-navigation/diagram-navigation-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-navigation-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/diagram-navigation-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagram-navigation-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/diagram-navigation-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,aAAa,EACb,UAAU,EACV,WAAW,EAEX,UAAU,EAQb,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAGlF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAKlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,qBACa,oBAAqB,SAAQ,QAAQ;IAC9C,MAAM,CAAC,EAAE,SAA6B;IACtC,MAAM,CAAC,KAAK,SAAuC;IAEnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAE+B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACpD,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;IAEvF,SAAS,CAAC,2BAA2B,EAAE,2BAA2B,CAAyC;IAE3G,MAAM,IAAI,IAAI;CASjB;AAED,aAAK,cAAc;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,IAAI,SAAS;CAChB;AAED,qBAAa,2BAA4B,SAAQ,WAAW;IAM5C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB;IALzD,SAAS,CAAC,IAAI,iBAAuB;IACrC,SAAS,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IAC/C,SAAS,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,KAAK,SAAoC;gBAE7B,IAAI,EAAE,oBAAoB;IAIhD,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAgBxE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IA2B3E,SAAS,CAAC,gCAAgC,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO;IAuBjG,SAAS,CAAC,8BAA8B,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAc5F,SAAS,CAAC,+BAA+B,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO;IAuBhG,SAAS,CAAC,6BAA6B,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAe3F,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IA8B1E,SAAS,CAAC,eAAe,CACrB,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,qBAAqB,GAC/B,aAAa,GAAG,SAAS;IAc5B,SAAS,CAAC,KAAK,IAAI,IAAI;IAKvB,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAI/E,SAAS,CAAC,+BAA+B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGxE,SAAS,CAAC,gCAAgC,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGzE,SAAS,CAAC,iCAAiC,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAG1E,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGhE,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAG5D,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAG1D,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG/D"}

package/lib/features/accessibility/element-navigation/diagram-navigation-tool.js

@@ -28,36 +28,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementNavigatorKeyListener = exports.ElementNavigatorTool = void 0;
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
+const available_shortcuts_tool_1 = require("../../../base/shortcuts/available-shortcuts-tool");
 const tool_1 = require("../../../base/tool-manager/tool");
 const model_1 = require("../../../model");
+const base_tools_1 = require("../../tools/base-tools");
 const reposition_1 = require("../../viewport/reposition");
-const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
-const accessible_key_shortcut_tool_1 = require("../key-shortcut/accessible-key-shortcut-tool");
 const search_tool_1 = require("../search/search-tool");
 const messages = require("../toast/messages.json");
 const toast_handler_1 = require("../toast/toast-handler");
-let ElementNavigatorTool = ElementNavigatorTool_1 = class ElementNavigatorTool {
+let ElementNavigatorTool = ElementNavigatorTool_1 = class ElementNavigatorTool extends base_tools_1.BaseTool {
     constructor() {
-        this.isEditTool = false;
+        super(...arguments);
         this.elementNavigatorKeyListener = new ElementNavigatorKeyListener(this);
     }
     get id() {
         return ElementNavigatorTool_1.ID;
     }
     enable() {
-        this.keytool.register(this.elementNavigatorKeyListener);
-        this.elementNavigatorKeyListener.registerShortcutKey();
-    }
-    disable() {
-        this.keytool.deregister(this.elementNavigatorKeyListener);
+        this.toDisposeOnDisable.push(this.keyTool.registerListener(this.elementNavigatorKeyListener), this.shortcutManager.register(ElementNavigatorTool_1.TOKEN, [
+            { shortcuts: ['ALT', 'N'], description: 'Activate local navigation mode', group: 'Navigation', position: 0 },
+            { shortcuts: ['N'], description: 'Activate global navigation mode', group: 'Navigation', position: 1 }
+        ]));
     }
 };
 exports.ElementNavigatorTool = ElementNavigatorTool;
 ElementNavigatorTool.ID = 'glsp.diagram-navigation';
+ElementNavigatorTool.TOKEN = Symbol.for(ElementNavigatorTool_1.ID);
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.KeyTool),
-    __metadata("design:type", sprotty_1.KeyTool)
-], ElementNavigatorTool.prototype, "keytool", void 0);
+    (0, inversify_1.inject)(sprotty_1.TYPES.IShortcutManager),
+    __metadata("design:type", Object)
+], ElementNavigatorTool.prototype, "shortcutManager", void 0);
 __decorate([
     (0, inversify_1.inject)(sprotty_1.TYPES.IElementNavigator),
     __metadata("design:type", Object)
@@ -66,10 +66,6 @@ __decorate([
     (0, inversify_1.inject)(sprotty_1.TYPES.ILocalElementNavigator),
     __metadata("design:type", Object)
 ], ElementNavigatorTool.prototype, "localElementNavigator", void 0);
-__decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
-    __metadata("design:type", Object)
-], ElementNavigatorTool.prototype, "actionDispatcher", void 0);
 exports.ElementNavigatorTool = ElementNavigatorTool = ElementNavigatorTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], ElementNavigatorTool);
@@ -86,26 +82,6 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
         this.mode = NavigationMode.NONE;
         this.token = ElementNavigatorKeyListener.name;
     }
-    registerShortcutKey() {
-        this.tool.actionDispatcher.dispatchOnceModelInitialized(accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
-            token: this.token,
-            keys: [
-                { shortcuts: ['N'], description: 'Activate default navigation', group: 'Navigation', position: 0 },
-                {
-                    shortcuts: ['ALT', 'N'],
-                    description: 'Activate position based navigation',
-                    group: 'Navigation',
-                    position: 1
-                },
-                {
-                    shortcuts: ['⬅  ⬆  ➡  ⬇'],
-                    description: 'Navigate by relation or neighbors according to navigation mode',
-                    group: 'Navigation',
-                    position: 2
-                }
-            ]
-        }));
-    }
     keyDown(element, event) {
         this.resetOnEscape(event, element);
         if (this.getSelectedElements(element.root).length > 0) {
@@ -124,7 +100,7 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
             (_b = (_a = this.navigator) === null || _a === void 0 ? void 0 : _a.clean) === null || _b === void 0 ? void 0 : _b.call(_a, element.root);
             this.clean();
             if (this.mode === NavigationMode.POSITION) {
-                this.tool.actionDispatcher.dispatchAll([
+                this.tool.dispatchActions([
                     tool_1.EnableDefaultToolsAction.create(),
                     toast_handler_1.ShowToastMessageAction.createWithTimeout({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
@@ -133,7 +109,7 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
                 ]);
             }
             else if (this.mode === NavigationMode.DEFAULT) {
-                this.tool.actionDispatcher.dispatchAll([
+                this.tool.dispatchActions([
                     tool_1.EnableDefaultToolsAction.create(),
                     toast_handler_1.ShowToastMessageAction.createWithTimeout({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
@@ -148,8 +124,8 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
         if (this.matchesActivatePositionNavigation(event)) {
             if (this.mode !== NavigationMode.POSITION) {
                 this.clean();
-                this.tool.actionDispatcher.dispatchAll([
-                    tool_1.EnableToolsAction.create([ElementNavigatorTool.ID, search_tool_1.SearchAutocompletePaletteTool.ID, accessible_key_shortcut_tool_1.AccessibleKeyShortcutTool.ID]),
+                this.tool.dispatchActions([
+                    tool_1.EnableToolsAction.create([ElementNavigatorTool.ID, search_tool_1.SearchAutocompletePaletteTool.ID, available_shortcuts_tool_1.AvailableShortcutsTool.ID]),
                     toast_handler_1.ShowToastMessageAction.create({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
                         message: messages.navigation.local_navigation_mode_activated
@@ -171,7 +147,7 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
             (_b = (_a = this.navigator) === null || _a === void 0 ? void 0 : _a.clean) === null || _b === void 0 ? void 0 : _b.call(_a, element.root);
             this.clean();
             this.mode = NavigationMode.NONE;
-            this.tool.actionDispatcher.dispatchAll([
+            this.tool.dispatchActions([
                 tool_1.EnableDefaultToolsAction.create(),
                 toast_handler_1.ShowToastMessageAction.createWithTimeout({
                     id: Symbol.for(ElementNavigatorKeyListener.name),
@@ -184,8 +160,8 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
         if (this.matchesActivateDefaultNavigation(event)) {
             if (this.mode !== NavigationMode.DEFAULT) {
                 this.clean();
-                this.tool.actionDispatcher.dispatchAll([
-                    tool_1.EnableToolsAction.create([ElementNavigatorTool.ID, search_tool_1.SearchAutocompletePaletteTool.ID, accessible_key_shortcut_tool_1.AccessibleKeyShortcutTool.ID]),
+                this.tool.dispatchActions([
+                    tool_1.EnableToolsAction.create([ElementNavigatorTool.ID, search_tool_1.SearchAutocompletePaletteTool.ID, available_shortcuts_tool_1.AvailableShortcutsTool.ID]),
                     toast_handler_1.ShowToastMessageAction.create({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
                         message: messages.navigation.default_navigation_mode_activated
@@ -207,7 +183,7 @@ class ElementNavigatorKeyListener extends sprotty_1.KeyListener {
             (_b = (_a = this.navigator) === null || _a === void 0 ? void 0 : _a.clean) === null || _b === void 0 ? void 0 : _b.call(_a, element.root);
             this.clean();
             this.mode = NavigationMode.NONE;
-            this.tool.actionDispatcher.dispatchAll([
+            this.tool.dispatchActions([
                 tool_1.EnableDefaultToolsAction.create(),
                 toast_handler_1.ShowToastMessageAction.createWithTimeout({
                     id: Symbol.for(ElementNavigatorKeyListener.name),

package/lib/features/accessibility/element-navigation/diagram-navigation-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-navigation-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/diagram-navigation-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagram-navigation-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/element-navigation/diagram-navigation-tool.ts"],"names":[],"mappings":"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"}

package/lib/features/accessibility/global-keylistener-tool.d.ts

@@ -13,18 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, IActionDispatcher } from '@eclipse-glsp/sprotty';
-import { Tool } from '../../base/tool-manager/tool';
-import { AccessibleKeyShortcutProvider } from './key-shortcut/accessible-key-shortcut';
-export declare class GlobalKeyListenerTool implements Tool, AccessibleKeyShortcutProvider {
+import { Action } from '@eclipse-glsp/sprotty';
+import type { IShortcutManager } from '../../base/shortcuts/shortcuts-manager';
+import { BaseEditTool } from '../tools/base-tools';
+export declare class GlobalKeyListenerTool extends BaseEditTool {
     static ID: string;
-    isEditTool: boolean;
+    static TOKEN: symbol;
     protected alreadyRegistered: boolean;
-    protected actionDispatcher: IActionDispatcher;
+    protected readonly shortcutManager: IShortcutManager;
     get id(): string;
     enable(): void;
-    disable(): void;
-    registerShortcutKey(): void;
     trigger(event: KeyboardEvent): void;
     protected handleKeyEvent(event: KeyboardEvent): Action[];
     protected matchesSetFocusOnToolPalette(event: KeyboardEvent): boolean;

package/lib/features/accessibility/global-keylistener-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-keylistener-tool.d.ts","sourceRoot":"","sources":["../../../src/features/accessibility/global-keylistener-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAA2D,MAAM,uBAAuB,CAAC;AAE3H,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIpD,OAAO,EAAE,6BAA6B,EAAkC,MAAM,wCAAwC,CAAC;AAIvH,qBACa,qBAAsB,YAAW,IAAI,EAAE,6BAA6B;IAC7E,MAAM,CAAC,EAAE,SAA8B;IAEvC,UAAU,UAAS;IACnB,SAAS,CAAC,iBAAiB,UAAS;IAGpC,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAE9C,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAQd,OAAO,IAAI,IAAI;IAKf,mBAAmB,IAAI,IAAI;IAe3B,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAInC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAexD,SAAS,CAAC,4BAA4B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGrE,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGjE,SAAS,CAAC,kCAAkC,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG9E"}
+{"version":3,"file":"global-keylistener-tool.d.ts","sourceRoot":"","sources":["../../../src/features/accessibility/global-keylistener-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAA2D,MAAM,uBAAuB,CAAC;AAExG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG/E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,qBACa,qBAAsB,SAAQ,YAAY;IACnD,MAAM,CAAC,EAAE,SAA8B;IACvC,MAAM,CAAC,KAAK,SAA0C;IAEtD,SAAS,CAAC,iBAAiB,UAAS;IAGpC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAErD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAYd,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAInC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAexD,SAAS,CAAC,4BAA4B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGrE,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAGjE,SAAS,CAAC,kCAAkC,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG9E"}

package/lib/features/accessibility/global-keylistener-tool.js

@@ -30,13 +30,12 @@ const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
 const constants_1 = require("../accessibility/keyboard-grid/constants");
 const tool_palette_1 = require("../tool-palette/tool-palette");
+const base_tools_1 = require("../tools/base-tools");
 const actions_1 = require("./actions");
-const accessible_key_shortcut_1 = require("./key-shortcut/accessible-key-shortcut");
 const constants_2 = require("./keyboard-pointer/constants");
-const keyboard_tool_palette_1 = require("./keyboard-tool-palette/keyboard-tool-palette");
-let GlobalKeyListenerTool = GlobalKeyListenerTool_1 = class GlobalKeyListenerTool {
+let GlobalKeyListenerTool = GlobalKeyListenerTool_1 = class GlobalKeyListenerTool extends base_tools_1.BaseEditTool {
     constructor() {
-        this.isEditTool = false;
+        super(...arguments);
         this.alreadyRegistered = false;
     }
     get id() {
@@ -46,26 +45,11 @@ let GlobalKeyListenerTool = GlobalKeyListenerTool_1 = class GlobalKeyListenerToo
         if (!this.alreadyRegistered) {
             this.alreadyRegistered = true;
             document.addEventListener('keyup', this.trigger.bind(this));
-            this.registerShortcutKey();
-        }
-    }
-    disable() {
-        // It is not possible to remove the handlers after registration
-        // The handlers need to be available all the time to work correctly
-    }
-    registerShortcutKey() {
-        this.actionDispatcher.onceModelInitialized().then(() => {
-            this.actionDispatcher.dispatchAll([
-                accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
-                    token: keyboard_tool_palette_1.KeyboardToolPalette.name,
-                    keys: [{ shortcuts: ['ALT', 'P'], description: 'Focus on tool palette', group: 'Tool-Palette', position: 0 }]
-                }),
-                accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
-                    token: 'Graph',
-                    keys: [{ shortcuts: ['ALT', 'G'], description: 'Focus on graph', group: 'Graph', position: 0 }]
-                })
+            this.shortcutManager.register(GlobalKeyListenerTool_1.TOKEN, [
+                { shortcuts: ['ALT', 'P'], description: 'Focus on tool palette', group: 'Tool-Palette', position: 0 },
+                { shortcuts: ['ALT', 'G'], description: 'Focus on graph', group: 'Graph', position: 0 }
             ]);
-        });
+        }
     }
     trigger(event) {
         this.actionDispatcher.dispatchAll(this.handleKeyEvent(event));
@@ -98,10 +82,11 @@ let GlobalKeyListenerTool = GlobalKeyListenerTool_1 = class GlobalKeyListenerToo
 };
 exports.GlobalKeyListenerTool = GlobalKeyListenerTool;
 GlobalKeyListenerTool.ID = 'glsp.global-key-listener';
+GlobalKeyListenerTool.TOKEN = Symbol.for(GlobalKeyListenerTool_1.name);
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(sprotty_1.TYPES.IShortcutManager),
     __metadata("design:type", Object)
-], GlobalKeyListenerTool.prototype, "actionDispatcher", void 0);
+], GlobalKeyListenerTool.prototype, "shortcutManager", void 0);
 exports.GlobalKeyListenerTool = GlobalKeyListenerTool = GlobalKeyListenerTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], GlobalKeyListenerTool);

package/lib/features/accessibility/global-keylistener-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"global-keylistener-tool.js","sourceRoot":"","sources":["../../../src/features/accessibility/global-keylistener-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA2H;AAC3H,yCAA+C;AAE/C,wEAA0G;AAC1G,+DAA2D;AAC3D,uCAA2C;AAC3C,oFAAuH;AACvH,4DAAuE;AACvE,yFAAoF;AAG7E,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAA3B;QAGH,eAAU,GAAG,KAAK,CAAC;QACT,sBAAiB,GAAG,KAAK,CAAC;IAiExC,CAAC;IA5DG,IAAI,EAAE;QACF,OAAO,uBAAqB,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,OAAO;QACH,+DAA+D;QAC/D,mEAAmE;IACvE,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACnD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;gBAC9B,wDAA8B,CAAC,MAAM,CAAC;oBAClC,KAAK,EAAE,2CAAmB,CAAC,IAAI;oBAC/B,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;iBAChH,CAAC;gBACF,wDAA8B,CAAC,MAAM,CAAC;oBAClC,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;iBAClG,CAAC;aACL,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IAES,cAAc,CAAC,KAAoB;QACzC,IAAI,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,wBAAc,CAAC,MAAM,CAAC,0BAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO,CAAC,wBAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,IAAI,CAAC,kCAAkC,CAAC,KAAK,CAAC,EAAE,CAAC;YACxD,OAAO;gBACH,wCAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,mCAAuB,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;gBACzH,wCAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,gCAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;gBACtH,wCAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,oCAAwB,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;aAC7H,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,4BAA4B,CAAC,KAAoB;QACvD,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IACS,wBAAwB,CAAC,KAAoB;QACnD,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IACS,kCAAkC,CAAC,KAAoB;QAC7D,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;;AApEQ,sDAAqB;AACvB,wBAAE,GAAG,0BAA0B,AAA7B,CAA8B;AAM7B;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;;+DACc;gCAPrC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAqEjC"}
+{"version":3,"file":"global-keylistener-tool.js","sourceRoot":"","sources":["../../../src/features/accessibility/global-keylistener-tool.ts"],"names":[],"mappings":"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"}

package/lib/features/accessibility/search/search-tool.d.ts

@@ -13,23 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, GModelElement, IActionDispatcher, KeyListener, KeyTool } from '@eclipse-glsp/sprotty';
-import { Tool } from '../../../base/tool-manager/tool';
-import { AccessibleKeyShortcutProvider } from '../key-shortcut/accessible-key-shortcut';
-export declare class SearchAutocompletePaletteTool implements Tool {
+import { Action, GModelElement, KeyListener } from '@eclipse-glsp/sprotty';
+import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
+import { BaseTool } from '../../tools/base-tools';
+export declare class SearchAutocompletePaletteTool extends BaseTool {
     static readonly ID = "glsp.search-autocomplete-palette-tool";
+    static readonly TOKEN: unique symbol;
     protected readonly keyListener: SearchAutocompletePaletteKeyListener;
-    readonly actionDispatcher: IActionDispatcher;
-    protected keyTool: KeyTool;
+    protected readonly shortcutManager: IShortcutManager;
     get id(): string;
     enable(): void;
-    disable(): void;
 }
-export declare class SearchAutocompletePaletteKeyListener extends KeyListener implements AccessibleKeyShortcutProvider {
+export declare class SearchAutocompletePaletteKeyListener extends KeyListener {
     protected tool: SearchAutocompletePaletteTool;
-    protected readonly token: string;
     constructor(tool: SearchAutocompletePaletteTool);
-    registerShortcutKey(): void;
     keyDown(element: GModelElement, event: KeyboardEvent): Action[];
     protected matchesSearchActivateKeystroke(event: KeyboardEvent): boolean;
 }

package/lib/features/accessibility/search/search-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,OAAO,EAIV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAkC,MAAM,yCAAyC,CAAC;AAExH,qBACa,6BAA8B,YAAW,IAAI;IACtD,MAAM,CAAC,QAAQ,CAAC,EAAE,2CAA2C;IAE7D,SAAS,CAAC,QAAQ,CAAC,WAAW,uCAAkD;IAC/C,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAC7D,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAE5C,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAKd,OAAO,IAAI,IAAI;CAGlB;AAED,qBAAa,oCAAqC,SAAQ,WAAY,YAAW,6BAA6B;IAG9F,SAAS,CAAC,IAAI,EAAE,6BAA6B;IAFzD,SAAS,CAAC,QAAQ,CAAC,KAAK,SAAkC;gBAEpC,IAAI,EAAE,6BAA6B;IAIzD,mBAAmB,IAAI,IAAI;IASlB,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAYxE,SAAS,CAAC,8BAA8B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG1E"}
+{"version":3,"file":"search-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAA2D,MAAM,uBAAuB,CAAC;AAEpI,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGlD,qBACa,6BAA8B,SAAQ,QAAQ;IACvD,MAAM,CAAC,QAAQ,CAAC,EAAE,2CAA2C;IAC7D,MAAM,CAAC,QAAQ,CAAC,KAAK,gBAAgD;IAErE,SAAS,CAAC,QAAQ,CAAC,WAAW,uCAAkD;IAEhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAErD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;CAQjB;AAED,qBAAa,oCAAqC,SAAQ,WAAW;IACrD,SAAS,CAAC,IAAI,EAAE,6BAA6B;gBAAnC,IAAI,EAAE,6BAA6B;IAIhD,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAYxE,SAAS,CAAC,8BAA8B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG1E"}

package/lib/features/accessibility/search/search-tool.js

@@ -28,33 +28,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchAutocompletePaletteKeyListener = exports.SearchAutocompletePaletteTool = void 0;
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
-const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
+const base_tools_1 = require("../../tools/base-tools");
 const search_palette_1 = require("./search-palette");
-let SearchAutocompletePaletteTool = SearchAutocompletePaletteTool_1 = class SearchAutocompletePaletteTool {
+let SearchAutocompletePaletteTool = SearchAutocompletePaletteTool_1 = class SearchAutocompletePaletteTool extends base_tools_1.BaseTool {
     constructor() {
+        super(...arguments);
         this.keyListener = new SearchAutocompletePaletteKeyListener(this);
     }
     get id() {
         return SearchAutocompletePaletteTool_1.ID;
     }
     enable() {
-        this.keyTool.register(this.keyListener);
-        this.keyListener.registerShortcutKey();
-    }
-    disable() {
-        this.keyTool.deregister(this.keyListener);
+        this.toDisposeOnDisable.push(this.keyTool.registerListener(this.keyListener), this.shortcutManager.register(SearchAutocompletePaletteTool_1.TOKEN, [
+            { shortcuts: ['CTRL', 'F'], description: 'Activate search for elements', group: 'Search', position: 0 }
+        ]));
     }
 };
 exports.SearchAutocompletePaletteTool = SearchAutocompletePaletteTool;
 SearchAutocompletePaletteTool.ID = 'glsp.search-autocomplete-palette-tool';
+SearchAutocompletePaletteTool.TOKEN = Symbol.for(SearchAutocompletePaletteTool_1.ID);
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(sprotty_1.TYPES.IShortcutManager),
     __metadata("design:type", Object)
-], SearchAutocompletePaletteTool.prototype, "actionDispatcher", void 0);
-__decorate([
-    (0, inversify_1.inject)(sprotty_1.KeyTool),
-    __metadata("design:type", sprotty_1.KeyTool)
-], SearchAutocompletePaletteTool.prototype, "keyTool", void 0);
+], SearchAutocompletePaletteTool.prototype, "shortcutManager", void 0);
 exports.SearchAutocompletePaletteTool = SearchAutocompletePaletteTool = SearchAutocompletePaletteTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], SearchAutocompletePaletteTool);
@@ -62,13 +58,6 @@ class SearchAutocompletePaletteKeyListener extends sprotty_1.KeyListener {
     constructor(tool) {
         super();
         this.tool = tool;
-        this.token = search_palette_1.SearchAutocompletePalette.name;
-    }
-    registerShortcutKey() {
-        this.tool.actionDispatcher.dispatchOnceModelInitialized(accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
-            token: this.token,
-            keys: [{ shortcuts: ['CTRL', 'F'], description: 'Activate search for elements', group: 'Search', position: 0 }]
-        }));
     }
     keyDown(element, event) {
         if (this.matchesSearchActivateKeystroke(event)) {

package/lib/features/accessibility/search/search-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,mDAS+B;AAC/B,yCAA+C;AAE/C,qFAAwH;AACxH,qDAA6D;AAEtD,IAAM,6BAA6B,qCAAnC,MAAM,6BAA6B;IAAnC;QAGgB,gBAAW,GAAG,IAAI,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAgBpF,CAAC;IAZG,IAAI,EAAE;QACF,OAAO,+BAA6B,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;;AAlBQ,sEAA6B;AACtB,gCAAE,GAAG,uCAAuC,AAA1C,CAA2C;AAGnB;IAAzC,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;;uEAA8C;AACnD;IAA1B,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAAoB,iBAAO;8DAAC;wCALnC,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAmBzC;AAED,MAAa,oCAAqC,SAAQ,qBAAW;IAGjE,YAAsB,IAAmC;QACrD,KAAK,EAAE,CAAC;QADU,SAAI,GAAJ,IAAI,CAA+B;QAFtC,UAAK,GAAG,0CAAyB,CAAC,IAAI,CAAC;IAI1D,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CACnD,wDAA8B,CAAC,MAAM,CAAC;YAClC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,8BAA8B,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAClH,CAAC,CACL,CAAC;IACN,CAAC;IAEQ,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,IAAI,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,OAAO;gBACH,wCAA8B,CAAC,MAAM,CAAC;oBAClC,WAAW,EAAE,0CAAyB,CAAC,EAAE;oBACzC,OAAO,EAAE,IAAI;iBAChB,CAAC;aACL,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,8BAA8B,CAAC,KAAoB;QACzD,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;CACJ;AA/BD,oFA+BC"}
+{"version":3,"file":"search-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,mDAAoI;AACpI,yCAA+C;AAE/C,uDAAkD;AAClD,qDAA6D;AAGtD,IAAM,6BAA6B,qCAAnC,MAAM,6BAA8B,SAAQ,qBAAQ;IAApD;;QAIgB,gBAAW,GAAG,IAAI,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAgBpF,CAAC;IAZG,IAAI,EAAE;QACF,OAAO,+BAA6B,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM;QACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CACxB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,EAC/C,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,+BAA6B,CAAC,KAAK,EAAE;YAC/D,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,8BAA8B,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE;SAC1G,CAAC,CACL,CAAC;IACN,CAAC;;AAnBQ,sEAA6B;AACtB,gCAAE,GAAG,uCAAuC,AAA1C,CAA2C;AAC7C,mCAAK,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA6B,CAAC,EAAE,CAAC,AAA/C,CAAgD;AAIlD;IADlB,IAAA,kBAAM,EAAC,eAAK,CAAC,gBAAgB,CAAC;;sEACsB;wCAN5C,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAoBzC;AAED,MAAa,oCAAqC,SAAQ,qBAAW;IACjE,YAAsB,IAAmC;QACrD,KAAK,EAAE,CAAC;QADU,SAAI,GAAJ,IAAI,CAA+B;IAEzD,CAAC;IAEQ,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,IAAI,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,OAAO;gBACH,wCAA8B,CAAC,MAAM,CAAC;oBAClC,WAAW,EAAE,0CAAyB,CAAC,EAAE;oBACzC,OAAO,EAAE,IAAI;iBAChB,CAAC;aACL,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,8BAA8B,CAAC,KAAoB;QACzD,OAAO,IAAA,0BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;CACJ;AApBD,oFAoBC"}

package/lib/features/accessibility/view-key-tools/{zoom-key-tool.d.ts → grid-cell-zoom-key-tool.d.ts}

@@ -13,38 +13,30 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, GModelElement, GModelRoot, IActionDispatcher, KeyListener, KeyTool, Point, SetViewportAction, Viewport } from '@eclipse-glsp/sprotty';
-import { EditorContextService } from '../../../base/editor-context-service';
+import { Action, GModelElement, GModelRoot, KeyListener, Point, SetViewportAction, Viewport } from '@eclipse-glsp/sprotty';
 import { SelectionService } from '../../../base/selection-service';
-import { Tool } from '../../../base/tool-manager/tool';
+import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
+import { BaseTool } from '../../tools/base-tools';
+import type { ZoomFactors } from '../../viewport/zoom-viewport-action';
 /**
  * Zoom viewport and elements when its focused and arrow keys are hit.
  */
-export declare class ZoomKeyTool implements Tool {
+export declare class GridCellZoomTool extends BaseTool {
     static ID: string;
-    isEditTool: boolean;
-    protected readonly zoomKeyListener: ZoomKeyListener;
-    protected readonly keytool: KeyTool;
-    readonly actionDispatcher: IActionDispatcher;
+    static TOKEN: symbol;
+    protected readonly zoomKeyListener: GridZoomKeyListener;
+    protected readonly shortcutManager: IShortcutManager;
+    protected readonly zoomFactors: ZoomFactors;
     selectionService: SelectionService;
-    protected editorContextService: EditorContextService;
     get id(): string;
     enable(): void;
-    disable(): void;
     handle(action: Action): Action | void;
 }
-export declare class ZoomKeyListener extends KeyListener {
-    protected tool: ZoomKeyTool;
-    static readonly defaultZoomInFactor = 1.1;
-    static readonly defaultZoomOutFactor = 0.9;
-    protected readonly token: string;
-    constructor(tool: ZoomKeyTool);
-    registerShortcutKey(): void;
+export declare class GridZoomKeyListener extends KeyListener {
+    protected tool: GridCellZoomTool;
+    constructor(tool: GridCellZoomTool);
     setNewZoomFactor(viewport: GModelElement & GModelRoot & Viewport, zoomFactor: number, point?: Point): SetViewportAction;
     keyDown(element: GModelElement, event: KeyboardEvent): Action[];
-    protected matchesZoomInKeystroke(event: KeyboardEvent): boolean;
     protected matchesZoomViaGrid(event: KeyboardEvent): boolean;
-    protected matchesMinZoomLevelKeystroke(event: KeyboardEvent): boolean;
-    protected matchesZoomOutKeystroke(event: KeyboardEvent): boolean;
 }
-//# sourceMappingURL=zoom-key-tool.d.ts.map
+//# sourceMappingURL=grid-cell-zoom-key-tool.d.ts.map

package/lib/features/accessibility/view-key-tools/grid-cell-zoom-key-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-cell-zoom-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/grid-cell-zoom-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,aAAa,EACb,UAAU,EACV,WAAW,EACX,KAAK,EACL,iBAAiB,EAEjB,QAAQ,EAGX,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAMvE;;GAEG;AACH,qBACa,gBAAiB,SAAQ,QAAQ;IAC1C,MAAM,CAAC,EAAE,SAA4C;IACrD,MAAM,CAAC,KAAK,SAAqC;IAEjD,SAAS,CAAC,QAAQ,CAAC,eAAe,sBAAiC;IAEnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAC7C,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IASd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CA0BxC;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IACpC,SAAS,CAAC,IAAI,EAAE,gBAAgB;gBAAtB,IAAI,EAAE,gBAAgB;IAI5C,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,UAAU,GAAG,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,iBAAiB;IAqB9G,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAiBxE,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG9D"}