@eclipse-glsp/client 1.1.0-RC02 → 1.1.0-next.0d35bd0.205
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/action-dispatcher.js.map +1 -1
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/container-modules.js +37 -36
- package/lib/base/container-modules.js.map +1 -1
- package/lib/base/editor-context-service.d.ts +1 -1
- package/lib/base/editor-context-service.d.ts.map +1 -1
- package/lib/base/editor-context-service.js.map +1 -1
- package/lib/base/focus-tracker.js.map +1 -1
- package/lib/base/model/model-registry.js.map +1 -1
- package/lib/base/model/update-model-command.js.map +1 -1
- package/lib/base/model-initialization-constraint.js.map +1 -1
- package/lib/base/selection-clearing-mouse-listener.js.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
- package/lib/base/view/view-registry.js.map +1 -1
- package/lib/features/bounds/di.config.d.ts +20 -0
- package/lib/features/bounds/di.config.d.ts.map +1 -0
- package/lib/features/bounds/di.config.js +36 -0
- package/lib/features/bounds/di.config.js.map +1 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts +34 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map +1 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.js +98 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.js.map +1 -0
- package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
- package/lib/features/change-bounds/snap.js.map +1 -1
- package/lib/features/command-palette/command-palette-tool.js.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.js.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.js.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
- package/lib/features/decoration/decoration-placer.js.map +1 -1
- package/lib/features/edit-label/edit-label-tool.js.map +1 -1
- package/lib/features/edit-label/edit-label-validator.js.map +1 -1
- package/lib/features/export/glsp-svg-exporter.js.map +1 -1
- package/lib/features/hints/type-hints.js.map +1 -1
- package/lib/features/hover/hover.js.map +1 -1
- package/lib/features/layout/freeform-layout.js.map +1 -1
- package/lib/features/layout/hbox-layout.js.map +1 -1
- package/lib/features/layout/layout-elements-action.d.ts +4 -4
- package/lib/features/layout/layout-elements-action.d.ts.map +1 -1
- package/lib/features/layout/layout-elements-action.js.map +1 -1
- package/lib/features/layout/layouter.js.map +1 -1
- package/lib/features/layout/vbox-layout.js.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts +1 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
- package/lib/features/navigation/navigation-action-handler.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
- package/lib/features/select/select-feedback-action.js.map +1 -1
- package/lib/features/select/selection-service.js.map +1 -1
- package/lib/features/source-model-watcher/source-model-changed-action-handler.js.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/css-feedback.js.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.js.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/view.js.map +1 -1
- package/lib/features/tool-palette/tool-palette.js.map +1 -1
- package/lib/features/tools/base-glsp-tool.js.map +1 -1
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/delete-tool.js.map +1 -1
- package/lib/features/tools/di.config.d.ts.map +1 -1
- package/lib/features/tools/di.config.js +3 -0
- package/lib/features/tools/di.config.js.map +1 -1
- package/lib/features/tools/edge-creation-tool.js.map +1 -1
- package/lib/features/tools/edge-edit-tool.js.map +1 -1
- package/lib/features/tools/enable-default-tools-on-focus-loss.js.map +1 -1
- package/lib/features/tools/glsp-manhattan-edge-router.d.ts +20 -0
- package/lib/features/tools/glsp-manhattan-edge-router.d.ts.map +1 -0
- package/lib/features/tools/glsp-manhattan-edge-router.js +69 -0
- package/lib/features/tools/glsp-manhattan-edge-router.js.map +1 -0
- package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
- package/lib/features/tools/marquee-tool.js.map +1 -1
- package/lib/features/tools/node-creation-tool.js.map +1 -1
- package/lib/features/tools/view.js.map +1 -1
- package/lib/features/validation/marker-navigator.d.ts +1 -1
- package/lib/features/validation/marker-navigator.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.js.map +1 -1
- package/lib/features/validation/validate.js.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.js.map +1 -1
- package/lib/model-source/glsp-diagram-server.js.map +1 -1
- package/lib/utils/smodel-util.d.ts +27 -6
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +40 -7
- package/lib/utils/smodel-util.js.map +1 -1
- package/lib/views/compartments.js.map +1 -1
- package/lib/views/glsp-edge-view.js.map +1 -1
- package/lib/views/glsp-projection-view.js.map +1 -1
- package/lib/views/issue-marker-view.js.map +1 -1
- package/lib/views/rounded-corner-view.js.map +1 -1
- package/package.json +9 -11
- package/src/base/container-modules.ts +2 -2
- package/src/features/bounds/di.config.ts +39 -0
- package/src/features/bounds/glsp-hidden-bounds-updater.ts +88 -0
- package/src/features/tools/di.config.ts +5 -1
- package/src/features/tools/glsp-manhattan-edge-router.ts +57 -0
- package/src/utils/smodel-util.ts +48 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-diagram-server.js","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,yCAAuC;AACvC,qCAA0I;AAG1I,MAAM,0BAA0B,GAAG,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-diagram-server.js","sourceRoot":"","sources":["../../src/model-source/glsp-diagram-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,14 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { ElementAndBounds, ElementAndRoutingPoints, SModelElementSchema, TypeGuard } from '@eclipse-glsp/protocol';
|
|
17
|
-
import { BoundsAware, EdgeRouterRegistry, ModelIndexImpl, Selectable, SModelElement, SRoutableElement, SRoutingHandle } from 'sprotty';
|
|
17
|
+
import { BoundsAware, EdgeRouterRegistry, ModelIndexImpl, RoutedPoint, Selectable, SModelElement, SRoutableElement, SRoutingHandle } from 'sprotty';
|
|
18
18
|
import { FluentIterable } from 'sprotty/lib/utils/iterable';
|
|
19
19
|
/**
|
|
20
20
|
* Helper type to represent a filter predicate for {@link SModelElement}s. This is used to retrieve
|
|
21
21
|
* elements from the {@link ModelIndexImpl} that also conform to a second type `T`. Its mainly used for
|
|
22
22
|
* retrieving elements that also implement a certain model features (e.g. selectable)
|
|
23
23
|
*/
|
|
24
|
-
export
|
|
24
|
+
export type ModelFilterPredicate<T> = (modelElement: SModelElement) => modelElement is SModelElement & T;
|
|
25
25
|
/**
|
|
26
26
|
* Retrieves all elements from the given {@link ModelIndexImpl} that match the given {@link ModelFilterPredicate}
|
|
27
27
|
* @param index The {@link ModelIndexImpl}.
|
|
@@ -114,11 +114,11 @@ export declare function isSelectableAndBoundsAware(element: SModelElement): elem
|
|
|
114
114
|
/**
|
|
115
115
|
* Union type to describe {@link SModelElement}s that implement the {@link Selectable} and {@link BoundsAware} feature.
|
|
116
116
|
*/
|
|
117
|
-
export
|
|
117
|
+
export type SelectableBoundsAware = SModelElement & BoundsAware & Selectable;
|
|
118
118
|
/**
|
|
119
119
|
* Union type to describe {@link SModelElement}s that implement the {@link BoundsAware} feature.
|
|
120
120
|
*/
|
|
121
|
-
export
|
|
121
|
+
export type BoundsAwareModelElement = SModelElement & BoundsAware;
|
|
122
122
|
/**
|
|
123
123
|
* Helper function to translate a given {@link SModelElement} into its corresponding {@link ElementAndBounds} representation.
|
|
124
124
|
* @param element The element to translate.
|
|
@@ -132,15 +132,36 @@ export declare function toElementAndBounds(element: BoundsAwareModelElement): El
|
|
|
132
132
|
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
133
133
|
*/
|
|
134
134
|
export declare function toElementAndRoutingPoints(element: SRoutableElement): ElementAndRoutingPoints;
|
|
135
|
+
/** Pure routing point data kinds. */
|
|
136
|
+
export declare const ROUTING_POINT_KINDS: string[];
|
|
137
|
+
/** Pure route data kinds. */
|
|
138
|
+
export declare const ROUTE_KINDS: string[];
|
|
135
139
|
/**
|
|
136
140
|
* Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
|
|
137
141
|
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
|
|
138
142
|
* points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
139
143
|
* @param element The element to translate.
|
|
140
|
-
* @param
|
|
144
|
+
* @param routerRegistry the edge router registry.
|
|
141
145
|
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
142
146
|
*/
|
|
143
|
-
export declare function calcElementAndRoutingPoints(element: SRoutableElement,
|
|
147
|
+
export declare function calcElementAndRoutingPoints(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints;
|
|
148
|
+
/**
|
|
149
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
150
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the points
|
|
151
|
+
* from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
152
|
+
* @param element The element to translate.
|
|
153
|
+
* @param routerRegistry the edge router registry.
|
|
154
|
+
* @returns The corresponding route for the given element.
|
|
155
|
+
*/
|
|
156
|
+
export declare function calcElementAndRoute(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints;
|
|
157
|
+
/**
|
|
158
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
159
|
+
* @param element The element to translate.
|
|
160
|
+
* @param routerRegistry the edge router registry.
|
|
161
|
+
* @param pointKinds the routing point kinds that should be considered.
|
|
162
|
+
* @returns The corresponding route for the given element.
|
|
163
|
+
*/
|
|
164
|
+
export declare function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined;
|
|
144
165
|
/**
|
|
145
166
|
* Checks if the model is compatible with the passed type string.
|
|
146
167
|
* (either has the same type or a subtype of this type)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,
|
|
1
|
+
{"version":3,"file":"smodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/smodel-util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getElementTypeId = exports.hasCompatibleType = exports.calcElementAndRoutingPoints = exports.toElementAndRoutingPoints = exports.toElementAndBounds = exports.isSelectableAndBoundsAware = exports.isRoutingHandle = exports.isRoutable = exports.isNonRoutableSelectedBoundsAware = exports.isNonRoutableSelectedMovableBoundsAware = exports.removeCssClasses = exports.addCssClasses = exports.isNotUndefined = exports.hasSelectedElements = exports.getSelectedElementCount = exports.getElements = exports.getMatchingElements = exports.forEachElement = exports.filter = void 0;
|
|
3
|
+
exports.getElementTypeId = exports.hasCompatibleType = exports.calcRoute = exports.calcElementAndRoute = exports.calcElementAndRoutingPoints = exports.ROUTE_KINDS = exports.ROUTING_POINT_KINDS = exports.toElementAndRoutingPoints = exports.toElementAndBounds = exports.isSelectableAndBoundsAware = exports.isRoutingHandle = exports.isRoutable = exports.isNonRoutableSelectedBoundsAware = exports.isNonRoutableSelectedMovableBoundsAware = exports.removeCssClasses = exports.addCssClasses = exports.isNotUndefined = exports.hasSelectedElements = exports.getSelectedElementCount = exports.getElements = exports.getMatchingElements = exports.forEachElement = exports.filter = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
5
|
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
6
6
|
*
|
|
@@ -196,21 +196,54 @@ function toElementAndRoutingPoints(element) {
|
|
|
196
196
|
};
|
|
197
197
|
}
|
|
198
198
|
exports.toElementAndRoutingPoints = toElementAndRoutingPoints;
|
|
199
|
+
/** Pure routing point data kinds. */
|
|
200
|
+
exports.ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
|
|
201
|
+
/** Pure route data kinds. */
|
|
202
|
+
exports.ROUTE_KINDS = [...exports.ROUTING_POINT_KINDS, 'source', 'target'];
|
|
199
203
|
/**
|
|
200
204
|
* Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
|
|
201
205
|
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
|
|
202
206
|
* points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
203
207
|
* @param element The element to translate.
|
|
204
|
-
* @param
|
|
208
|
+
* @param routerRegistry the edge router registry.
|
|
205
209
|
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
206
210
|
*/
|
|
207
|
-
function calcElementAndRoutingPoints(element,
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
const clientRoutingPoints = router === null || router === void 0 ? void 0 : router.route(element).filter((point, idx, route) => idx === route.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y)).filter(point => point.kind === 'linear' || point.kind === 'bezier-junction');
|
|
211
|
-
return { elementId: element.id, newRoutingPoints: clientRoutingPoints || element.routingPoints };
|
|
211
|
+
function calcElementAndRoutingPoints(element, routerRegistry) {
|
|
212
|
+
const newRoutingPoints = routerRegistry ? calcRoute(element, routerRegistry, exports.ROUTING_POINT_KINDS) : element.routingPoints;
|
|
213
|
+
return { elementId: element.id, newRoutingPoints };
|
|
212
214
|
}
|
|
213
215
|
exports.calcElementAndRoutingPoints = calcElementAndRoutingPoints;
|
|
216
|
+
/**
|
|
217
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
218
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the points
|
|
219
|
+
* from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
220
|
+
* @param element The element to translate.
|
|
221
|
+
* @param routerRegistry the edge router registry.
|
|
222
|
+
* @returns The corresponding route for the given element.
|
|
223
|
+
*/
|
|
224
|
+
function calcElementAndRoute(element, routerRegistry) {
|
|
225
|
+
var _a, _b;
|
|
226
|
+
let route = routerRegistry ? calcRoute(element, routerRegistry, exports.ROUTE_KINDS) : undefined;
|
|
227
|
+
if (!route) {
|
|
228
|
+
// add source and target to the routing points
|
|
229
|
+
route = [...element.routingPoints];
|
|
230
|
+
route.splice(0, 0, ((_a = element.source) === null || _a === void 0 ? void 0 : _a.position) || protocol_1.Point.ORIGIN);
|
|
231
|
+
route.push(((_b = element.target) === null || _b === void 0 ? void 0 : _b.position) || protocol_1.Point.ORIGIN);
|
|
232
|
+
}
|
|
233
|
+
return { elementId: element.id, newRoutingPoints: route };
|
|
234
|
+
}
|
|
235
|
+
exports.calcElementAndRoute = calcElementAndRoute;
|
|
236
|
+
/**
|
|
237
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
238
|
+
* @param element The element to translate.
|
|
239
|
+
* @param routerRegistry the edge router registry.
|
|
240
|
+
* @param pointKinds the routing point kinds that should be considered.
|
|
241
|
+
* @returns The corresponding route for the given element.
|
|
242
|
+
*/
|
|
243
|
+
function calcRoute(element, routerRegistry, pointKinds) {
|
|
244
|
+
return routerRegistry === null || routerRegistry === void 0 ? void 0 : routerRegistry.get(element.routerKind).route(element).filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y)).filter(point => !pointKinds || pointKinds.includes(point.kind));
|
|
245
|
+
}
|
|
246
|
+
exports.calcRoute = calcRoute;
|
|
214
247
|
/**
|
|
215
248
|
* Checks if the model is compatible with the passed type string.
|
|
216
249
|
* (either has the same type or a subtype of this type)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compartments.js","sourceRoot":"","sources":["../../src/views/compartments.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAyG;AAEzG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,SAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"compartments.js","sourceRoot":"","sources":["../../src/views/compartments.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAyG;AAEzG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,SAAG,EAAE,CAAC;AAG5B,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,eAAS;IACnD,MAAM,CAAC,KAA2D,EAAE,OAAyB;QACzF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;YACjC,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,CACH;YACI,kDAA0B,IAAI,iBAAe,KAAK,EAAE,CAAC,EAAC,GAAG,EAAC,CAAC,EAAC,GAAG,EAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,GAAS;YAC1H,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAC9B,CACP,CAAC;IACN,CAAC;CACJ,CAAA;AAbY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAapC;AAbY,4DAAwB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-edge-view.js","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AAEvC,qCAAyE;AACzE,4DAAsD;AAEtD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-edge-view.js","sourceRoot":"","sources":["../../src/views/glsp-edge-view.tsx"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AAEvC,qCAAyE;AACzE,4DAAsD;AAEtD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,0BAAgB;IAClC,MAAM,CAAC,IAAqB,EAAE,OAAyB;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACzE;QAED,OAAO,CACH,6DAAuB,IAAI,qBAAmB,IAAI,CAAC,aAAa,IAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;YACrG,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;YACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;YAC5C,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CACxC,CACP,CAAC;IACN,CAAC;IAES,gBAAgB,CAAC,KAAsB,EAAE,QAA0B;QACzE,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,UAAU,CAAC,KAAY,EAAE,QAAiB,EAAE,QAA0B;QACrF,OAAO,4BAAM,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAI,CAAC;IAC7D,CAAC;IAEkB,iBAAiB,CAAC,IAAW,EAAE,QAAiB,EAAE,QAA0B;QAC3F,mFAAmF;QACnF,MAAM,WAAW,GAAG,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,CAAC;IAES,iBAAiB,CAAC,QAAiB,EAAE,OAAe;QAC1D,OAAO,CACH,wDAEI,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,wBACnB,OAAO,GAAG,CAAC,kBAClB,aAAa,4BACH,MAAM,6BACL,GAAG,GAC7B,CACL,CAAC;IACN,CAAC;IAES,qBAAqB,CAAC,QAAiB;QAC7C,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,IAAI,GAAG,KAAK,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AArDY,SAAS;IADrB,IAAA,sBAAU,GAAE;GACA,SAAS,CAqDrB;AArDY,8BAAS"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-projection-view.js","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAIlF,yCAAuC;AACvC,uCAAgD;AAChD,qCAWiB;AAEjB;;GAEG;
|
|
1
|
+
{"version":3,"file":"glsp-projection-view.js","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker-view.js","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4BAA4B;AAC5B,yCAAuC;AAEvC,qCAAyG;AAEzG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"issue-marker-view.js","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4BAA4B;AAC5B,yCAAuC;AAEvC,qCAAyG;AAEzG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,yBAAe;IACxC,MAAM,CAAC,MAAoB,EAAE,QAA0B;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,CACV,gDAAwB,IAAI;YACxB;gBACK,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC;gBAC/C,4BAAM,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAI,CACrD,CACJ,CACP,CAAC;QACF,IAAA,kBAAQ,EAAC,KAAK,EAAE,UAAU,GAAG,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,4BAA4B,CAAC,QAAwB;QAC3D,QAAQ,QAAQ,EAAE;YACd,KAAK,SAAS;gBACV,OAAO,iEAAyC,IAAI,EAAE,MAAM,EAAC,0BAA0B,GAAG,CAAC;YAC/F,KAAK,OAAO,CAAC;YACb,KAAK,MAAM;gBACP,OAAO,gEAAwC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,GAAI,CAAC;SACjH;IACL,CAAC;IAED,IAAc,MAAM;QAChB,OAAO,CAAC,CAAC,CAAC,wCAAwC;IACtD,CAAC;IAES,sBAAsB,CAAC,QAAwB;QACrD,QAAQ,QAAQ,EAAE;YACd,uFAAuF;YACvF,KAAK,OAAO,EAAE,kBAAkB;gBAC5B,OAAO,u0CAAu0C,CAAC;YACn1C,KAAK,SAAS,EAAE,oBAAoB;gBAChC,OAAO,2RAA2R,CAAC;YACvS,KAAK,MAAM,EAAE,iBAAiB;gBAC1B,OAAO,ktBAAktB,CAAC;SACjuB;IACL,CAAC;CACJ,CAAA;AAxCY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAwC5B;AAxCY,4CAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rounded-corner-view.js","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAyH;AACzH,4DAAuD;AACvD,qDAAwD;AAExD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"rounded-corner-view.js","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"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-
|
|
3
|
+
"version": "1.1.0-next.0d35bd0.205+0d35bd0",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
|
|
6
6
|
"keywords": [
|
|
@@ -34,29 +34,27 @@
|
|
|
34
34
|
"css"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "1.1.0-
|
|
37
|
+
"@eclipse-glsp/protocol": "1.1.0-next.0d35bd0.205+0d35bd0",
|
|
38
38
|
"autocompleter": "5.1.0",
|
|
39
39
|
"sprotty": "0.13.0-next.1c4343c.328"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@vscode/codicons": "^0.0.25"
|
|
43
|
-
"eslint-import-resolver-typescript": "2.7.0",
|
|
44
|
-
"typescript": "^4.5.5"
|
|
42
|
+
"@vscode/codicons": "^0.0.25"
|
|
45
43
|
},
|
|
46
44
|
"scripts": {
|
|
47
|
-
"
|
|
45
|
+
"build": "tsc -b",
|
|
48
46
|
"clean": "rimraf lib tsconfig.tsbuildinfo ",
|
|
49
|
-
"build": "tsc",
|
|
50
47
|
"lint": "eslint --ext .ts,.tsx ./src",
|
|
51
|
-
"lint:
|
|
52
|
-
"
|
|
48
|
+
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
|
|
49
|
+
"prepare": "yarn clean && yarn build",
|
|
53
50
|
"test": "mocha --config ../../.mocharc.json \"./src/**/*.spec.?(ts|tsx)\"",
|
|
54
|
-
"test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter"
|
|
51
|
+
"test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
|
|
52
|
+
"watch": "tsc -w"
|
|
55
53
|
},
|
|
56
54
|
"publishConfig": {
|
|
57
55
|
"access": "public"
|
|
58
56
|
},
|
|
59
57
|
"main": "lib/index",
|
|
60
58
|
"types": "lib/index",
|
|
61
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "0d35bd063032fab0b9175ee6db8ce933896ee13b"
|
|
62
60
|
}
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
|
|
17
17
|
import { Container, ContainerModule } from 'inversify';
|
|
18
18
|
import {
|
|
19
|
-
boundsModule,
|
|
20
19
|
buttonModule,
|
|
21
20
|
defaultModule,
|
|
22
21
|
edgeIntersectionModule,
|
|
@@ -30,6 +29,7 @@ import {
|
|
|
30
29
|
routingModule,
|
|
31
30
|
zorderModule
|
|
32
31
|
} from 'sprotty';
|
|
32
|
+
import glspBoundsModule from '../features/bounds/di.config';
|
|
33
33
|
import glspCommandPaletteModule from '../features/command-palette/di.config';
|
|
34
34
|
import glspContextMenuModule from '../features/context-menu/di.config';
|
|
35
35
|
import { glspServerCopyPasteModule } from '../features/copy-paste/di.config';
|
|
@@ -52,13 +52,13 @@ import defaultGLSPModule from './di.config';
|
|
|
52
52
|
export const DEFAULT_MODULES = [
|
|
53
53
|
defaultModule,
|
|
54
54
|
defaultGLSPModule,
|
|
55
|
-
boundsModule,
|
|
56
55
|
buttonModule,
|
|
57
56
|
edgeIntersectionModule,
|
|
58
57
|
edgeLayoutModule,
|
|
59
58
|
expandModule,
|
|
60
59
|
exportModule,
|
|
61
60
|
fadeModule,
|
|
61
|
+
glspBoundsModule,
|
|
62
62
|
glspCommandPaletteModule,
|
|
63
63
|
glspContextMenuModule,
|
|
64
64
|
glspDecorationModule,
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2022 EclipseSource 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
|
+
import { ContainerModule } from 'inversify';
|
|
17
|
+
import {
|
|
18
|
+
configureCommand, configureLayout, HBoxLayouter, HiddenBoundsUpdater, Layouter,
|
|
19
|
+
LayoutRegistry, RequestBoundsCommand, SetBoundsCommand, StackLayouter, VBoxLayouter
|
|
20
|
+
} from 'sprotty';
|
|
21
|
+
import '../../../css/command-palette.css';
|
|
22
|
+
import { TYPES } from '../../base/types';
|
|
23
|
+
import { GLSPHiddenBoundsUpdater } from './glsp-hidden-bounds-updater';
|
|
24
|
+
|
|
25
|
+
const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
|
|
26
|
+
configureCommand({ bind, isBound }, SetBoundsCommand);
|
|
27
|
+
configureCommand({ bind, isBound }, RequestBoundsCommand);
|
|
28
|
+
bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
|
|
29
|
+
bind(GLSPHiddenBoundsUpdater).toSelf().inSingletonScope();
|
|
30
|
+
bind(TYPES.HiddenVNodePostprocessor).toService(GLSPHiddenBoundsUpdater);
|
|
31
|
+
bind(TYPES.Layouter).to(Layouter).inSingletonScope();
|
|
32
|
+
bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
|
|
33
|
+
|
|
34
|
+
configureLayout({ bind, isBound }, VBoxLayouter.KIND, VBoxLayouter);
|
|
35
|
+
configureLayout({ bind, isBound }, HBoxLayouter.KIND, HBoxLayouter);
|
|
36
|
+
configureLayout({ bind, isBound }, StackLayouter.KIND, StackLayouter);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
export default glspBoundsModule;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2022 EclipseSource 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 {
|
|
18
|
+
Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction,
|
|
19
|
+
ResponseAction
|
|
20
|
+
} from '@eclipse-glsp/protocol';
|
|
21
|
+
import { inject, injectable, optional } from 'inversify';
|
|
22
|
+
import { VNode } from 'snabbdom';
|
|
23
|
+
import { EdgeRouterRegistry, HiddenBoundsUpdater, IActionDispatcher, SModelElement, SRoutableElement } from 'sprotty';
|
|
24
|
+
import { calcElementAndRoute, isRoutable } from '../../utils/smodel-util';
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
|
|
28
|
+
*
|
|
29
|
+
* The actions will contain the bound, alignment, and routing points of elements.
|
|
30
|
+
*/
|
|
31
|
+
@injectable()
|
|
32
|
+
export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
33
|
+
|
|
34
|
+
@inject(EdgeRouterRegistry) @optional() protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
35
|
+
|
|
36
|
+
protected element2route: ElementAndRoutingPoints[] = [];
|
|
37
|
+
protected edges: SRoutableElement[] = [];
|
|
38
|
+
protected nodes: VNode[] = [];
|
|
39
|
+
|
|
40
|
+
override decorate(vnode: VNode, element: SModelElement): VNode {
|
|
41
|
+
super.decorate(vnode, element);
|
|
42
|
+
if (isRoutable(element)) {
|
|
43
|
+
this.element2route.push(calcElementAndRoute(element, this.edgeRouterRegistry));
|
|
44
|
+
}
|
|
45
|
+
return vnode;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
override postUpdate(cause?: Action): void {
|
|
49
|
+
const actions = this.captureActions(() => super.postUpdate(cause));
|
|
50
|
+
actions.filter(action => ComputedBoundsAction.is(action))
|
|
51
|
+
.forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action as ComputedBoundsAction)));
|
|
52
|
+
this.element2route = [];
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
protected captureActions(call: () => void): Action[] {
|
|
56
|
+
const capturingActionDispatcher = new CapturingActionDispatcher();
|
|
57
|
+
const actualActionDispatcher = this.actionDispatcher;
|
|
58
|
+
this.actionDispatcher = capturingActionDispatcher;
|
|
59
|
+
try {
|
|
60
|
+
call();
|
|
61
|
+
return capturingActionDispatcher.actions;
|
|
62
|
+
} finally {
|
|
63
|
+
this.actionDispatcher = actualActionDispatcher;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
protected enhanceAction(action: ComputedBoundsAction): ComputedBoundsAction {
|
|
68
|
+
action.routes = this.element2route.length === 0 ? undefined : this.element2route;
|
|
69
|
+
return action;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
class CapturingActionDispatcher implements IActionDispatcher {
|
|
74
|
+
readonly actions: Action[] = [];
|
|
75
|
+
|
|
76
|
+
async dispatch(action: Action): Promise<void> {
|
|
77
|
+
this.actions.push(action);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
async dispatchAll(actions: Action[]): Promise<void> {
|
|
81
|
+
this.actions.push(...actions);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
async request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
|
|
85
|
+
// ignore, not needed for our purposes
|
|
86
|
+
return new Deferred<Res>().promise;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { ContainerModule, interfaces } from 'inversify';
|
|
18
|
-
import { configureActionHandler, configureModelElement } from 'sprotty';
|
|
18
|
+
import { configureActionHandler, configureModelElement, ManhattanEdgeRouter } from 'sprotty';
|
|
19
19
|
import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
|
|
20
20
|
import { TYPES } from '../../base/types';
|
|
21
21
|
import { GLSPSvgExporter } from '../export/glsp-svg-exporter';
|
|
@@ -25,6 +25,7 @@ import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
|
|
|
25
25
|
import { EdgeCreationTool } from './edge-creation-tool';
|
|
26
26
|
import { EdgeEditTool } from './edge-edit-tool';
|
|
27
27
|
import { EnableDefaultToolsOnFocusLossHandler } from './enable-default-tools-on-focus-loss';
|
|
28
|
+
import { GSLPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
|
|
28
29
|
import { MarqueeMouseTool } from './marquee-mouse-tool';
|
|
29
30
|
import { MarqueeTool } from './marquee-tool';
|
|
30
31
|
import { MarqueeNode } from './model';
|
|
@@ -54,6 +55,9 @@ export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind)
|
|
|
54
55
|
|
|
55
56
|
bind(GLSPSvgExporter).toSelf().inSingletonScope();
|
|
56
57
|
rebind(TYPES.SvgExporter).toService(GLSPSvgExporter);
|
|
58
|
+
|
|
59
|
+
bind(GSLPManhattanEdgeRouter).toSelf().inSingletonScope();
|
|
60
|
+
rebind(ManhattanEdgeRouter).toService(GSLPManhattanEdgeRouter);
|
|
57
61
|
});
|
|
58
62
|
|
|
59
63
|
export function configureMarqueeTool(context: { bind: interfaces.Bind; isBound: interfaces.IsBound }): void {
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2022 EclipseSource 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 { almostEquals } from '@eclipse-glsp/protocol';
|
|
18
|
+
import { ManhattanEdgeRouter, ResolvedHandleMove, SRoutableElement } from 'sprotty';
|
|
19
|
+
|
|
20
|
+
export class GSLPManhattanEdgeRouter extends ManhattanEdgeRouter {
|
|
21
|
+
protected override applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void {
|
|
22
|
+
const route = this.route(edge);
|
|
23
|
+
const routingPoints = edge.routingPoints;
|
|
24
|
+
const minimalPointDistance = this.getOptions(edge).minimalPointDistance;
|
|
25
|
+
moves.forEach(move => {
|
|
26
|
+
const handle = move.handle;
|
|
27
|
+
const index = handle.pointIndex;
|
|
28
|
+
const correctedX = this.correctX(routingPoints, index, move.toPosition.x, minimalPointDistance);
|
|
29
|
+
const correctedY = this.correctY(routingPoints, index, move.toPosition.y, minimalPointDistance);
|
|
30
|
+
switch (handle.kind) {
|
|
31
|
+
case 'manhattan-50%':
|
|
32
|
+
if (index < 0) {
|
|
33
|
+
if (routingPoints.length === 0) {
|
|
34
|
+
routingPoints.push({ x: correctedX, y: correctedY });
|
|
35
|
+
move.handle.pointIndex = 0;
|
|
36
|
+
}
|
|
37
|
+
else if (almostEquals(route[0].x, route[1].x)) { this.alignX(routingPoints, 0, correctedX); }
|
|
38
|
+
else { this.alignY(routingPoints, 0, correctedY); }
|
|
39
|
+
} else if (index < routingPoints.length - 1) {
|
|
40
|
+
if (almostEquals(routingPoints[index].x, routingPoints[index + 1].x)) {
|
|
41
|
+
this.alignX(routingPoints, index, correctedX);
|
|
42
|
+
this.alignX(routingPoints, index + 1, correctedX);
|
|
43
|
+
} else {
|
|
44
|
+
this.alignY(routingPoints, index, correctedY);
|
|
45
|
+
this.alignY(routingPoints, index + 1, correctedY);
|
|
46
|
+
}
|
|
47
|
+
} else {
|
|
48
|
+
if (almostEquals(route[route.length - 2].x, route[route.length - 1].x)) {
|
|
49
|
+
this.alignX(routingPoints, routingPoints.length - 1, correctedX);
|
|
50
|
+
}
|
|
51
|
+
else { this.alignY(routingPoints, routingPoints.length - 1, correctedY); }
|
|
52
|
+
}
|
|
53
|
+
break;
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|