@eclipse-glsp/client 2.2.0-next.354 → 2.2.0-next.356
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/tool-manager/tool-manager.d.ts +5 -1
- package/lib/base/tool-manager/tool-manager.d.ts.map +1 -1
- package/lib/base/tool-manager/tool-manager.js +10 -1
- package/lib/base/tool-manager/tool-manager.js.map +1 -1
- package/lib/features/context-menu/glsp-context-menu-mouse-listener.d.ts +1 -1
- package/lib/features/context-menu/glsp-context-menu-mouse-listener.js +2 -2
- package/lib/features/context-menu/glsp-context-menu-mouse-listener.js.map +1 -1
- package/lib/features/grid/grid-style.d.ts +0 -1
- package/lib/features/grid/grid-style.d.ts.map +1 -1
- package/lib/features/grid/grid-style.js +0 -1
- package/lib/features/grid/grid-style.js.map +1 -1
- package/package.json +3 -3
- package/src/base/tool-manager/tool-manager.ts +17 -3
- package/src/features/context-menu/glsp-context-menu-mouse-listener.ts +2 -2
- package/src/features/grid/grid-style.ts +0 -1
|
@@ -31,6 +31,8 @@ export interface IToolManager {
|
|
|
31
31
|
readonly defaultTools: Tool[];
|
|
32
32
|
/** The currently active tools, which are either specifically enabled tools, or the default tools. */
|
|
33
33
|
readonly activeTools: Tool[];
|
|
34
|
+
/** Flag to indicate that the default tools are enabled and no other tool was explicitly enabled. */
|
|
35
|
+
readonly defaultToolsEnabled: boolean;
|
|
34
36
|
/**
|
|
35
37
|
* Enables the tools with the specified `toolIds`.
|
|
36
38
|
* Therefore, this manager first disables currently active tools and then enable the
|
|
@@ -43,7 +45,7 @@ export interface IToolManager {
|
|
|
43
45
|
*/
|
|
44
46
|
enable(toolIds: string[]): void;
|
|
45
47
|
/**
|
|
46
|
-
* Enables all default tools.
|
|
48
|
+
* Enables all default tools. If the default tools are already enabled, this is a no-op.
|
|
47
49
|
*/
|
|
48
50
|
enableDefaultTools(): void;
|
|
49
51
|
/** Disables all currently active tools. After this call, no tool will be active anymore. */
|
|
@@ -61,6 +63,8 @@ export declare class ToolManager implements IToolManager, IDiagramStartup, IEdit
|
|
|
61
63
|
readonly actives: Tool[];
|
|
62
64
|
readonly tools: Tool[];
|
|
63
65
|
readonly defaultTools: Tool[];
|
|
66
|
+
protected _defaultToolsEnabled: boolean;
|
|
67
|
+
get defaultToolsEnabled(): boolean;
|
|
64
68
|
preLoadDiagram(): MaybePromise<void>;
|
|
65
69
|
get managedTools(): Tool[];
|
|
66
70
|
get activeTools(): Tool[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/tool-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,YAAY,
|
|
1
|
+
{"version":3,"file":"tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/tool-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAEN,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,YAAY,EAKf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAA+C,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC3E;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IACzB,8CAA8C;IAC9C,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;IAE9B,gFAAgF;IAChF,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;IAE9B,qGAAqG;IACrG,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;IAE7B,oGAAoG;IACpG,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IAEtC;;;;;;;;;OASG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEhC;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC;IAE3B,4FAA4F;IAC5F,kBAAkB,IAAI,IAAI,CAAC;IAE3B,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAE7C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;CACzC;AAED;;;GAGG;AACH,qBACa,WAAY,YAAW,YAAY,EAAE,eAAe,EAAE,iBAAiB;IAEhF,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAE9C,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,CAAM;IAC9B,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,CAAM;IAC5B,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAM;IAEnC,SAAS,CAAC,oBAAoB,UAAS;IACvC,IAAI,mBAAmB,IAAI,OAAO,CAEjC;IAED,cAAc,IAAI,YAAY,CAAC,IAAI,CAAC;IAQpC,IAAI,YAAY,IAAI,IAAI,EAAE,CAEzB;IAED,IAAI,WAAW,IAAI,IAAI,EAAE,CAExB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAI5C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAIrC,kBAAkB,IAAI,IAAI;IAM1B,kBAAkB,IAAI,IAAI;IAQ1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAc/B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAItC,gBAAgB,IAAI,IAAI;IAKxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAU5D;AAED,qBACa,wBAAyB,YAAW,cAAc;IAE3D,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IAEnC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM;CAOnD;AAED,qBACa,+BAAgC,SAAQ,WAAW;IACnD,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAM3E"}
|
|
@@ -39,6 +39,10 @@ let ToolManager = class ToolManager {
|
|
|
39
39
|
this.actives = [];
|
|
40
40
|
this.tools = [];
|
|
41
41
|
this.defaultTools = [];
|
|
42
|
+
this._defaultToolsEnabled = false;
|
|
43
|
+
}
|
|
44
|
+
get defaultToolsEnabled() {
|
|
45
|
+
return this._defaultToolsEnabled;
|
|
42
46
|
}
|
|
43
47
|
preLoadDiagram() {
|
|
44
48
|
const tools = this.lazyInjector.getAll(sprotty_1.TYPES.ITool);
|
|
@@ -63,11 +67,16 @@ let ToolManager = class ToolManager {
|
|
|
63
67
|
(0, sprotty_1.distinctAdd)(this.tools, ...tools);
|
|
64
68
|
}
|
|
65
69
|
disableActiveTools() {
|
|
70
|
+
this._defaultToolsEnabled = false;
|
|
66
71
|
this.actives.forEach(tool => tool.disable());
|
|
67
72
|
this.actives.splice(0, this.actives.length);
|
|
68
73
|
}
|
|
69
74
|
enableDefaultTools() {
|
|
70
|
-
|
|
75
|
+
if (this.defaultToolsEnabled) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this.enable((0, sprotty_1.pluck)(this.defaultTools, 'id'));
|
|
79
|
+
this._defaultToolsEnabled = true;
|
|
71
80
|
}
|
|
72
81
|
enable(toolIds) {
|
|
73
82
|
this.disableActiveTools();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-manager.js","sourceRoot":"","sources":["../../../src/base/tool-manager/tool-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"tool-manager.js","sourceRoot":"","sources":["../../../src/base/tool-manager/tool-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2024 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.GLSPContextMenuMouseListener = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
|
-
* Copyright (c) 2019-
|
|
14
|
+
* Copyright (c) 2019-2024 EclipseSource and others.
|
|
15
15
|
*
|
|
16
16
|
* This program and the accompanying materials are made available under the
|
|
17
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -63,7 +63,7 @@ let GLSPContextMenuMouseListener = class GLSPContextMenuMouseListener extends sp
|
|
|
63
63
|
this.menuService.show(menuItems, mousePosition, () => this.focusEventTarget(event));
|
|
64
64
|
return focus_state_change_action_1.FocusStateChangedAction.create(false);
|
|
65
65
|
}
|
|
66
|
-
// Clear selection the context menu target is not selectable
|
|
66
|
+
// Clear selection if the context menu target is not selectable
|
|
67
67
|
// Otherwise either maintain current selection if target is already selected or single select the current target.
|
|
68
68
|
async handleContextElementSelection(target, event) {
|
|
69
69
|
const selectableTarget = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-context-menu-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/context-menu/glsp-context-menu-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAW+B;AAC/B,yCAAwE;AACxE,oEAAoE;AACpE,0FAAqF;AAG9E,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,uBAAa;IAejD,UAAU;;QAChB,MAAA,IAAI,CAAC,0BAA0B,qDAAK,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED;;OAEG;IACM,WAAW,CAAC,MAAqB,EAAE,KAAiB;QACzD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;;OASG;IACO,eAAe,CAAC,MAAqB,EAAE,KAAiB;QAC9D,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACtD,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,MAAqB,EAAE,KAAiB;QACzE,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAEjD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,WAAY,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,OAAO,mDAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"glsp-context-menu-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/context-menu/glsp-context-menu-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAW+B;AAC/B,yCAAwE;AACxE,oEAAoE;AACpE,0FAAqF;AAG9E,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,uBAAa;IAejD,UAAU;;QAChB,MAAA,IAAI,CAAC,0BAA0B,qDAAK,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED;;OAEG;IACM,WAAW,CAAC,MAAqB,EAAE,KAAiB;QACzD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;;OASG;IACO,eAAe,CAAC,MAAqB,EAAE,KAAiB;QAC9D,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1C,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACtD,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,MAAqB,EAAE,KAAiB;QACzE,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAEjD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,WAAY,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,OAAO,mDAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,+DAA+D;IAC/D,iHAAiH;IACvG,KAAK,CAAC,6BAA6B,CAAC,MAAqB,EAAE,KAAiB;QAClF,MAAM,gBAAgB,GAAG,IAAA,6BAAmB,EAAC,MAAM,EAAE,sBAAY,CAAC,CAAC;QACnE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,sBAAY,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,sBAAY,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO;IACX,CAAC;IAES,gBAAgB,CAAC,KAAiB;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,MAAM,gBAAgB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,gBAAgB,EAAE,CAAC;YACnB,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC;IACL,CAAC;CACJ,CAAA;AAzEY,oEAA4B;AAG3B;IAFT,IAAA,kBAAM,EAAC,eAAK,CAAC,2BAA2B,CAAC;IACzC,IAAA,oBAAQ,GAAE;;gFACwD;AAIzD;IAFT,IAAA,kBAAM,EAAC,eAAK,CAAC,4BAA4B,CAAC;IAC1C,IAAA,oBAAQ,GAAE;8BACc,qCAA2B;kEAAC;AAG3C;IADT,IAAA,kBAAM,EAAC,wCAAoB,CAAC;8BACD,wCAAoB;sEAAC;AAKvC;IADT,IAAA,yBAAa,GAAE;;;;8DAGf;uCAjBQ,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAyExC"}
|
|
@@ -19,7 +19,6 @@ export declare namespace GridProperty {
|
|
|
19
19
|
const GRID_BACKGROUND_WIDTH = "--grid-background-width";
|
|
20
20
|
const GRID_BACKGROUND_HEIGHT = "--grid-background-height";
|
|
21
21
|
const GRID_BACKGROUND_ZOOM = "--grid-background-zoom";
|
|
22
|
-
const GRID_BACKGROUND_IMAGE = "--grid-background-image";
|
|
23
22
|
const GRID_COLOR = "--grid-color";
|
|
24
23
|
}
|
|
25
24
|
//# sourceMappingURL=grid-style.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid-style.d.ts","sourceRoot":"","sources":["../../../src/features/grid/grid-style.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,yBAAiB,YAAY,CAAC;IACnB,MAAM,iBAAiB,wBAAwB,CAAC;IAChD,MAAM,iBAAiB,wBAAwB,CAAC;IAChD,MAAM,qBAAqB,4BAA4B,CAAC;IACxD,MAAM,sBAAsB,6BAA6B,CAAC;IAC1D,MAAM,oBAAoB,2BAA2B,CAAC;IACtD,MAAM,
|
|
1
|
+
{"version":3,"file":"grid-style.d.ts","sourceRoot":"","sources":["../../../src/features/grid/grid-style.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,yBAAiB,YAAY,CAAC;IACnB,MAAM,iBAAiB,wBAAwB,CAAC;IAChD,MAAM,iBAAiB,wBAAwB,CAAC;IAChD,MAAM,qBAAqB,4BAA4B,CAAC;IACxD,MAAM,sBAAsB,6BAA6B,CAAC;IAC1D,MAAM,oBAAoB,2BAA2B,CAAC;IACtD,MAAM,UAAU,iBAAiB,CAAC;CAC5C"}
|
|
@@ -23,7 +23,6 @@ var GridProperty;
|
|
|
23
23
|
GridProperty.GRID_BACKGROUND_WIDTH = '--grid-background-width';
|
|
24
24
|
GridProperty.GRID_BACKGROUND_HEIGHT = '--grid-background-height';
|
|
25
25
|
GridProperty.GRID_BACKGROUND_ZOOM = '--grid-background-zoom';
|
|
26
|
-
GridProperty.GRID_BACKGROUND_IMAGE = '--grid-background-image';
|
|
27
26
|
GridProperty.GRID_COLOR = '--grid-color';
|
|
28
27
|
})(GridProperty || (exports.GridProperty = GridProperty = {}));
|
|
29
28
|
//# sourceMappingURL=grid-style.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid-style.js","sourceRoot":"","sources":["../../../src/features/grid/grid-style.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,IAAiB,YAAY,
|
|
1
|
+
{"version":3,"file":"grid-style.js","sourceRoot":"","sources":["../../../src/features/grid/grid-style.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,IAAiB,YAAY,CAO5B;AAPD,WAAiB,YAAY;IACZ,8BAAiB,GAAG,qBAAqB,CAAC;IAC1C,8BAAiB,GAAG,qBAAqB,CAAC;IAC1C,kCAAqB,GAAG,yBAAyB,CAAC;IAClD,mCAAsB,GAAG,0BAA0B,CAAC;IACpD,iCAAoB,GAAG,wBAAwB,CAAC;IAChD,uBAAU,GAAG,cAAc,CAAC;AAC7C,CAAC,EAPgB,YAAY,4BAAZ,YAAY,QAO5B"}
|
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.356+7e20238",
|
|
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.356+7e20238",
|
|
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": "7e20238d692310d2095826ffb9800750a43599dc"
|
|
67
67
|
}
|
|
@@ -25,7 +25,8 @@ import {
|
|
|
25
25
|
MaybePromise,
|
|
26
26
|
TYPES,
|
|
27
27
|
distinctAdd,
|
|
28
|
-
matchesKeystroke
|
|
28
|
+
matchesKeystroke,
|
|
29
|
+
pluck
|
|
29
30
|
} from '@eclipse-glsp/sprotty';
|
|
30
31
|
import { inject, injectable } from 'inversify';
|
|
31
32
|
import { EditorContextService, IEditModeListener } from '../editor-context-service';
|
|
@@ -49,6 +50,9 @@ export interface IToolManager {
|
|
|
49
50
|
/** The currently active tools, which are either specifically enabled tools, or the default tools. */
|
|
50
51
|
readonly activeTools: Tool[];
|
|
51
52
|
|
|
53
|
+
/** Flag to indicate that the default tools are enabled and no other tool was explicitly enabled. */
|
|
54
|
+
readonly defaultToolsEnabled: boolean;
|
|
55
|
+
|
|
52
56
|
/**
|
|
53
57
|
* Enables the tools with the specified `toolIds`.
|
|
54
58
|
* Therefore, this manager first disables currently active tools and then enable the
|
|
@@ -62,7 +66,7 @@ export interface IToolManager {
|
|
|
62
66
|
enable(toolIds: string[]): void;
|
|
63
67
|
|
|
64
68
|
/**
|
|
65
|
-
* Enables all default tools.
|
|
69
|
+
* Enables all default tools. If the default tools are already enabled, this is a no-op.
|
|
66
70
|
*/
|
|
67
71
|
enableDefaultTools(): void;
|
|
68
72
|
|
|
@@ -90,6 +94,11 @@ export class ToolManager implements IToolManager, IDiagramStartup, IEditModeList
|
|
|
90
94
|
readonly tools: Tool[] = [];
|
|
91
95
|
readonly defaultTools: Tool[] = [];
|
|
92
96
|
|
|
97
|
+
protected _defaultToolsEnabled = false;
|
|
98
|
+
get defaultToolsEnabled(): boolean {
|
|
99
|
+
return this._defaultToolsEnabled;
|
|
100
|
+
}
|
|
101
|
+
|
|
93
102
|
preLoadDiagram(): MaybePromise<void> {
|
|
94
103
|
const tools: Tool[] = this.lazyInjector.getAll(TYPES.ITool);
|
|
95
104
|
const defaultTools: Tool[] = this.lazyInjector.getAll(TYPES.IDefaultTool);
|
|
@@ -119,12 +128,17 @@ export class ToolManager implements IToolManager, IDiagramStartup, IEditModeList
|
|
|
119
128
|
}
|
|
120
129
|
|
|
121
130
|
disableActiveTools(): void {
|
|
131
|
+
this._defaultToolsEnabled = false;
|
|
122
132
|
this.actives.forEach(tool => tool.disable());
|
|
123
133
|
this.actives.splice(0, this.actives.length);
|
|
124
134
|
}
|
|
125
135
|
|
|
126
136
|
enableDefaultTools(): void {
|
|
127
|
-
|
|
137
|
+
if (this.defaultToolsEnabled) {
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
this.enable(pluck(this.defaultTools, 'id'));
|
|
141
|
+
this._defaultToolsEnabled = true;
|
|
128
142
|
}
|
|
129
143
|
|
|
130
144
|
enable(toolIds: string[]): void {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2024 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -83,7 +83,7 @@ export class GLSPContextMenuMouseListener extends MouseListener {
|
|
|
83
83
|
return FocusStateChangedAction.create(false);
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
// Clear selection the context menu target is not selectable
|
|
86
|
+
// Clear selection if the context menu target is not selectable
|
|
87
87
|
// Otherwise either maintain current selection if target is already selected or single select the current target.
|
|
88
88
|
protected async handleContextElementSelection(target: GModelElement, event: MouseEvent): Promise<void> {
|
|
89
89
|
const selectableTarget = findParentByFeature(target, isSelectable);
|
|
@@ -20,6 +20,5 @@ export namespace GridProperty {
|
|
|
20
20
|
export const GRID_BACKGROUND_WIDTH = '--grid-background-width';
|
|
21
21
|
export const GRID_BACKGROUND_HEIGHT = '--grid-background-height';
|
|
22
22
|
export const GRID_BACKGROUND_ZOOM = '--grid-background-zoom';
|
|
23
|
-
export const GRID_BACKGROUND_IMAGE = '--grid-background-image';
|
|
24
23
|
export const GRID_COLOR = '--grid-color';
|
|
25
24
|
}
|