@eclipse-glsp/client 1.1.0-RC04 → 1.1.0-RC05
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/README.md +1 -1
- package/lib/base/selection-clearing-mouse-listener.js +1 -1
- package/lib/features/command-palette/command-palette-tool.js +1 -1
- package/lib/features/save/model.d.ts +1 -1
- package/lib/features/source-model-watcher/di.config.js +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +1 -2
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js +1 -7
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +1 -1
- package/lib/features/validation/issue-marker.js +1 -1
- package/lib/lib/model.d.ts +7 -3
- package/lib/lib/model.d.ts.map +1 -1
- package/lib/lib/model.js +48 -1
- package/lib/lib/model.js.map +1 -1
- package/lib/utils/html-utils.d.ts +1 -1
- package/lib/utils/html-utils.js +1 -1
- package/lib/views/base-view-module.js +1 -1
- package/lib/views/glsp-projection-view.d.ts +1 -1
- package/lib/views/glsp-projection-view.js +1 -1
- package/lib/views/index.d.ts +1 -1
- package/lib/views/index.js +1 -1
- package/package.json +17 -17
- package/src/base/selection-clearing-mouse-listener.ts +1 -1
- package/src/features/command-palette/command-palette-tool.ts +1 -1
- package/src/features/save/model.ts +1 -1
- package/src/features/source-model-watcher/di.config.ts +1 -1
- package/src/features/tool-feedback/edge-edit-tool-feedback.ts +1 -9
- package/src/features/validation/issue-marker.ts +1 -1
- package/src/lib/model.ts +35 -3
- package/src/utils/html-utils.ts +1 -1
- package/src/views/base-view-module.ts +1 -1
- package/src/views/glsp-projection-view.tsx +1 -1
- package/src/views/index.ts +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Eclipse GLSP - Client
|
|
1
|
+
# Eclipse GLSP - Client
|
|
2
2
|
|
|
3
3
|
A web-based diagram client framework for the [Graphical Language Server Platform (GLSP)](https://github.com/eclipse-glsp/glsp) based on [Eclipse Sprotty](https://github.com/eclipse/sprotty).
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.SelectionClearingMouseListener = void 0;
|
|
10
10
|
/********************************************************************************
|
|
11
|
-
* Copyright (c) 2020 EclipseSource and others.
|
|
11
|
+
* Copyright (c) 2020-2022 EclipseSource and others.
|
|
12
12
|
*
|
|
13
13
|
* This program and the accompanying materials are made available under the
|
|
14
14
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -12,7 +12,7 @@ var CommandPaletteTool_1;
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.CommandPaletteTool = void 0;
|
|
14
14
|
/********************************************************************************
|
|
15
|
-
* Copyright (c)
|
|
15
|
+
* Copyright (c) 2019-2021 EclipseSource and others.
|
|
16
16
|
*
|
|
17
17
|
* This program and the accompanying materials are made available under the
|
|
18
18
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2019-2021 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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
/********************************************************************************
|
|
4
|
-
* Copyright (c)
|
|
4
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
5
5
|
*
|
|
6
6
|
* This program and the accompanying materials are made available under the
|
|
7
7
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -114,8 +114,7 @@ export declare class FeedbackEdgeRouteMovingMouseListener extends MouseListener
|
|
|
114
114
|
protected toElementMove(element: SRoutingHandle, positionDelta: Point, isSnap: boolean): ElementMove | undefined;
|
|
115
115
|
protected getSnappedHandlePosition(element: SRoutingHandle, point: Point, isSnap: boolean): Point;
|
|
116
116
|
protected getHandlePosition(handle: SRoutingHandle): Point | undefined;
|
|
117
|
-
|
|
118
|
-
mouseUp(_target: SModelElement, event: MouseEvent): Action[];
|
|
117
|
+
mouseUp(_target: SModelElement, _event: MouseEvent): Action[];
|
|
119
118
|
decorate(vnode: VNode, _element: SModelElement): VNode;
|
|
120
119
|
}
|
|
121
120
|
//# sourceMappingURL=edge-edit-tool-feedback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-edit-tool-feedback.d.ts","sourceRoot":"","sources":["../../../src/features/tool-feedback/edge-edit-tool-feedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAyB,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EACH,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,kBAAkB,EAClB,WAAW,EAKX,QAAQ,EAER,aAAa,EAEb,mBAAmB,EACnB,aAAa,
|
|
1
|
+
{"version":3,"file":"edge-edit-tool-feedback.d.ts","sourceRoot":"","sources":["../../../src/features/tool-feedback/edge-edit-tool-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -286,13 +286,7 @@ class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
|
|
|
286
286
|
}
|
|
287
287
|
return undefined;
|
|
288
288
|
}
|
|
289
|
-
|
|
290
|
-
if (target instanceof sprotty_1.SModelRoot && event.buttons === 0) {
|
|
291
|
-
this.mouseUp(target, event);
|
|
292
|
-
}
|
|
293
|
-
return [];
|
|
294
|
-
}
|
|
295
|
-
mouseUp(_target, event) {
|
|
289
|
+
mouseUp(_target, _event) {
|
|
296
290
|
this.pointPositionUpdater.resetPosition();
|
|
297
291
|
return [];
|
|
298
292
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-edit-tool-feedback.js","sourceRoot":"","sources":["../../../src/features/tool-feedback/edge-edit-tool-feedback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA8E;AAC9E,yCAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"edge-edit-tool-feedback.js","sourceRoot":"","sources":["../../../src/features/tool-feedback/edge-edit-tool-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2022 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
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSeverity = exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2019-
|
|
5
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/lib/lib/model.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2023 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
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { SModelElementSchema } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { SGraph, SModelElement } from 'sprotty';
|
|
16
|
+
import { Bounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { SEdge, SGraph, SModelElement } from 'sprotty';
|
|
18
18
|
import { Containable } from '../features/hints/model';
|
|
19
19
|
import { Saveable } from '../features/save/model';
|
|
20
20
|
export declare class GLSPGraph extends SGraph implements Saveable, Containable {
|
|
@@ -22,4 +22,8 @@ export declare class GLSPGraph extends SGraph implements Saveable, Containable {
|
|
|
22
22
|
dirty: boolean;
|
|
23
23
|
isContainableElement(input: string | SModelElement | SModelElementSchema): boolean;
|
|
24
24
|
}
|
|
25
|
+
export declare class GEdge extends SEdge {
|
|
26
|
+
localToParent(point: Point | Bounds): Bounds;
|
|
27
|
+
parentToLocal(point: Point | Bounds): Bounds;
|
|
28
|
+
}
|
|
25
29
|
//# sourceMappingURL=model.d.ts.map
|
package/lib/lib/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAiC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAmB,MAAM,SAAS,CAAC;AACvG,OAAO,EAAE,WAAW,EAAoB,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAE/D,qBAAa,SAAU,SAAQ,MAAO,YAAW,QAAQ,EAAE,WAAW;IAClE,gBAAyB,gBAAgB,WAAmE;IAC5G,KAAK,UAAS;IACd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,mBAAmB,GAAG,OAAO;CAGrF;AAED,qBAAa,KAAM,SAAQ,KAAK;IACnB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;IAe5C,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAcxD"}
|
package/lib/lib/model.js
CHANGED
|
@@ -1,6 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GLSPGraph = void 0;
|
|
3
|
+
exports.GEdge = exports.GLSPGraph = void 0;
|
|
4
|
+
/********************************************************************************
|
|
5
|
+
* Copyright (c) 2019-2023 EclipseSource and others.
|
|
6
|
+
*
|
|
7
|
+
* This program and the accompanying materials are made available under the
|
|
8
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
9
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
10
|
+
*
|
|
11
|
+
* This Source Code may also be made available under the following Secondary
|
|
12
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
13
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
14
|
+
* with the GNU Classpath Exception which is available at
|
|
15
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
16
|
+
*
|
|
17
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
18
|
+
********************************************************************************/
|
|
19
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
4
20
|
const sprotty_1 = require("sprotty");
|
|
5
21
|
const model_1 = require("../features/hints/model");
|
|
6
22
|
const model_2 = require("../features/save/model");
|
|
@@ -15,4 +31,35 @@ class GLSPGraph extends sprotty_1.SGraph {
|
|
|
15
31
|
}
|
|
16
32
|
exports.GLSPGraph = GLSPGraph;
|
|
17
33
|
GLSPGraph.DEFAULT_FEATURES = [sprotty_1.viewportFeature, sprotty_1.exportFeature, model_2.saveFeature, model_1.containerFeature];
|
|
34
|
+
class GEdge extends sprotty_1.SEdge {
|
|
35
|
+
localToParent(point) {
|
|
36
|
+
const bounds = (0, sprotty_1.getRouteBounds)(this.routingPoints);
|
|
37
|
+
const result = {
|
|
38
|
+
x: point.x + bounds.x,
|
|
39
|
+
y: point.y + bounds.y,
|
|
40
|
+
width: -1,
|
|
41
|
+
height: -1
|
|
42
|
+
};
|
|
43
|
+
if ((0, protocol_1.isBounds)(point)) {
|
|
44
|
+
result.width = point.width;
|
|
45
|
+
result.height = point.height;
|
|
46
|
+
}
|
|
47
|
+
return result;
|
|
48
|
+
}
|
|
49
|
+
parentToLocal(point) {
|
|
50
|
+
const bounds = (0, sprotty_1.getRouteBounds)(this.routingPoints);
|
|
51
|
+
const result = {
|
|
52
|
+
x: point.x - bounds.x,
|
|
53
|
+
y: point.y - bounds.y,
|
|
54
|
+
width: -1,
|
|
55
|
+
height: -1
|
|
56
|
+
};
|
|
57
|
+
if ((0, protocol_1.isBounds)(point)) {
|
|
58
|
+
result.width = point.width;
|
|
59
|
+
result.height = point.height;
|
|
60
|
+
}
|
|
61
|
+
return result;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.GEdge = GEdge;
|
|
18
65
|
//# sourceMappingURL=model.js.map
|
package/lib/lib/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsF;AACtF,qCAAuG;AACvG,mDAAwE;AACxE,kDAA+D;AAE/D,MAAa,SAAU,SAAQ,gBAAM;IAArC;;QAEI,UAAK,GAAG,KAAK,CAAC;IAIlB,CAAC;IAHG,oBAAoB,CAAC,KAAmD;QACpE,OAAO,IAAI,CAAC;IAChB,CAAC;;AALL,8BAMC;AAL4B,0BAAgB,GAAG,CAAC,yBAAe,EAAE,uBAAa,EAAE,mBAAW,EAAE,wBAAgB,CAAC,CAAC;AAOhH,MAAa,KAAM,SAAQ,eAAK;IACnB,aAAa,CAAC,KAAqB;QACxC,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG;YACX,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,CAAC,CAAC;SACb,CAAC;QACF,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC3B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;SAChC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,aAAa,CAAC,KAAqB;QACxC,MAAM,MAAM,GAAG,IAAA,wBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG;YACX,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YACrB,KAAK,EAAE,CAAC,CAAC;YACT,MAAM,EAAE,CAAC,CAAC;SACb,CAAC;QACF,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC3B,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;SAChC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA9BD,sBA8BC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2019-2020 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
|
package/lib/utils/html-utils.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createElementFromHTML = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
5
|
+
* Copyright (c) 2019-2020 EclipseSource and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureDefaultModelElements = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2021 EclipseSource and others.
|
|
5
|
+
* Copyright (c) 2021-2022 EclipseSource and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2017-
|
|
2
|
+
* Copyright (c) 2017-2022 TypeFox 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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/********************************************************************************
|
|
3
|
-
* Copyright (c) 2017-
|
|
3
|
+
* Copyright (c) 2017-2022 TypeFox and others.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made available under the
|
|
6
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/lib/views/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2019-2022 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
|
package/lib/views/index.js
CHANGED
|
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
/********************************************************************************
|
|
18
|
-
* Copyright (c)
|
|
18
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made available under the
|
|
21
21
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
package/package.json
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "1.1.0-
|
|
3
|
+
"version": "1.1.0-RC05",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
|
-
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
6
5
|
"keywords": [
|
|
7
6
|
"eclipse",
|
|
8
7
|
"graphics",
|
|
@@ -12,15 +11,16 @@
|
|
|
12
11
|
"glsp",
|
|
13
12
|
"diagram editor"
|
|
14
13
|
],
|
|
15
|
-
"author": {
|
|
16
|
-
"name": "Eclipse GLSP"
|
|
17
|
-
},
|
|
18
14
|
"homepage": "https://www.eclipse.org/glsp/",
|
|
15
|
+
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
|
|
19
16
|
"repository": {
|
|
20
17
|
"type": "git",
|
|
21
18
|
"url": "https://github.com/eclipse-glsp/glsp-client.git"
|
|
22
19
|
},
|
|
23
|
-
"
|
|
20
|
+
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
21
|
+
"author": {
|
|
22
|
+
"name": "Eclipse GLSP"
|
|
23
|
+
},
|
|
24
24
|
"contributors": [
|
|
25
25
|
{
|
|
26
26
|
"name": "Eclipse GLSP Project",
|
|
@@ -28,19 +28,13 @@
|
|
|
28
28
|
"url": "https://projects.eclipse.org/projects/ecd.glsp"
|
|
29
29
|
}
|
|
30
30
|
],
|
|
31
|
+
"main": "lib/index",
|
|
32
|
+
"types": "lib/index",
|
|
31
33
|
"files": [
|
|
32
34
|
"lib",
|
|
33
35
|
"src",
|
|
34
36
|
"css"
|
|
35
37
|
],
|
|
36
|
-
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "1.1.0-RC04",
|
|
38
|
-
"autocompleter": "5.1.0",
|
|
39
|
-
"sprotty": "0.13.0-next.f4445dd.342"
|
|
40
|
-
},
|
|
41
|
-
"devDependencies": {
|
|
42
|
-
"@vscode/codicons": "^0.0.25"
|
|
43
|
-
},
|
|
44
38
|
"scripts": {
|
|
45
39
|
"build": "tsc -b",
|
|
46
40
|
"clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
|
|
@@ -52,10 +46,16 @@
|
|
|
52
46
|
"test:coverage": "nyc yarn test",
|
|
53
47
|
"watch": "tsc -w"
|
|
54
48
|
},
|
|
49
|
+
"dependencies": {
|
|
50
|
+
"@eclipse-glsp/protocol": "1.1.0-RC05",
|
|
51
|
+
"autocompleter": "5.1.0",
|
|
52
|
+
"sprotty": "0.13.0-next.f4445dd.342"
|
|
53
|
+
},
|
|
54
|
+
"devDependencies": {
|
|
55
|
+
"@vscode/codicons": "^0.0.25"
|
|
56
|
+
},
|
|
55
57
|
"publishConfig": {
|
|
56
58
|
"access": "public"
|
|
57
59
|
},
|
|
58
|
-
"
|
|
59
|
-
"types": "lib/index",
|
|
60
|
-
"gitHead": "8a89fef82ee8b4400d5a56e39c5a01c51fab6f4d"
|
|
60
|
+
"gitHead": "e71dab20d1b6816e7acc361a212892a036fbc485"
|
|
61
61
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2020 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2020-2022 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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2019-2021 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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2019-2021 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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2019-2022 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
|
|
@@ -32,7 +32,6 @@ import {
|
|
|
32
32
|
PolylineEdgeRouter,
|
|
33
33
|
SConnectableElement,
|
|
34
34
|
SModelElement,
|
|
35
|
-
SModelRoot,
|
|
36
35
|
SRoutingHandle,
|
|
37
36
|
SwitchEditModeAction,
|
|
38
37
|
SwitchEditModeCommand,
|
|
@@ -326,14 +325,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
|
|
|
326
325
|
return undefined;
|
|
327
326
|
}
|
|
328
327
|
|
|
329
|
-
override
|
|
330
|
-
if (target instanceof SModelRoot && event.buttons === 0) {
|
|
331
|
-
this.mouseUp(target, event);
|
|
332
|
-
}
|
|
333
|
-
return [];
|
|
334
|
-
}
|
|
335
|
-
|
|
336
|
-
override mouseUp(_target: SModelElement, event: MouseEvent): Action[] {
|
|
328
|
+
override mouseUp(_target: SModelElement, _event: MouseEvent): Action[] {
|
|
337
329
|
this.pointPositionUpdater.resetPosition();
|
|
338
330
|
return [];
|
|
339
331
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2022 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
|
package/src/lib/model.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2023 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
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { SModelElementSchema } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { exportFeature, SGraph, SModelElement, viewportFeature } from 'sprotty';
|
|
16
|
+
import { Bounds, isBounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { exportFeature, getRouteBounds, SEdge, SGraph, SModelElement, viewportFeature } from 'sprotty';
|
|
18
18
|
import { Containable, containerFeature } from '../features/hints/model';
|
|
19
19
|
import { Saveable, saveFeature } from '../features/save/model';
|
|
20
20
|
|
|
@@ -25,3 +25,35 @@ export class GLSPGraph extends SGraph implements Saveable, Containable {
|
|
|
25
25
|
return true;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
|
|
29
|
+
export class GEdge extends SEdge {
|
|
30
|
+
override localToParent(point: Point | Bounds): Bounds {
|
|
31
|
+
const bounds = getRouteBounds(this.routingPoints);
|
|
32
|
+
const result = {
|
|
33
|
+
x: point.x + bounds.x,
|
|
34
|
+
y: point.y + bounds.y,
|
|
35
|
+
width: -1,
|
|
36
|
+
height: -1
|
|
37
|
+
};
|
|
38
|
+
if (isBounds(point)) {
|
|
39
|
+
result.width = point.width;
|
|
40
|
+
result.height = point.height;
|
|
41
|
+
}
|
|
42
|
+
return result;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
override parentToLocal(point: Point | Bounds): Bounds {
|
|
46
|
+
const bounds = getRouteBounds(this.routingPoints);
|
|
47
|
+
const result = {
|
|
48
|
+
x: point.x - bounds.x,
|
|
49
|
+
y: point.y - bounds.y,
|
|
50
|
+
width: -1,
|
|
51
|
+
height: -1
|
|
52
|
+
};
|
|
53
|
+
if (isBounds(point)) {
|
|
54
|
+
result.width = point.width;
|
|
55
|
+
result.height = point.height;
|
|
56
|
+
}
|
|
57
|
+
return result;
|
|
58
|
+
}
|
|
59
|
+
}
|
package/src/utils/html-utils.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2019-2020 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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2021 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2021-2022 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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2017-
|
|
2
|
+
* Copyright (c) 2017-2022 TypeFox 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
|
package/src/views/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2019-2022 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
|