@eclipse-glsp/client 1.1.0-next.ac7a617.192 → 1.1.0-next.b15d96b.196
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/container-modules.js +37 -36
- package/lib/base/container-modules.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/tools/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds-tool.js +13 -10
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/edge-edit-tool.d.ts +2 -2
- package/lib/features/tools/edge-edit-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-edit-tool.js +3 -2
- package/lib/features/tools/edge-edit-tool.js.map +1 -1
- package/lib/utils/smodel-util.d.ts +32 -2
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +50 -2
- package/lib/utils/smodel-util.js.map +1 -1
- package/package.json +3 -3
- 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/change-bounds-tool.ts +16 -13
- package/src/features/tools/edge-edit-tool.ts +5 -6
- package/src/utils/smodel-util.ts +60 -4
|
@@ -18,28 +18,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.createClientContainer = exports.DEFAULT_MODULES = void 0;
|
|
19
19
|
const inversify_1 = require("inversify");
|
|
20
20
|
const sprotty_1 = require("sprotty");
|
|
21
|
-
const di_config_1 = require("../features/
|
|
22
|
-
const di_config_2 = require("../features/
|
|
23
|
-
const di_config_3 = require("../features/
|
|
24
|
-
const di_config_4 = require("../features/
|
|
25
|
-
const di_config_5 = require("../features/
|
|
26
|
-
const di_config_6 = require("../features/
|
|
27
|
-
const di_config_7 = require("../features/
|
|
28
|
-
const di_config_8 = require("../features/
|
|
29
|
-
const di_config_9 = require("../features/
|
|
30
|
-
const di_config_10 = require("../features/
|
|
31
|
-
const di_config_11 = require("../features/
|
|
32
|
-
const di_config_12 = require("../features/
|
|
33
|
-
const di_config_13 = require("../features/
|
|
34
|
-
const di_config_14 = require("../features/tool-
|
|
35
|
-
const di_config_15 = require("../features/
|
|
36
|
-
const di_config_16 = require("../features/
|
|
37
|
-
const di_config_17 = require("../features/
|
|
38
|
-
const di_config_18 = require("
|
|
21
|
+
const di_config_1 = require("../features/bounds/di.config");
|
|
22
|
+
const di_config_2 = require("../features/command-palette/di.config");
|
|
23
|
+
const di_config_3 = require("../features/context-menu/di.config");
|
|
24
|
+
const di_config_4 = require("../features/copy-paste/di.config");
|
|
25
|
+
const di_config_5 = require("../features/decoration/di.config");
|
|
26
|
+
const di_config_6 = require("../features/edit-label/di.config");
|
|
27
|
+
const di_config_7 = require("../features/hints/di.config");
|
|
28
|
+
const di_config_8 = require("../features/hover/di.config");
|
|
29
|
+
const di_config_9 = require("../features/layout/di.config");
|
|
30
|
+
const di_config_10 = require("../features/mouse-tool/di.config");
|
|
31
|
+
const di_config_11 = require("../features/navigation/di.config");
|
|
32
|
+
const di_config_12 = require("../features/select/di.config");
|
|
33
|
+
const di_config_13 = require("../features/source-model-watcher/di.config");
|
|
34
|
+
const di_config_14 = require("../features/tool-feedback/di.config");
|
|
35
|
+
const di_config_15 = require("../features/tool-palette/di.config");
|
|
36
|
+
const di_config_16 = require("../features/tools/di.config");
|
|
37
|
+
const di_config_17 = require("../features/validation/di.config");
|
|
38
|
+
const di_config_18 = require("../features/viewport/di.config");
|
|
39
|
+
const di_config_19 = require("./di.config");
|
|
39
40
|
exports.DEFAULT_MODULES = [
|
|
40
41
|
sprotty_1.defaultModule,
|
|
41
|
-
|
|
42
|
-
sprotty_1.boundsModule,
|
|
42
|
+
di_config_19.default,
|
|
43
43
|
sprotty_1.buttonModule,
|
|
44
44
|
sprotty_1.edgeIntersectionModule,
|
|
45
45
|
sprotty_1.edgeLayoutModule,
|
|
@@ -48,27 +48,28 @@ exports.DEFAULT_MODULES = [
|
|
|
48
48
|
sprotty_1.fadeModule,
|
|
49
49
|
di_config_1.default,
|
|
50
50
|
di_config_2.default,
|
|
51
|
-
|
|
51
|
+
di_config_3.default,
|
|
52
52
|
di_config_5.default,
|
|
53
|
-
di_config_7.default,
|
|
54
|
-
di_config_9.default,
|
|
55
|
-
di_config_11.default,
|
|
56
|
-
di_config_3.glspServerCopyPasteModule,
|
|
57
|
-
di_config_17.default,
|
|
58
|
-
sprotty_1.labelEditUiModule,
|
|
59
|
-
di_config_8.default,
|
|
60
|
-
di_config_16.markerNavigatorModule,
|
|
61
53
|
di_config_6.default,
|
|
62
|
-
|
|
54
|
+
di_config_8.default,
|
|
55
|
+
di_config_10.default,
|
|
63
56
|
di_config_12.default,
|
|
64
|
-
|
|
57
|
+
di_config_4.glspServerCopyPasteModule,
|
|
58
|
+
di_config_18.default,
|
|
59
|
+
sprotty_1.labelEditUiModule,
|
|
60
|
+
di_config_9.default,
|
|
61
|
+
di_config_17.markerNavigatorModule,
|
|
62
|
+
di_config_7.default,
|
|
63
|
+
sprotty_1.modelSourceModule,
|
|
64
|
+
di_config_13.default,
|
|
65
|
+
di_config_11.navigationModule,
|
|
65
66
|
sprotty_1.openModule,
|
|
66
|
-
|
|
67
|
+
di_config_15.default,
|
|
67
68
|
sprotty_1.routingModule,
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
di_config_14.default,
|
|
70
|
+
di_config_16.toolsModule,
|
|
71
|
+
di_config_16.enableDefaultToolsOnFocusLossModule,
|
|
72
|
+
di_config_17.validationModule,
|
|
72
73
|
sprotty_1.zorderModule
|
|
73
74
|
];
|
|
74
75
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAAuD;AACvD,qCAaiB;AACjB,4DAA4D;AAC5D,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,2DAA2D;AAC3D,2DAA0D;AAC1D,4DAAwD;AACxD,iEAAmE;AACnE,iEAAoE;AACpE,6DAA4D;AAC5D,2EAAkF;AAClF,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,uBAAa;IACb,oBAAiB;IACjB,sBAAY;IACZ,gCAAsB;IACtB,0BAAgB;IAChB,sBAAY;IACZ,sBAAY;IACZ,oBAAU;IACV,mBAAgB;IAChB,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,mBAAe;IACf,oBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,2BAAiB;IACjB,mBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,2BAAiB;IACjB,oBAAwB;IACxB,6BAAgB;IAChB,oBAAU;IACV,oBAAiB;IACjB,uBAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,sBAAY;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,qBAAqB,CAAC,GAAG,OAA0B;IAC/D,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC,GAAG,uBAAe,EAAE,GAAG,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC;AACrB,CAAC;AAJD,sDAIC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
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 '../../../css/command-palette.css';
|
|
18
|
+
declare const glspBoundsModule: ContainerModule;
|
|
19
|
+
export default glspBoundsModule;
|
|
20
|
+
//# sourceMappingURL=di.config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAK5C,OAAO,kCAAkC,CAAC;AAI1C,QAAA,MAAM,gBAAgB,iBAYpB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/********************************************************************************
|
|
4
|
+
* Copyright (c) 2022 EclipseSource and others.
|
|
5
|
+
*
|
|
6
|
+
* This program and the accompanying materials are made available under the
|
|
7
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
8
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
9
|
+
*
|
|
10
|
+
* This Source Code may also be made available under the following Secondary
|
|
11
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
12
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
13
|
+
* with the GNU Classpath Exception which is available at
|
|
14
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
15
|
+
*
|
|
16
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
17
|
+
********************************************************************************/
|
|
18
|
+
const inversify_1 = require("inversify");
|
|
19
|
+
const sprotty_1 = require("sprotty");
|
|
20
|
+
require("../../../css/command-palette.css");
|
|
21
|
+
const types_1 = require("../../base/types");
|
|
22
|
+
const glsp_hidden_bounds_updater_1 = require("./glsp-hidden-bounds-updater");
|
|
23
|
+
const glspBoundsModule = new inversify_1.ContainerModule((bind, _unbind, isBound, _rebind) => {
|
|
24
|
+
(0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.SetBoundsCommand);
|
|
25
|
+
(0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.RequestBoundsCommand);
|
|
26
|
+
bind(sprotty_1.HiddenBoundsUpdater).toSelf().inSingletonScope();
|
|
27
|
+
bind(glsp_hidden_bounds_updater_1.GLSPHiddenBoundsUpdater).toSelf().inSingletonScope();
|
|
28
|
+
bind(types_1.TYPES.HiddenVNodePostprocessor).toService(glsp_hidden_bounds_updater_1.GLSPHiddenBoundsUpdater);
|
|
29
|
+
bind(types_1.TYPES.Layouter).to(sprotty_1.Layouter).inSingletonScope();
|
|
30
|
+
bind(types_1.TYPES.LayoutRegistry).to(sprotty_1.LayoutRegistry).inSingletonScope();
|
|
31
|
+
(0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.VBoxLayouter.KIND, sprotty_1.VBoxLayouter);
|
|
32
|
+
(0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.HBoxLayouter.KIND, sprotty_1.HBoxLayouter);
|
|
33
|
+
(0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.StackLayouter.KIND, sprotty_1.StackLayouter);
|
|
34
|
+
});
|
|
35
|
+
exports.default = glspBoundsModule;
|
|
36
|
+
//# sourceMappingURL=di.config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/bounds/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAGiB;AACjB,4CAA0C;AAC1C,4CAAyC;AACzC,6EAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC7E,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,0BAAgB,CAAC,CAAC;IACtD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,8BAAoB,CAAC,CAAC;IAC1D,IAAI,CAAC,6BAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,aAAK,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IACxE,IAAI,CAAC,aAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,kBAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,aAAK,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,wBAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEjE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sBAAY,CAAC,IAAI,EAAE,sBAAY,CAAC,CAAC;IACpE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sBAAY,CAAC,IAAI,EAAE,sBAAY,CAAC,CAAC;IACpE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uBAAa,CAAC,IAAI,EAAE,uBAAa,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
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 { Action, ComputedBoundsAction, ElementAndRoutingPoints } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { VNode } from 'snabbdom';
|
|
18
|
+
import { EdgeRouterRegistry, HiddenBoundsUpdater, SModelElement, SRoutableElement } from 'sprotty';
|
|
19
|
+
/**
|
|
20
|
+
* Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
|
|
21
|
+
*
|
|
22
|
+
* The actions will contain the bound, alignment, and routing points of elements.
|
|
23
|
+
*/
|
|
24
|
+
export declare class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
25
|
+
protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
26
|
+
protected element2route: ElementAndRoutingPoints[];
|
|
27
|
+
protected edges: SRoutableElement[];
|
|
28
|
+
protected nodes: VNode[];
|
|
29
|
+
decorate(vnode: VNode, element: SModelElement): VNode;
|
|
30
|
+
postUpdate(cause?: Action): void;
|
|
31
|
+
protected captureActions(call: () => void): Action[];
|
|
32
|
+
protected enhanceAction(action: ComputedBoundsAction): ComputedBoundsAction;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=glsp-hidden-bounds-updater.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAAE,oBAAoB,EAAY,uBAAuB,EAElE,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAGtH;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IAEpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAEnG,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IACxD,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;IACzC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAM;IAErB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAOzC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,EAAE;IAYpD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAI9E"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/********************************************************************************
|
|
3
|
+
* Copyright (c) 2022 EclipseSource and others.
|
|
4
|
+
*
|
|
5
|
+
* This program and the accompanying materials are made available under the
|
|
6
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
*
|
|
9
|
+
* This Source Code may also be made available under the following Secondary
|
|
10
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
* with the GNU Classpath Exception which is available at
|
|
13
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
*
|
|
15
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
|
+
********************************************************************************/
|
|
17
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
+
};
|
|
23
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
+
};
|
|
26
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
+
exports.GLSPHiddenBoundsUpdater = void 0;
|
|
28
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
29
|
+
const inversify_1 = require("inversify");
|
|
30
|
+
const sprotty_1 = require("sprotty");
|
|
31
|
+
const smodel_util_1 = require("../../utils/smodel-util");
|
|
32
|
+
/**
|
|
33
|
+
* Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
|
|
34
|
+
*
|
|
35
|
+
* The actions will contain the bound, alignment, and routing points of elements.
|
|
36
|
+
*/
|
|
37
|
+
let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.HiddenBoundsUpdater {
|
|
38
|
+
constructor() {
|
|
39
|
+
super(...arguments);
|
|
40
|
+
this.element2route = [];
|
|
41
|
+
this.edges = [];
|
|
42
|
+
this.nodes = [];
|
|
43
|
+
}
|
|
44
|
+
decorate(vnode, element) {
|
|
45
|
+
super.decorate(vnode, element);
|
|
46
|
+
if ((0, smodel_util_1.isRoutable)(element)) {
|
|
47
|
+
this.element2route.push((0, smodel_util_1.calcElementAndRoute)(element, this.edgeRouterRegistry));
|
|
48
|
+
}
|
|
49
|
+
return vnode;
|
|
50
|
+
}
|
|
51
|
+
postUpdate(cause) {
|
|
52
|
+
const actions = this.captureActions(() => super.postUpdate(cause));
|
|
53
|
+
actions.filter(action => protocol_1.ComputedBoundsAction.is(action))
|
|
54
|
+
.forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action)));
|
|
55
|
+
this.element2route = [];
|
|
56
|
+
}
|
|
57
|
+
captureActions(call) {
|
|
58
|
+
const capturingActionDispatcher = new CapturingActionDispatcher();
|
|
59
|
+
const actualActionDispatcher = this.actionDispatcher;
|
|
60
|
+
this.actionDispatcher = capturingActionDispatcher;
|
|
61
|
+
try {
|
|
62
|
+
call();
|
|
63
|
+
return capturingActionDispatcher.actions;
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
this.actionDispatcher = actualActionDispatcher;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
enhanceAction(action) {
|
|
70
|
+
action.routes = this.element2route.length === 0 ? undefined : this.element2route;
|
|
71
|
+
return action;
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
__decorate([
|
|
75
|
+
(0, inversify_1.inject)(sprotty_1.EdgeRouterRegistry),
|
|
76
|
+
(0, inversify_1.optional)(),
|
|
77
|
+
__metadata("design:type", sprotty_1.EdgeRouterRegistry)
|
|
78
|
+
], GLSPHiddenBoundsUpdater.prototype, "edgeRouterRegistry", void 0);
|
|
79
|
+
GLSPHiddenBoundsUpdater = __decorate([
|
|
80
|
+
(0, inversify_1.injectable)()
|
|
81
|
+
], GLSPHiddenBoundsUpdater);
|
|
82
|
+
exports.GLSPHiddenBoundsUpdater = GLSPHiddenBoundsUpdater;
|
|
83
|
+
class CapturingActionDispatcher {
|
|
84
|
+
constructor() {
|
|
85
|
+
this.actions = [];
|
|
86
|
+
}
|
|
87
|
+
async dispatch(action) {
|
|
88
|
+
this.actions.push(action);
|
|
89
|
+
}
|
|
90
|
+
async dispatchAll(actions) {
|
|
91
|
+
this.actions.push(...actions);
|
|
92
|
+
}
|
|
93
|
+
async request(action) {
|
|
94
|
+
// ignore, not needed for our purposes
|
|
95
|
+
return new protocol_1.Deferred().promise;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=glsp-hidden-bounds-updater.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAGgC;AAChC,yCAAyD;AAEzD,qCAAsH;AACtH,yDAA0E;AAE1E;;;;GAIG;AAEH,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,6BAAmB;IAAhE;;QAIc,kBAAa,GAA8B,EAAE,CAAC;QAC9C,UAAK,GAAuB,EAAE,CAAC;QAC/B,UAAK,GAAY,EAAE,CAAC;IAiClC,CAAC;IA/BY,QAAQ,CAAC,KAAY,EAAE,OAAsB;QAClD,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAA,wBAAU,EAAC,OAAO,CAAC,EAAE;YACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAc;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,+BAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACpD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,MAA8B,CAAC,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAES,cAAc,CAAC,IAAgB;QACrC,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAClE,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC;QAClD,IAAI;YACA,IAAI,EAAE,CAAC;YACP,OAAO,yBAAyB,CAAC,OAAO,CAAC;SAC5C;gBAAS;YACN,IAAI,CAAC,gBAAgB,GAAG,sBAAsB,CAAC;SAClD;IACL,CAAC;IAES,aAAa,CAAC,MAA4B;QAChD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACjF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AArC2C;IAAvC,IAAA,kBAAM,EAAC,4BAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyC,4BAAkB;mEAAC;AAF1F,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAuCnC;AAvCY,0DAAuB;AAyCpC,MAAM,yBAAyB;IAA/B;QACa,YAAO,GAAa,EAAE,CAAC;IAcpC,CAAC;IAZG,KAAK,CAAC,QAAQ,CAAC,MAAc;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAA6B,MAA0B;QAChE,sCAAsC;QACtC,OAAO,IAAI,mBAAQ,EAAO,CAAC,OAAO,CAAC;IACvC,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/change-bounds-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;
|
|
1
|
+
{"version":3,"file":"change-bounds-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/change-bounds-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -203,19 +203,22 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
|
|
|
203
203
|
return false;
|
|
204
204
|
}
|
|
205
205
|
handleMoveRoutingPointsOnServer(target) {
|
|
206
|
-
const result = [];
|
|
207
206
|
const newRoutingPoints = [];
|
|
208
|
-
|
|
207
|
+
const routerRegistry = this.tool.edgeRouterRegistry;
|
|
208
|
+
if (routerRegistry) {
|
|
209
209
|
// If client routing is enabled -> delegate routingpoints of connected edges to server
|
|
210
|
-
|
|
211
|
-
element
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
210
|
+
(0, smodel_util_1.forEachElement)(target.index, smodel_util_1.isNonRoutableSelectedMovableBoundsAware, element => {
|
|
211
|
+
if (element instanceof sprotty_1.SConnectableElement) {
|
|
212
|
+
element.incomingEdges.map(connectable => (0, smodel_util_1.calcElementAndRoutingPoints)(connectable, routerRegistry))
|
|
213
|
+
.forEach(ear => newRoutingPoints.push(ear));
|
|
214
|
+
element.outgoingEdges.map(connectable => (0, smodel_util_1.calcElementAndRoutingPoints)(connectable, routerRegistry))
|
|
215
|
+
.forEach(ear => newRoutingPoints.push(ear));
|
|
216
|
+
}
|
|
217
|
+
});
|
|
217
218
|
}
|
|
218
|
-
return
|
|
219
|
+
return newRoutingPoints.length > 0
|
|
220
|
+
? [protocol_1.ChangeRoutingPointsOperation.create(newRoutingPoints)]
|
|
221
|
+
: [];
|
|
219
222
|
}
|
|
220
223
|
handleResize(activeResizeHandle) {
|
|
221
224
|
const actions = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool.js","sourceRoot":"","sources":["../../../src/features/tools/change-bounds-tool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"change-bounds-tool.js","sourceRoot":"","sources":["../../../src/features/tools/change-bounds-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AACjF,qDAY+B;AAChC,yCAAyD;AACzD,qCAYiB;AACjB,oFAA8E;AAC9E,4CAAyC;AACzC,2DAAoE;AACpE,yDAKiC;AACjC,kDAA4H;AAC5H,8EAI8C;AAC9C,gDAA6D;AAC7D,mEAAkF;AAClF,8FAIsD;AACtD,gEAAmH;AACnH,qDAAgD;AAEhD;;;;;;;;;;;;GAYG;AAEH,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,6BAAY;IAU9C,IAAI,EAAE;QACF,OAAO,kBAAgB,CAAC,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM;QACF,oEAAoE;QACpE,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAChE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAExD,wFAAwF;QACxF,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACnD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC9D,CAAC;IAES,uBAAuB;QAC7B,OAAO,IAAI,uDAAyB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAES,0BAA0B;QAChC,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC1D,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC5D,IAAI,CAAC,kBAAkB,CAAC,CAAC,sEAAwC,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC5G,CAAC;CACJ,CAAA;AAvCU,mBAAE,GAAG,yBAAyB,CAAC;AAEN;IAA/B,IAAA,kBAAM,EAAC,aAAK,CAAC,gBAAgB,CAAC;8BAA6B,oCAAgB;0DAAC;AACrC;IAAvC,IAAA,kBAAM,EAAC,4BAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAA+B,4BAAkB;4DAAC;AACrD;IAAnC,IAAA,kBAAM,EAAC,aAAK,CAAC,QAAQ,CAAC;IAAE,IAAA,oBAAQ,GAAE;;iDAA6B;AACjB;IAA9C,IAAA,kBAAM,EAAC,aAAK,CAAC,mBAAmB,CAAC;IAAE,IAAA,oBAAQ,GAAE;;4DAAmD;AANxF,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAwC5B;AAxCY,4CAAgB;AA0C7B,MAAa,oBAAqB,SAAQ,kDAAsB;IAW5D,YAAsB,IAAsB;QACxC,KAAK,EAAE,CAAC;QADU,SAAI,GAAJ,IAAI,CAAkB;QAExC,IAAI,CAAC,oBAAoB,GAAG,IAAI,2BAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/B,qEAAqE;QACrE,uEAAuE;QACvE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,YAAY,oBAAU,EAAE;YACpD,OAAO,EAAE,CAAC;SACb;QACD,2DAA2D;QAC3D,IAAI,IAAI,CAAC,mBAAmB,IAAI,MAAM,YAAY,qBAAa,EAAE;YAC7D,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;SACpC;aAAM;YACH,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;SACvC;QACD,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAC5B;aAAM;YACH,IAAI,CAAC,KAAK,EAAE,CAAC;SAChB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC7C,0FAA0F;YAC1F,oCAAoC;YACpC,MAAM,OAAO,GAAa;gBACtB,IAAA,mCAAoB,EAAC,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,wBAAS,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAS,CAAC,WAAW,CAAC;gBAC5G,IAAA,8BAAe,EAAC,IAAI,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;aAClF,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3H,IAAI,cAAc,EAAE;gBAChB,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;gBAChE,OAAO,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;aAClC;YACD,OAAO,OAAO,CAAC;SAClB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,eAAe,CAAC,MAAqB,EAAE,KAAiB;QAC7D,IAAI,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,EAAE,EAAE;YACzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;SACb;QACD,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,SAAS;YACT,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAC/D;aAAM;YACH,OAAO;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;SACpD;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,kBAAkB,CAAC,MAAqB;QAC9C,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;QACjE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,4BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;SACjD;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,0BAA0B,CAAC,MAAqB;QACtD,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAuB,EAAE,CAAC;QACzC,MAAM,gBAAgB,GAAoC,EAAE,CAAC;QAC7D,IAAA,4BAAc,EAAC,MAAM,CAAC,KAAK,EAAE,qDAAuC,EAAE,OAAO,CAAC,EAAE;YAC5E,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAqC,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACjF,gBAAgB;aACX,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;aACjE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;aACpD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;QAElD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,MAAM,CAAC,IAAI,CAAC,gCAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;SACxD;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,iBAAiB,CAAC,gBAAoC,EAAE,OAAsB;QACpF,OAAO,OAAO,YAAY,uBAAa,EAAE;YACrC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YACzB,IAAI,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC/B,OAAO,IAAI,CAAC;aACf;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,+BAA+B,CAAC,MAAqB;QAC3D,MAAM,gBAAgB,GAA8B,EAAE,CAAC;QACvD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;QACpD,IAAI,cAAc,EAAE;YAChB,uFAAuF;YACvF,IAAA,4BAAc,EAAC,MAAM,CAAC,KAAK,EAAE,qDAAuC,EAAE,OAAO,CAAC,EAAE;gBAC5E,IAAI,OAAO,YAAY,6BAAmB,EAAE;oBACxC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAA,yCAA2B,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;yBAC7F,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAChD,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAA,yCAA2B,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;yBAC7F,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBACnD;YACL,CAAC,CAAC,CAAC;SACN;QACD,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC;YACjC,CAAC,CAAC,CAAC,uCAA4B,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACzD,CAAC,CAAC,EAAE,CAAC;IACV,CAAC;IAES,YAAY,CAAC,kBAAiC;QACpD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,IAAA,mCAAoB,EAAC,wBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,IAAA,+BAAgB,EAAC,kBAAkB,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,IAAA,6BAAmB,EAAC,kBAAkB,EAAE,mBAAW,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE;YAC3C,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACxF;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,IAAgB,EAAE,gBAA0B;QACzD,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE;gBACxD,sDAAsD;gBACtD,OAAO;aACV;YAED,+DAA+D;YAC/D,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,OAAO,EAAE,EAAE;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,OAAO,IAAI,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE;oBACjD,OAAO;iBACV;aACJ;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC;IAES,sBAAsB,CAAC,MAAqB;QAClD,0EAA0E;QAC1E,MAAM,eAAe,GAAG,IAAA,6BAAmB,EAAC,MAAM,EAAE,6BAAqB,CAAC,CAAC;QAC3E,IAAI,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE;YAC7B,4DAA4D;YAC5D,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;YAC3C,IAAI,IAAA,mBAAW,EAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;gBACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,sEAAwC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;aACpH;YACD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB,CAAC,OAAuB;QACnD,OAAO,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACzH,CAAC;IAES,YAAY,CAAC,KAAiB;QACpC,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACrF,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,MAAM,aAAa,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAW,CAAC,CAAC;YAChF,IAAI,CAAC,aAAa,GAAG;gBACjB,CAAC,EAAE,aAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC,EAAE,aAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,KAAK,EAAE,aAAc,CAAC,MAAM,CAAC,KAAK;gBAClC,MAAM,EAAE,aAAc,CAAC,MAAM,CAAC,MAAM;aACvC,CAAC;SACL;IACL,CAAC;IAES,KAAK;QACX,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAA,mBAAW,EAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACnE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,sEAAwC,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;SACzF;QACD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAA,mCAAoB,EAAC,wBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;QACpC,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC;IAES,oBAAoB,CAAC,cAAqB;QAChD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,OAAO,EAAE,CAAC;SACb;QAED,MAAM,aAAa,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAW,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE;YAC3C,QAAQ,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBACtC,KAAK,4BAAoB,CAAC,OAAO;oBAC7B,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;gBACnE,KAAK,4BAAoB,CAAC,QAAQ;oBAC9B,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;gBACpE,KAAK,4BAAoB,CAAC,UAAU;oBAChC,OAAO,IAAI,CAAC,sBAAsB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;gBACtE,KAAK,4BAAoB,CAAC,WAAW;oBACjC,OAAO,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;aAC1E;SACJ;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,mBAAmB,CAAC,aAAyC,EAAE,cAAqB;QAC1F,OAAO,IAAI,CAAC,qBAAqB,CAC7B,aAAa,EACb,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EACzC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EACzC,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CACjD,CAAC;IACN,CAAC;IAES,oBAAoB,CAAC,aAAyC,EAAE,cAAqB;QAC3F,OAAO,IAAI,CAAC,qBAAqB,CAC7B,aAAa,EACb,aAAa,CAAC,MAAM,CAAC,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EACzC,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CACjD,CAAC;IACN,CAAC;IAES,sBAAsB,CAAC,aAAyC,EAAE,cAAqB;QAC7F,OAAO,IAAI,CAAC,qBAAqB,CAC7B,aAAa,EACb,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EACzC,aAAa,CAAC,MAAM,CAAC,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CACjD,CAAC;IACN,CAAC;IAES,uBAAuB,CAAC,aAAyC,EAAE,cAAqB;QAC9F,OAAO,IAAI,CAAC,qBAAqB,CAC7B,aAAa,EACb,aAAa,CAAC,MAAM,CAAC,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,CAAC,EACtB,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,CAAC,EAC7C,aAAa,CAAC,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CACjD,CAAC;IACN,CAAC;IAES,wBAAwB,CAAC,OAAoC;QACnE,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,CAAC,gCAAqB,CAAC,MAAM,CAAC,CAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM,IAAI,IAAI,CAAC,aAAa,EAAE;YAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,IAAA,uDAAiC,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;aAC1F;YACD,OAAO,CAAC,IAAI,CAAC,0BAAe,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;YAChI,OAAO,OAAO,CAAC;SAClB;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,sBAAsB,CAAC,OAAoC;QACjE,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,CAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,qBAAqB,CAAC,OAAoC,EAAE,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;QACrH,MAAM,WAAW,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClC,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;YACxD,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,IAAA,uDAAiC,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;aACzF;YACD,MAAM,CAAC,IAAI,CAAC,0BAAe,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1F;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,IAAA,uDAAiC,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;aACzF;YACD,MAAM,CAAC,IAAI,CAAC,0BAAe,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1F;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,IAAI,CAAC,QAAe,EAAE,OAAsB,EAAE,MAAe;QACnE,OAAO,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;IACtH,CAAC;IAES,kBAAkB,CAAC,OAAoC,EAAE,WAAkB,EAAE,OAAkB;QACrG,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACxF,CAAC;IAES,WAAW,CAAC,OAAoC,EAAE,IAAe;QACvE,OAAO,IAAA,0BAAW,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IAES,WAAW,CAAC,OAAoC,EAAE,WAAkB;QAC1E,OAAO,IAAA,0BAAW,EAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC3E,CAAC;;AAnUL,oDAoUC;AAnUmB,qCAAgB,GAAG,QAAQ,CAAC"}
|
|
@@ -24,7 +24,7 @@ export declare class EdgeEditTool extends BaseGLSPTool {
|
|
|
24
24
|
static ID: string;
|
|
25
25
|
protected selectionService: SelectionService;
|
|
26
26
|
protected anchorRegistry: AnchorComputerRegistry;
|
|
27
|
-
|
|
27
|
+
readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
28
28
|
readonly snapper?: ISnapper;
|
|
29
29
|
protected feedbackEdgeSourceMovingListener: FeedbackEdgeSourceMovingMouseListener;
|
|
30
30
|
protected feedbackEdgeTargetMovingListener: FeedbackEdgeTargetMovingMouseListener;
|
|
@@ -57,7 +57,7 @@ declare class EdgeEditListener extends DragAwareMouseListener implements Selecti
|
|
|
57
57
|
mouseDown(target: SModelElement, event: MouseEvent): Action[];
|
|
58
58
|
mouseMove(target: SModelElement, event: MouseEvent): Action[];
|
|
59
59
|
mouseUp(target: SModelElement, event: MouseEvent): Action[];
|
|
60
|
-
mouseOver(target: SModelElement,
|
|
60
|
+
mouseOver(target: SModelElement, _event: MouseEvent): Action[];
|
|
61
61
|
selectionChanged(root: Readonly<SModelRoot>, selectedElements: string[]): void;
|
|
62
62
|
reset(): void;
|
|
63
63
|
protected resetData(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-edit-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/edge-edit-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAwD,MAAM,wBAAwB,CAAC;AAEtG,OAAO,EACH,sBAAsB,EAEtB,WAAW,EACX,kBAAkB,EAGlB,QAAQ,EAER,aAAa,EACb,UAAU,EACV,gBAAgB,EAChB,cAAc,EACjB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAG9E,OAAO,EAAoF,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACxI,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGlF,OAAO,EAEH,oCAAoC,EACpC,qCAAqC,EACrC,qCAAqC,EAIxC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBACa,YAAa,SAAQ,YAAY;IAC1C,MAAM,CAAC,EAAE,SAAyB;IAEF,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC;IACzC,
|
|
1
|
+
{"version":3,"file":"edge-edit-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/edge-edit-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -212,13 +212,14 @@ class EdgeEditListener extends drag_aware_mouse_listener_1.DragAwareMouseListene
|
|
|
212
212
|
// reroute actions
|
|
213
213
|
const latestEdge = target.index.getById(this.edge.id);
|
|
214
214
|
if (latestEdge && (0, smodel_util_1.isRoutable)(latestEdge)) {
|
|
215
|
-
|
|
215
|
+
const newRoutingPoints = (0, smodel_util_1.calcElementAndRoutingPoints)(latestEdge, this.tool.edgeRouterRegistry);
|
|
216
|
+
result.push(protocol_1.ChangeRoutingPointsOperation.create([newRoutingPoints]));
|
|
216
217
|
this.routingHandle = undefined;
|
|
217
218
|
}
|
|
218
219
|
}
|
|
219
220
|
return result;
|
|
220
221
|
}
|
|
221
|
-
mouseOver(target,
|
|
222
|
+
mouseOver(target, _event) {
|
|
222
223
|
if (this.edge && this.isReconnecting()) {
|
|
223
224
|
const currentTarget = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isConnectable);
|
|
224
225
|
if (!this.newConnectable || currentTarget !== this.newConnectable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-edit-tool.js","sourceRoot":"","sources":["../../../src/features/tools/edge-edit-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsG;AACtG,yCAAyD;AACzD,qCAaiB;AACjB,oFAA8E;AAC9E,4CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"edge-edit-tool.js","sourceRoot":"","sources":["../../../src/features/tools/edge-edit-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
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, 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
|
|
@@ -127,11 +127,41 @@ export declare type BoundsAwareModelElement = SModelElement & BoundsAware;
|
|
|
127
127
|
export declare function toElementAndBounds(element: BoundsAwareModelElement): ElementAndBounds;
|
|
128
128
|
/**
|
|
129
129
|
* Helper function to translate a given {@link SRoutableElement} into its corresponding
|
|
130
|
-
* {@ElementAndRoutingPoints
|
|
130
|
+
* {@link ElementAndRoutingPoints} representation.
|
|
131
131
|
* @param element The element to translate.
|
|
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[];
|
|
139
|
+
/**
|
|
140
|
+
* Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
|
|
141
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
|
|
142
|
+
* points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
143
|
+
* @param element The element to translate.
|
|
144
|
+
* @param routerRegistry the edge router registry.
|
|
145
|
+
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
146
|
+
*/
|
|
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;
|
|
135
165
|
/**
|
|
136
166
|
* Checks if the model is compatible with the passed type string.
|
|
137
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.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
|
*
|
|
@@ -185,7 +185,7 @@ function toElementAndBounds(element) {
|
|
|
185
185
|
exports.toElementAndBounds = toElementAndBounds;
|
|
186
186
|
/**
|
|
187
187
|
* Helper function to translate a given {@link SRoutableElement} into its corresponding
|
|
188
|
-
* {@ElementAndRoutingPoints
|
|
188
|
+
* {@link ElementAndRoutingPoints} representation.
|
|
189
189
|
* @param element The element to translate.
|
|
190
190
|
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
191
191
|
*/
|
|
@@ -196,6 +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'];
|
|
203
|
+
/**
|
|
204
|
+
* Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
|
|
205
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
|
|
206
|
+
* points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
207
|
+
* @param element The element to translate.
|
|
208
|
+
* @param routerRegistry the edge router registry.
|
|
209
|
+
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
210
|
+
*/
|
|
211
|
+
function calcElementAndRoutingPoints(element, routerRegistry) {
|
|
212
|
+
const newRoutingPoints = routerRegistry ? calcRoute(element, routerRegistry, exports.ROUTING_POINT_KINDS) : element.routingPoints;
|
|
213
|
+
return { elementId: element.id, newRoutingPoints };
|
|
214
|
+
}
|
|
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;
|
|
199
247
|
/**
|
|
200
248
|
* Checks if the model is compatible with the passed type string.
|
|
201
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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"}
|
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.b15d96b.196+b15d96b",
|
|
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,7 +34,7 @@
|
|
|
34
34
|
"css"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@eclipse-glsp/protocol": "1.1.0-next.
|
|
37
|
+
"@eclipse-glsp/protocol": "1.1.0-next.b15d96b.196+b15d96b",
|
|
38
38
|
"autocompleter": "5.1.0",
|
|
39
39
|
"sprotty": "0.13.0-next.1c4343c.328"
|
|
40
40
|
},
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
},
|
|
59
59
|
"main": "lib/index",
|
|
60
60
|
"types": "lib/index",
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "b15d96ba4be5dc6f7befd20561d6ab5e11fec7df"
|
|
62
62
|
}
|
|
@@ -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
|
+
}
|
|
@@ -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 {
|
|
16
|
+
import {
|
|
17
17
|
Action,
|
|
18
18
|
Bounds,
|
|
19
19
|
ChangeBoundsOperation,
|
|
@@ -44,10 +44,10 @@ import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
|
|
|
44
44
|
import { TYPES } from '../../base/types';
|
|
45
45
|
import { isValidMove, isValidSize } from '../../utils/layout-utils';
|
|
46
46
|
import {
|
|
47
|
+
calcElementAndRoutingPoints,
|
|
47
48
|
forEachElement,
|
|
48
49
|
isNonRoutableSelectedMovableBoundsAware,
|
|
49
|
-
toElementAndBounds
|
|
50
|
-
toElementAndRoutingPoints
|
|
50
|
+
toElementAndBounds
|
|
51
51
|
} from '../../utils/smodel-util';
|
|
52
52
|
import { isBoundsAwareMoveable, isResizable, Resizable, ResizeHandleLocation, SResizeHandle } from '../change-bounds/model';
|
|
53
53
|
import {
|
|
@@ -237,19 +237,22 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
|
|
|
237
237
|
}
|
|
238
238
|
|
|
239
239
|
protected handleMoveRoutingPointsOnServer(target: SModelElement): Operation[] {
|
|
240
|
-
const result: Operation[] = [];
|
|
241
240
|
const newRoutingPoints: ElementAndRoutingPoints[] = [];
|
|
242
|
-
|
|
241
|
+
const routerRegistry = this.tool.edgeRouterRegistry;
|
|
242
|
+
if (routerRegistry) {
|
|
243
243
|
// If client routing is enabled -> delegate routingpoints of connected edges to server
|
|
244
|
-
|
|
245
|
-
element
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
244
|
+
forEachElement(target.index, isNonRoutableSelectedMovableBoundsAware, element => {
|
|
245
|
+
if (element instanceof SConnectableElement) {
|
|
246
|
+
element.incomingEdges.map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
|
|
247
|
+
.forEach(ear => newRoutingPoints.push(ear));
|
|
248
|
+
element.outgoingEdges.map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
|
|
249
|
+
.forEach(ear => newRoutingPoints.push(ear));
|
|
250
|
+
}
|
|
251
|
+
});
|
|
251
252
|
}
|
|
252
|
-
return
|
|
253
|
+
return newRoutingPoints.length > 0
|
|
254
|
+
? [ChangeRoutingPointsOperation.create(newRoutingPoints)]
|
|
255
|
+
: [];
|
|
253
256
|
}
|
|
254
257
|
|
|
255
258
|
protected handleResize(activeResizeHandle: SResizeHandle): Action[] {
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
} from 'sprotty';
|
|
32
32
|
import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
|
|
33
33
|
import { TYPES } from '../../base/types';
|
|
34
|
-
import { isRoutable, isRoutingHandle } from '../../utils/smodel-util';
|
|
34
|
+
import { calcElementAndRoutingPoints, isRoutable, isRoutingHandle } from '../../utils/smodel-util';
|
|
35
35
|
import { isReconnectable, isReconnectHandle, isSourceRoutingHandle, isTargetRoutingHandle, SReconnectHandle } from '../reconnect/model';
|
|
36
36
|
import { SelectionListener, SelectionService } from '../select/selection-service';
|
|
37
37
|
import { DrawFeedbackEdgeAction, feedbackEdgeId, RemoveFeedbackEdgeAction } from '../tool-feedback/creation-tool-feedback';
|
|
@@ -53,7 +53,7 @@ export class EdgeEditTool extends BaseGLSPTool {
|
|
|
53
53
|
|
|
54
54
|
@inject(TYPES.SelectionService) protected selectionService: SelectionService;
|
|
55
55
|
@inject(AnchorComputerRegistry) protected anchorRegistry: AnchorComputerRegistry;
|
|
56
|
-
@inject(EdgeRouterRegistry) @optional()
|
|
56
|
+
@inject(EdgeRouterRegistry) @optional() readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
57
57
|
@inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
|
|
58
58
|
|
|
59
59
|
protected feedbackEdgeSourceMovingListener: FeedbackEdgeSourceMovingMouseListener;
|
|
@@ -237,16 +237,15 @@ class EdgeEditListener extends DragAwareMouseListener implements SelectionListen
|
|
|
237
237
|
// reroute actions
|
|
238
238
|
const latestEdge = target.index.getById(this.edge.id);
|
|
239
239
|
if (latestEdge && isRoutable(latestEdge)) {
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
);
|
|
240
|
+
const newRoutingPoints = calcElementAndRoutingPoints(latestEdge, this.tool.edgeRouterRegistry);
|
|
241
|
+
result.push(ChangeRoutingPointsOperation.create([newRoutingPoints]));
|
|
243
242
|
this.routingHandle = undefined;
|
|
244
243
|
}
|
|
245
244
|
}
|
|
246
245
|
return result;
|
|
247
246
|
}
|
|
248
247
|
|
|
249
|
-
override mouseOver(target: SModelElement,
|
|
248
|
+
override mouseOver(target: SModelElement, _event: MouseEvent): Action[] {
|
|
250
249
|
if (this.edge && this.isReconnecting()) {
|
|
251
250
|
const currentTarget = findParentByFeature(target, isConnectable);
|
|
252
251
|
if (!this.newConnectable || currentTarget !== this.newConnectable) {
|
package/src/utils/smodel-util.ts
CHANGED
|
@@ -13,14 +13,18 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
distinctAdd, ElementAndBounds, ElementAndRoutingPoints, Point, remove, SModelElementSchema,
|
|
18
|
+
TypeGuard
|
|
19
|
+
} from '@eclipse-glsp/protocol';
|
|
17
20
|
import {
|
|
18
21
|
BoundsAware,
|
|
22
|
+
EdgeRouterRegistry,
|
|
19
23
|
isBoundsAware,
|
|
20
24
|
isMoveable,
|
|
21
25
|
isSelectable,
|
|
22
|
-
isSelected,
|
|
23
|
-
|
|
26
|
+
isSelected, ModelIndexImpl,
|
|
27
|
+
RoutedPoint,
|
|
24
28
|
Selectable,
|
|
25
29
|
SModelElement,
|
|
26
30
|
SRoutableElement,
|
|
@@ -214,7 +218,7 @@ export function toElementAndBounds(element: BoundsAwareModelElement): ElementAnd
|
|
|
214
218
|
|
|
215
219
|
/**
|
|
216
220
|
* Helper function to translate a given {@link SRoutableElement} into its corresponding
|
|
217
|
-
* {@ElementAndRoutingPoints
|
|
221
|
+
* {@link ElementAndRoutingPoints} representation.
|
|
218
222
|
* @param element The element to translate.
|
|
219
223
|
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
220
224
|
*/
|
|
@@ -225,6 +229,57 @@ export function toElementAndRoutingPoints(element: SRoutableElement): ElementAnd
|
|
|
225
229
|
};
|
|
226
230
|
}
|
|
227
231
|
|
|
232
|
+
/** Pure routing point data kinds. */
|
|
233
|
+
export const ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
|
|
234
|
+
|
|
235
|
+
/** Pure route data kinds. */
|
|
236
|
+
export const ROUTE_KINDS = [...ROUTING_POINT_KINDS, 'source', 'target'];
|
|
237
|
+
|
|
238
|
+
/**
|
|
239
|
+
* Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
|
|
240
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
|
|
241
|
+
* points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
242
|
+
* @param element The element to translate.
|
|
243
|
+
* @param routerRegistry the edge router registry.
|
|
244
|
+
* @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
|
|
245
|
+
*/
|
|
246
|
+
export function calcElementAndRoutingPoints(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
|
|
247
|
+
const newRoutingPoints = routerRegistry ? calcRoute(element, routerRegistry, ROUTING_POINT_KINDS) : element.routingPoints;
|
|
248
|
+
return { elementId: element.id, newRoutingPoints };
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
/**
|
|
252
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
253
|
+
* If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the points
|
|
254
|
+
* from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
|
|
255
|
+
* @param element The element to translate.
|
|
256
|
+
* @param routerRegistry the edge router registry.
|
|
257
|
+
* @returns The corresponding route for the given element.
|
|
258
|
+
*/
|
|
259
|
+
export function calcElementAndRoute(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
|
|
260
|
+
let route: Point[] | undefined = routerRegistry ? calcRoute(element, routerRegistry, ROUTE_KINDS) : undefined;
|
|
261
|
+
if (!route) {
|
|
262
|
+
// add source and target to the routing points
|
|
263
|
+
route = [...element.routingPoints];
|
|
264
|
+
route.splice(0, 0, element.source?.position || Point.ORIGIN);
|
|
265
|
+
route.push(element.target?.position || Point.ORIGIN);
|
|
266
|
+
}
|
|
267
|
+
return { elementId: element.id, newRoutingPoints: route };
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
/**
|
|
271
|
+
* Helper function to calculate the route for a given {@link SRoutableElement}.
|
|
272
|
+
* @param element The element to translate.
|
|
273
|
+
* @param routerRegistry the edge router registry.
|
|
274
|
+
* @param pointKinds the routing point kinds that should be considered.
|
|
275
|
+
* @returns The corresponding route for the given element.
|
|
276
|
+
*/
|
|
277
|
+
export function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined {
|
|
278
|
+
return routerRegistry?.get(element.routerKind).route(element)
|
|
279
|
+
.filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y))
|
|
280
|
+
.filter(point => !pointKinds || pointKinds.includes(point.kind));
|
|
281
|
+
}
|
|
282
|
+
|
|
228
283
|
/**
|
|
229
284
|
* Checks if the model is compatible with the passed type string.
|
|
230
285
|
* (either has the same type or a subtype of this type)
|
|
@@ -247,3 +302,4 @@ export function getElementTypeId(input: SModelElement | SModelElementSchema | st
|
|
|
247
302
|
return (input as any)['type'] as string;
|
|
248
303
|
}
|
|
249
304
|
}
|
|
305
|
+
|