@eclipse-glsp/client 1.1.0-next.0e4a7fc.263 → 1.1.0-next.14c7209.265
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/css/key-shortcut.css +107 -0
- package/lib/features/accessibility/accessibility-module.d.ts.map +1 -1
- package/lib/features/accessibility/accessibility-module.js +2 -0
- package/lib/features/accessibility/accessibility-module.js.map +1 -1
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.d.ts +31 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.d.ts.map +1 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.js +72 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut-tool.js.map +1 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.d.ts +53 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.d.ts.map +1 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.js +149 -0
- package/lib/features/accessibility/key-shortcut/accessible-key-shortcut.js.map +1 -0
- package/lib/features/accessibility/key-shortcut/di.config.d.ts +24 -0
- package/lib/features/accessibility/key-shortcut/di.config.d.ts.map +1 -0
- package/lib/features/accessibility/key-shortcut/di.config.js +37 -0
- package/lib/features/accessibility/key-shortcut/di.config.js.map +1 -0
- package/lib/features/accessibility/resize-key-tool/resize-key-tool.d.ts +6 -1
- package/lib/features/accessibility/resize-key-tool/resize-key-tool.d.ts.map +1 -1
- package/lib/features/accessibility/resize-key-tool/resize-key-tool.js +26 -3
- package/lib/features/accessibility/resize-key-tool/resize-key-tool.js.map +1 -1
- package/lib/features/accessibility/search/search-tool.d.ts +8 -1
- package/lib/features/accessibility/search/search-tool.d.ts.map +1 -1
- package/lib/features/accessibility/search/search-tool.js +23 -1
- package/lib/features/accessibility/search/search-tool.js.map +1 -1
- package/lib/features/accessibility/view-key-tools/movement-key-tool.d.ts +7 -2
- package/lib/features/accessibility/view-key-tools/movement-key-tool.d.ts.map +1 -1
- package/lib/features/accessibility/view-key-tools/movement-key-tool.js +19 -1
- package/lib/features/accessibility/view-key-tools/movement-key-tool.js.map +1 -1
- package/lib/features/accessibility/view-key-tools/zoom-key-tool.d.ts +4 -0
- package/lib/features/accessibility/view-key-tools/zoom-key-tool.d.ts.map +1 -1
- package/lib/features/accessibility/view-key-tools/zoom-key-tool.js +23 -0
- package/lib/features/accessibility/view-key-tools/zoom-key-tool.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/package.json +3 -3
- package/src/features/accessibility/accessibility-module.ts +2 -0
- package/src/features/accessibility/key-shortcut/accessible-key-shortcut-tool.ts +55 -0
- package/src/features/accessibility/key-shortcut/accessible-key-shortcut.ts +182 -0
- package/src/features/accessibility/key-shortcut/di.config.ts +35 -0
- package/src/features/accessibility/resize-key-tool/resize-key-tool.ts +22 -1
- package/src/features/accessibility/search/search-tool.ts +24 -5
- package/src/features/accessibility/view-key-tools/movement-key-tool.ts +19 -3
- package/src/features/accessibility/view-key-tools/zoom-key-tool.ts +22 -1
- package/src/index.ts +1 -0
|
@@ -23,13 +23,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
23
23
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
24
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
25
|
};
|
|
26
|
-
var ResizeKeyTool_1;
|
|
26
|
+
var ResizeKeyTool_1, ResizeKeyListener_1;
|
|
27
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
28
|
exports.ResizeKeyListener = exports.ResizeKeyTool = void 0;
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
31
31
|
const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
|
|
32
|
+
const action_dispatcher_1 = require("../../../base/action-dispatcher");
|
|
32
33
|
const selection_service_1 = require("../../../base/selection-service");
|
|
34
|
+
const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
|
|
33
35
|
const resize_key_handler_1 = require("./resize-key-handler");
|
|
34
36
|
let ResizeKeyTool = exports.ResizeKeyTool = ResizeKeyTool_1 = class ResizeKeyTool {
|
|
35
37
|
constructor() {
|
|
@@ -41,6 +43,7 @@ let ResizeKeyTool = exports.ResizeKeyTool = ResizeKeyTool_1 = class ResizeKeyToo
|
|
|
41
43
|
}
|
|
42
44
|
enable() {
|
|
43
45
|
this.keytool.register(this.resizeKeyListener);
|
|
46
|
+
this.resizeKeyListener.registerShortcutKey();
|
|
44
47
|
}
|
|
45
48
|
disable() {
|
|
46
49
|
this.keytool.deregister(this.resizeKeyListener);
|
|
@@ -61,6 +64,10 @@ __decorate([
|
|
|
61
64
|
(0, inversify_1.optional)(),
|
|
62
65
|
__metadata("design:type", Object)
|
|
63
66
|
], ResizeKeyTool.prototype, "snapper", void 0);
|
|
67
|
+
__decorate([
|
|
68
|
+
(0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
|
|
69
|
+
__metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
|
|
70
|
+
], ResizeKeyTool.prototype, "actionDispatcher", void 0);
|
|
64
71
|
__decorate([
|
|
65
72
|
(0, inversify_1.inject)(selection_service_1.SelectionService),
|
|
66
73
|
__metadata("design:type", selection_service_1.SelectionService)
|
|
@@ -68,11 +75,27 @@ __decorate([
|
|
|
68
75
|
exports.ResizeKeyTool = ResizeKeyTool = ResizeKeyTool_1 = __decorate([
|
|
69
76
|
(0, inversify_1.injectable)()
|
|
70
77
|
], ResizeKeyTool);
|
|
71
|
-
let ResizeKeyListener = exports.ResizeKeyListener = class ResizeKeyListener extends _glsp_sprotty_1.KeyListener {
|
|
78
|
+
let ResizeKeyListener = exports.ResizeKeyListener = ResizeKeyListener_1 = class ResizeKeyListener extends _glsp_sprotty_1.KeyListener {
|
|
72
79
|
constructor(tool) {
|
|
73
80
|
super();
|
|
74
81
|
this.tool = tool;
|
|
75
82
|
this.isEditMode = false;
|
|
83
|
+
this.token = ResizeKeyListener_1.name;
|
|
84
|
+
}
|
|
85
|
+
registerShortcutKey() {
|
|
86
|
+
this.tool.actionDispatcher.onceModelInitialized().then(() => {
|
|
87
|
+
this.tool.actionDispatcher.dispatchAll([
|
|
88
|
+
accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
|
|
89
|
+
token: this.token,
|
|
90
|
+
keys: [
|
|
91
|
+
{ shortcuts: ['ALT', 'A'], description: 'Activate resize mode for selected element', group: 'Resize', position: 0 },
|
|
92
|
+
{ shortcuts: ['+'], description: 'Increase size of element', group: 'Resize', position: 1 },
|
|
93
|
+
{ shortcuts: ['-'], description: 'Increase size of element', group: 'Resize', position: 2 },
|
|
94
|
+
{ shortcuts: ['CTRL', '0'], description: 'Set element size to default', group: 'Resize', position: 3 }
|
|
95
|
+
]
|
|
96
|
+
})
|
|
97
|
+
]);
|
|
98
|
+
});
|
|
76
99
|
}
|
|
77
100
|
keyDown(element, event) {
|
|
78
101
|
const actions = [];
|
|
@@ -117,7 +140,7 @@ let ResizeKeyListener = exports.ResizeKeyListener = class ResizeKeyListener exte
|
|
|
117
140
|
return (0, keyboard_1.matchesKeystroke)(event, 'Minus') || (0, keyboard_1.matchesKeystroke)(event, 'NumpadSubtract');
|
|
118
141
|
}
|
|
119
142
|
};
|
|
120
|
-
exports.ResizeKeyListener = ResizeKeyListener = __decorate([
|
|
143
|
+
exports.ResizeKeyListener = ResizeKeyListener = ResizeKeyListener_1 = __decorate([
|
|
121
144
|
(0, inversify_1.injectable)(),
|
|
122
145
|
__metadata("design:paramtypes", [ResizeKeyTool])
|
|
123
146
|
], ResizeKeyListener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAAyD;AACzD,yDAA8D;AAC9D,iDAA0I;AAC1I,uEAAmE;AAGnE,6DAAuE;AAGhE,IAAM,aAAa,6CAAnB,MAAM,aAAa;IAAnB;QAGH,eAAU,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"resize-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/resize-key-tool/resize-key-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,15 +14,22 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, KeyListener, KeyTool, SModelElement, Tool } from '../../../glsp-sprotty/index';
|
|
17
|
+
import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
|
|
18
|
+
import { AccessibleKeyShortcutProvider } from '../key-shortcut/accessible-key-shortcut';
|
|
17
19
|
export declare class SearchAutocompletePaletteTool implements Tool {
|
|
18
20
|
static readonly ID = "glsp.search-autocomplete-palette-tool";
|
|
19
21
|
protected readonly keyListener: SearchAutocompletePaletteKeyListener;
|
|
22
|
+
readonly actionDispatcher: GLSPActionDispatcher;
|
|
20
23
|
protected keyTool: KeyTool;
|
|
21
24
|
get id(): string;
|
|
22
25
|
enable(): void;
|
|
23
26
|
disable(): void;
|
|
24
27
|
}
|
|
25
|
-
export declare class SearchAutocompletePaletteKeyListener extends KeyListener {
|
|
28
|
+
export declare class SearchAutocompletePaletteKeyListener extends KeyListener implements AccessibleKeyShortcutProvider {
|
|
29
|
+
protected tool: SearchAutocompletePaletteTool;
|
|
30
|
+
protected readonly token: string;
|
|
31
|
+
constructor(tool: SearchAutocompletePaletteTool);
|
|
32
|
+
registerShortcutKey(): void;
|
|
26
33
|
keyDown(element: SModelElement, event: KeyboardEvent): Action[];
|
|
27
34
|
protected matchesSearchActivateKeystroke(event: KeyboardEvent): boolean;
|
|
28
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"search-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAkC,aAAa,EAAE,IAAI,EAAS,MAAM,eAAe,CAAC;AACzH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,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,oBAAoB,CAAC;IAChE,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;IAWlB,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAYxE,SAAS,CAAC,8BAA8B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAG1E"}
|
|
@@ -29,22 +29,29 @@ exports.SearchAutocompletePaletteKeyListener = exports.SearchAutocompletePalette
|
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
31
31
|
const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
|
|
32
|
+
const action_dispatcher_1 = require("../../../base/action-dispatcher");
|
|
33
|
+
const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
|
|
32
34
|
const search_palette_1 = require("./search-palette");
|
|
33
35
|
let SearchAutocompletePaletteTool = exports.SearchAutocompletePaletteTool = SearchAutocompletePaletteTool_1 = class SearchAutocompletePaletteTool {
|
|
34
36
|
constructor() {
|
|
35
|
-
this.keyListener = new SearchAutocompletePaletteKeyListener();
|
|
37
|
+
this.keyListener = new SearchAutocompletePaletteKeyListener(this);
|
|
36
38
|
}
|
|
37
39
|
get id() {
|
|
38
40
|
return SearchAutocompletePaletteTool_1.ID;
|
|
39
41
|
}
|
|
40
42
|
enable() {
|
|
41
43
|
this.keyTool.register(this.keyListener);
|
|
44
|
+
this.keyListener.registerShortcutKey();
|
|
42
45
|
}
|
|
43
46
|
disable() {
|
|
44
47
|
this.keyTool.deregister(this.keyListener);
|
|
45
48
|
}
|
|
46
49
|
};
|
|
47
50
|
SearchAutocompletePaletteTool.ID = 'glsp.search-autocomplete-palette-tool';
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
|
|
53
|
+
__metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
|
|
54
|
+
], SearchAutocompletePaletteTool.prototype, "actionDispatcher", void 0);
|
|
48
55
|
__decorate([
|
|
49
56
|
(0, inversify_1.inject)(_glsp_sprotty_1.KeyTool),
|
|
50
57
|
__metadata("design:type", _glsp_sprotty_1.KeyTool)
|
|
@@ -53,6 +60,21 @@ exports.SearchAutocompletePaletteTool = SearchAutocompletePaletteTool = SearchAu
|
|
|
53
60
|
(0, inversify_1.injectable)()
|
|
54
61
|
], SearchAutocompletePaletteTool);
|
|
55
62
|
class SearchAutocompletePaletteKeyListener extends _glsp_sprotty_1.KeyListener {
|
|
63
|
+
constructor(tool) {
|
|
64
|
+
super();
|
|
65
|
+
this.tool = tool;
|
|
66
|
+
this.token = search_palette_1.SearchAutocompletePalette.name;
|
|
67
|
+
}
|
|
68
|
+
registerShortcutKey() {
|
|
69
|
+
this.tool.actionDispatcher.onceModelInitialized().then(() => {
|
|
70
|
+
this.tool.actionDispatcher.dispatchAll([
|
|
71
|
+
accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
|
|
72
|
+
token: this.token,
|
|
73
|
+
keys: [{ shortcuts: ['CTRL', 'F'], description: 'Activate search for elements', group: 'Search', position: 0 }]
|
|
74
|
+
})
|
|
75
|
+
]);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
56
78
|
keyDown(element, event) {
|
|
57
79
|
if (this.matchesSearchActivateKeystroke(event)) {
|
|
58
80
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAA+C;AAC/C,yDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"search-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/search/search-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAA+C;AAC/C,yDAA8D;AAC9D,iDAAyH;AACzH,uEAAuE;AACvE,qFAAwH;AACxH,qDAA6D;AAEtD,IAAM,6BAA6B,6EAAnC,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;;AAjBe,gCAAE,GAAG,uCAAuC,AAA1C,CAA2C;AAGnB;IAAzC,IAAA,kBAAM,EAAC,qBAAK,CAAC,iBAAiB,CAAC;8BAA4B,wCAAoB;uEAAC;AACtD;IAA1B,IAAA,kBAAM,EAAC,uBAAO,CAAC;8BAAoB,uBAAO;8DAAC;wCALnC,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAmBzC;AAED,MAAa,oCAAqC,SAAQ,2BAAW;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,oBAAoB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACxD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;gBACnC,wDAA8B,CAAC,MAAM,CAAC;oBAClC,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,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;iBAClH,CAAC;aACL,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,OAAO,CAAC,OAAsB,EAAE,KAAoB;QACzD,IAAI,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,EAAE;YAC5C,OAAO;gBACH,8CAA8B,CAAC,MAAM,CAAC;oBAClC,WAAW,EAAE,0CAAyB,CAAC,EAAE;oBACzC,OAAO,EAAE,IAAI;iBAChB,CAAC;aACL,CAAC;SACL;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,8BAA8B,CAAC,KAAoB;QACzD,OAAO,IAAA,2BAAgB,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;CACJ;AAjCD,oFAiCC"}
|
|
@@ -14,8 +14,10 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, ISnapper, KeyListener, KeyTool, SModelElement } from '../../../glsp-sprotty/index';
|
|
17
|
-
import {
|
|
17
|
+
import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
|
|
18
18
|
import { SelectionService } from '../../../base/selection-service';
|
|
19
|
+
import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
|
|
20
|
+
import { AccessibleKeyShortcutProvider } from '../key-shortcut/accessible-key-shortcut';
|
|
19
21
|
/**
|
|
20
22
|
* Moves viewport and elements when its focused and arrow keys are hit.
|
|
21
23
|
*/
|
|
@@ -26,19 +28,22 @@ export declare class MovementKeyTool implements GLSPTool {
|
|
|
26
28
|
protected readonly keytool: KeyTool;
|
|
27
29
|
selectionService: SelectionService;
|
|
28
30
|
readonly snapper?: ISnapper;
|
|
31
|
+
readonly actionDispatcher: GLSPActionDispatcher;
|
|
29
32
|
get id(): string;
|
|
30
33
|
enable(): void;
|
|
31
34
|
disable(): void;
|
|
32
35
|
}
|
|
33
|
-
export declare class MoveKeyListener extends KeyListener {
|
|
36
|
+
export declare class MoveKeyListener extends KeyListener implements AccessibleKeyShortcutProvider {
|
|
34
37
|
protected readonly tool: MovementKeyTool;
|
|
35
38
|
static readonly defaultMoveX = 20;
|
|
36
39
|
static readonly defaultMoveY = 20;
|
|
40
|
+
protected readonly token: string;
|
|
37
41
|
protected grid: {
|
|
38
42
|
x: number;
|
|
39
43
|
y: number;
|
|
40
44
|
};
|
|
41
45
|
constructor(tool: MovementKeyTool);
|
|
46
|
+
registerShortcutKey(): void;
|
|
42
47
|
keyDown(element: SModelElement, event: KeyboardEvent): Action[];
|
|
43
48
|
protected matchesMoveUpKeystroke(event: KeyboardEvent): boolean;
|
|
44
49
|
protected matchesMoveDownKeystroke(event: KeyboardEvent): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"movement-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/movement-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAS,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"movement-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/movement-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,EAAS,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAC;AAExE,OAAO,EAAE,6BAA6B,EAAkC,MAAM,yCAAyC,CAAC;AAGxH;;GAEG;AACH,qBACa,eAAgB,YAAW,QAAQ;IAC5C,MAAM,CAAC,EAAE,SAA4B;IAErC,UAAU,UAAQ;IAElB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,kBAA6B;IAElD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAEjF,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAKd,OAAO,IAAI,IAAI;CAGlB;AAED,qBAAa,eAAgB,SAAQ,WAAY,YAAW,6BAA6B;IAWzE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe;IATpD,MAAM,CAAC,QAAQ,CAAC,YAAY,MAAM;IAGlC,MAAM,CAAC,QAAQ,CAAC,YAAY,MAAM;IAElC,SAAS,CAAC,QAAQ,CAAC,KAAK,SAAwB;IAEhD,SAAS,CAAC,IAAI;;;MAAwE;gBAEvD,IAAI,EAAE,eAAe;IAQpD,mBAAmB,IAAI,IAAI;IAWlB,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IA2BxE,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAI/D,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIjE,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIlE,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAGpE"}
|
|
@@ -29,8 +29,10 @@ exports.MoveKeyListener = exports.MovementKeyTool = void 0;
|
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
31
31
|
const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
|
|
32
|
-
const
|
|
32
|
+
const action_dispatcher_1 = require("../../../base/action-dispatcher");
|
|
33
33
|
const selection_service_1 = require("../../../base/selection-service");
|
|
34
|
+
const snap_1 = require("../../change-bounds/snap");
|
|
35
|
+
const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
|
|
34
36
|
const move_handler_1 = require("../move-zoom/move-handler");
|
|
35
37
|
/**
|
|
36
38
|
* Moves viewport and elements when its focused and arrow keys are hit.
|
|
@@ -45,6 +47,7 @@ let MovementKeyTool = exports.MovementKeyTool = MovementKeyTool_1 = class Moveme
|
|
|
45
47
|
}
|
|
46
48
|
enable() {
|
|
47
49
|
this.keytool.register(this.movementKeyListener);
|
|
50
|
+
this.movementKeyListener.registerShortcutKey();
|
|
48
51
|
}
|
|
49
52
|
disable() {
|
|
50
53
|
this.keytool.deregister(this.movementKeyListener);
|
|
@@ -64,6 +67,10 @@ __decorate([
|
|
|
64
67
|
(0, inversify_1.optional)(),
|
|
65
68
|
__metadata("design:type", Object)
|
|
66
69
|
], MovementKeyTool.prototype, "snapper", void 0);
|
|
70
|
+
__decorate([
|
|
71
|
+
(0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
|
|
72
|
+
__metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
|
|
73
|
+
], MovementKeyTool.prototype, "actionDispatcher", void 0);
|
|
67
74
|
exports.MovementKeyTool = MovementKeyTool = MovementKeyTool_1 = __decorate([
|
|
68
75
|
(0, inversify_1.injectable)()
|
|
69
76
|
], MovementKeyTool);
|
|
@@ -71,11 +78,22 @@ class MoveKeyListener extends _glsp_sprotty_1.KeyListener {
|
|
|
71
78
|
constructor(tool) {
|
|
72
79
|
super();
|
|
73
80
|
this.tool = tool;
|
|
81
|
+
this.token = MoveKeyListener.name;
|
|
74
82
|
this.grid = { x: MoveKeyListener.defaultMoveX, y: MoveKeyListener.defaultMoveY };
|
|
75
83
|
if (this.tool.snapper instanceof snap_1.GridSnapper) {
|
|
76
84
|
this.grid = this.tool.snapper.grid;
|
|
77
85
|
}
|
|
78
86
|
}
|
|
87
|
+
registerShortcutKey() {
|
|
88
|
+
this.tool.actionDispatcher.onceModelInitialized().then(() => {
|
|
89
|
+
this.tool.actionDispatcher.dispatchAll([
|
|
90
|
+
accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
|
|
91
|
+
token: this.token,
|
|
92
|
+
keys: [{ shortcuts: ['⬅ ⬆ ➡ ⬇'], description: 'Move element or viewport', group: 'Move', position: 0 }]
|
|
93
|
+
})
|
|
94
|
+
]);
|
|
95
|
+
});
|
|
96
|
+
}
|
|
79
97
|
keyDown(element, event) {
|
|
80
98
|
const selectedElementIds = this.tool.selectionService.getSelectedElementIDs();
|
|
81
99
|
if (selectedElementIds.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"movement-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/movement-key-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAAyD;AACzD,yDAA8D;AAC9D,iDAA6F;
|
|
1
|
+
{"version":3,"file":"movement-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/movement-key-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, KeyListener, KeyTool, SModelElement } from '../../../glsp-sprotty/index';
|
|
17
|
+
import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
|
|
17
18
|
import { SelectionService } from '../../../base/selection-service';
|
|
18
19
|
import { GLSPTool } from '../../../base/tool-manager/glsp-tool-manager';
|
|
19
20
|
/**
|
|
@@ -24,6 +25,7 @@ export declare class ZoomKeyTool implements GLSPTool {
|
|
|
24
25
|
isEditTool: boolean;
|
|
25
26
|
protected readonly zoomKeyListener: ZoomKeyListener;
|
|
26
27
|
protected readonly keytool: KeyTool;
|
|
28
|
+
readonly actionDispatcher: GLSPActionDispatcher;
|
|
27
29
|
selectionService: SelectionService;
|
|
28
30
|
get id(): string;
|
|
29
31
|
enable(): void;
|
|
@@ -33,7 +35,9 @@ export declare class ZoomKeyListener extends KeyListener {
|
|
|
33
35
|
protected tool: ZoomKeyTool;
|
|
34
36
|
static readonly defaultZoomInFactor = 1.1;
|
|
35
37
|
static readonly defaultZoomOutFactor = 0.9;
|
|
38
|
+
protected readonly token: string;
|
|
36
39
|
constructor(tool: ZoomKeyTool);
|
|
40
|
+
registerShortcutKey(): void;
|
|
37
41
|
keyDown(element: SModelElement, event: KeyboardEvent): Action[];
|
|
38
42
|
protected matchesZoomInKeystroke(event: KeyboardEvent): boolean;
|
|
39
43
|
protected matchesMinZoomLevelKeystroke(event: KeyboardEvent): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zoom-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/zoom-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAgB,WAAW,EAAE,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"zoom-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/zoom-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,MAAM,EAAgB,WAAW,EAAE,OAAO,EAAE,aAAa,EAAS,MAAM,eAAe,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAC;AAIxE;;GAEG;AACH,qBACa,WAAY,YAAW,QAAQ;IACxC,MAAM,CAAC,EAAE,SAAwB;IAEjC,UAAU,UAAS;IAEnB,SAAS,CAAC,QAAQ,CAAC,eAAe,kBAA6B;IAE9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IACvD,gBAAgB,EAAE,gBAAgB,CAAC;IAE7D,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAKd,OAAO,IAAI,IAAI;CAGlB;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAKhC,SAAS,CAAC,IAAI,EAAE,WAAW;IAJvC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,OAAO;IAC1C,MAAM,CAAC,QAAQ,CAAC,oBAAoB,OAAO;IAC3C,SAAS,CAAC,QAAQ,CAAC,KAAK,SAAwB;gBAE1B,IAAI,EAAE,WAAW;IAIvC,mBAAmB,IAAI,IAAI;IAgBlB,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAqBxE,SAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAK/D,SAAS,CAAC,4BAA4B,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIrE,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAGnE"}
|
|
@@ -29,7 +29,9 @@ exports.ZoomKeyListener = exports.ZoomKeyTool = void 0;
|
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
30
|
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
31
31
|
const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
|
|
32
|
+
const action_dispatcher_1 = require("../../../base/action-dispatcher");
|
|
32
33
|
const selection_service_1 = require("../../../base/selection-service");
|
|
34
|
+
const accessible_key_shortcut_1 = require("../key-shortcut/accessible-key-shortcut");
|
|
33
35
|
const zoom_handler_1 = require("../move-zoom/zoom-handler");
|
|
34
36
|
/**
|
|
35
37
|
* Zoom viewport and elements when its focused and arrow keys are hit.
|
|
@@ -44,6 +46,7 @@ let ZoomKeyTool = exports.ZoomKeyTool = ZoomKeyTool_1 = class ZoomKeyTool {
|
|
|
44
46
|
}
|
|
45
47
|
enable() {
|
|
46
48
|
this.keytool.register(this.zoomKeyListener);
|
|
49
|
+
this.zoomKeyListener.registerShortcutKey();
|
|
47
50
|
}
|
|
48
51
|
disable() {
|
|
49
52
|
this.keytool.deregister(this.zoomKeyListener);
|
|
@@ -54,6 +57,10 @@ __decorate([
|
|
|
54
57
|
(0, inversify_1.inject)(_glsp_sprotty_1.KeyTool),
|
|
55
58
|
__metadata("design:type", _glsp_sprotty_1.KeyTool)
|
|
56
59
|
], ZoomKeyTool.prototype, "keytool", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
|
|
62
|
+
__metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
|
|
63
|
+
], ZoomKeyTool.prototype, "actionDispatcher", void 0);
|
|
57
64
|
__decorate([
|
|
58
65
|
(0, inversify_1.inject)(selection_service_1.SelectionService),
|
|
59
66
|
__metadata("design:type", selection_service_1.SelectionService)
|
|
@@ -65,6 +72,22 @@ class ZoomKeyListener extends _glsp_sprotty_1.KeyListener {
|
|
|
65
72
|
constructor(tool) {
|
|
66
73
|
super();
|
|
67
74
|
this.tool = tool;
|
|
75
|
+
this.token = ZoomKeyListener.name;
|
|
76
|
+
}
|
|
77
|
+
registerShortcutKey() {
|
|
78
|
+
this.tool.actionDispatcher.onceModelInitialized().then(() => {
|
|
79
|
+
this.tool.actionDispatcher.dispatchAll([
|
|
80
|
+
accessible_key_shortcut_1.SetAccessibleKeyShortcutAction.create({
|
|
81
|
+
token: this.token,
|
|
82
|
+
keys: [
|
|
83
|
+
{ shortcuts: ['+'], description: 'Zoom in to element or viewport', group: 'Zoom', position: 0 },
|
|
84
|
+
{ shortcuts: ['-'], description: 'Zoom out to element or viewport', group: 'Zoom', position: 1 },
|
|
85
|
+
{ shortcuts: ['CTRL', '0'], description: 'Reset zoom to default', group: 'Zoom', position: 2 },
|
|
86
|
+
{ shortcuts: ['CTRL', '+'], description: 'Zoom in via Grid', group: 'Zoom', position: 3 }
|
|
87
|
+
]
|
|
88
|
+
})
|
|
89
|
+
]);
|
|
90
|
+
});
|
|
68
91
|
}
|
|
69
92
|
keyDown(element, event) {
|
|
70
93
|
const selectedElementIds = this.tool.selectionService.getSelectedElementIDs();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zoom-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/zoom-key-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAA+C;AAC/C,yDAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"zoom-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/zoom-key-tool.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -41,6 +41,7 @@ export * from './features/accessibility/resize-key-tool/resize-key-tool';
|
|
|
41
41
|
export * from './features/accessibility/view-key-tools/deselect-key-tool';
|
|
42
42
|
export * from './features/accessibility/view-key-tools/movement-key-tool';
|
|
43
43
|
export * from './features/accessibility/view-key-tools/zoom-key-tool';
|
|
44
|
+
export * from './features/accessibility/key-shortcut/accessible-key-shortcut-tool';
|
|
44
45
|
export * from './features/bounds/freeform-layout';
|
|
45
46
|
export * from './features/bounds/glsp-hidden-bounds-updater';
|
|
46
47
|
export * from './features/bounds/hbox-layout';
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -60,6 +60,7 @@ __exportStar(require("./features/accessibility/resize-key-tool/resize-key-tool")
|
|
|
60
60
|
__exportStar(require("./features/accessibility/view-key-tools/deselect-key-tool"), exports);
|
|
61
61
|
__exportStar(require("./features/accessibility/view-key-tools/movement-key-tool"), exports);
|
|
62
62
|
__exportStar(require("./features/accessibility/view-key-tools/zoom-key-tool"), exports);
|
|
63
|
+
__exportStar(require("./features/accessibility/key-shortcut/accessible-key-shortcut-tool"), exports);
|
|
63
64
|
__exportStar(require("./features/bounds/freeform-layout"), exports);
|
|
64
65
|
__exportStar(require("./features/bounds/glsp-hidden-bounds-updater"), exports);
|
|
65
66
|
__exportStar(require("./features/bounds/hbox-layout"), exports);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,6CAA6C;AAC7C,2DAAyC;AACzC,sDAAoC;AACpC,6EAA2D;AAC3D,4EAA0D;AAC1D,4EAA0D;AAC1D,uDAAqC;AACrC,mEAAiD;AACjD,gEAA8C;AAC9C,6EAA2D;AAC3D,mEAAiD;AACjD,uEAAqD;AACrD,yEAAuD;AACvD,6DAA2C;AAC3C,yEAAuD;AACvD,8DAA4C;AAC5C,gDAA8B;AAC9B,2EAAyD;AACzD,2DAAyC;AACzC,0DAAwC;AACxC,wEAAsD;AACtD,yDAAuC;AACvC,4DAA0C;AAE1C,EAAE;AACF,iDAAiD;AACjD,+DAA6C;AAC7C,yDAAuC;AACvC,2FAAyE;AACzE,4FAA0E;AAC1E,4FAA0E;AAC1E,wFAAsE;AACtE,oEAAkD;AAClD,+EAA6D;AAC7D,gEAA8C;AAC9C,6DAA2C;AAC3C,gEAA8C;AAC9C,iEAA+C;AAC/C,+EAA6D;AAC7D,gEAA8C;AAC9C,kFAAgE;AAChE,6FAA2E;AAC3E,sFAAoE;AACpE,8GAA4F;AAC5F,uFAAqE;AACrE,gFAA8D;AAC9D,2EAAyD;AACzD,0EAAwD;AACxD,sEAAoD;AACpD,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,wEAAsD;AACtD,6EAA2D;AAC3D,2EAAyD;AACzD,kFAAgE;AAChE,mFAAiE;AACjE,6DAA2C;AAC3C,gFAA8D;AAC9D,mEAAiD;AACjD,4EAA0D;AAC1D,0EAAwD;AACxD,sGAAoF;AACpF,0EAAwD;AACxD,uEAAqD;AACrD,kEAAgD;AAChD,oFAAkE;AAClE,6FAA2E;AAC3E,sEAAoD;AACpD,wEAAsD;AACtD,oFAAkE;AAClE,6FAA2E;AAC3E,sEAAoD;AACpD,4EAA0D;AAC1D,qFAAmE;AACnE,sFAAoE;AACpE,wFAAsE;AACtE,kFAAgE;AAChE,2FAAyE;AACzE,2EAAyD;AACzD,0EAAwD;AACxD,oFAAkE;AAClE,8EAA4D;AAC5D,qEAAmD;AACnD,yEAAuD;AACvD,iEAA+C;AAC/C,iFAA+D;AAC/D,iDAA+B;AAC/B,uDAAqC;AACrC,EAAE;AACF,6CAA6C;AAC7C,oDAAkC;AAClC,8CAA4B;AAC5B,qEAAmD;AACnD,uDAAqC;AACrC,yDAAuC;AACvC,qDAAmC;AACnC,uDAAqC;AACrC,iDAA+B;AAC/B,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB;AACxB,mDAAmD;AACnD,wDAAsC;AACtC,gFAA8D;AAC9D,sFAAoE;AACpE,6FAA2E;AAC3E,wFAAsE;AACtE,gGAA8E;AAC9E,oFAAkE;AAClE,8EAA4D;AAC5D,2EAAyD;AACzD,0EAAwD;AACxD,mEAAiD;AACjD,qEAAmD;AACnD,gEAA8C;AAC9C,0EAAwD;AACxD,kEAAgD;AAChD,0EAAwD;AACxD,oEAAkD;AAClD,8DAA4C;AAC5C,kEAAgD;AAChD,6FAA2E;AAC3E,8EAA4D;AAC5D,8EAA4D;AAC5D,4FAA0E;AAC1E,iFAA+D;AAC/D,uFAAqE;AACrE,8EAA4D;AAC5D,8FAA4E;AAC5E,sFAAoE;AACpE,0EAAwD;AACxD,wEAAsD;AACtD,2EAAyD;AACzD,uEAAqD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;AAElF,6CAA6C;AAC7C,2DAAyC;AACzC,sDAAoC;AACpC,6EAA2D;AAC3D,4EAA0D;AAC1D,4EAA0D;AAC1D,uDAAqC;AACrC,mEAAiD;AACjD,gEAA8C;AAC9C,6EAA2D;AAC3D,mEAAiD;AACjD,uEAAqD;AACrD,yEAAuD;AACvD,6DAA2C;AAC3C,yEAAuD;AACvD,8DAA4C;AAC5C,gDAA8B;AAC9B,2EAAyD;AACzD,2DAAyC;AACzC,0DAAwC;AACxC,wEAAsD;AACtD,yDAAuC;AACvC,4DAA0C;AAE1C,EAAE;AACF,iDAAiD;AACjD,+DAA6C;AAC7C,yDAAuC;AACvC,2FAAyE;AACzE,4FAA0E;AAC1E,4FAA0E;AAC1E,wFAAsE;AACtE,qGAAmF;AACnF,oEAAkD;AAClD,+EAA6D;AAC7D,gEAA8C;AAC9C,6DAA2C;AAC3C,gEAA8C;AAC9C,iEAA+C;AAC/C,+EAA6D;AAC7D,gEAA8C;AAC9C,kFAAgE;AAChE,6FAA2E;AAC3E,sFAAoE;AACpE,8GAA4F;AAC5F,uFAAqE;AACrE,gFAA8D;AAC9D,2EAAyD;AACzD,0EAAwD;AACxD,sEAAoD;AACpD,yDAAuC;AACvC,8DAA4C;AAC5C,yDAAuC;AACvC,wEAAsD;AACtD,6EAA2D;AAC3D,2EAAyD;AACzD,kFAAgE;AAChE,mFAAiE;AACjE,6DAA2C;AAC3C,gFAA8D;AAC9D,mEAAiD;AACjD,4EAA0D;AAC1D,0EAAwD;AACxD,sGAAoF;AACpF,0EAAwD;AACxD,uEAAqD;AACrD,kEAAgD;AAChD,oFAAkE;AAClE,6FAA2E;AAC3E,sEAAoD;AACpD,wEAAsD;AACtD,oFAAkE;AAClE,6FAA2E;AAC3E,sEAAoD;AACpD,4EAA0D;AAC1D,qFAAmE;AACnE,sFAAoE;AACpE,wFAAsE;AACtE,kFAAgE;AAChE,2FAAyE;AACzE,2EAAyD;AACzD,0EAAwD;AACxD,oFAAkE;AAClE,8EAA4D;AAC5D,qEAAmD;AACnD,yEAAuD;AACvD,iEAA+C;AAC/C,iFAA+D;AAC/D,iDAA+B;AAC/B,uDAAqC;AACrC,EAAE;AACF,6CAA6C;AAC7C,oDAAkC;AAClC,8CAA4B;AAC5B,qEAAmD;AACnD,uDAAqC;AACrC,yDAAuC;AACvC,qDAAmC;AACnC,uDAAqC;AACrC,iDAA+B;AAC/B,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB;AACxB,mDAAmD;AACnD,wDAAsC;AACtC,gFAA8D;AAC9D,sFAAoE;AACpE,6FAA2E;AAC3E,wFAAsE;AACtE,gGAA8E;AAC9E,oFAAkE;AAClE,8EAA4D;AAC5D,2EAAyD;AACzD,0EAAwD;AACxD,mEAAiD;AACjD,qEAAmD;AACnD,gEAA8C;AAC9C,0EAAwD;AACxD,kEAAgD;AAChD,0EAAwD;AACxD,oEAAkD;AAClD,8DAA4C;AAC5C,kEAAgD;AAChD,6FAA2E;AAC3E,8EAA4D;AAC5D,8EAA4D;AAC5D,4FAA0E;AAC1E,iFAA+D;AAC/D,uFAAqE;AACrE,8EAA4D;AAC5D,8FAA4E;AAC5E,sFAAoE;AACpE,0EAAwD;AACxD,wEAAsD;AACtD,2EAAyD;AACzD,uEAAqD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "1.1.0-next.
|
|
3
|
+
"version": "1.1.0-next.14c7209.265+14c7209",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"watch": "tsc -w"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@eclipse-glsp/protocol": "1.1.0-next.
|
|
50
|
+
"@eclipse-glsp/protocol": "1.1.0-next.14c7209.265+14c7209",
|
|
51
51
|
"autocompleter": "5.1.0",
|
|
52
52
|
"lodash": "4.17.21",
|
|
53
53
|
"sprotty": "0.14.0-next.02bbac0.26"
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"publishConfig": {
|
|
62
62
|
"access": "public"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "14c7209dc6abb06891630118cf919caad0a9b6bb"
|
|
65
65
|
}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
17
|
import { FeatureModule } from '~glsp-sprotty';
|
|
18
|
+
import { configureShortcutHelpTool } from './key-shortcut/di.config';
|
|
18
19
|
import { configureMoveZoom } from './move-zoom/move-zoom-module';
|
|
19
20
|
import { configureResizeTools } from './resize-key-tool/resize-key-module';
|
|
20
21
|
import { configureSearchPaletteModule } from './search/search-palette-module';
|
|
@@ -29,4 +30,5 @@ export const accessibilityModule = new FeatureModule((bind, unbind, isBound, reb
|
|
|
29
30
|
configureViewKeyTools(context);
|
|
30
31
|
configureMoveZoom(context);
|
|
31
32
|
configureSearchPaletteModule(context);
|
|
33
|
+
configureShortcutHelpTool(context);
|
|
32
34
|
});
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
*
|
|
8
|
+
* This Source Code may also be made available under the following Secondary
|
|
9
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
* with the GNU Classpath Exception which is available at
|
|
12
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
*
|
|
14
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
|
|
17
|
+
import { inject, injectable } from 'inversify';
|
|
18
|
+
import { Action, KeyListener, KeyTool, matchesKeystroke, SetUIExtensionVisibilityAction, SModelElement } from '~glsp-sprotty';
|
|
19
|
+
import { BaseGLSPTool } from '../../tools/base-glsp-tool';
|
|
20
|
+
import { KeyShortcutUIExtension } from './accessible-key-shortcut';
|
|
21
|
+
|
|
22
|
+
@injectable()
|
|
23
|
+
export class AccessibleKeyShortcutTool extends BaseGLSPTool {
|
|
24
|
+
static ID = 'accessible-key-shortcut-tool';
|
|
25
|
+
|
|
26
|
+
@inject(KeyTool) protected readonly keytool: KeyTool;
|
|
27
|
+
|
|
28
|
+
protected shortcutKeyListener = new AccessibleShortcutKeyListener();
|
|
29
|
+
|
|
30
|
+
get id(): string {
|
|
31
|
+
return AccessibleKeyShortcutTool.ID;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
enable(): void {
|
|
35
|
+
this.keytool.register(this.shortcutKeyListener);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
override disable(): void {
|
|
39
|
+
this.keytool.deregister(this.shortcutKeyListener);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export class AccessibleShortcutKeyListener extends KeyListener {
|
|
44
|
+
protected readonly token = Symbol(AccessibleShortcutKeyListener.name);
|
|
45
|
+
override keyDown(element: SModelElement, event: KeyboardEvent): Action[] {
|
|
46
|
+
if (this.matchesActivateShortcutHelpKeystroke(event)) {
|
|
47
|
+
return [SetUIExtensionVisibilityAction.create({ extensionId: KeyShortcutUIExtension.ID, visible: true })];
|
|
48
|
+
}
|
|
49
|
+
return [];
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
protected matchesActivateShortcutHelpKeystroke(event: KeyboardEvent): boolean {
|
|
53
|
+
return matchesKeystroke(event, 'KeyH', 'alt');
|
|
54
|
+
}
|
|
55
|
+
}
|