@eclipse-glsp/client 2.2.0-next.367 → 2.2.0-next.369
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/lib/base/selection-service.js +1 -1
- package/lib/base/selection-service.js.map +1 -1
- package/lib/features/accessibility/view-key-tools/deselect-key-tool.d.ts +3 -1
- package/lib/features/accessibility/view-key-tools/deselect-key-tool.d.ts.map +1 -1
- package/lib/features/accessibility/view-key-tools/deselect-key-tool.js +7 -7
- package/lib/features/accessibility/view-key-tools/deselect-key-tool.js.map +1 -1
- package/package.json +3 -3
- package/src/base/selection-service.spec.ts +9 -0
- package/src/base/selection-service.ts +1 -1
- package/src/features/accessibility/view-key-tools/deselect-key-tool.ts +6 -19
|
@@ -42,7 +42,7 @@ let SelectionService = class SelectionService {
|
|
|
42
42
|
}
|
|
43
43
|
preLoadDiagram() {
|
|
44
44
|
this.lazyInjector
|
|
45
|
-
.getAll(
|
|
45
|
+
.getAll(sprotty_1.TYPES.ISelectionListener)
|
|
46
46
|
.forEach(listener => this.onSelectionChanged(change => listener.selectionChanged(change.root, change.selectedElements, change.deselectedElements)));
|
|
47
47
|
}
|
|
48
48
|
dispose() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAqB+B;AAC/B,yCAA0E;AAC1E,sDAA2F;AAgBpF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAWO,uBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAE5C,cAAS,GAAG,IAAI,8BAAoB,EAAE,CAAC;QAsBvC,8BAAyB,GAAG,IAAI,iBAAO,EAAmB,CAAC;IAmGzE,CAAC;IAtHa,UAAU;QAChB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;IAED,cAAc;QACV,IAAI,CAAC,YAAY;aACZ,MAAM,CAAqB,
|
|
1
|
+
{"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../src/base/selection-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,14 +15,16 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, GModelElement, KeyListener, KeyTool } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { Tool } from '../../../base/tool-manager/tool';
|
|
18
|
+
import { IToolManager } from '../../../base/tool-manager/tool-manager';
|
|
18
19
|
/**
|
|
19
|
-
* Deselects
|
|
20
|
+
* Deselects currently selected elements on Escape if the default tools are currently active.
|
|
20
21
|
*/
|
|
21
22
|
export declare class DeselectKeyTool implements Tool {
|
|
22
23
|
static ID: string;
|
|
23
24
|
isEditTool: boolean;
|
|
24
25
|
protected readonly deselectKeyListener: DeselectKeyListener;
|
|
25
26
|
protected readonly keytool: KeyTool;
|
|
27
|
+
protected toolManager: IToolManager;
|
|
26
28
|
get id(): string;
|
|
27
29
|
enable(): void;
|
|
28
30
|
disable(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deselect-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/deselect-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,
|
|
1
|
+
{"version":3,"file":"deselect-key-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/deselect-key-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAoB,WAAW,EAAE,OAAO,EAAqC,MAAM,uBAAuB,CAAC;AAIzI,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE;;GAEG;AACH,qBACa,eAAgB,YAAW,IAAI;IACxC,MAAM,CAAC,EAAE,SAA4B;IAErC,UAAU,UAAQ;IAElB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,sBAA6B;IAElD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC;IAEhE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAId,OAAO,IAAI,IAAI;CAGlB;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IACvC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;IAmBvE,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;CAGpE"}
|
|
@@ -30,9 +30,9 @@ const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
|
30
30
|
const inversify_1 = require("inversify");
|
|
31
31
|
const iterable_1 = require("sprotty/lib/utils/iterable");
|
|
32
32
|
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
33
|
-
const
|
|
33
|
+
const edge_edit_tool_feedback_1 = require("../../tools/edge-edit/edge-edit-tool-feedback");
|
|
34
34
|
/**
|
|
35
|
-
* Deselects
|
|
35
|
+
* Deselects currently selected elements on Escape if the default tools are currently active.
|
|
36
36
|
*/
|
|
37
37
|
let DeselectKeyTool = DeselectKeyTool_1 = class DeselectKeyTool {
|
|
38
38
|
constructor() {
|
|
@@ -55,16 +55,16 @@ __decorate([
|
|
|
55
55
|
(0, inversify_1.inject)(sprotty_1.KeyTool),
|
|
56
56
|
__metadata("design:type", sprotty_1.KeyTool)
|
|
57
57
|
], DeselectKeyTool.prototype, "keytool", void 0);
|
|
58
|
+
__decorate([
|
|
59
|
+
(0, inversify_1.inject)(sprotty_1.TYPES.IToolManager),
|
|
60
|
+
__metadata("design:type", Object)
|
|
61
|
+
], DeselectKeyTool.prototype, "toolManager", void 0);
|
|
58
62
|
exports.DeselectKeyTool = DeselectKeyTool = DeselectKeyTool_1 = __decorate([
|
|
59
63
|
(0, inversify_1.injectable)()
|
|
60
64
|
], DeselectKeyTool);
|
|
61
65
|
class DeselectKeyListener extends sprotty_1.KeyListener {
|
|
62
66
|
keyDown(target, event) {
|
|
63
67
|
if (this.matchesDeselectKeystroke(event)) {
|
|
64
|
-
const isResizeHandleActive = (0, iterable_1.toArray)(target.root.index.all().filter(el => el instanceof model_1.GResizeHandle)).length > 0;
|
|
65
|
-
if (isResizeHandleActive) {
|
|
66
|
-
return [];
|
|
67
|
-
}
|
|
68
68
|
const deselect = (0, iterable_1.toArray)(target.root.index.all().filter(element => (0, sprotty_1.isSelectable)(element) && element.selected));
|
|
69
69
|
const actions = [];
|
|
70
70
|
if (deselect.length > 0) {
|
|
@@ -72,7 +72,7 @@ class DeselectKeyListener extends sprotty_1.KeyListener {
|
|
|
72
72
|
}
|
|
73
73
|
const routableDeselect = deselect.filter(e => e instanceof sprotty_1.GRoutableElement).map(e => e.id);
|
|
74
74
|
if (routableDeselect.length > 0) {
|
|
75
|
-
actions.push(
|
|
75
|
+
actions.push(edge_edit_tool_feedback_1.SwitchRoutingModeAction.create({ elementsToDeactivate: routableDeselect }));
|
|
76
76
|
}
|
|
77
77
|
return actions;
|
|
78
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deselect-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/deselect-key-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"deselect-key-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/view-key-tools/deselect-key-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,mDAAyI;AACzI,yCAA+C;AAC/C,yDAAqD;AACrD,yDAA8D;AAG9D,2FAAwF;AAExF;;GAEG;AAEI,IAAM,eAAe,uBAArB,MAAM,eAAe;IAArB;QAGH,eAAU,GAAG,IAAI,CAAC;QAEC,wBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAgBvE,CAAC;IAXG,IAAI,EAAE;QACF,OAAO,iBAAe,CAAC,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtD,CAAC;;AApBQ,0CAAe;AACjB,kBAAE,GAAG,wBAAwB,AAA3B,CAA4B;AAMD;IAAnC,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAA6B,iBAAO;gDAAC;AACf;IAArC,IAAA,kBAAM,EAAC,eAAK,CAAC,YAAY,CAAC;;oDAAqC;0BARvD,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CAqB3B;AAED,MAAa,mBAAoB,SAAQ,qBAAW;IACvC,OAAO,CAAC,MAAqB,EAAE,KAAoB;QACxD,IAAI,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,IAAA,kBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAY,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/G,MAAM,OAAO,GAAa,EAAE,CAAC;YAE7B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,sBAAY,CAAC,MAAM,CAAC,EAAE,qBAAqB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1F,CAAC;YAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,0BAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5F,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,IAAI,CAAC,iDAAuB,CAAC,MAAM,CAAC,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAC7F,CAAC;YAED,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,wBAAwB,CAAC,KAAoB;QACnD,OAAO,IAAA,2BAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;CACJ;AAvBD,kDAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "2.2.0-next.
|
|
3
|
+
"version": "2.2.0-next.369+9b95d68",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.2.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.2.0-next.369+9b95d68",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "9b95d6897bc8fede34e27bc3cc52f4da7cbd2577"
|
|
67
67
|
}
|
|
@@ -248,6 +248,15 @@ describe('SelectionService', () => {
|
|
|
248
248
|
selectionService.updateSelection(root, ['not-existing'], []);
|
|
249
249
|
assertListener(listener, root, ['node1'], [], 1);
|
|
250
250
|
});
|
|
251
|
+
it('Bindings of TYPES.ISelectionListener should be registered as listener in `preLoadDiagram`', () => {
|
|
252
|
+
const container = createContainer();
|
|
253
|
+
const selectionListener = sandbox.createStubInstance(MockSelectionListener);
|
|
254
|
+
container.bind(TYPES.ISelectionListener).toConstantValue(selectionListener);
|
|
255
|
+
const testSelectionService = container.get<SelectionService>(SelectionService);
|
|
256
|
+
testSelectionService.preLoadDiagram();
|
|
257
|
+
testSelectionService.updateSelection(root, ['node1', 'node1'], []);
|
|
258
|
+
assertListener(selectionListener, root, ['node1'], [], 1);
|
|
259
|
+
});
|
|
251
260
|
});
|
|
252
261
|
|
|
253
262
|
function createRoot(...nodes: string[]): GModelRoot {
|
|
@@ -74,7 +74,7 @@ export class SelectionService implements IGModelRootListener, Disposable, IDiagr
|
|
|
74
74
|
|
|
75
75
|
preLoadDiagram(): void {
|
|
76
76
|
this.lazyInjector
|
|
77
|
-
.getAll<ISelectionListener>(
|
|
77
|
+
.getAll<ISelectionListener>(TYPES.ISelectionListener)
|
|
78
78
|
.forEach(listener =>
|
|
79
79
|
this.onSelectionChanged(change =>
|
|
80
80
|
listener.selectionChanged(change.root, change.selectedElements, change.deselectedElements)
|
|
@@ -14,24 +14,16 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
Action,
|
|
19
|
-
GModelElement,
|
|
20
|
-
GRoutableElement,
|
|
21
|
-
KeyListener,
|
|
22
|
-
KeyTool,
|
|
23
|
-
SelectAction,
|
|
24
|
-
SwitchEditModeAction,
|
|
25
|
-
isSelectable
|
|
26
|
-
} from '@eclipse-glsp/sprotty';
|
|
17
|
+
import { Action, GModelElement, GRoutableElement, KeyListener, KeyTool, SelectAction, TYPES, isSelectable } from '@eclipse-glsp/sprotty';
|
|
27
18
|
import { inject, injectable } from 'inversify';
|
|
28
19
|
import { toArray } from 'sprotty/lib/utils/iterable';
|
|
29
20
|
import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
|
|
30
21
|
import { Tool } from '../../../base/tool-manager/tool';
|
|
31
|
-
import {
|
|
22
|
+
import { IToolManager } from '../../../base/tool-manager/tool-manager';
|
|
23
|
+
import { SwitchRoutingModeAction } from '../../tools/edge-edit/edge-edit-tool-feedback';
|
|
32
24
|
|
|
33
25
|
/**
|
|
34
|
-
* Deselects
|
|
26
|
+
* Deselects currently selected elements on Escape if the default tools are currently active.
|
|
35
27
|
*/
|
|
36
28
|
@injectable()
|
|
37
29
|
export class DeselectKeyTool implements Tool {
|
|
@@ -42,6 +34,7 @@ export class DeselectKeyTool implements Tool {
|
|
|
42
34
|
protected readonly deselectKeyListener = new DeselectKeyListener();
|
|
43
35
|
|
|
44
36
|
@inject(KeyTool) protected readonly keytool: KeyTool;
|
|
37
|
+
@inject(TYPES.IToolManager) protected toolManager: IToolManager;
|
|
45
38
|
|
|
46
39
|
get id(): string {
|
|
47
40
|
return DeselectKeyTool.ID;
|
|
@@ -59,12 +52,6 @@ export class DeselectKeyTool implements Tool {
|
|
|
59
52
|
export class DeselectKeyListener extends KeyListener {
|
|
60
53
|
override keyDown(target: GModelElement, event: KeyboardEvent): Action[] {
|
|
61
54
|
if (this.matchesDeselectKeystroke(event)) {
|
|
62
|
-
const isResizeHandleActive = toArray(target.root.index.all().filter(el => el instanceof GResizeHandle)).length > 0;
|
|
63
|
-
|
|
64
|
-
if (isResizeHandleActive) {
|
|
65
|
-
return [];
|
|
66
|
-
}
|
|
67
|
-
|
|
68
55
|
const deselect = toArray(target.root.index.all().filter(element => isSelectable(element) && element.selected));
|
|
69
56
|
const actions: Action[] = [];
|
|
70
57
|
|
|
@@ -74,7 +61,7 @@ export class DeselectKeyListener extends KeyListener {
|
|
|
74
61
|
|
|
75
62
|
const routableDeselect = deselect.filter(e => e instanceof GRoutableElement).map(e => e.id);
|
|
76
63
|
if (routableDeselect.length > 0) {
|
|
77
|
-
actions.push(
|
|
64
|
+
actions.push(SwitchRoutingModeAction.create({ elementsToDeactivate: routableDeselect }));
|
|
78
65
|
}
|
|
79
66
|
|
|
80
67
|
return actions;
|