@eclipse-glsp/client 2.2.0-next.333 → 2.2.0-next.335
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/css/change-bounds.css +36 -2
- package/css/glsp-sprotty.css +18 -2
- package/css/helper-lines.css +3 -3
- package/lib/base/default.module.d.ts.map +1 -1
- package/lib/base/default.module.js +3 -0
- package/lib/base/default.module.js.map +1 -1
- package/lib/base/feedback/css-feedback.d.ts +7 -2
- package/lib/base/feedback/css-feedback.d.ts.map +1 -1
- package/lib/base/feedback/css-feedback.js +10 -2
- package/lib/base/feedback/css-feedback.js.map +1 -1
- package/lib/base/feedback/feeback-emitter.d.ts +2 -2
- package/lib/base/feedback/feeback-emitter.d.ts.map +1 -1
- package/lib/base/feedback/feeback-emitter.js +5 -2
- package/lib/base/feedback/feeback-emitter.js.map +1 -1
- package/lib/base/index.d.ts +1 -0
- package/lib/base/index.d.ts.map +1 -1
- package/lib/base/index.js +1 -0
- package/lib/base/index.js.map +1 -1
- package/lib/base/mouse-position-tracker.d.ts +22 -0
- package/lib/base/mouse-position-tracker.d.ts.map +1 -0
- package/lib/base/mouse-position-tracker.js +40 -0
- package/lib/base/mouse-position-tracker.js.map +1 -0
- package/lib/features/accessibility/view-key-tools/movement-key-tool.d.ts +2 -0
- package/lib/features/accessibility/view-key-tools/movement-key-tool.d.ts.map +1 -1
- package/lib/features/accessibility/view-key-tools/movement-key-tool.js +15 -7
- package/lib/features/accessibility/view-key-tools/movement-key-tool.js.map +1 -1
- package/lib/features/bounds/bounds-module.d.ts.map +1 -1
- package/lib/features/bounds/bounds-module.js +2 -0
- package/lib/features/bounds/bounds-module.js.map +1 -1
- package/lib/features/bounds/freeform-layout.d.ts +17 -1
- package/lib/features/bounds/freeform-layout.d.ts.map +1 -1
- package/lib/features/bounds/freeform-layout.js +14 -5
- package/lib/features/bounds/freeform-layout.js.map +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts +5 -4
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.js +51 -39
- package/lib/features/bounds/glsp-hidden-bounds-updater.js.map +1 -1
- package/lib/features/bounds/hbox-layout.d.ts +18 -2
- package/lib/features/bounds/hbox-layout.d.ts.map +1 -1
- package/lib/features/bounds/hbox-layout.js +14 -5
- package/lib/features/bounds/hbox-layout.js.map +1 -1
- package/lib/features/bounds/index.d.ts +1 -0
- package/lib/features/bounds/index.d.ts.map +1 -1
- package/lib/features/bounds/index.js +1 -0
- package/lib/features/bounds/index.js.map +1 -1
- package/lib/features/bounds/layout-data.d.ts +27 -0
- package/lib/features/bounds/layout-data.d.ts.map +1 -0
- package/lib/features/bounds/layout-data.js +48 -0
- package/lib/features/bounds/layout-data.js.map +1 -0
- package/lib/features/bounds/local-bounds.d.ts +3 -1
- package/lib/features/bounds/local-bounds.d.ts.map +1 -1
- package/lib/features/bounds/local-bounds.js +14 -0
- package/lib/features/bounds/local-bounds.js.map +1 -1
- package/lib/features/bounds/vbox-layout.d.ts +18 -2
- package/lib/features/bounds/vbox-layout.d.ts.map +1 -1
- package/lib/features/bounds/vbox-layout.js +14 -5
- package/lib/features/bounds/vbox-layout.js.map +1 -1
- package/lib/features/change-bounds/index.d.ts +1 -0
- package/lib/features/change-bounds/index.d.ts.map +1 -1
- package/lib/features/change-bounds/index.js +1 -0
- package/lib/features/change-bounds/index.js.map +1 -1
- package/lib/features/change-bounds/model.d.ts +19 -3
- package/lib/features/change-bounds/model.d.ts.map +1 -1
- package/lib/features/change-bounds/model.js +92 -4
- package/lib/features/change-bounds/model.js.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.d.ts +1 -0
- package/lib/features/change-bounds/movement-restrictor.d.ts.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.js +7 -1
- package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
- package/lib/features/change-bounds/point-position-updater.d.ts +3 -0
- package/lib/features/change-bounds/point-position-updater.d.ts.map +1 -1
- package/lib/features/change-bounds/point-position-updater.js +7 -2
- package/lib/features/change-bounds/point-position-updater.js.map +1 -1
- package/lib/features/change-bounds/position-snapper.d.ts +4 -0
- package/lib/features/change-bounds/position-snapper.d.ts.map +1 -1
- package/lib/features/change-bounds/position-snapper.js +4 -0
- package/lib/features/change-bounds/position-snapper.js.map +1 -1
- package/lib/features/change-bounds/snap.d.ts +6 -0
- package/lib/features/change-bounds/snap.d.ts.map +1 -1
- package/lib/features/change-bounds/snap.js +6 -0
- package/lib/features/change-bounds/snap.js.map +1 -1
- package/lib/features/change-bounds/tracker.d.ts +32 -0
- package/lib/features/change-bounds/tracker.d.ts.map +1 -0
- package/lib/features/change-bounds/tracker.js +60 -0
- package/lib/features/change-bounds/tracker.js.map +1 -0
- package/lib/features/debug/debug-bounds-decorator.d.ts +4 -1
- package/lib/features/debug/debug-bounds-decorator.d.ts.map +1 -1
- package/lib/features/debug/debug-bounds-decorator.js +14 -7
- package/lib/features/debug/debug-bounds-decorator.js.map +1 -1
- package/lib/features/element-template/mouse-tracking-element-position-listener.d.ts +9 -22
- package/lib/features/element-template/mouse-tracking-element-position-listener.d.ts.map +1 -1
- package/lib/features/element-template/mouse-tracking-element-position-listener.js +30 -46
- package/lib/features/element-template/mouse-tracking-element-position-listener.js.map +1 -1
- package/lib/features/helper-lines/helper-line-feedback.d.ts +2 -2
- package/lib/features/helper-lines/helper-line-feedback.d.ts.map +1 -1
- package/lib/features/helper-lines/helper-line-feedback.js +1 -1
- package/lib/features/helper-lines/helper-line-feedback.js.map +1 -1
- package/lib/features/helper-lines/helper-line-manager-default.d.ts +2 -1
- package/lib/features/helper-lines/helper-line-manager-default.d.ts.map +1 -1
- package/lib/features/helper-lines/helper-line-manager-default.js +23 -0
- package/lib/features/helper-lines/helper-line-manager-default.js.map +1 -1
- package/lib/features/helper-lines/helper-line-manager.d.ts +10 -2
- package/lib/features/helper-lines/helper-line-manager.d.ts.map +1 -1
- package/lib/features/routing/edge-router.d.ts +4 -0
- package/lib/features/routing/edge-router.d.ts.map +1 -1
- package/lib/features/routing/edge-router.js +37 -0
- package/lib/features/routing/edge-router.js.map +1 -1
- package/lib/features/select/select-mouse-listener.d.ts +3 -0
- package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
- package/lib/features/select/select-mouse-listener.js +30 -2
- package/lib/features/select/select-mouse-listener.js.map +1 -1
- package/lib/features/tools/base-tools.d.ts +24 -15
- package/lib/features/tools/base-tools.d.ts.map +1 -1
- package/lib/features/tools/base-tools.js +0 -18
- package/lib/features/tools/base-tools.js.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-manager.d.ts +42 -0
- package/lib/features/tools/change-bounds/change-bounds-manager.d.ts.map +1 -0
- package/lib/features/tools/change-bounds/change-bounds-manager.js +136 -0
- package/lib/features/tools/change-bounds/change-bounds-manager.js.map +1 -0
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.d.ts +6 -0
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js +14 -8
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-module.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-module.js +2 -0
- package/lib/features/tools/change-bounds/change-bounds-tool-module.js.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.d.ts +6 -15
- package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.js +24 -72
- package/lib/features/tools/change-bounds/change-bounds-tool-move-feedback.js.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool.d.ts +14 -25
- package/lib/features/tools/change-bounds/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool.js +63 -109
- package/lib/features/tools/change-bounds/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tracker.d.ts +136 -0
- package/lib/features/tools/change-bounds/change-bounds-tracker.d.ts.map +1 -0
- package/lib/features/tools/change-bounds/change-bounds-tracker.js +301 -0
- package/lib/features/tools/change-bounds/change-bounds-tracker.js.map +1 -0
- package/lib/features/tools/change-bounds/index.d.ts +2 -0
- package/lib/features/tools/change-bounds/index.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/index.js +2 -0
- package/lib/features/tools/change-bounds/index.js.map +1 -1
- package/lib/features/tools/change-bounds/view.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/view.js +1 -16
- package/lib/features/tools/change-bounds/view.js.map +1 -1
- package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts +7 -9
- package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tools/edge-edit/edge-edit-tool-feedback.js +27 -47
- package/lib/features/tools/edge-edit/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tools/edge-edit/edge-edit-tool.d.ts +2 -2
- package/lib/features/tools/edge-edit/edge-edit-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-edit/edge-edit-tool.js +5 -5
- package/lib/features/tools/edge-edit/edge-edit-tool.js.map +1 -1
- package/lib/features/tools/marquee-selection/marquee-mouse-tool.d.ts +1 -0
- package/lib/features/tools/marquee-selection/marquee-mouse-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-selection/marquee-mouse-tool.js +3 -0
- package/lib/features/tools/marquee-selection/marquee-mouse-tool.js.map +1 -1
- package/lib/features/tools/node-creation/node-creation-tool.d.ts +2 -4
- package/lib/features/tools/node-creation/node-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/node-creation/node-creation-tool.js +8 -11
- package/lib/features/tools/node-creation/node-creation-tool.js.map +1 -1
- package/lib/utils/gmodel-util.d.ts +20 -1
- package/lib/utils/gmodel-util.d.ts.map +1 -1
- package/lib/utils/gmodel-util.js +38 -16
- package/lib/utils/gmodel-util.js.map +1 -1
- package/lib/utils/layout-utils.d.ts +1 -0
- package/lib/utils/layout-utils.d.ts.map +1 -1
- package/lib/utils/layout-utils.js +5 -1
- package/lib/utils/layout-utils.js.map +1 -1
- package/package.json +3 -3
- package/src/base/default.module.ts +4 -1
- package/src/base/feedback/css-feedback.ts +10 -2
- package/src/base/feedback/feeback-emitter.ts +6 -3
- package/src/base/index.ts +1 -0
- package/src/base/mouse-position-tracker.ts +25 -0
- package/src/features/accessibility/view-key-tools/movement-key-tool.ts +12 -7
- package/src/features/bounds/bounds-module.ts +2 -0
- package/src/features/bounds/freeform-layout.ts +16 -6
- package/src/features/bounds/glsp-hidden-bounds-updater.ts +63 -46
- package/src/features/bounds/hbox-layout.ts +18 -9
- package/src/features/bounds/index.ts +1 -0
- package/src/features/bounds/layout-data.ts +48 -0
- package/src/features/bounds/local-bounds.ts +20 -4
- package/src/features/bounds/vbox-layout.ts +18 -10
- package/src/features/change-bounds/index.ts +1 -0
- package/src/features/change-bounds/model.ts +104 -4
- package/src/features/change-bounds/movement-restrictor.ts +10 -0
- package/src/features/change-bounds/point-position-updater.spec.ts +2 -0
- package/src/features/change-bounds/point-position-updater.ts +6 -0
- package/src/features/change-bounds/position-snapper.ts +4 -0
- package/src/features/change-bounds/snap.ts +6 -0
- package/src/features/change-bounds/tracker.ts +63 -0
- package/src/features/debug/debug-bounds-decorator.tsx +17 -7
- package/src/features/element-template/mouse-tracking-element-position-listener.ts +49 -71
- package/src/features/helper-lines/helper-line-feedback.ts +2 -1
- package/src/features/helper-lines/helper-line-manager-default.ts +37 -2
- package/src/features/helper-lines/helper-line-manager.ts +11 -2
- package/src/features/routing/edge-router.ts +42 -0
- package/src/features/select/select-mouse-listener.ts +15 -1
- package/src/features/tools/base-tools.ts +31 -19
- package/src/features/tools/change-bounds/change-bounds-manager.ts +145 -0
- package/src/features/tools/change-bounds/change-bounds-tool-feedback.ts +17 -6
- package/src/features/tools/change-bounds/change-bounds-tool-module.ts +2 -0
- package/src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts +31 -81
- package/src/features/tools/change-bounds/change-bounds-tool.ts +89 -148
- package/src/features/tools/change-bounds/change-bounds-tracker.ts +455 -0
- package/src/features/tools/change-bounds/index.ts +2 -0
- package/src/features/tools/change-bounds/view.tsx +2 -14
- package/src/features/tools/edge-edit/edge-edit-tool-feedback.ts +34 -52
- package/src/features/tools/edge-edit/edge-edit-tool.ts +4 -3
- package/src/features/tools/marquee-selection/marquee-mouse-tool.ts +4 -0
- package/src/features/tools/node-creation/node-creation-tool.ts +7 -7
- package/src/utils/gmodel-util.ts +41 -5
- package/src/utils/layout-utils.ts +4 -0
|
@@ -0,0 +1,301 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/********************************************************************************
|
|
3
|
+
* Copyright (c) 2024 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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.MoveableRoutingHandle = exports.MoveableResizeHandle = exports.ChangeBoundsTracker = exports.DEFAULT_RESIZE_OPTIONS = exports.TrackedMove = exports.DEFAULT_MOVE_OPTIONS = void 0;
|
|
19
|
+
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
20
|
+
const utils_1 = require("../../../utils");
|
|
21
|
+
const change_bounds_1 = require("../../change-bounds");
|
|
22
|
+
exports.DEFAULT_MOVE_OPTIONS = {
|
|
23
|
+
snap: true,
|
|
24
|
+
restrict: true,
|
|
25
|
+
validate: true,
|
|
26
|
+
skipStatic: true,
|
|
27
|
+
skipInvalid: false
|
|
28
|
+
};
|
|
29
|
+
var TrackedMove;
|
|
30
|
+
(function (TrackedMove) {
|
|
31
|
+
function is(obj) {
|
|
32
|
+
return sprotty_1.Movement.is(obj) && (0, sprotty_1.hasBooleanProp)(obj, 'valid');
|
|
33
|
+
}
|
|
34
|
+
TrackedMove.is = is;
|
|
35
|
+
})(TrackedMove || (exports.TrackedMove = TrackedMove = {}));
|
|
36
|
+
exports.DEFAULT_RESIZE_OPTIONS = {
|
|
37
|
+
snap: true,
|
|
38
|
+
restrict: true,
|
|
39
|
+
validate: true,
|
|
40
|
+
symmetric: true,
|
|
41
|
+
constrainResize: true,
|
|
42
|
+
skipStatic: true,
|
|
43
|
+
skipInvalidSize: false,
|
|
44
|
+
skipInvalidMove: false
|
|
45
|
+
};
|
|
46
|
+
class ChangeBoundsTracker {
|
|
47
|
+
constructor(manager) {
|
|
48
|
+
this.manager = manager;
|
|
49
|
+
this.diagramMovement = new change_bounds_1.DiagramMovementCalculator(manager.positionTracker);
|
|
50
|
+
}
|
|
51
|
+
startTracking() {
|
|
52
|
+
this.diagramMovement.init();
|
|
53
|
+
return this;
|
|
54
|
+
}
|
|
55
|
+
updateTrackingPosition(param) {
|
|
56
|
+
const update = TrackedMove.is(param) ? sprotty_1.Vector.max(...param.elementMoves.map(move => move.moveVector)) : param;
|
|
57
|
+
this.diagramMovement.updatePosition(update);
|
|
58
|
+
}
|
|
59
|
+
isTracking() {
|
|
60
|
+
return this.diagramMovement.hasPosition;
|
|
61
|
+
}
|
|
62
|
+
stopTracking() {
|
|
63
|
+
this.diagramMovement.dispose();
|
|
64
|
+
return this;
|
|
65
|
+
}
|
|
66
|
+
//
|
|
67
|
+
// MOVE
|
|
68
|
+
//
|
|
69
|
+
moveElements(elements, opts) {
|
|
70
|
+
const options = this.resolveMoveOptions(opts);
|
|
71
|
+
const update = this.calculateDiagramMovement();
|
|
72
|
+
const move = Object.assign(Object.assign({}, update), { elementMoves: [], valid: true, options });
|
|
73
|
+
if (sprotty_1.Vector.isZero(update.vector)) {
|
|
74
|
+
// no movement detected so elements won't be moved, exit early
|
|
75
|
+
return move;
|
|
76
|
+
}
|
|
77
|
+
// calculate move for each element
|
|
78
|
+
const elementsToMove = this.getMoveableElements(elements, options);
|
|
79
|
+
for (const element of elementsToMove) {
|
|
80
|
+
const elementMove = this.calculateElementMove(element, update.vector, options);
|
|
81
|
+
if (!this.skipElementMove(elementMove, options)) {
|
|
82
|
+
move.elementMoves.push(elementMove);
|
|
83
|
+
move.valid && (move.valid = elementMove.valid);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return move;
|
|
87
|
+
}
|
|
88
|
+
resolveMoveOptions(opts) {
|
|
89
|
+
var _a, _b;
|
|
90
|
+
return Object.assign(Object.assign(Object.assign({}, exports.DEFAULT_MOVE_OPTIONS), opts), { snap: this.manager.usePositionSnap((_a = opts === null || opts === void 0 ? void 0 : opts.snap) !== null && _a !== void 0 ? _a : exports.DEFAULT_MOVE_OPTIONS.snap), restrict: this.manager.useMovementRestriction((_b = opts === null || opts === void 0 ? void 0 : opts.restrict) !== null && _b !== void 0 ? _b : exports.DEFAULT_MOVE_OPTIONS.restrict) });
|
|
91
|
+
}
|
|
92
|
+
calculateDiagramMovement() {
|
|
93
|
+
return this.diagramMovement.calculateMoveToCurrent();
|
|
94
|
+
}
|
|
95
|
+
getMoveableElements(elements, options) {
|
|
96
|
+
var _a;
|
|
97
|
+
return Array.isArray(elements) ? elements : (0, utils_1.getElements)(elements.ctx.index, elements.elementIDs, (_a = elements.guard) !== null && _a !== void 0 ? _a : sprotty_1.isMoveable);
|
|
98
|
+
}
|
|
99
|
+
skipElementMove(elementMove, options) {
|
|
100
|
+
return (options.skipInvalid && !elementMove.valid) || (options.skipStatic && sprotty_1.Vector.isZero(elementMove.moveVector));
|
|
101
|
+
}
|
|
102
|
+
calculateElementMove(element, vector, options) {
|
|
103
|
+
const fromPosition = element.position;
|
|
104
|
+
const toPosition = sprotty_1.Point.add(fromPosition, vector);
|
|
105
|
+
const move = { element, fromPosition, toPosition, valid: true, moveVector: vector, sourceVector: vector };
|
|
106
|
+
if (options.snap) {
|
|
107
|
+
move.toPosition = this.snapPosition(move, options);
|
|
108
|
+
}
|
|
109
|
+
if (options.restrict) {
|
|
110
|
+
move.toPosition = this.restrictMovement(move, options);
|
|
111
|
+
}
|
|
112
|
+
if (options.validate) {
|
|
113
|
+
move.valid = this.validateElementMove(move, options);
|
|
114
|
+
}
|
|
115
|
+
move.moveVector = sprotty_1.Point.vector(move.fromPosition, move.toPosition);
|
|
116
|
+
return move;
|
|
117
|
+
}
|
|
118
|
+
snapPosition(elementMove, opts) {
|
|
119
|
+
return this.manager.snapPosition(elementMove.element, elementMove.toPosition);
|
|
120
|
+
}
|
|
121
|
+
restrictMovement(elementMove, opts) {
|
|
122
|
+
const movement = sprotty_1.Point.move(elementMove.fromPosition, elementMove.toPosition);
|
|
123
|
+
return this.manager.restrictMovement(elementMove.element, movement).to;
|
|
124
|
+
}
|
|
125
|
+
validateElementMove(elementMove, opts) {
|
|
126
|
+
return this.manager.hasValidPosition(elementMove.element, elementMove.toPosition);
|
|
127
|
+
}
|
|
128
|
+
//
|
|
129
|
+
// RESIZE
|
|
130
|
+
//
|
|
131
|
+
resizeElements(handle, opts) {
|
|
132
|
+
const options = this.resolveResizeOptions(opts);
|
|
133
|
+
const update = this.calculateDiagramMovement();
|
|
134
|
+
const handleMove = this.calculateHandleMove(new MoveableResizeHandle(handle), update.vector, options);
|
|
135
|
+
const resize = Object.assign(Object.assign({}, update), { valid: { move: true, size: true }, options, handleMove, elementResizes: [] });
|
|
136
|
+
if (sprotty_1.Vector.isZero(handleMove.moveVector)) {
|
|
137
|
+
// no movement detected so elements won't be moved, exit early
|
|
138
|
+
return resize;
|
|
139
|
+
}
|
|
140
|
+
// calculate resize for each element (typically only one element is resized at a time but customizations are possible)
|
|
141
|
+
const elementsToResize = this.getResizeableElements(handle, options);
|
|
142
|
+
for (const element of elementsToResize) {
|
|
143
|
+
const elementResize = this.calculateElementResize(element, handleMove, options);
|
|
144
|
+
if (!this.skipElementResize(elementResize, options)) {
|
|
145
|
+
resize.elementResizes.push(elementResize);
|
|
146
|
+
resize.valid.move = resize.valid.move && elementResize.valid.move;
|
|
147
|
+
resize.valid.size = resize.valid.size && elementResize.valid.size;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return resize;
|
|
151
|
+
}
|
|
152
|
+
resolveResizeOptions(opts) {
|
|
153
|
+
var _a, _b, _c;
|
|
154
|
+
return Object.assign(Object.assign(Object.assign({}, exports.DEFAULT_RESIZE_OPTIONS), opts), { snap: this.manager.usePositionSnap((_a = opts === null || opts === void 0 ? void 0 : opts.snap) !== null && _a !== void 0 ? _a : exports.DEFAULT_RESIZE_OPTIONS.snap), restrict: this.manager.useMovementRestriction((_b = opts === null || opts === void 0 ? void 0 : opts.restrict) !== null && _b !== void 0 ? _b : exports.DEFAULT_RESIZE_OPTIONS.restrict), symmetric: this.manager.useSymmetricResize((_c = opts === null || opts === void 0 ? void 0 : opts.symmetric) !== null && _c !== void 0 ? _c : exports.DEFAULT_RESIZE_OPTIONS.symmetric) });
|
|
155
|
+
}
|
|
156
|
+
calculateHandleMove(handle, diagramMovement, opts) {
|
|
157
|
+
const moveOptions = this.resolveMoveOptions(Object.assign(Object.assign({}, opts), { validate: false }));
|
|
158
|
+
return this.calculateElementMove(handle, diagramMovement, moveOptions);
|
|
159
|
+
}
|
|
160
|
+
getResizeableElements(handle, options) {
|
|
161
|
+
return [handle.parent];
|
|
162
|
+
}
|
|
163
|
+
skipElementResize(elementResize, options) {
|
|
164
|
+
return ((options.skipInvalidMove && !elementResize.valid.move) ||
|
|
165
|
+
(options.skipInvalidSize && !elementResize.valid.size) ||
|
|
166
|
+
(options.skipStatic && sprotty_1.Dimension.equals(elementResize.fromBounds, elementResize.toBounds)));
|
|
167
|
+
}
|
|
168
|
+
calculateElementResize(element, handleMove, options) {
|
|
169
|
+
const fromBounds = element.bounds;
|
|
170
|
+
const toBounds = this.calculateElementBounds(element, handleMove, options);
|
|
171
|
+
const resize = { element, fromBounds, toBounds, valid: { size: true, move: true } };
|
|
172
|
+
if (options.validate) {
|
|
173
|
+
resize.valid.size = this.manager.hasValidSize(resize.element, resize.toBounds);
|
|
174
|
+
resize.valid.move = handleMove.valid && this.manager.hasValidPosition(resize.element, resize.toBounds);
|
|
175
|
+
}
|
|
176
|
+
return resize;
|
|
177
|
+
}
|
|
178
|
+
calculateElementBounds(element, handleMove, options) {
|
|
179
|
+
let toBounds = this.calculateBounds(element.bounds, handleMove);
|
|
180
|
+
if (options.symmetric) {
|
|
181
|
+
const symmetricHandleMove = this.calculateSymmetricHandleMove(handleMove, options);
|
|
182
|
+
toBounds = this.calculateBounds(toBounds, symmetricHandleMove);
|
|
183
|
+
}
|
|
184
|
+
if (!options.constrainResize || this.manager.hasValidSize(element, toBounds)) {
|
|
185
|
+
return toBounds;
|
|
186
|
+
}
|
|
187
|
+
// we need to adjust to the minimum size but it is not enough to simply set the size
|
|
188
|
+
// we need to make sure that the element is still at the expected position
|
|
189
|
+
// we therefore constrain the movement vector to actually avoid going below the minimum size
|
|
190
|
+
const minimum = this.manager.getMinimumSize(element);
|
|
191
|
+
handleMove.moveVector = this.constrainResizeVector(element.bounds, handleMove, minimum);
|
|
192
|
+
if (options.symmetric) {
|
|
193
|
+
// if we have symmetric resize we want to distribute the constrained movement vector to both sides
|
|
194
|
+
// but only for the dimension that was actually resized beyond the minimum
|
|
195
|
+
handleMove.moveVector.x = element.bounds.width > minimum.width ? handleMove.moveVector.x / 2 : handleMove.moveVector.x;
|
|
196
|
+
handleMove.moveVector.y = element.bounds.height > minimum.height ? handleMove.moveVector.y / 2 : handleMove.moveVector.y;
|
|
197
|
+
}
|
|
198
|
+
toBounds = this.calculateBounds(element.bounds, handleMove);
|
|
199
|
+
if (options.symmetric) {
|
|
200
|
+
// since we already distributed the available movement vector, we do not want to snap the symmetric handle move
|
|
201
|
+
const symmetricHandleMove = this.calculateSymmetricHandleMove(handleMove, Object.assign(Object.assign({}, options), { snap: false }));
|
|
202
|
+
toBounds = this.calculateBounds(toBounds, symmetricHandleMove);
|
|
203
|
+
}
|
|
204
|
+
return toBounds;
|
|
205
|
+
}
|
|
206
|
+
calculateSymmetricHandleMove(handleMove, options) {
|
|
207
|
+
const moveOptions = this.resolveMoveOptions(Object.assign(Object.assign({}, options), { validate: false, restrict: false }));
|
|
208
|
+
return this.calculateElementMove(handleMove.element.opposite(), sprotty_1.Vector.reverse(handleMove.moveVector), moveOptions);
|
|
209
|
+
}
|
|
210
|
+
calculateBounds(src, handleMove) {
|
|
211
|
+
if (!handleMove || sprotty_1.Vector.isZero(handleMove.moveVector)) {
|
|
212
|
+
return src;
|
|
213
|
+
}
|
|
214
|
+
return this.doCalculateBounds(src, handleMove.moveVector, handleMove.element.location);
|
|
215
|
+
}
|
|
216
|
+
doCalculateBounds(src, vector, location) {
|
|
217
|
+
switch (location) {
|
|
218
|
+
case change_bounds_1.ResizeHandleLocation.TopLeft:
|
|
219
|
+
return { x: src.x + vector.x, y: src.y + vector.y, width: src.width - vector.x, height: src.height - vector.y };
|
|
220
|
+
case change_bounds_1.ResizeHandleLocation.Top:
|
|
221
|
+
return Object.assign(Object.assign({}, src), { y: src.y + vector.y, height: src.height - vector.y });
|
|
222
|
+
case change_bounds_1.ResizeHandleLocation.TopRight:
|
|
223
|
+
return Object.assign(Object.assign({}, src), { y: src.y + vector.y, width: src.width + vector.x, height: src.height - vector.y });
|
|
224
|
+
case change_bounds_1.ResizeHandleLocation.Right:
|
|
225
|
+
return Object.assign(Object.assign({}, src), { width: src.width + vector.x });
|
|
226
|
+
case change_bounds_1.ResizeHandleLocation.BottomRight:
|
|
227
|
+
return Object.assign(Object.assign({}, src), { width: src.width + vector.x, height: src.height + vector.y });
|
|
228
|
+
case change_bounds_1.ResizeHandleLocation.Bottom:
|
|
229
|
+
return Object.assign(Object.assign({}, src), { height: src.height + vector.y });
|
|
230
|
+
case change_bounds_1.ResizeHandleLocation.BottomLeft:
|
|
231
|
+
return Object.assign(Object.assign({}, src), { x: src.x + vector.x, width: src.width - vector.x, height: src.height + vector.y });
|
|
232
|
+
case change_bounds_1.ResizeHandleLocation.Left:
|
|
233
|
+
return Object.assign(Object.assign({}, src), { x: src.x + vector.x, width: src.width - vector.x });
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
constrainResizeVector(src, handleMove, minimum) {
|
|
237
|
+
const vector = handleMove.moveVector;
|
|
238
|
+
switch (handleMove.element.location) {
|
|
239
|
+
case change_bounds_1.ResizeHandleLocation.TopLeft:
|
|
240
|
+
vector.x = src.width - vector.x < minimum.width ? src.width - minimum.width : vector.x;
|
|
241
|
+
vector.y = src.height - vector.y < minimum.height ? src.height - minimum.height : vector.y;
|
|
242
|
+
break;
|
|
243
|
+
case change_bounds_1.ResizeHandleLocation.Top:
|
|
244
|
+
vector.y = src.height - vector.y < minimum.height ? src.height - minimum.height : vector.y;
|
|
245
|
+
break;
|
|
246
|
+
case change_bounds_1.ResizeHandleLocation.TopRight:
|
|
247
|
+
vector.x = src.width + vector.x < minimum.width ? minimum.width - src.width : vector.x;
|
|
248
|
+
vector.y = src.height - vector.y < minimum.height ? src.height - minimum.height : vector.y;
|
|
249
|
+
break;
|
|
250
|
+
case change_bounds_1.ResizeHandleLocation.Right:
|
|
251
|
+
vector.x = src.width + vector.x < minimum.width ? minimum.width - src.width : vector.x;
|
|
252
|
+
break;
|
|
253
|
+
case change_bounds_1.ResizeHandleLocation.BottomRight:
|
|
254
|
+
vector.x = src.width + vector.x < minimum.width ? minimum.width - src.width : vector.x;
|
|
255
|
+
vector.y = src.height + vector.y < minimum.height ? minimum.height - src.height : vector.y;
|
|
256
|
+
break;
|
|
257
|
+
case change_bounds_1.ResizeHandleLocation.Bottom:
|
|
258
|
+
vector.y = src.height + vector.y < minimum.height ? minimum.height - src.height : vector.y;
|
|
259
|
+
break;
|
|
260
|
+
case change_bounds_1.ResizeHandleLocation.BottomLeft:
|
|
261
|
+
vector.x = src.width - vector.x < minimum.width ? src.width - minimum.width : vector.x;
|
|
262
|
+
vector.y = src.height + vector.y < minimum.height ? minimum.height - src.height : vector.y;
|
|
263
|
+
break;
|
|
264
|
+
case change_bounds_1.ResizeHandleLocation.Left:
|
|
265
|
+
vector.x = src.width - vector.x < minimum.width ? src.width - minimum.width : vector.x;
|
|
266
|
+
break;
|
|
267
|
+
}
|
|
268
|
+
return vector;
|
|
269
|
+
}
|
|
270
|
+
dispose() {
|
|
271
|
+
this.stopTracking();
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
exports.ChangeBoundsTracker = ChangeBoundsTracker;
|
|
275
|
+
class MoveableResizeHandle extends change_bounds_1.SResizeHandle {
|
|
276
|
+
constructor(handle, location = handle.location, position = change_bounds_1.SResizeHandle.getHandlePosition(handle.parent, location)) {
|
|
277
|
+
super(location, handle.type, handle.hoverFeedback);
|
|
278
|
+
this.handle = handle;
|
|
279
|
+
this.location = location;
|
|
280
|
+
this.position = position;
|
|
281
|
+
this.id = handle.id;
|
|
282
|
+
// this only acts as a wrapper so we do not actually add this to the parent but still want the parent reference
|
|
283
|
+
this.parent = handle.parent;
|
|
284
|
+
}
|
|
285
|
+
opposite() {
|
|
286
|
+
return new MoveableResizeHandle(this.handle, change_bounds_1.ResizeHandleLocation.opposite(this.location));
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
exports.MoveableResizeHandle = MoveableResizeHandle;
|
|
290
|
+
class MoveableRoutingHandle extends sprotty_1.GRoutingHandle {
|
|
291
|
+
constructor(handle, position) {
|
|
292
|
+
super();
|
|
293
|
+
this.handle = handle;
|
|
294
|
+
this.position = position;
|
|
295
|
+
this.id = handle.id;
|
|
296
|
+
// this only acts as a wrapper so we do not actually add this to the parent but still want the parent reference
|
|
297
|
+
this.parent = handle.parent;
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
exports.MoveableRoutingHandle = MoveableRoutingHandle;
|
|
301
|
+
//# sourceMappingURL=change-bounds-tracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"change-bounds-tracker.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,11 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
+
export * from './change-bounds-manager';
|
|
16
17
|
export * from './change-bounds-tool';
|
|
17
18
|
export * from './change-bounds-tool-feedback';
|
|
18
19
|
export * from './change-bounds-tool-module';
|
|
19
20
|
export * from './change-bounds-tool-move-feedback';
|
|
21
|
+
export * from './change-bounds-tracker';
|
|
20
22
|
export * from './view';
|
|
21
23
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC"}
|
|
@@ -29,9 +29,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
*
|
|
30
30
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
31
31
|
********************************************************************************/
|
|
32
|
+
__exportStar(require("./change-bounds-manager"), exports);
|
|
32
33
|
__exportStar(require("./change-bounds-tool"), exports);
|
|
33
34
|
__exportStar(require("./change-bounds-tool-feedback"), exports);
|
|
34
35
|
__exportStar(require("./change-bounds-tool-module"), exports);
|
|
35
36
|
__exportStar(require("./change-bounds-tool-move-feedback"), exports);
|
|
37
|
+
__exportStar(require("./change-bounds-tracker"), exports);
|
|
36
38
|
__exportStar(require("./view"), exports);
|
|
37
39
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,uDAAqC;AACrC,gEAA8C;AAC9C,8DAA4C;AAC5C,qEAAmD;AACnD,yCAAuB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,0DAAwC;AACxC,uDAAqC;AACrC,gEAA8C;AAC9C,8DAA4C;AAC5C,qEAAmD;AACnD,0DAAwC;AACxC,yCAAuB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK1D,qBACa,iBAAkB,YAAW,KAAK;IAC3C,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS;IAsB3E,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS;IAI/D,SAAS,IAAI,MAAM;CAGtB"}
|
|
@@ -42,22 +42,7 @@ let SResizeHandleView = class SResizeHandleView {
|
|
|
42
42
|
return JSX.createElement("g", null);
|
|
43
43
|
}
|
|
44
44
|
getPosition(handle) {
|
|
45
|
-
|
|
46
|
-
if ((0, model_1.isResizable)(parent)) {
|
|
47
|
-
if (handle.location === model_1.ResizeHandleLocation.TopLeft) {
|
|
48
|
-
return { x: 0, y: 0 };
|
|
49
|
-
}
|
|
50
|
-
else if (handle.location === model_1.ResizeHandleLocation.TopRight) {
|
|
51
|
-
return { x: parent.bounds.width, y: 0 };
|
|
52
|
-
}
|
|
53
|
-
else if (handle.location === model_1.ResizeHandleLocation.BottomLeft) {
|
|
54
|
-
return { x: 0, y: parent.bounds.height };
|
|
55
|
-
}
|
|
56
|
-
else if (handle.location === model_1.ResizeHandleLocation.BottomRight) {
|
|
57
|
-
return { x: parent.bounds.width, y: parent.bounds.height };
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
return undefined;
|
|
45
|
+
return sprotty_1.Point.subtract(model_1.SResizeHandle.getHandlePosition(handle), handle.parent.bounds);
|
|
61
46
|
}
|
|
62
47
|
getRadius() {
|
|
63
48
|
return 7;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAqF;AACrF,yCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAAqF;AACrF,yCAAuC;AAEvC,qDAA0D;AAE1D,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,MAAM,CAAC,MAAqB,EAAE,OAAyB;QACnD,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,CACT,6DACiC,IAAI,qBAChB,MAAM,CAAC,aAAa,EACrC,EAAE,EAAE,QAAQ,CAAC,CAAC,EACd,EAAE,EAAE,QAAQ,CAAC,CAAC,EACd,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,GACrB,CACL,CAAC;YACF,IAAA,iBAAO,EAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,kCAAkC;QAClC,OAAO,4BAAK,CAAC;IACjB,CAAC;IAES,WAAW,CAAC,MAAqB;QACvC,OAAO,eAAK,CAAC,QAAQ,CAAC,qBAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzF,CAAC;IAED,SAAS;QACL,OAAO,CAAC,CAAC;IACb,CAAC;CACJ,CAAA;AA9BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;GACA,iBAAiB,CA8B7B"}
|
|
@@ -13,12 +13,11 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, AnchorComputerRegistry, CommandExecutionContext, CommandReturn, Disposable, EdgeRouterRegistry,
|
|
16
|
+
import { Action, AnchorComputerRegistry, CommandExecutionContext, CommandReturn, Disposable, EdgeRouterRegistry, GConnectableElement, GModelElement, GRoutingHandle, MouseListener, Point, SwitchEditModeAction, SwitchEditModeCommand } from '@eclipse-glsp/sprotty';
|
|
17
|
+
import { ChangeBoundsManager, ChangeBoundsTracker, MoveableRoutingHandle } from '..';
|
|
17
18
|
import { FeedbackEmitter } from '../../../base';
|
|
18
19
|
import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
|
|
19
20
|
import { FeedbackCommand } from '../../../base/feedback/feedback-command';
|
|
20
|
-
import { PointPositionUpdater } from '../../change-bounds/point-position-updater';
|
|
21
|
-
import { PositionSnapper } from '../../change-bounds/position-snapper';
|
|
22
21
|
import { FeedbackEdgeEndMovingMouseListener } from '../edge-creation/edge-creation-tool-feedback';
|
|
23
22
|
/**
|
|
24
23
|
* RECONNECT HANDLES FEEDBACK
|
|
@@ -107,15 +106,14 @@ export declare class FeedbackEdgeSourceMovingMouseListener extends MouseListener
|
|
|
107
106
|
dispose(): void;
|
|
108
107
|
}
|
|
109
108
|
export declare class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
|
|
110
|
-
protected
|
|
109
|
+
protected changeBoundsManager: ChangeBoundsManager;
|
|
111
110
|
protected edgeRouterRegistry?: EdgeRouterRegistry | undefined;
|
|
112
|
-
protected
|
|
113
|
-
constructor(
|
|
111
|
+
protected tracker: ChangeBoundsTracker;
|
|
112
|
+
constructor(changeBoundsManager: ChangeBoundsManager, edgeRouterRegistry?: EdgeRouterRegistry | undefined);
|
|
114
113
|
mouseDown(target: GModelElement, event: MouseEvent): Action[];
|
|
115
114
|
mouseMove(target: GModelElement, event: MouseEvent): Action[];
|
|
116
|
-
protected
|
|
117
|
-
protected
|
|
118
|
-
protected getSnappedHandlePosition(element: GRoutingHandle, point: Point, isSnap: boolean): Point;
|
|
115
|
+
protected moveRoutingHandles(target: GModelElement, event: MouseEvent): Action[];
|
|
116
|
+
protected getRoutingHandlesToMove(context: GModelElement): MoveableRoutingHandle[];
|
|
119
117
|
protected getHandlePosition(handle: GRoutingHandle): Point | undefined;
|
|
120
118
|
mouseUp(_target: GModelElement, _event: MouseEvent): Action[];
|
|
121
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-edit-tool-feedback.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-tool-feedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,sBAAsB,EAEtB,uBAAuB,EACvB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"edge-edit-tool-feedback.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-tool-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,11 +30,10 @@ exports.drawFeedbackEdgeSource = exports.FeedbackEdgeRouteMovingMouseListener =
|
|
|
30
30
|
********************************************************************************/
|
|
31
31
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
32
32
|
const inversify_1 = require("inversify");
|
|
33
|
+
const __1 = require("..");
|
|
33
34
|
const feedback_command_1 = require("../../../base/feedback/feedback-command");
|
|
34
35
|
const gmodel_util_1 = require("../../../utils/gmodel-util");
|
|
35
36
|
const viewpoint_util_1 = require("../../../utils/viewpoint-util");
|
|
36
|
-
const point_position_updater_1 = require("../../change-bounds/point-position-updater");
|
|
37
|
-
const snap_1 = require("../../change-bounds/snap");
|
|
38
37
|
const model_1 = require("../../reconnect/model");
|
|
39
38
|
const dangling_edge_feedback_1 = require("../edge-creation/dangling-edge-feedback");
|
|
40
39
|
const edge_creation_tool_feedback_1 = require("../edge-creation/edge-creation-tool-feedback");
|
|
@@ -207,11 +206,11 @@ class FeedbackEdgeSourceMovingMouseListener extends sprotty_1.MouseListener {
|
|
|
207
206
|
}
|
|
208
207
|
exports.FeedbackEdgeSourceMovingMouseListener = FeedbackEdgeSourceMovingMouseListener;
|
|
209
208
|
class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
|
|
210
|
-
constructor(
|
|
209
|
+
constructor(changeBoundsManager, edgeRouterRegistry) {
|
|
211
210
|
super();
|
|
212
|
-
this.
|
|
211
|
+
this.changeBoundsManager = changeBoundsManager;
|
|
213
212
|
this.edgeRouterRegistry = edgeRouterRegistry;
|
|
214
|
-
this.
|
|
213
|
+
this.tracker = this.changeBoundsManager.createTracker();
|
|
215
214
|
}
|
|
216
215
|
mouseDown(target, event) {
|
|
217
216
|
const result = [];
|
|
@@ -219,62 +218,43 @@ class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
|
|
|
219
218
|
const routingHandle = (0, sprotty_1.findParentByFeature)(target, gmodel_util_1.isRoutingHandle);
|
|
220
219
|
if (routingHandle !== undefined) {
|
|
221
220
|
result.push(SwitchRoutingModeAction.create({ elementsToActivate: [target.id] }));
|
|
222
|
-
this.
|
|
221
|
+
this.tracker.startTracking();
|
|
223
222
|
}
|
|
224
223
|
else {
|
|
225
|
-
this.
|
|
224
|
+
this.tracker.dispose();
|
|
226
225
|
}
|
|
227
226
|
}
|
|
228
227
|
return result;
|
|
229
228
|
}
|
|
230
229
|
mouseMove(target, event) {
|
|
231
|
-
|
|
230
|
+
super.mouseMove(target, event);
|
|
232
231
|
if (event.buttons === 0) {
|
|
233
232
|
return this.mouseUp(target, event);
|
|
234
233
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
const moveActions = this.handleMoveOnClient(target, positionUpdate, (0, snap_1.useSnap)(event));
|
|
238
|
-
result.push(...moveActions);
|
|
239
|
-
}
|
|
240
|
-
return result;
|
|
241
|
-
}
|
|
242
|
-
handleMoveOnClient(target, positionUpdate, isSnap) {
|
|
243
|
-
const handleMoves = [];
|
|
244
|
-
target.root.index
|
|
245
|
-
.all()
|
|
246
|
-
.filter(element => (0, sprotty_1.isSelected)(element))
|
|
247
|
-
.forEach(element => {
|
|
248
|
-
if ((0, gmodel_util_1.isRoutingHandle)(element)) {
|
|
249
|
-
const elementMove = this.toElementMove(element, positionUpdate, isSnap);
|
|
250
|
-
if (elementMove) {
|
|
251
|
-
handleMoves.push(elementMove);
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
});
|
|
255
|
-
if (handleMoves.length > 0) {
|
|
256
|
-
return [sprotty_1.MoveAction.create(handleMoves, { animate: false })];
|
|
234
|
+
else if (this.tracker.isTracking()) {
|
|
235
|
+
return this.moveRoutingHandles(target, event);
|
|
257
236
|
}
|
|
258
237
|
return [];
|
|
259
238
|
}
|
|
260
|
-
|
|
261
|
-
const
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
return
|
|
265
|
-
elementId: element.id,
|
|
266
|
-
fromPosition: point,
|
|
267
|
-
toPosition: {
|
|
268
|
-
x: snappedPoint.x + positionDelta.x,
|
|
269
|
-
y: snappedPoint.y + positionDelta.y
|
|
270
|
-
}
|
|
271
|
-
};
|
|
239
|
+
moveRoutingHandles(target, event) {
|
|
240
|
+
const routingHandlesToMove = this.getRoutingHandlesToMove(target);
|
|
241
|
+
const move = this.tracker.moveElements(routingHandlesToMove, { snap: event, restrict: event });
|
|
242
|
+
if (move.elementMoves.length === 0) {
|
|
243
|
+
return [];
|
|
272
244
|
}
|
|
273
|
-
|
|
245
|
+
this.tracker.updateTrackingPosition(move);
|
|
246
|
+
return [
|
|
247
|
+
sprotty_1.MoveAction.create(move.elementMoves.map(elementMove => ({ elementId: elementMove.element.id, toPosition: elementMove.toPosition })), { animate: false })
|
|
248
|
+
];
|
|
274
249
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
return
|
|
250
|
+
getRoutingHandlesToMove(context) {
|
|
251
|
+
const selectedRoutingHandles = (0, gmodel_util_1.getMatchingElements)(context.root.index, (0, sprotty_1.typeGuard)(gmodel_util_1.isRoutingHandle, sprotty_1.isSelected));
|
|
252
|
+
return selectedRoutingHandles
|
|
253
|
+
.map(handle => {
|
|
254
|
+
const position = this.getHandlePosition(handle);
|
|
255
|
+
return position ? new __1.MoveableRoutingHandle(handle, position) : undefined;
|
|
256
|
+
})
|
|
257
|
+
.filter((0, sprotty_1.toTypeGuard)(__1.MoveableRoutingHandle));
|
|
278
258
|
}
|
|
279
259
|
getHandlePosition(handle) {
|
|
280
260
|
if (this.edgeRouterRegistry) {
|
|
@@ -289,7 +269,7 @@ class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
|
|
|
289
269
|
return undefined;
|
|
290
270
|
}
|
|
291
271
|
mouseUp(_target, _event) {
|
|
292
|
-
this.
|
|
272
|
+
this.tracker.dispose();
|
|
293
273
|
return [];
|
|
294
274
|
}
|
|
295
275
|
}
|