@eclipse-glsp/client 2.1.0-next.304 → 2.1.0-next.306
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/selection-service.d.ts +1 -1
- package/lib/base/selection-service.d.ts.map +1 -1
- package/lib/base/selection-service.js +15 -20
- package/lib/base/selection-service.js.map +1 -1
- package/lib/base/selection-service.spec.js +9 -7
- package/lib/base/selection-service.spec.js.map +1 -1
- package/lib/features/change-bounds/position-snapper.js +4 -4
- package/lib/features/change-bounds/position-snapper.js.map +1 -1
- package/lib/features/helper-lines/helper-line-feedback.d.ts +30 -11
- package/lib/features/helper-lines/helper-line-feedback.d.ts.map +1 -1
- package/lib/features/helper-lines/helper-line-feedback.js +93 -32
- package/lib/features/helper-lines/helper-line-feedback.js.map +1 -1
- package/lib/features/helper-lines/helper-line-manager-default.d.ts +42 -11
- package/lib/features/helper-lines/helper-line-manager-default.d.ts.map +1 -1
- package/lib/features/helper-lines/helper-line-manager-default.js +21 -16
- package/lib/features/helper-lines/helper-line-manager-default.js.map +1 -1
- package/lib/features/helper-lines/helper-line-manager.d.ts +8 -1
- package/lib/features/helper-lines/helper-line-manager.d.ts.map +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js +1 -1
- package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/utils/gmodel-util.d.ts +1 -0
- package/lib/utils/gmodel-util.d.ts.map +1 -1
- package/lib/utils/gmodel-util.js +10 -1
- package/lib/utils/gmodel-util.js.map +1 -1
- package/package.json +3 -3
- package/src/base/selection-service.spec.ts +9 -7
- package/src/base/selection-service.ts +17 -21
- package/src/features/change-bounds/position-snapper.ts +4 -4
- package/src/features/helper-lines/helper-line-feedback.ts +127 -45
- package/src/features/helper-lines/helper-line-manager-default.ts +68 -20
- package/src/features/helper-lines/helper-line-manager.ts +8 -1
- package/src/features/tools/change-bounds/change-bounds-tool-feedback.ts +1 -1
- package/src/utils/gmodel-util.ts +12 -0
|
@@ -172,4 +172,5 @@ export declare function calcRoute(element: GRoutableElement, routerRegistry: Edg
|
|
|
172
172
|
export declare function getElementTypeId(input: GModelElement | GModelElementSchema | string): string;
|
|
173
173
|
export declare function findTopLevelElementByFeature<T>(element: GModelElement, predicate: (t: GModelElement) => t is GModelElement & T, skip?: (t: GModelElement) => boolean): (GModelElement & T) | undefined;
|
|
174
174
|
export declare function calculateDeltaBetweenPoints(target: Point, source: Point, element: GModelElement): Point;
|
|
175
|
+
export declare function isVisibleOnCanvas(model: BoundsAwareModelElement): boolean;
|
|
175
176
|
//# sourceMappingURL=gmodel-util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/gmodel-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EAChB,uBAAuB,EACvB,cAAc,EAEd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,KAAK,EACL,WAAW,EACX,UAAU,EACV,SAAS,
|
|
1
|
+
{"version":3,"file":"gmodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/gmodel-util.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/gmodel-util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.calculateDeltaBetweenPoints = exports.findTopLevelElementByFeature = exports.getElementTypeId = exports.calcRoute = exports.calcElementAndRoute = exports.calcElementAndRoutingPoints = exports.ROUTE_KINDS = exports.ROUTING_POINT_KINDS = exports.ALL_ROUTING_POINTS = 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.isVisibleOnCanvas = exports.calculateDeltaBetweenPoints = exports.findTopLevelElementByFeature = exports.getElementTypeId = exports.calcRoute = exports.calcElementAndRoute = exports.calcElementAndRoutingPoints = exports.ROUTE_KINDS = exports.ROUTING_POINT_KINDS = exports.ALL_ROUTING_POINTS = 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-2023 EclipseSource and others.
|
|
6
6
|
*
|
|
@@ -301,4 +301,13 @@ function calculateDeltaBetweenPoints(target, source, element) {
|
|
|
301
301
|
return adaptedDelta;
|
|
302
302
|
}
|
|
303
303
|
exports.calculateDeltaBetweenPoints = calculateDeltaBetweenPoints;
|
|
304
|
+
function isVisibleOnCanvas(model) {
|
|
305
|
+
const modelBounds = (0, sprotty_1.getAbsoluteBounds)(model);
|
|
306
|
+
const canvasBounds = model.root.canvasBounds;
|
|
307
|
+
return (modelBounds.x <= canvasBounds.width &&
|
|
308
|
+
modelBounds.x + modelBounds.width >= 0 &&
|
|
309
|
+
modelBounds.y <= canvasBounds.height &&
|
|
310
|
+
modelBounds.y + modelBounds.height >= 0);
|
|
311
|
+
}
|
|
312
|
+
exports.isVisibleOnCanvas = isVisibleOnCanvas;
|
|
304
313
|
//# sourceMappingURL=gmodel-util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmodel-util.js","sourceRoot":"","sources":["../../src/utils/gmodel-util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"gmodel-util.js","sourceRoot":"","sources":["../../src/utils/gmodel-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": "2.1.0-next.
|
|
3
|
+
"version": "2.1.0-next.306+45e896a",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"watch": "tsc -w"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@eclipse-glsp/sprotty": "2.1.0-next.
|
|
50
|
+
"@eclipse-glsp/sprotty": "2.1.0-next.306+45e896a",
|
|
51
51
|
"autocompleter": "^9.1.0",
|
|
52
52
|
"file-saver": "^2.0.5",
|
|
53
53
|
"lodash": "4.17.21"
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"publishConfig": {
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "45e896a12e39a220635b5c4f1d165165d0c07c86"
|
|
63
63
|
}
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
+
import { Action, Disposable, GModelRoot, GNode, TYPES, initializeContainer } from '@eclipse-glsp/sprotty';
|
|
16
17
|
import { AssertionError, expect } from 'chai';
|
|
17
18
|
import { Container, injectable } from 'inversify';
|
|
18
19
|
import * as sinon from 'sinon';
|
|
19
|
-
import { Action, Disposable, GModelRoot, GNode, TYPES, initializeContainer } from '@eclipse-glsp/sprotty';
|
|
20
20
|
import { defaultModule } from './default.module';
|
|
21
21
|
import { IFeedbackActionDispatcher, IFeedbackEmitter } from './feedback/feedback-action-dispatcher';
|
|
22
22
|
import { ISelectionListener, SelectFeedbackAction, SelectionService } from './selection-service';
|
|
@@ -217,13 +217,13 @@ describe('SelectionService', () => {
|
|
|
217
217
|
selectionService.updateSelection(root, [], ['node4']);
|
|
218
218
|
assertListener(listener, root, ['node2', 'node3'], ['node4'], 4);
|
|
219
219
|
});
|
|
220
|
-
it('A registered listener should be notified of root changes.', () => {
|
|
220
|
+
it('A registered listener should NOT be notified of root changes.', () => {
|
|
221
221
|
selectionService.updateSelection(root, [], []);
|
|
222
|
-
assertListener(listener, root, [], [],
|
|
222
|
+
assertListener(listener, root, [], [], 0);
|
|
223
223
|
|
|
224
224
|
const newRoot = createRoot('node1', 'newNode2', 'newNode3');
|
|
225
225
|
selectionService.updateSelection(newRoot, [], []);
|
|
226
|
-
assertListener(listener, newRoot, [], [],
|
|
226
|
+
assertListener(listener, newRoot, [], [], 0);
|
|
227
227
|
});
|
|
228
228
|
it('Selecting the same elements consecutively should not trigger a listener update.', () => {
|
|
229
229
|
selectionService.updateSelection(root, ['node1'], []);
|
|
@@ -290,8 +290,10 @@ describe('SelectionService', () => {
|
|
|
290
290
|
expectedCalled: number
|
|
291
291
|
): void {
|
|
292
292
|
expect(listener.selectionChanged.callCount).to.be.equal(expectedCalled);
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
293
|
+
if (expectedCalled > 0) {
|
|
294
|
+
expect(listener.selectionChanged.lastCall.args[0]).to.be.deep.equals(expectedRoot);
|
|
295
|
+
expect(listener.selectionChanged.lastCall.args[1]).to.be.deep.equals(expectedSelection);
|
|
296
|
+
expect(listener.selectionChanged.lastCall.args[2]).to.be.deep.equals(expectedDeselection);
|
|
297
|
+
}
|
|
296
298
|
}
|
|
297
299
|
});
|
|
@@ -96,41 +96,41 @@ export class SelectionService implements IGModelRootListener, Disposable {
|
|
|
96
96
|
this.updateSelection(root, [], []);
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
updateSelection(
|
|
100
|
-
if (
|
|
99
|
+
updateSelection(newRoot: Readonly<GModelRoot>, select: string[], deselect: string[]): void {
|
|
100
|
+
if (newRoot === undefined && select.length === 0 && deselect.length === 0) {
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
const prevRoot = this.root;
|
|
104
104
|
const prevSelectedElementIDs = new Set(this.selectedElementIDs);
|
|
105
105
|
|
|
106
|
-
|
|
107
|
-
this.root = root;
|
|
106
|
+
this.root = newRoot;
|
|
108
107
|
|
|
109
|
-
//
|
|
110
|
-
// - select all elements that are not deselected at the same time (no-op)
|
|
111
|
-
// - deselect all elements that are not selected at the same time (no-op) but was selected
|
|
108
|
+
// We only select elements that are not part of the deselection
|
|
112
109
|
const toSelect = [...select].filter(selectId => deselect.indexOf(selectId) === -1);
|
|
110
|
+
|
|
111
|
+
// We only need to deselect elements that are not part of the selection
|
|
112
|
+
// If an element is part of both the select and deselect, it's state is not changed
|
|
113
113
|
const toDeselect = [...deselect].filter(deselectId => select.indexOf(deselectId) === -1 && this.selectedElementIDs.has(deselectId));
|
|
114
|
-
for (const id of toDeselect) {
|
|
115
|
-
this.selectedElementIDs.delete(id);
|
|
116
|
-
}
|
|
117
|
-
for (const id of toSelect) {
|
|
118
|
-
this.selectedElementIDs.add(id);
|
|
119
|
-
}
|
|
120
114
|
|
|
115
|
+
// update selected element ids
|
|
116
|
+
toDeselect.forEach(toDeselectId => this.selectedElementIDs.delete(toDeselectId));
|
|
117
|
+
toSelect.forEach(toSelectId => this.selectedElementIDs.add(toSelectId));
|
|
118
|
+
|
|
119
|
+
// check if the newly or previously selected elements still exist in the updated root
|
|
121
120
|
const deselectedElementIDs = new Set(toDeselect);
|
|
122
|
-
// see if selected elements still exist in the updated root
|
|
123
121
|
for (const id of this.selectedElementIDs) {
|
|
124
|
-
const element =
|
|
122
|
+
const element = newRoot.index.getById(id);
|
|
125
123
|
if (element === undefined) {
|
|
124
|
+
// element to be selected does not exist in the root...
|
|
126
125
|
this.selectedElementIDs.delete(id);
|
|
127
|
-
if (prevRoot
|
|
126
|
+
if (prevRoot?.index.getById(id)) {
|
|
127
|
+
// ...but existed in the previous root, so we want to consider it deselected
|
|
128
128
|
deselectedElementIDs.add(id);
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
|
|
133
|
-
// only send out changes if there actually are changes, i.e.,
|
|
133
|
+
// only send out changes if there actually are changes, i.e., any of the selected elements ids has changed
|
|
134
134
|
const selectionChanged =
|
|
135
135
|
prevSelectedElementIDs.size !== this.selectedElementIDs.size ||
|
|
136
136
|
![...prevSelectedElementIDs].every(value => this.selectedElementIDs.has(value));
|
|
@@ -142,10 +142,6 @@ export class SelectionService implements IGModelRootListener, Disposable {
|
|
|
142
142
|
deselectedElementsIDs: [...deselectedElementIDs]
|
|
143
143
|
})
|
|
144
144
|
]);
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
const rootChanged = prevRoot !== root;
|
|
148
|
-
if (rootChanged || selectionChanged) {
|
|
149
145
|
// notify listeners after the feedback action
|
|
150
146
|
this.notifyListeners(this.root, this.selectedElementIDs, deselectedElementIDs);
|
|
151
147
|
}
|
|
@@ -55,14 +55,14 @@ export class PositionSnapper {
|
|
|
55
55
|
|
|
56
56
|
const minimum: Writable<Point> = { x: 0, y: 0 };
|
|
57
57
|
if (directions.includes(Direction.Left) && helperLines.some(line => line.isLeft || line.isCenter)) {
|
|
58
|
-
minimum.x = this.helperLineManager.
|
|
58
|
+
minimum.x = this.helperLineManager.getMinimumMoveDelta(target, isSnap, Direction.Left);
|
|
59
59
|
} else if (directions.includes(Direction.Right) && helperLines.some(line => line.isRight || line.isCenter)) {
|
|
60
|
-
minimum.x = this.helperLineManager.
|
|
60
|
+
minimum.x = this.helperLineManager.getMinimumMoveDelta(target, isSnap, Direction.Right);
|
|
61
61
|
}
|
|
62
62
|
if (directions.includes(Direction.Up) && helperLines.some(line => line.isTop || line.isMiddle)) {
|
|
63
|
-
minimum.y = this.helperLineManager.
|
|
63
|
+
minimum.y = this.helperLineManager.getMinimumMoveDelta(target, isSnap, Direction.Up);
|
|
64
64
|
} else if (directions.includes(Direction.Down) && helperLines.some(line => line.isBottom || line.isMiddle)) {
|
|
65
|
-
minimum.y = this.helperLineManager.
|
|
65
|
+
minimum.y = this.helperLineManager.getMinimumMoveDelta(target, isSnap, Direction.Down);
|
|
66
66
|
}
|
|
67
67
|
return minimum;
|
|
68
68
|
}
|
|
@@ -19,12 +19,17 @@ import {
|
|
|
19
19
|
Bounds,
|
|
20
20
|
CommandExecutionContext,
|
|
21
21
|
CommandReturn,
|
|
22
|
+
GChildElement,
|
|
23
|
+
GLabel,
|
|
22
24
|
GModelElement,
|
|
23
25
|
GModelRoot,
|
|
26
|
+
ILogger,
|
|
27
|
+
Point,
|
|
24
28
|
TYPES,
|
|
25
29
|
Viewport,
|
|
26
30
|
findParentByFeature,
|
|
27
31
|
isBoundsAware,
|
|
32
|
+
isDecoration,
|
|
28
33
|
isViewport
|
|
29
34
|
} from '@eclipse-glsp/sprotty';
|
|
30
35
|
import { inject, injectable } from 'inversify';
|
|
@@ -50,14 +55,23 @@ import {
|
|
|
50
55
|
topLeft,
|
|
51
56
|
topRight
|
|
52
57
|
} from '../../utils/geometry-util';
|
|
53
|
-
import {
|
|
54
|
-
|
|
58
|
+
import {
|
|
59
|
+
BoundsAwareModelElement,
|
|
60
|
+
findTopLevelElementByFeature,
|
|
61
|
+
forEachElement,
|
|
62
|
+
getMatchingElements,
|
|
63
|
+
isRoutable,
|
|
64
|
+
isVisibleOnCanvas
|
|
65
|
+
} from '../../utils/gmodel-util';
|
|
66
|
+
import { getViewportBounds, toAbsoluteBounds } from '../../utils/viewpoint-util';
|
|
55
67
|
import { HelperLine, HelperLineType, SelectionBounds, isHelperLine, isSelectionBounds } from './model';
|
|
56
68
|
|
|
57
69
|
export type ViewportLineType = typeof HelperLineType.Center | typeof HelperLineType.Middle | string;
|
|
58
70
|
|
|
59
|
-
export
|
|
60
|
-
|
|
71
|
+
export type AlignmentElementFilter = (element: BoundsAwareModelElement, referenceElementIds: string[]) => boolean;
|
|
72
|
+
|
|
73
|
+
export const isTopLevelBoundsAwareElement: AlignmentElementFilter = element =>
|
|
74
|
+
findTopLevelElementByFeature(element, isBoundsAware, isViewport) === element;
|
|
61
75
|
|
|
62
76
|
export interface DrawHelperLinesFeedbackAction extends Action {
|
|
63
77
|
kind: typeof DrawHelperLinesFeedbackAction.KIND;
|
|
@@ -65,8 +79,20 @@ export interface DrawHelperLinesFeedbackAction extends Action {
|
|
|
65
79
|
elementLines?: HelperLineType[];
|
|
66
80
|
viewportLines?: ViewportLineType[];
|
|
67
81
|
alignmentEpsilon?: number;
|
|
82
|
+
alignmentElementFilter?: AlignmentElementFilter;
|
|
83
|
+
debug?: boolean;
|
|
68
84
|
}
|
|
69
85
|
|
|
86
|
+
export const ALL_ELEMENT_LINE_TYPES = Object.values(HelperLineType);
|
|
87
|
+
export const ALL_VIEWPORT_LINE_TYPES = [HelperLineType.Center, HelperLineType.Middle];
|
|
88
|
+
|
|
89
|
+
export const DEFAULT_ELEMENT_LINES = ALL_ELEMENT_LINE_TYPES;
|
|
90
|
+
export const DEFAULT_VIEWPORT_LINES = ALL_VIEWPORT_LINE_TYPES;
|
|
91
|
+
export const DEFAULT_EPSILON = 1;
|
|
92
|
+
export const DEFAULT_ALIGNABLE_ELEMENT_FILTER = (element: BoundsAwareModelElement): boolean =>
|
|
93
|
+
isVisibleOnCanvas(element) && !isRoutable(element) && !(element instanceof GLabel) && !isDecoration(element);
|
|
94
|
+
export const DEFAULT_DEBUG = false;
|
|
95
|
+
|
|
70
96
|
export namespace DrawHelperLinesFeedbackAction {
|
|
71
97
|
export const KIND = 'drawHelperLines';
|
|
72
98
|
|
|
@@ -82,153 +108,200 @@ export namespace DrawHelperLinesFeedbackAction {
|
|
|
82
108
|
export class DrawHelperLinesFeedbackCommand extends FeedbackCommand {
|
|
83
109
|
static readonly KIND = DrawHelperLinesFeedbackAction.KIND;
|
|
84
110
|
|
|
85
|
-
|
|
111
|
+
protected elementIds: string[];
|
|
112
|
+
protected elementLines: HelperLineType[];
|
|
113
|
+
protected viewportLines: ViewportLineType[];
|
|
114
|
+
protected alignmentEpsilon: number;
|
|
115
|
+
protected alignableElementFilter: AlignmentElementFilter;
|
|
116
|
+
protected isAlignableElementPredicate: (element: GModelElement) => element is BoundsAwareModelElement;
|
|
117
|
+
protected debug: boolean;
|
|
118
|
+
|
|
119
|
+
constructor(
|
|
120
|
+
@inject(TYPES.Action) action: DrawHelperLinesFeedbackAction,
|
|
121
|
+
@inject(TYPES.ILogger) protected logger: ILogger
|
|
122
|
+
) {
|
|
86
123
|
super();
|
|
124
|
+
this.elementIds = action.elementIds;
|
|
125
|
+
this.elementLines = action.elementLines ?? DEFAULT_ELEMENT_LINES;
|
|
126
|
+
this.viewportLines = action.viewportLines ?? DEFAULT_VIEWPORT_LINES;
|
|
127
|
+
this.alignmentEpsilon = action.alignmentEpsilon ?? DEFAULT_EPSILON;
|
|
128
|
+
this.alignableElementFilter = action.alignmentElementFilter ?? DEFAULT_ALIGNABLE_ELEMENT_FILTER;
|
|
129
|
+
this.isAlignableElementPredicate = this.isAlignableElement.bind(this);
|
|
130
|
+
this.debug = action.debug ?? DEFAULT_DEBUG;
|
|
87
131
|
}
|
|
88
132
|
|
|
89
133
|
execute(context: CommandExecutionContext): CommandReturn {
|
|
90
134
|
removeHelperLines(context.root);
|
|
91
135
|
removeSelectionBounds(context.root);
|
|
92
|
-
const
|
|
93
|
-
|
|
136
|
+
const alignableElements = getMatchingElements(context.root.index, this.isAlignableElementPredicate);
|
|
137
|
+
this.log('All alignable elements: ', alignableElements);
|
|
138
|
+
const [referenceElements, elements] = partition(alignableElements, element => this.elementIds.includes(element.id));
|
|
139
|
+
this.log('Split alignable elements into reference elements and other elements: ', referenceElements, elements);
|
|
94
140
|
if (referenceElements.length === 0) {
|
|
141
|
+
this.log('--> No helper lines as we do not have any reference elements.');
|
|
95
142
|
return context.root;
|
|
96
143
|
}
|
|
97
144
|
const referenceBounds = this.calcReferenceBounds(referenceElements);
|
|
145
|
+
this.log('Bounds encompasing all reference elements: ', referenceBounds);
|
|
98
146
|
const helperLines = this.calcHelperLines(elements, referenceBounds, context);
|
|
99
147
|
if (referenceElements.length > 1) {
|
|
100
148
|
context.root.add(new SelectionBounds(referenceBounds));
|
|
149
|
+
this.log('Render selection bounds for more than one reference element:', referenceBounds);
|
|
101
150
|
}
|
|
102
151
|
helperLines.forEach(helperLine => context.root.add(helperLine));
|
|
152
|
+
if (helperLines.length > 0) {
|
|
153
|
+
this.log(`--> Add ${helperLines.length} helper lines to root:`, helperLines);
|
|
154
|
+
} else {
|
|
155
|
+
this.log('--> Add no helper lines to root.');
|
|
156
|
+
}
|
|
103
157
|
return context.root;
|
|
104
158
|
}
|
|
105
159
|
|
|
106
|
-
protected
|
|
107
|
-
return isBoundsAware(element) &&
|
|
160
|
+
protected isAlignableElement(element: GModelElement): element is BoundsAwareModelElement {
|
|
161
|
+
return isBoundsAware(element) && this.alignableElementFilter(element, this.elementIds);
|
|
108
162
|
}
|
|
109
163
|
|
|
110
164
|
protected calcReferenceBounds(referenceElements: BoundsAwareModelElement[]): Bounds {
|
|
111
|
-
return referenceElements.map(element => element
|
|
165
|
+
return referenceElements.map(element => this.calcBounds(element)).reduce(Bounds.combine, Bounds.EMPTY);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
protected calcBounds(element: BoundsAwareModelElement): Bounds {
|
|
169
|
+
return toAbsoluteBounds(element);
|
|
112
170
|
}
|
|
113
171
|
|
|
114
172
|
protected calcHelperLines(elements: BoundsAwareModelElement[], bounds: Bounds, context: CommandExecutionContext): HelperLine[] {
|
|
115
173
|
const helperLines: HelperLine[] = [];
|
|
116
174
|
const viewport = findParentByFeature(context.root, isViewport);
|
|
117
175
|
if (viewport) {
|
|
118
|
-
helperLines.push(...this.calcHelperLinesForViewport(viewport, bounds));
|
|
176
|
+
helperLines.push(...this.calcHelperLinesForViewport(viewport, bounds, this.viewportLines));
|
|
119
177
|
}
|
|
120
|
-
elements
|
|
178
|
+
elements
|
|
179
|
+
.flatMap(element => this.calcHelperLinesForElement(element, bounds, this.elementLines))
|
|
180
|
+
.forEach(line => helperLines.push(line));
|
|
121
181
|
return helperLines;
|
|
122
182
|
}
|
|
123
183
|
|
|
124
|
-
protected calcHelperLinesForViewport(
|
|
125
|
-
root: Viewport & GModelRoot,
|
|
126
|
-
bounds: Bounds,
|
|
127
|
-
lineTypes: HelperLineType[] = this.action.viewportLines ?? ALL_VIEWPORT_LINE_TYPES
|
|
128
|
-
): HelperLine[] {
|
|
184
|
+
protected calcHelperLinesForViewport(root: Viewport & GModelRoot, bounds: Bounds, lineTypes: HelperLineType[]): HelperLine[] {
|
|
129
185
|
const helperLines: HelperLine[] = [];
|
|
186
|
+
this.log('Find helperlines for viewport:', root);
|
|
130
187
|
const viewportBounds = getViewportBounds(root, root.canvasBounds);
|
|
131
188
|
if (lineTypes.includes(HelperLineType.Center) && this.isAligned(center, viewportBounds, bounds, 2)) {
|
|
132
189
|
helperLines.push(new HelperLine(topCenter(viewportBounds), bottomCenter(viewportBounds), HelperLineType.Center));
|
|
190
|
+
this.log('- Reference bounds center align with viewport.', viewportBounds);
|
|
133
191
|
}
|
|
134
192
|
if (lineTypes.includes(HelperLineType.Middle) && this.isAligned(middle, viewportBounds, bounds, 2)) {
|
|
135
193
|
helperLines.push(new HelperLine(middleLeft(viewportBounds), middleRight(viewportBounds), HelperLineType.Middle));
|
|
194
|
+
this.log('- Reference bounds middle align with viewport.', viewportBounds);
|
|
195
|
+
}
|
|
196
|
+
if (helperLines.length > 0) {
|
|
197
|
+
this.log(`--> Add ${helperLines.length} helperlines for viewport:`, helperLines);
|
|
136
198
|
}
|
|
137
199
|
return helperLines;
|
|
138
200
|
}
|
|
139
201
|
|
|
140
|
-
protected calcHelperLinesForElement(
|
|
141
|
-
element:
|
|
142
|
-
bounds
|
|
143
|
-
lineTypes: HelperLineType[] = this.action.elementLines ?? ALL_ELEMENT_LINE_TYPES
|
|
144
|
-
): HelperLine[] {
|
|
145
|
-
return this.calcHelperLinesForBounds(element.bounds, bounds, lineTypes);
|
|
202
|
+
protected calcHelperLinesForElement(element: BoundsAwareModelElement, bounds: Bounds, lineTypes: HelperLineType[]): HelperLine[] {
|
|
203
|
+
this.log('Find helperlines for element:', element);
|
|
204
|
+
return this.calcHelperLinesForBounds(this.calcBounds(element), bounds, lineTypes);
|
|
146
205
|
}
|
|
147
206
|
|
|
148
|
-
protected calcHelperLinesForBounds(
|
|
149
|
-
elementBounds: Bounds,
|
|
150
|
-
bounds: Bounds,
|
|
151
|
-
lineTypes: HelperLineType[] = this.action.elementLines ?? ALL_ELEMENT_LINE_TYPES
|
|
152
|
-
): HelperLine[] {
|
|
207
|
+
protected calcHelperLinesForBounds(elementBounds: Bounds, bounds: Bounds, lineTypes: HelperLineType[]): HelperLine[] {
|
|
153
208
|
const helperLines: HelperLine[] = [];
|
|
154
209
|
|
|
155
|
-
if (lineTypes.includes(HelperLineType.Left) && this.isAligned(left, elementBounds, bounds)) {
|
|
210
|
+
if (lineTypes.includes(HelperLineType.Left) && this.isAligned(left, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
156
211
|
const [above, below] = sortBy(top, elementBounds, bounds); // higher top-value ==> lower
|
|
157
212
|
helperLines.push(new HelperLine(bottomLeft(below), topLeft(above), HelperLineType.Left));
|
|
213
|
+
this.log('- Reference bounds left align with element', elementBounds);
|
|
158
214
|
}
|
|
159
215
|
|
|
160
|
-
if (lineTypes.includes(HelperLineType.Center) && this.isAligned(center, elementBounds, bounds)) {
|
|
216
|
+
if (lineTypes.includes(HelperLineType.Center) && this.isAligned(center, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
161
217
|
const [above, below] = sortBy(top, elementBounds, bounds); // higher top-value ==> lower
|
|
162
218
|
helperLines.push(new HelperLine(topCenter(above), bottomCenter(below), HelperLineType.Center));
|
|
219
|
+
this.log('- Reference bounds center align with element', elementBounds);
|
|
163
220
|
}
|
|
164
221
|
|
|
165
|
-
if (lineTypes.includes(HelperLineType.Right) && this.isAligned(right, elementBounds, bounds)) {
|
|
222
|
+
if (lineTypes.includes(HelperLineType.Right) && this.isAligned(right, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
166
223
|
const [above, below] = sortBy(top, elementBounds, bounds); // higher top-value ==> lower
|
|
167
224
|
helperLines.push(new HelperLine(bottomRight(below), topRight(above), HelperLineType.Right));
|
|
225
|
+
this.log('- Reference bounds right align with element', elementBounds);
|
|
168
226
|
}
|
|
169
227
|
|
|
170
|
-
if (lineTypes.includes(HelperLineType.Bottom) && this.isAligned(bottom, elementBounds, bounds)) {
|
|
228
|
+
if (lineTypes.includes(HelperLineType.Bottom) && this.isAligned(bottom, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
171
229
|
const [before, after] = sortBy(left, elementBounds, bounds); // higher left-value ==> more to the right
|
|
172
230
|
helperLines.push(new HelperLine(bottomLeft(before), bottomRight(after), HelperLineType.Bottom));
|
|
231
|
+
this.log('- Reference bounds bottom align with element', elementBounds);
|
|
173
232
|
}
|
|
174
233
|
|
|
175
|
-
if (lineTypes.includes(HelperLineType.Middle) && this.isAligned(middle, elementBounds, bounds)) {
|
|
234
|
+
if (lineTypes.includes(HelperLineType.Middle) && this.isAligned(middle, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
176
235
|
const [before, after] = sortBy(left, elementBounds, bounds); // higher left-value ==> more to the right
|
|
177
236
|
helperLines.push(new HelperLine(middleLeft(before), middleRight(after), HelperLineType.Middle));
|
|
237
|
+
this.log('- Reference bounds middle align with element', elementBounds);
|
|
178
238
|
}
|
|
179
239
|
|
|
180
|
-
if (lineTypes.includes(HelperLineType.Top) && this.isAligned(top, elementBounds, bounds)) {
|
|
240
|
+
if (lineTypes.includes(HelperLineType.Top) && this.isAligned(top, elementBounds, bounds, this.alignmentEpsilon)) {
|
|
181
241
|
const [before, after] = sortBy(left, elementBounds, bounds); // higher left-value ==> more to the right
|
|
182
242
|
helperLines.push(new HelperLine(topLeft(before), topRight(after), HelperLineType.Top));
|
|
243
|
+
this.log('- Reference bounds top align with element', elementBounds);
|
|
183
244
|
}
|
|
184
245
|
|
|
185
|
-
if (lineTypes.includes(HelperLineType.LeftRight) && this.isMatch(left(elementBounds), right(bounds),
|
|
246
|
+
if (lineTypes.includes(HelperLineType.LeftRight) && this.isMatch(left(elementBounds), right(bounds), this.alignmentEpsilon)) {
|
|
186
247
|
if (isAbove(bounds, elementBounds)) {
|
|
187
248
|
helperLines.push(new HelperLine(bottomLeft(elementBounds), topRight(bounds), HelperLineType.RightLeft));
|
|
249
|
+
this.log('- Reference bounds right aligns with element left', elementBounds);
|
|
188
250
|
} else {
|
|
189
251
|
helperLines.push(new HelperLine(topLeft(elementBounds), bottomRight(bounds), HelperLineType.RightLeft));
|
|
252
|
+
this.log('- Reference bounds right aligns with element left', elementBounds);
|
|
190
253
|
}
|
|
191
254
|
}
|
|
192
255
|
|
|
193
|
-
if (lineTypes.includes(HelperLineType.LeftRight) && this.isMatch(right(elementBounds), left(bounds),
|
|
256
|
+
if (lineTypes.includes(HelperLineType.LeftRight) && this.isMatch(right(elementBounds), left(bounds), this.alignmentEpsilon)) {
|
|
194
257
|
if (isAbove(bounds, elementBounds)) {
|
|
195
258
|
helperLines.push(new HelperLine(bottomRight(elementBounds), topLeft(bounds), HelperLineType.LeftRight));
|
|
259
|
+
this.log('- Reference bounds left aligns with element right', elementBounds);
|
|
196
260
|
} else {
|
|
197
261
|
helperLines.push(new HelperLine(topRight(elementBounds), bottomLeft(bounds), HelperLineType.LeftRight));
|
|
262
|
+
this.log('- Reference bounds left aligns with element right', elementBounds);
|
|
198
263
|
}
|
|
199
264
|
}
|
|
200
265
|
|
|
201
|
-
if (lineTypes.includes(HelperLineType.TopBottom) && this.isMatch(top(elementBounds), bottom(bounds),
|
|
266
|
+
if (lineTypes.includes(HelperLineType.TopBottom) && this.isMatch(top(elementBounds), bottom(bounds), this.alignmentEpsilon)) {
|
|
202
267
|
if (isBefore(bounds, elementBounds)) {
|
|
203
268
|
helperLines.push(new HelperLine(topRight(elementBounds), bottomLeft(bounds), HelperLineType.BottomTop));
|
|
269
|
+
this.log('- Reference bounds bottom aligns with element top', elementBounds);
|
|
204
270
|
} else {
|
|
205
271
|
helperLines.push(new HelperLine(topLeft(elementBounds), bottomRight(bounds), HelperLineType.BottomTop));
|
|
272
|
+
this.log('- Reference bounds bottom aligns with element top', elementBounds);
|
|
206
273
|
}
|
|
207
274
|
}
|
|
208
275
|
|
|
209
|
-
if (lineTypes.includes(HelperLineType.TopBottom) && this.isMatch(bottom(elementBounds), top(bounds),
|
|
276
|
+
if (lineTypes.includes(HelperLineType.TopBottom) && this.isMatch(bottom(elementBounds), top(bounds), this.alignmentEpsilon)) {
|
|
210
277
|
if (isBefore(bounds, elementBounds)) {
|
|
211
278
|
helperLines.push(new HelperLine(bottomRight(elementBounds), topLeft(bounds), HelperLineType.TopBottom));
|
|
279
|
+
this.log('- Reference bounds top aligns with element bottom', elementBounds);
|
|
212
280
|
} else {
|
|
213
281
|
helperLines.push(new HelperLine(bottomLeft(elementBounds), topRight(bounds), HelperLineType.TopBottom));
|
|
282
|
+
this.log('- Reference bounds top aligns with element bottom', elementBounds);
|
|
214
283
|
}
|
|
215
284
|
}
|
|
285
|
+
if (helperLines.length > 0) {
|
|
286
|
+
this.log(`--> Add ${helperLines.length} helperlines for element:`, helperLines);
|
|
287
|
+
}
|
|
216
288
|
|
|
217
289
|
return helperLines;
|
|
218
290
|
}
|
|
219
291
|
|
|
220
|
-
protected isAligned(
|
|
221
|
-
coordinate: (elem: Bounds) => number,
|
|
222
|
-
leftBounds: Bounds,
|
|
223
|
-
rightBounds: Bounds,
|
|
224
|
-
epsilon = this.action.alignmentEpsilon ?? 1
|
|
225
|
-
): boolean {
|
|
292
|
+
protected isAligned(coordinate: (elem: Bounds) => number, leftBounds: Bounds, rightBounds: Bounds, epsilon: number): boolean {
|
|
226
293
|
return this.isMatch(coordinate(leftBounds), coordinate(rightBounds), epsilon);
|
|
227
294
|
}
|
|
228
295
|
|
|
229
|
-
protected isMatch(leftCoordinate: number, rightCoordinate: number, epsilon
|
|
296
|
+
protected isMatch(leftCoordinate: number, rightCoordinate: number, epsilon: number): boolean {
|
|
230
297
|
return Math.abs(leftCoordinate - rightCoordinate) < epsilon;
|
|
231
298
|
}
|
|
299
|
+
|
|
300
|
+
protected log(message: string, ...params: any[]): void {
|
|
301
|
+
if (this.debug) {
|
|
302
|
+
this.logger.log(this, message, params);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
232
305
|
}
|
|
233
306
|
|
|
234
307
|
export interface RemoveHelperLinesFeedbackAction extends Action {
|
|
@@ -253,6 +326,7 @@ export class RemoveHelperLinesFeedbackCommand extends FeedbackCommand {
|
|
|
253
326
|
constructor(@inject(TYPES.Action) public action: RemoveHelperLinesFeedbackAction) {
|
|
254
327
|
super();
|
|
255
328
|
}
|
|
329
|
+
|
|
256
330
|
override execute(context: CommandExecutionContext): CommandReturn {
|
|
257
331
|
removeHelperLines(context.root);
|
|
258
332
|
removeSelectionBounds(context.root);
|
|
@@ -267,3 +341,11 @@ export function removeHelperLines(root: GModelRoot): void {
|
|
|
267
341
|
export function removeSelectionBounds(root: GModelRoot): void {
|
|
268
342
|
forEachElement(root.index, isSelectionBounds, line => root.remove(line));
|
|
269
343
|
}
|
|
344
|
+
|
|
345
|
+
export function boundsInViewport(element: GModelElement, bounds: Bounds | Point): Bounds | Point {
|
|
346
|
+
if (element instanceof GChildElement && !isViewport(element.parent)) {
|
|
347
|
+
return boundsInViewport(element.parent, element.parent.localToParent(bounds) as Bounds);
|
|
348
|
+
} else {
|
|
349
|
+
return bounds;
|
|
350
|
+
}
|
|
351
|
+
}
|