@eclipse-glsp/client 1.1.0-next.4fe94e1.224 → 1.1.0-next.6efef44.226
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/features/tool-feedback/creation-tool-feedback.d.ts +4 -4
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js +4 -8
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/package.json +3 -3
- package/src/features/tool-feedback/creation-tool-feedback.ts +14 -12
|
@@ -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 { Action, Point } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { AnchorComputerRegistry, CommandExecutionContext, CommandReturn, MouseListener, SConnectableElement, SDanglingAnchor,
|
|
16
|
+
import { Action, Point, SEdgeSchema } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { AnchorComputerRegistry, CommandExecutionContext, CommandReturn, MouseListener, SConnectableElement, SDanglingAnchor, SModelElement, SModelRoot, SRoutableElement } from 'sprotty';
|
|
18
18
|
import { FeedbackCommand } from './model';
|
|
19
19
|
export interface DrawFeedbackEdgeAction extends Action {
|
|
20
20
|
kind: typeof DrawFeedbackEdgeAction.KIND;
|
|
@@ -65,7 +65,7 @@ export declare class FeedbackEdgeEndMovingMouseListener extends MouseListener {
|
|
|
65
65
|
}
|
|
66
66
|
export declare function feedbackEdgeId(root: SModelRoot): string;
|
|
67
67
|
export declare function feedbackEdgeEndId(root: SModelRoot): string;
|
|
68
|
-
export declare const defaultFeedbackEdgeSchema: SEdgeSchema
|
|
69
|
-
export declare function drawFeedbackEdge(context: CommandExecutionContext, sourceId: string, elementTypeId: string,
|
|
68
|
+
export declare const defaultFeedbackEdgeSchema: Partial<SEdgeSchema>;
|
|
69
|
+
export declare function drawFeedbackEdge(context: CommandExecutionContext, sourceId: string, elementTypeId: string, edgeTemplate?: Partial<SEdgeSchema>): void;
|
|
70
70
|
export declare function removeFeedbackEdge(root: SModelRoot): void;
|
|
71
71
|
//# sourceMappingURL=creation-tool-feedback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creation-tool-feedback.d.ts","sourceRoot":"","sources":["../../../src/features/tool-feedback/creation-tool-feedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAU,KAAK,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"creation-tool-feedback.d.ts","sourceRoot":"","sources":["../../../src/features/tool-feedback/creation-tool-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,8 +53,7 @@ let DrawFeedbackEdgeCommand = class DrawFeedbackEdgeCommand extends model_1.Feed
|
|
|
53
53
|
this.action = action;
|
|
54
54
|
}
|
|
55
55
|
execute(context) {
|
|
56
|
-
|
|
57
|
-
drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, feedbackEdgeSchema);
|
|
56
|
+
drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, this.action.edgeSchema);
|
|
58
57
|
return context.root;
|
|
59
58
|
}
|
|
60
59
|
};
|
|
@@ -180,7 +179,7 @@ exports.defaultFeedbackEdgeSchema = {
|
|
|
180
179
|
cssClasses: ['feedback-edge'],
|
|
181
180
|
opacity: 0.3
|
|
182
181
|
};
|
|
183
|
-
function drawFeedbackEdge(context, sourceId, elementTypeId,
|
|
182
|
+
function drawFeedbackEdge(context, sourceId, elementTypeId, edgeTemplate) {
|
|
184
183
|
const root = context.root;
|
|
185
184
|
const sourceChild = root.index.getById(sourceId);
|
|
186
185
|
if (!sourceChild) {
|
|
@@ -193,11 +192,8 @@ function drawFeedbackEdge(context, sourceId, elementTypeId, feedbackEdgeSchema)
|
|
|
193
192
|
const edgeEnd = new FeedbackEdgeEnd(source.id, elementTypeId);
|
|
194
193
|
edgeEnd.id = feedbackEdgeEndId(root);
|
|
195
194
|
edgeEnd.position = (0, viewpoint_util_1.toAbsolutePosition)(source);
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
feedbackEdgeSchema.sourceId = source.id;
|
|
199
|
-
feedbackEdgeSchema.targetId = edgeEnd.id;
|
|
200
|
-
const feedbackEdge = context.modelFactory.createElement(feedbackEdgeSchema);
|
|
195
|
+
const edgeSchema = Object.assign(Object.assign({ id: feedbackEdgeId(root), type: elementTypeId, sourceId: source.id, targetId: edgeEnd.id }, exports.defaultFeedbackEdgeSchema), edgeTemplate);
|
|
196
|
+
const feedbackEdge = context.modelFactory.createElement(edgeSchema);
|
|
201
197
|
if ((0, smodel_util_1.isRoutable)(feedbackEdge)) {
|
|
202
198
|
edgeEnd.feedbackEdge = feedbackEdge;
|
|
203
199
|
root.add(edgeEnd);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creation-tool-feedback.js","sourceRoot":"","sources":["../../../src/features/tool-feedback/creation-tool-feedback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"creation-tool-feedback.js","sourceRoot":"","sources":["../../../src/features/tool-feedback/creation-tool-feedback.ts"],"names":[],"mappings":"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"}
|
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.6efef44.226+6efef44",
|
|
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.6efef44.226+6efef44",
|
|
51
51
|
"autocompleter": "5.1.0",
|
|
52
52
|
"sprotty": "0.13.0-next.f4445dd.342"
|
|
53
53
|
},
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"publishConfig": {
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "6efef44234a98cafc891ecefc015b6f6578d2f47"
|
|
61
61
|
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, Bounds, Point } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { Action, Bounds, Point, SEdgeSchema } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { inject, injectable } from 'inversify';
|
|
18
18
|
import {
|
|
19
19
|
AnchorComputerRegistry,
|
|
@@ -28,7 +28,6 @@ import {
|
|
|
28
28
|
SChildElement,
|
|
29
29
|
SConnectableElement,
|
|
30
30
|
SDanglingAnchor,
|
|
31
|
-
SEdge as SEdgeSchema,
|
|
32
31
|
SModelElement,
|
|
33
32
|
SModelRoot,
|
|
34
33
|
SRoutableElement,
|
|
@@ -69,8 +68,7 @@ export class DrawFeedbackEdgeCommand extends FeedbackCommand {
|
|
|
69
68
|
}
|
|
70
69
|
|
|
71
70
|
execute(context: CommandExecutionContext): CommandReturn {
|
|
72
|
-
|
|
73
|
-
drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, feedbackEdgeSchema);
|
|
71
|
+
drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, this.action.edgeSchema);
|
|
74
72
|
return context.root;
|
|
75
73
|
}
|
|
76
74
|
}
|
|
@@ -195,16 +193,16 @@ export function feedbackEdgeEndId(root: SModelRoot): string {
|
|
|
195
193
|
return root.id + '_feedback_anchor';
|
|
196
194
|
}
|
|
197
195
|
|
|
198
|
-
export const defaultFeedbackEdgeSchema: SEdgeSchema = {
|
|
196
|
+
export const defaultFeedbackEdgeSchema: Partial<SEdgeSchema> = {
|
|
199
197
|
cssClasses: ['feedback-edge'],
|
|
200
198
|
opacity: 0.3
|
|
201
|
-
}
|
|
199
|
+
};
|
|
202
200
|
|
|
203
201
|
export function drawFeedbackEdge(
|
|
204
202
|
context: CommandExecutionContext,
|
|
205
203
|
sourceId: string,
|
|
206
204
|
elementTypeId: string,
|
|
207
|
-
|
|
205
|
+
edgeTemplate?: Partial<SEdgeSchema>
|
|
208
206
|
): void {
|
|
209
207
|
const root = context.root;
|
|
210
208
|
const sourceChild = root.index.getById(sourceId);
|
|
@@ -221,12 +219,16 @@ export function drawFeedbackEdge(
|
|
|
221
219
|
edgeEnd.id = feedbackEdgeEndId(root);
|
|
222
220
|
edgeEnd.position = toAbsolutePosition(source);
|
|
223
221
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
222
|
+
const edgeSchema: SEdgeSchema = {
|
|
223
|
+
id: feedbackEdgeId(root),
|
|
224
|
+
type: elementTypeId,
|
|
225
|
+
sourceId: source.id,
|
|
226
|
+
targetId: edgeEnd.id,
|
|
227
|
+
...defaultFeedbackEdgeSchema,
|
|
228
|
+
...edgeTemplate
|
|
229
|
+
};
|
|
228
230
|
|
|
229
|
-
const feedbackEdge = context.modelFactory.createElement(
|
|
231
|
+
const feedbackEdge = context.modelFactory.createElement(edgeSchema);
|
|
230
232
|
if (isRoutable(feedbackEdge)) {
|
|
231
233
|
edgeEnd.feedbackEdge = feedbackEdge;
|
|
232
234
|
root.add(edgeEnd);
|