@eclipse-glsp/client 2.2.0-next.333 → 2.2.0-next.334
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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool-feedback.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-feedback.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA6G;AAC7G,yCAA+C;AAE/C,8EAA0E;AAC1E,6EAAuE;AACvE,4DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"change-bounds-tool-feedback.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAyD,MAAM,uBAAuB,CAAC;AAC7G,OAAO,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"change-bounds-tool-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAyD,MAAM,uBAAuB,CAAC;AAC7G,OAAO,mCAAmC,CAAC;AAO3C,eAAO,MAAM,sBAAsB,eAOjC,CAAC"}
|
|
@@ -19,11 +19,13 @@ exports.changeBoundsToolModule = void 0;
|
|
|
19
19
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
20
20
|
require("../../../../css/change-bounds.css");
|
|
21
21
|
const model_1 = require("../../change-bounds/model");
|
|
22
|
+
const change_bounds_manager_1 = require("./change-bounds-manager");
|
|
22
23
|
const change_bounds_tool_1 = require("./change-bounds-tool");
|
|
23
24
|
const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
|
|
24
25
|
const view_1 = require("./view");
|
|
25
26
|
exports.changeBoundsToolModule = new sprotty_1.FeatureModule((bind, unbind, isBound, rebind) => {
|
|
26
27
|
const context = { bind, unbind, isBound, rebind };
|
|
28
|
+
(0, sprotty_1.bindAsService)(context, sprotty_1.TYPES.IChangeBoundsManager, change_bounds_manager_1.ChangeBoundsManager);
|
|
27
29
|
(0, sprotty_1.bindAsService)(context, sprotty_1.TYPES.IDefaultTool, change_bounds_tool_1.ChangeBoundsTool);
|
|
28
30
|
(0, sprotty_1.configureCommand)(context, change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackCommand);
|
|
29
31
|
(0, sprotty_1.configureCommand)(context, change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackCommand);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool-module.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA6G;AAC7G,6CAA2C;AAC3C,qDAA0D;AAC1D,6DAAwD;AACxD,+EAAqI;AACrI,iCAA2C;AAE9B,QAAA,sBAAsB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACtF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,qCAAgB,CAAC,CAAC;IAC7D,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,uBAAa,EAAC,OAAO,EAAE,qBAAa,CAAC,IAAI,EAAE,wBAAiB,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"change-bounds-tool-module.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA6G;AAC7G,6CAA2C;AAC3C,qDAA0D;AAC1D,mEAA8D;AAC9D,6DAAwD;AACxD,+EAAqI;AACrI,iCAA2C;AAE9B,QAAA,sBAAsB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACtF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,oBAAoB,EAAE,2CAAmB,CAAC,CAAC;IACxE,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,qCAAgB,CAAC,CAAC;IAC7D,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,0BAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,uBAAa,EAAC,OAAO,EAAE,qBAAa,CAAC,IAAI,EAAE,wBAAiB,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
@@ -13,19 +13,13 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action,
|
|
16
|
+
import { Action, ElementMove, GModelElement, GModelRoot, MoveAction, Point } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { DebouncedFunc } from 'lodash';
|
|
18
|
+
import { ChangeBoundsTracker, TrackedMove } from '.';
|
|
18
19
|
import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
|
|
19
20
|
import { FeedbackEmitter } from '../../../base/feedback/feeback-emitter';
|
|
20
21
|
import { MoveableElement } from '../../../utils';
|
|
21
|
-
import { PointPositionUpdater } from '../../change-bounds';
|
|
22
22
|
import { ChangeBoundsTool } from './change-bounds-tool';
|
|
23
|
-
export interface ValidatedElementMove extends ElementMove {
|
|
24
|
-
valid: boolean;
|
|
25
|
-
}
|
|
26
|
-
export declare namespace ValidatedElementMove {
|
|
27
|
-
function isValid(move: ElementMove): boolean;
|
|
28
|
-
}
|
|
29
23
|
/**
|
|
30
24
|
* This mouse listener provides visual feedback for moving by sending client-side
|
|
31
25
|
* `MoveAction`s while elements are selected and dragged. This will also update
|
|
@@ -33,10 +27,10 @@ export declare namespace ValidatedElementMove {
|
|
|
33
27
|
* the visual feedback but also the basis for sending the change to the server
|
|
34
28
|
* (see also `tools/MoveTool`).
|
|
35
29
|
*/
|
|
36
|
-
export declare class FeedbackMoveMouseListener extends DragAwareMouseListener
|
|
30
|
+
export declare class FeedbackMoveMouseListener extends DragAwareMouseListener {
|
|
37
31
|
protected tool: ChangeBoundsTool;
|
|
38
32
|
protected rootElement?: GModelRoot;
|
|
39
|
-
protected
|
|
33
|
+
protected tracker: ChangeBoundsTracker;
|
|
40
34
|
protected elementId2startPos: Map<string, Point>;
|
|
41
35
|
protected pendingMoveInitialized?: DebouncedFunc<() => void>;
|
|
42
36
|
protected moveInitializedFeedback: FeedbackEmitter;
|
|
@@ -51,14 +45,11 @@ export declare class FeedbackMoveMouseListener extends DragAwareMouseListener im
|
|
|
51
45
|
nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[];
|
|
52
46
|
mouseMove(target: GModelElement, event: MouseEvent): Action[];
|
|
53
47
|
protected moveElements(target: GModelElement, event: MouseEvent): Action[];
|
|
54
|
-
protected
|
|
48
|
+
protected createMoveAction(trackedMove: TrackedMove): Action;
|
|
49
|
+
protected addMovementFeedback(trackedMove: TrackedMove, ctx: GModelElement, event: MouseEvent): void;
|
|
55
50
|
protected initializeElementsToMove(root: GModelRoot): void;
|
|
56
51
|
protected collectElementsToMove(root: GModelRoot): MoveableElement[];
|
|
57
52
|
protected getElementsToMove(context: GModelElement): MoveableElement[];
|
|
58
|
-
protected getElementMoves(target: GModelElement, event: MouseEvent, finished: boolean): MoveAction | undefined;
|
|
59
|
-
protected filterElementMove(elementMove: ValidatedElementMove): boolean;
|
|
60
|
-
protected getElementMovesForDelta(target: GModelElement, delta: Point, finished: boolean): ValidatedElementMove[];
|
|
61
|
-
protected createElementMove(element: MoveableElement, toPosition: Point, valid: boolean, finished: boolean): ValidatedElementMove;
|
|
62
53
|
protected resetElementPositions(context: GModelElement): MoveAction | undefined;
|
|
63
54
|
protected revertElementMoves(context?: GModelElement): ElementMove[];
|
|
64
55
|
draggingMouseUp(target: GModelElement, event: MouseEvent): Action[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool-move-feedback.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"change-bounds-tool-move-feedback.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAuB,MAAM,uBAAuB,CAAC;AAE/H,OAAO,EAAE,aAAa,EAAY,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAmF,MAAM,gBAAgB,CAAC;AAElI,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,sBAAsB;IAUrD,SAAS,CAAC,IAAI,EAAE,gBAAgB;IAT5C,SAAS,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACvC,SAAS,CAAC,kBAAkB,qBAA4B;IAExD,SAAS,CAAC,sBAAsB,CAAC,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;IAE7D,SAAS,CAAC,uBAAuB,EAAE,eAAe,CAAC;IACnD,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC;gBAElB,IAAI,EAAE,gBAAgB;IAOnC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAUtE,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAcxE,SAAS,CAAC,uBAAuB,IAAI,IAAI;IASzC,SAAS,CAAC,yBAAyB,IAAI,MAAM;IAI7C,SAAS,CAAC,eAAe,IAAI,IAAI;IASjC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,IAAI,eAAe;IAIrE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAOvE,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAUtE,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAkB1E,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM;IAQ5D,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAQpG,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAK1D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe,EAAE;IAMpE,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,eAAe,EAAE;IAItE,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,UAAU,GAAG,SAAS;IAK/E,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,EAAE;IAW3D,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAYnE,OAAO,IAAI,IAAI;CAQ3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FeedbackMoveMouseListener =
|
|
3
|
+
exports.FeedbackMoveMouseListener = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
5
|
* Copyright (c) 2019-2023 EclipseSource and others.
|
|
6
6
|
*
|
|
@@ -21,18 +21,8 @@ const lodash_1 = require("lodash");
|
|
|
21
21
|
const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
|
|
22
22
|
const css_feedback_1 = require("../../../base/feedback/css-feedback");
|
|
23
23
|
const utils_1 = require("../../../utils");
|
|
24
|
-
const change_bounds_1 = require("../../change-bounds");
|
|
25
24
|
const model_1 = require("../../change-bounds/model");
|
|
26
|
-
const movement_restrictor_1 = require("../../change-bounds/movement-restrictor");
|
|
27
25
|
const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
|
|
28
|
-
var ValidatedElementMove;
|
|
29
|
-
(function (ValidatedElementMove) {
|
|
30
|
-
function isValid(move) {
|
|
31
|
-
var _a;
|
|
32
|
-
return (_a = move.valid) !== null && _a !== void 0 ? _a : true;
|
|
33
|
-
}
|
|
34
|
-
ValidatedElementMove.isValid = isValid;
|
|
35
|
-
})(ValidatedElementMove || (exports.ValidatedElementMove = ValidatedElementMove = {}));
|
|
36
26
|
/**
|
|
37
27
|
* This mouse listener provides visual feedback for moving by sending client-side
|
|
38
28
|
* `MoveAction`s while elements are selected and dragged. This will also update
|
|
@@ -45,7 +35,7 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
45
35
|
super();
|
|
46
36
|
this.tool = tool;
|
|
47
37
|
this.elementId2startPos = new Map();
|
|
48
|
-
this.
|
|
38
|
+
this.tracker = tool.createChangeBoundsTracker();
|
|
49
39
|
this.moveInitializedFeedback = tool.createFeedbackEmitter();
|
|
50
40
|
this.moveFeedback = tool.createFeedbackEmitter();
|
|
51
41
|
}
|
|
@@ -55,7 +45,7 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
55
45
|
this.initializeMove(target, event);
|
|
56
46
|
return [];
|
|
57
47
|
}
|
|
58
|
-
this.
|
|
48
|
+
this.tracker.stopTracking();
|
|
59
49
|
return [];
|
|
60
50
|
}
|
|
61
51
|
initializeMove(target, event) {
|
|
@@ -65,11 +55,11 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
65
55
|
}
|
|
66
56
|
const moveable = (0, sprotty_1.findParentByFeature)(target, this.isValidMoveable);
|
|
67
57
|
if (moveable !== undefined) {
|
|
68
|
-
this.
|
|
58
|
+
this.tracker.startTracking();
|
|
69
59
|
this.scheduleMoveInitialized();
|
|
70
60
|
}
|
|
71
61
|
else {
|
|
72
|
-
this.
|
|
62
|
+
this.tracker.stopTracking();
|
|
73
63
|
}
|
|
74
64
|
}
|
|
75
65
|
scheduleMoveInitialized() {
|
|
@@ -98,7 +88,7 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
98
88
|
nonDraggingMouseUp(element, event) {
|
|
99
89
|
// should reset everything that may have happend on mouse down
|
|
100
90
|
this.moveInitializedFeedback.dispose();
|
|
101
|
-
this.
|
|
91
|
+
this.tracker.stopTracking();
|
|
102
92
|
return [];
|
|
103
93
|
}
|
|
104
94
|
mouseMove(target, event) {
|
|
@@ -106,7 +96,7 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
106
96
|
if (event.buttons === 0) {
|
|
107
97
|
return this.mouseUp(target, event);
|
|
108
98
|
}
|
|
109
|
-
else if (
|
|
99
|
+
else if (this.tracker.isTracking()) {
|
|
110
100
|
return this.moveElements(target, event);
|
|
111
101
|
}
|
|
112
102
|
return [];
|
|
@@ -116,32 +106,28 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
116
106
|
if (this.elementId2startPos.size === 0) {
|
|
117
107
|
this.initializeElementsToMove(target.root);
|
|
118
108
|
}
|
|
119
|
-
const
|
|
120
|
-
|
|
109
|
+
const elementsToMove = this.getElementsToMove(target);
|
|
110
|
+
const move = this.tracker.moveElements(elementsToMove, { snap: event, restrict: event });
|
|
111
|
+
if (move.elementMoves.length === 0) {
|
|
121
112
|
return [];
|
|
122
113
|
}
|
|
123
114
|
// cancel any pending move
|
|
124
115
|
(_a = this.pendingMoveInitialized) === null || _a === void 0 ? void 0 : _a.cancel();
|
|
125
|
-
this.moveFeedback.add(
|
|
126
|
-
this.addMovementFeedback(
|
|
116
|
+
this.moveFeedback.add(this.createMoveAction(move), () => this.resetElementPositions(target));
|
|
117
|
+
this.addMovementFeedback(move, target, event);
|
|
118
|
+
this.tracker.updateTrackingPosition(move);
|
|
127
119
|
this.moveFeedback.submit();
|
|
128
120
|
return [];
|
|
129
121
|
}
|
|
130
|
-
|
|
122
|
+
createMoveAction(trackedMove) {
|
|
123
|
+
// we never want to animate the move action as this interferes with the move feedback
|
|
124
|
+
return sprotty_1.MoveAction.create(trackedMove.elementMoves.map(move => ({ elementId: move.element.id, toPosition: move.toPosition })), { animate: false });
|
|
125
|
+
}
|
|
126
|
+
addMovementFeedback(trackedMove, ctx, event) {
|
|
131
127
|
// cursor feedback
|
|
132
128
|
this.moveFeedback.add((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.MOVE), (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
|
|
133
129
|
// restriction feedback
|
|
134
|
-
|
|
135
|
-
const element = ctx.root.index.getById(move.elementId);
|
|
136
|
-
if (element && this.tool.movementRestrictor) {
|
|
137
|
-
if (!ValidatedElementMove.isValid(move)) {
|
|
138
|
-
this.moveFeedback.add((0, movement_restrictor_1.createMovementRestrictionFeedback)(element, this.tool.movementRestrictor), () => (0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
|
|
139
|
-
}
|
|
140
|
-
else {
|
|
141
|
-
this.moveFeedback.add((0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
});
|
|
130
|
+
trackedMove.elementMoves.forEach(move => this.tool.changeBoundsManager.addRestrictionFeedback(this.moveFeedback, move));
|
|
145
131
|
}
|
|
146
132
|
initializeElementsToMove(root) {
|
|
147
133
|
const elementsToMove = this.collectElementsToMove(root);
|
|
@@ -155,41 +141,6 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
155
141
|
getElementsToMove(context) {
|
|
156
142
|
return (0, utils_1.getElements)(context.root.index, Array.from(this.elementId2startPos.keys()), this.isValidMoveable);
|
|
157
143
|
}
|
|
158
|
-
getElementMoves(target, event, finished) {
|
|
159
|
-
const delta = this.positionUpdater.updatePosition(target, event);
|
|
160
|
-
if (!delta) {
|
|
161
|
-
return undefined;
|
|
162
|
-
}
|
|
163
|
-
const elementMoves = this.getElementMovesForDelta(target, delta, finished).filter(move => this.filterElementMove(move));
|
|
164
|
-
if (elementMoves.length > 0) {
|
|
165
|
-
// we never want to animate the move action as this interferes with the move feedback
|
|
166
|
-
return sprotty_1.MoveAction.create(elementMoves, { animate: false, finished });
|
|
167
|
-
}
|
|
168
|
-
else {
|
|
169
|
-
return undefined;
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
filterElementMove(elementMove) {
|
|
173
|
-
return !!elementMove.fromPosition && !sprotty_1.Point.equals(elementMove.fromPosition, elementMove.toPosition);
|
|
174
|
-
}
|
|
175
|
-
getElementMovesForDelta(target, delta, finished) {
|
|
176
|
-
return this.getElementsToMove(target).flatMap(element => {
|
|
177
|
-
var _a, _b;
|
|
178
|
-
const startPosition = this.elementId2startPos.get(element.id);
|
|
179
|
-
if (!startPosition) {
|
|
180
|
-
return [];
|
|
181
|
-
}
|
|
182
|
-
const targetPosition = sprotty_1.Point.add(element.position, delta);
|
|
183
|
-
const valid = (_b = (_a = this.tool.movementRestrictor) === null || _a === void 0 ? void 0 : _a.validate(element, targetPosition)) !== null && _b !== void 0 ? _b : true;
|
|
184
|
-
return [this.createElementMove(element, targetPosition, valid, finished)];
|
|
185
|
-
});
|
|
186
|
-
}
|
|
187
|
-
createElementMove(element, toPosition, valid, finished) {
|
|
188
|
-
// if we are finished and have an invalid move, we want to move the element back to its start position
|
|
189
|
-
return !valid && finished
|
|
190
|
-
? { elementId: element.id, fromPosition: element.position, toPosition: element.position, valid }
|
|
191
|
-
: { elementId: element.id, fromPosition: element.position, toPosition, valid };
|
|
192
|
-
}
|
|
193
144
|
resetElementPositions(context) {
|
|
194
145
|
const elementMoves = this.revertElementMoves(context);
|
|
195
146
|
return sprotty_1.MoveAction.create(elementMoves, { animate: false, finished: true });
|
|
@@ -204,12 +155,13 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
204
155
|
return elementMoves;
|
|
205
156
|
}
|
|
206
157
|
draggingMouseUp(target, event) {
|
|
207
|
-
if (this.
|
|
158
|
+
if (!this.tracker.isTracking()) {
|
|
208
159
|
return [];
|
|
209
160
|
}
|
|
210
161
|
// only reset the move of invalid elements, the others will be handled by the change bounds tool itself
|
|
211
|
-
|
|
212
|
-
|
|
162
|
+
this.getElementsToMove(target)
|
|
163
|
+
.filter(element => this.tool.changeBoundsManager.isValid(element))
|
|
164
|
+
.forEach(element => this.elementId2startPos.delete(element.id));
|
|
213
165
|
this.dispose();
|
|
214
166
|
return [];
|
|
215
167
|
}
|
|
@@ -218,7 +170,7 @@ class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMou
|
|
|
218
170
|
(_a = this.pendingMoveInitialized) === null || _a === void 0 ? void 0 : _a.cancel();
|
|
219
171
|
this.moveInitializedFeedback.dispose();
|
|
220
172
|
this.moveFeedback.dispose();
|
|
221
|
-
this.
|
|
173
|
+
this.tracker.dispose();
|
|
222
174
|
this.elementId2startPos.clear();
|
|
223
175
|
super.dispose();
|
|
224
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool-move-feedback.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"change-bounds-tool-move-feedback.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool-move-feedback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Action, BoundsAware,
|
|
1
|
+
import { Action, BoundsAware, EdgeRouterRegistry, ElementAndBounds, GModelElement, GModelRoot, GParentElement, MouseListener, Operation } from '@eclipse-glsp/sprotty';
|
|
2
|
+
import { ChangeBoundsManager, ChangeBoundsTracker, TrackedElementResize, TrackedResize } from '..';
|
|
2
3
|
import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
|
|
3
4
|
import { FeedbackEmitter } from '../../../base/feedback/feeback-emitter';
|
|
4
5
|
import { ISelectionListener, SelectionService } from '../../../base/selection-service';
|
|
5
6
|
import { BoundsAwareModelElement, ResizableModelElement } from '../../../utils/gmodel-util';
|
|
6
|
-
import {
|
|
7
|
+
import { SetBoundsFeedbackAction } from '../../bounds';
|
|
7
8
|
import { SResizeHandle } from '../../change-bounds/model';
|
|
8
9
|
import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
|
|
9
|
-
import { PositionSnapper } from '../../change-bounds/position-snapper';
|
|
10
10
|
import { BaseEditTool } from '../base-tools';
|
|
11
11
|
/**
|
|
12
12
|
* The change bounds tool has the license to move multiple elements or resize a single element by implementing the ChangeBounds operation.
|
|
@@ -26,23 +26,18 @@ export declare class ChangeBoundsTool extends BaseEditTool {
|
|
|
26
26
|
protected selectionService: SelectionService;
|
|
27
27
|
readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
28
28
|
readonly movementRestrictor?: IMovementRestrictor;
|
|
29
|
-
readonly
|
|
29
|
+
readonly changeBoundsManager: ChangeBoundsManager;
|
|
30
30
|
get id(): string;
|
|
31
31
|
enable(): void;
|
|
32
|
+
createChangeBoundsTracker(): ChangeBoundsTracker;
|
|
32
33
|
protected createMoveMouseListener(): MouseListener;
|
|
33
34
|
protected createChangeBoundsListener(): MouseListener & ISelectionListener;
|
|
34
35
|
}
|
|
35
|
-
export
|
|
36
|
-
valid: boolean;
|
|
37
|
-
}
|
|
38
|
-
export declare namespace ValidatedElementAndBounds {
|
|
39
|
-
function isValid(move: ElementAndBounds): boolean;
|
|
40
|
-
}
|
|
41
|
-
export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener, Disposable {
|
|
36
|
+
export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener {
|
|
42
37
|
protected tool: ChangeBoundsTool;
|
|
43
38
|
static readonly CSS_CLASS_ACTIVE = "active";
|
|
44
39
|
protected initialBounds: ElementAndBounds | undefined;
|
|
45
|
-
protected
|
|
40
|
+
protected tracker: ChangeBoundsTracker;
|
|
46
41
|
protected activeResizeElement?: ResizableModelElement;
|
|
47
42
|
protected activeResizeHandle?: SResizeHandle;
|
|
48
43
|
protected handleFeedback: FeedbackEmitter;
|
|
@@ -52,27 +47,21 @@ export declare class ChangeBoundsListener extends DragAwareMouseListener impleme
|
|
|
52
47
|
protected updateResizeElement(target: GModelElement, event?: MouseEvent): boolean;
|
|
53
48
|
protected findResizeElement(target: GModelElement): ResizableModelElement | undefined;
|
|
54
49
|
protected draggingMouseMove(target: GModelElement, event: MouseEvent): Action[];
|
|
55
|
-
protected
|
|
56
|
-
protected
|
|
57
|
-
protected
|
|
58
|
-
|
|
50
|
+
protected resizeBoundsAction(resize: TrackedResize): SetBoundsFeedbackAction;
|
|
51
|
+
protected toElementAndBounds(elementResize: TrackedElementResize): ElementAndBounds;
|
|
52
|
+
protected addResizeFeedback(resize: TrackedResize, target: GModelElement, event: MouseEvent): void;
|
|
53
|
+
protected resetBounds(): Action[];
|
|
54
|
+
draggingMouseUp(target: GModelElement, event: MouseEvent): Action[];
|
|
59
55
|
nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[];
|
|
60
56
|
protected handleMoveOnServer(target: GModelElement): Action[];
|
|
61
57
|
protected handleMoveElementsOnServer(target: GModelElement): Operation[];
|
|
62
|
-
protected
|
|
58
|
+
protected isValidMove(element: BoundsAwareModelElement, selectedElements?: Set<BoundsAwareModelElement>): boolean;
|
|
63
59
|
protected isChildOfSelected(selectedElements: Set<GModelElement>, element: GModelElement): boolean;
|
|
64
60
|
protected handleMoveRoutingPointsOnServer(target: GModelElement): Operation[];
|
|
65
61
|
protected handleResizeOnServer(activeResizeHandle: SResizeHandle): Action[];
|
|
62
|
+
protected isValidResize(element: BoundsAwareModelElement): boolean;
|
|
66
63
|
selectionChanged(root: GModelRoot, selectedElements: string[]): void;
|
|
67
64
|
protected isActiveResizeElement(element?: GModelElement): element is GParentElement & BoundsAware;
|
|
68
|
-
protected handleResizeOnClient(positionUpdate: Point): ValidatedElementAndBounds[];
|
|
69
|
-
protected handleTopLeftResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
|
|
70
|
-
protected handleTopRightResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
|
|
71
|
-
protected handleBottomLeftResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
|
|
72
|
-
protected handleBottomRightResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
|
|
73
|
-
protected createSetBoundsAction(element: BoundsAwareModelElement, newPosition: Point, newSize: Dimension): ValidatedElementAndBounds[];
|
|
74
|
-
protected isValidSize(element: BoundsAwareModelElement, size: Dimension): boolean;
|
|
75
|
-
protected isValidMove(element: BoundsAwareModelElement, newPosition: Point): boolean;
|
|
76
65
|
protected disposeAllButHandles(): void;
|
|
77
66
|
dispose(): void;
|
|
78
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-bounds-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,MAAM,EACN,WAAW,
|
|
1
|
+
{"version":3,"file":"change-bounds-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-bounds-tool.ts"],"names":[],"mappings":"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"}
|