@eclipse-glsp/client 2.3.0-next.322 → 2.3.0-next.363

package/lib/features/tools/edge-creation/edge-creation-tool.js

@@ -12,7 +12,7 @@ var EdgeCreationTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EdgeCreationToolMouseListener = exports.EdgeCreationTool = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,16 +26,15 @@ exports.EdgeCreationToolMouseListener = exports.EdgeCreationTool = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const inversify_1 = require("inversify");
 const sprotty_1 = require("@eclipse-glsp/sprotty");
-const action_dispatcher_1 = require("../../../base/action-dispatcher");
+const inversify_1 = require("inversify");
 const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
 const css_feedback_1 = require("../../../base/feedback/css-feedback");
 const tool_1 = require("../../../base/tool-manager/tool");
+const model_1 = require("../../../model");
 const base_tools_1 = require("../base-tools");
 const dangling_edge_feedback_1 = require("./dangling-edge-feedback");
 const edge_creation_tool_feedback_1 = require("./edge-creation-tool-feedback");
-const model_1 = require("../../../model");
 /**
  * Tool to create connections in a Diagram, by selecting a source and target node.
  */
@@ -48,11 +47,23 @@ let EdgeCreationTool = EdgeCreationTool_1 = class EdgeCreationTool extends base_
         return EdgeCreationTool_1.ID;
     }
     doEnable() {
+        this.toolFeedback();
+        this.creationListener();
+        this.trackFeedbackEdge();
+    }
+    toolFeedback() {
+        const toolFeedback = this.createFeedbackEmitter()
+            .add((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.OPERATION_NOT_ALLOWED), (0, css_feedback_1.cursorFeedbackAction)())
+            .submit();
+        this.toDisposeOnDisable.push(toolFeedback);
+    }
+    creationListener() {
+        const creationListener = new EdgeCreationToolMouseListener(this.triggerAction, this.actionDispatcher, this.typeHintProvider, this, this.grid ? this.grid.x / 2 : undefined);
+        this.toDisposeOnDisable.push(creationListener, this.mouseTool.registerListener(creationListener));
+    }
+    trackFeedbackEdge() {
         const mouseMovingFeedback = new edge_creation_tool_feedback_1.FeedbackEdgeEndMovingMouseListener(this.anchorRegistry, this.feedbackDispatcher);
-        this.toDisposeOnDisable.push(mouseMovingFeedback, this.mouseTool.registerListener(new EdgeCreationToolMouseListener(this.triggerAction, this.actionDispatcher, this.typeHintProvider, this)), this.mouseTool.registerListener(mouseMovingFeedback), this.registerFeedback([(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.OPERATION_NOT_ALLOWED)], this, [
-            dangling_edge_feedback_1.RemoveFeedbackEdgeAction.create(),
-            (0, css_feedback_1.cursorFeedbackAction)()
-        ]));
+        this.toDisposeOnDisable.push(mouseMovingFeedback, this.mouseTool.registerListener(mouseMovingFeedback));
     }
 };
 exports.EdgeCreationTool = EdgeCreationTool;
@@ -65,63 +76,81 @@ __decorate([
     (0, inversify_1.inject)(sprotty_1.TYPES.ITypeHintProvider),
     __metadata("design:type", Object)
 ], EdgeCreationTool.prototype, "typeHintProvider", void 0);
+__decorate([
+    (0, inversify_1.optional)(),
+    (0, inversify_1.inject)(sprotty_1.TYPES.Grid),
+    __metadata("design:type", Object)
+], EdgeCreationTool.prototype, "grid", void 0);
 exports.EdgeCreationTool = EdgeCreationTool = EdgeCreationTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], EdgeCreationTool);
-let EdgeCreationToolMouseListener = class EdgeCreationToolMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
-    constructor(triggerAction, actionDispatcher, typeHintProvider, tool) {
-        super();
+class EdgeCreationToolMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
+    constructor(triggerAction, actionDispatcher, typeHintProvider, tool, dragSensitivity) {
+        super(dragSensitivity);
         this.triggerAction = triggerAction;
         this.actionDispatcher = actionDispatcher;
         this.typeHintProvider = typeHintProvider;
         this.tool = tool;
+        this.dragSensitivity = dragSensitivity;
         this.allowedTarget = false;
         this.pendingDynamicCheck = false;
         this.proxyEdge = new model_1.GEdge();
         this.proxyEdge.type = triggerAction.elementTypeId;
+        this.cursorFeedback = tool.createFeedbackEmitter();
+        this.feedbackEdgeFeedback = tool.createFeedbackEmitter();
     }
-    reinitialize() {
-        this.source = undefined;
-        this.target = undefined;
-        this.currentTarget = undefined;
-        this.allowedTarget = false;
-        this.tool.registerFeedback([dangling_edge_feedback_1.RemoveFeedbackEdgeAction.create()]);
-    }
-    nonDraggingMouseUp(_element, event) {
+    nonDraggingMouseUp(element, event) {
         const result = [];
         if (event.button === 0) {
             if (!this.isSourceSelected()) {
                 if (this.currentTarget && this.allowedTarget) {
                     this.source = this.currentTarget.id;
-                    this.tool.registerFeedback([
-                        dangling_edge_feedback_1.DrawFeedbackEdgeAction.create({ elementTypeId: this.triggerAction.elementTypeId, sourceId: this.source })
-                    ]);
+                    this.feedbackEdgeFeedback
+                        .add(dangling_edge_feedback_1.DrawFeedbackEdgeAction.create({ elementTypeId: this.triggerAction.elementTypeId, sourceId: this.source }), dangling_edge_feedback_1.RemoveFeedbackEdgeAction.create())
+                        .submit();
                 }
             }
             else if (this.currentTarget && this.allowedTarget) {
                 this.target = this.currentTarget.id;
             }
             if (this.source && this.target) {
-                result.push(sprotty_1.CreateEdgeOperation.create({
-                    elementTypeId: this.triggerAction.elementTypeId,
-                    sourceElementId: this.source,
-                    targetElementId: this.target,
-                    args: this.triggerAction.args
-                }));
-                if (!(0, sprotty_1.isCtrlOrCmd)(event)) {
+                result.push(this.getCreateOperation(element, event, this.source, this.target));
+                if (!this.isContinuousMode(element, event)) {
                     result.push(tool_1.EnableDefaultToolsAction.create());
                 }
                 else {
-                    this.reinitialize();
+                    this.dispose();
                 }
             }
         }
         else if (event.button === 2) {
-            this.reinitialize();
+            this.dispose();
             result.push(tool_1.EnableDefaultToolsAction.create());
         }
         return result;
     }
+    /**
+     * Determines wether the tool should run in continuous mode (also called stamp mode) or not.
+     * If continuous mode is enabled, the tool will stay after a successful creation.
+     * The user can then create more elements of the same type without having to re-trigger the tool.
+     * By default, continuous mode is enabled if the user holds the CTRL key.
+     * @param element the current model element
+     * @param event
+     */
+    isContinuousMode(element, event) {
+        return (0, sprotty_1.isCtrlOrCmd)(event);
+    }
+    getCreateOperation(element, event, sourceElementId, targetElementId) {
+        return sprotty_1.CreateEdgeOperation.create({
+            elementTypeId: this.triggerAction.elementTypeId,
+            sourceElementId,
+            targetElementId,
+            args: this.getCreateEdgeOperationArgs(element, event)
+        });
+    }
+    getCreateEdgeOperationArgs(ctx, event) {
+        return Object.assign({}, this.triggerAction.args);
+    }
     isSourceSelected() {
         return this.source !== undefined;
     }
@@ -191,10 +220,15 @@ let EdgeCreationToolMouseListener = class EdgeCreationToolMouseListener extends
         const typeHint = this.typeHintProvider.getEdgeTypeHint(edgeTypeId);
         return (_a = typeHint === null || typeHint === void 0 ? void 0 : typeHint.dynamic) !== null && _a !== void 0 ? _a : false;
     }
-};
+    dispose() {
+        this.source = undefined;
+        this.target = undefined;
+        this.currentTarget = undefined;
+        this.allowedTarget = false;
+        this.feedbackEdgeFeedback.dispose();
+        this.cursorFeedback.dispose();
+        super.dispose();
+    }
+}
 exports.EdgeCreationToolMouseListener = EdgeCreationToolMouseListener;
-exports.EdgeCreationToolMouseListener = EdgeCreationToolMouseListener = __decorate([
-    (0, inversify_1.injectable)(),
-    __metadata("design:paramtypes", [Object, action_dispatcher_1.GLSPActionDispatcher, Object, EdgeCreationTool])
-], EdgeCreationToolMouseListener);
 //# sourceMappingURL=edge-creation-tool.js.map

package/lib/features/tools/edge-creation/edge-creation-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"edge-creation-tool.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/edge-creation-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edge-creation-tool.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/edge-creation-tool.ts"],"names":[],"mappings":"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"}

package/lib/features/tools/edge-creation/view.d.ts

@@ -1,5 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2019-2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+/** @jsx svg */
+import { GModelElement, IView, RenderingContext } from '@eclipse-glsp/sprotty';
 import { VNode } from 'snabbdom';
-import { IView, RenderingContext, GModelElement } from '@eclipse-glsp/sprotty';
 /**
  * This view is used for the invisible end of the feedback edge.
  * A feedback edge is shown as a visual feedback when creating edges.

package/lib/features/tools/edge-creation/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,KAAK,EAAS,gBAAgB,EAAE,aAAa,EAAO,MAAM,uBAAuB,CAAC;AAK3F;;;GAGG;AACH,qBACa,mBAAoB,YAAW,KAAK;IAC7C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAI3E"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,eAAe;AACf,OAAO,EAAE,aAAa,EAAE,KAAK,EAAS,gBAAgB,EAAO,MAAM,uBAAuB,CAAC;AAE3F,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC;;;GAGG;AACH,qBACa,mBAAoB,YAAW,KAAK;IAC7C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAI3E"}

package/lib/features/tools/edge-creation/view.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeedbackEdgeEndView = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,10 +22,9 @@ exports.FeedbackEdgeEndView = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const inversify_1 = require("inversify");
+/** @jsx svg */
 const sprotty_1 = require("@eclipse-glsp/sprotty");
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: sprotty_1.svg };
+const inversify_1 = require("inversify");
 /**
  * This view is used for the invisible end of the feedback edge.
  * A feedback edge is shown as a visual feedback when creating edges.
@@ -34,7 +33,7 @@ let FeedbackEdgeEndView = class FeedbackEdgeEndView {
     render(model, context) {
         var _a;
         const position = (_a = model.position) !== null && _a !== void 0 ? _a : sprotty_1.Point.ORIGIN;
-        return JSX.createElement("g", { x: position.x, y: position.y });
+        return (0, sprotty_1.svg)("g", { x: position.x, y: position.y });
     }
 };
 exports.FeedbackEdgeEndView = FeedbackEdgeEndView;

package/lib/features/tools/edge-creation/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,mDAA2F;AAE3F,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAEnC;;;GAGG;AAEI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,MAAM,CAAC,KAA8B,EAAE,OAAyB;;QAC5D,MAAM,QAAQ,GAAU,MAAC,KAAa,CAAC,QAAQ,mCAAI,eAAK,CAAC,MAAM,CAAC;QAChE,OAAO,yBAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAI,CAAC;IAC/C,CAAC;CACJ,CAAA;AALY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAK/B"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-creation/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,eAAe;AACf,mDAA2F;AAC3F,yCAAuC;AAGvC;;;GAGG;AAEI,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,MAAM,CAAC,KAA8B,EAAE,OAAyB;;QAC5D,MAAM,QAAQ,GAAU,MAAC,KAAa,CAAC,QAAQ,mCAAI,eAAK,CAAC,MAAM,CAAC;QAChE,OAAO,0BAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAI,CAAC;IAC/C,CAAC;CACJ,CAAA;AALY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAK/B"}

package/lib/features/tools/edge-edit/edge-edit-module.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/lib/features/tools/edge-edit/edge-edit-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-edit-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAA0C,MAAM,uBAAuB,CAAC;AAU9F,eAAO,MAAM,kBAAkB,eAY7B,CAAC"}
+{"version":3,"file":"edge-edit-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAA0C,MAAM,uBAAuB,CAAC;AAU9F,eAAO,MAAM,kBAAkB,eAe9B,CAAC"}

package/lib/features/tools/edge-edit/edge-edit-module.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.edgeEditToolModule = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,5 +30,5 @@ exports.edgeEditToolModule = new sprotty_1.FeatureModule((bind, unbind, isBound,
     (0, sprotty_1.configureCommand)(context, edge_edit_tool_feedback_1.SwitchRoutingModeCommand);
     // dangling edge feedback
     (0, dangling_edge_feedback_1.configureDanglingFeedbackEdge)(context);
-});
+}, { featureId: Symbol('edgeEditTool') });
 //# sourceMappingURL=edge-edit-module.js.map

package/lib/features/tools/edge-edit/edge-edit-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"edge-edit-module.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA8F;AAC9F,oFAAwF;AACxF,qDAAgD;AAChD,uEAKmC;AAEtB,QAAA,kBAAkB,GAAG,IAAI,uBAAa,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAClF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,6BAAY,CAAC,CAAC;IAEzD,+BAA+B;IAC/B,IAAA,0BAAgB,EAAC,OAAO,EAAE,iEAAuC,CAAC,CAAC;IACnE,IAAA,0BAAgB,EAAC,OAAO,EAAE,iEAAuC,CAAC,CAAC;IACnE,IAAA,0BAAgB,EAAC,OAAO,EAAE,uDAA6B,CAAC,CAAC;IACzD,IAAA,0BAAgB,EAAC,OAAO,EAAE,kDAAwB,CAAC,CAAC;IAEpD,yBAAyB;IACzB,IAAA,sDAA6B,EAAC,OAAO,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"edge-edit-module.js","sourceRoot":"","sources":["../../../../src/features/tools/edge-edit/edge-edit-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAA8F;AAC9F,oFAAwF;AACxF,qDAAgD;AAChD,uEAKmC;AAEtB,QAAA,kBAAkB,GAAG,IAAI,uBAAa,CAC/C,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClD,IAAA,uBAAa,EAAC,OAAO,EAAE,eAAK,CAAC,YAAY,EAAE,6BAAY,CAAC,CAAC;IAEzD,+BAA+B;IAC/B,IAAA,0BAAgB,EAAC,OAAO,EAAE,iEAAuC,CAAC,CAAC;IACnE,IAAA,0BAAgB,EAAC,OAAO,EAAE,iEAAuC,CAAC,CAAC;IACnE,IAAA,0BAAgB,EAAC,OAAO,EAAE,uDAA6B,CAAC,CAAC;IACzD,IAAA,0BAAgB,EAAC,OAAO,EAAE,kDAAwB,CAAC,CAAC;IAEpD,yBAAyB;IACzB,IAAA,sDAA6B,EAAC,OAAO,CAAC,CAAC;AAC3C,CAAC,EACD,EAAE,SAAS,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CACxC,CAAC"}

package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,12 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, AnchorComputerRegistry, CommandExecutionContext, CommandReturn, Disposable, EdgeRouterRegistry, ElementMove, GConnectableElement, GModelElement, GRoutingHandle, MouseListener, Point, SwitchEditModeAction, SwitchEditModeCommand } from '@eclipse-glsp/sprotty';
+import { Action, AnchorComputerRegistry, CommandExecutionContext, CommandReturn, Disposable, EdgeRouterRegistry, GConnectableElement, GModelElement, GRoutingHandle, MouseListener, Point, SwitchEditModeAction, SwitchEditModeCommand } from '@eclipse-glsp/sprotty';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
 import { IFeedbackActionDispatcher } from '../../../base/feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../../base/feedback/feedback-command';
-import { PositionSnapper } from '../../change-bounds/position-snapper';
+import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
+import { ChangeBoundsManager } from '../change-bounds/change-bounds-manager';
+import { ChangeBoundsTracker, MoveableRoutingHandle } from '../change-bounds/change-bounds-tracker';
 import { FeedbackEdgeEndMovingMouseListener } from '../edge-creation/edge-creation-tool-feedback';
-import { PointPositionUpdater } from '../../change-bounds/point-position-updater';
 /**
  * RECONNECT HANDLES FEEDBACK
  */
@@ -99,23 +101,25 @@ export declare class FeedbackEdgeTargetMovingMouseListener extends FeedbackEdgeE
 export declare class FeedbackEdgeSourceMovingMouseListener extends MouseListener implements Disposable {
     protected anchorRegistry: AnchorComputerRegistry;
     protected feedbackDispatcher: IFeedbackActionDispatcher;
+    protected feedback: FeedbackEmitter;
     constructor(anchorRegistry: AnchorComputerRegistry, feedbackDispatcher: IFeedbackActionDispatcher);
     mouseMove(target: GModelElement, event: MouseEvent): Action[];
     protected computeAbsoluteAnchor(element: GConnectableElement, referencePoint: Point, offset?: number): Point;
     dispose(): void;
 }
-export declare class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
-    protected positionSnapper: PositionSnapper;
+export declare class FeedbackEdgeRouteMovingMouseListener extends DragAwareMouseListener {
+    protected changeBoundsManager: ChangeBoundsManager;
     protected edgeRouterRegistry?: EdgeRouterRegistry | undefined;
-    protected pointPositionUpdater: PointPositionUpdater;
-    constructor(positionSnapper: PositionSnapper, edgeRouterRegistry?: EdgeRouterRegistry | undefined);
+    protected tracker: ChangeBoundsTracker;
+    constructor(changeBoundsManager: ChangeBoundsManager, edgeRouterRegistry?: EdgeRouterRegistry | undefined);
     mouseDown(target: GModelElement, event: MouseEvent): Action[];
-    mouseMove(target: GModelElement, event: MouseEvent): Action[];
-    protected handleMoveOnClient(target: GModelElement, positionUpdate: Point, isSnap: boolean): Action[];
-    protected toElementMove(element: GRoutingHandle, positionDelta: Point, isSnap: boolean): ElementMove | undefined;
-    protected getSnappedHandlePosition(element: GRoutingHandle, point: Point, isSnap: boolean): Point;
+    draggingMouseMove(target: GModelElement, event: MouseEvent): Action[];
+    protected moveRoutingHandles(target: GModelElement, event: MouseEvent): Action[];
+    protected getRoutingHandlesToMove(context: GModelElement): MoveableRoutingHandle[];
     protected getHandlePosition(handle: GRoutingHandle): Point | undefined;
-    mouseUp(_target: GModelElement, _event: MouseEvent): Action[];
+    nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[];
+    draggingMouseUp(_target: GModelElement, _event: MouseEvent): Action[];
+    dispose(): void;
 }
 /**
  * UTILITY FUNCTIONS

package/lib/features/tools/edge-edit/edge-edit-tool-feedback.d.ts.map

@@ -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":"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"}
+{"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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"}

package/lib/features/tools/edge-edit/edge-edit-tool-feedback.js

@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawFeedbackEdgeSource = exports.FeedbackEdgeRouteMovingMouseListener = exports.FeedbackEdgeSourceMovingMouseListener = exports.FeedbackEdgeTargetMovingMouseListener = exports.DrawFeedbackEdgeSourceCommand = exports.DrawFeedbackEdgeSourceAction = exports.SwitchRoutingModeCommand = exports.SwitchRoutingModeAction = exports.HideEdgeReconnectHandlesFeedbackCommand = exports.ShowEdgeReconnectHandlesFeedbackCommand = exports.HideEdgeReconnectHandlesFeedbackAction = exports.ShowEdgeReconnectHandlesFeedbackAction = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,14 +30,14 @@ exports.drawFeedbackEdgeSource = exports.FeedbackEdgeRouteMovingMouseListener =
  ********************************************************************************/
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
+const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
 const feedback_command_1 = require("../../../base/feedback/feedback-command");
 const gmodel_util_1 = require("../../../utils/gmodel-util");
 const viewpoint_util_1 = require("../../../utils/viewpoint-util");
-const snap_1 = require("../../change-bounds/snap");
 const model_1 = require("../../reconnect/model");
+const change_bounds_tracker_1 = require("../change-bounds/change-bounds-tracker");
 const dangling_edge_feedback_1 = require("../edge-creation/dangling-edge-feedback");
 const edge_creation_tool_feedback_1 = require("../edge-creation/edge-creation-tool-feedback");
-const point_position_updater_1 = require("../../change-bounds/point-position-updater");
 var ShowEdgeReconnectHandlesFeedbackAction;
 (function (ShowEdgeReconnectHandlesFeedbackAction) {
     ShowEdgeReconnectHandlesFeedbackAction.KIND = 'showReconnectHandlesFeedback';
@@ -165,6 +165,7 @@ class FeedbackEdgeSourceMovingMouseListener extends sprotty_1.MouseListener {
         super();
         this.anchorRegistry = anchorRegistry;
         this.feedbackDispatcher = feedbackDispatcher;
+        this.feedback = feedbackDispatcher.createEmitter();
     }
     mouseMove(target, event) {
         const root = target.root;
@@ -178,15 +179,11 @@ class FeedbackEdgeSourceMovingMouseListener extends sprotty_1.MouseListener {
         if (endAtMousePosition instanceof sprotty_1.GConnectableElement && edge.target && (0, sprotty_1.isBoundsAware)(edge.target)) {
             const anchor = this.computeAbsoluteAnchor(endAtMousePosition, sprotty_1.Bounds.center(edge.target.bounds));
             if (sprotty_1.Point.euclideanDistance(anchor, edgeEnd.position) > 1) {
-                this.feedbackDispatcher.registerFeedback(this, [
-                    sprotty_1.MoveAction.create([{ elementId: edgeEnd.id, toPosition: anchor }], { animate: false })
-                ]);
+                this.feedback.add(sprotty_1.MoveAction.create([{ elementId: edgeEnd.id, toPosition: anchor }], { animate: false })).submit();
             }
         }
         else {
-            this.feedbackDispatcher.registerFeedback(this, [
-                sprotty_1.MoveAction.create([{ elementId: edgeEnd.id, toPosition: position }], { animate: false })
-            ]);
+            this.feedback.add(sprotty_1.MoveAction.create([{ elementId: edgeEnd.id, toPosition: position }], { animate: false })).submit();
         }
         return [];
     }
@@ -205,79 +202,57 @@ class FeedbackEdgeSourceMovingMouseListener extends sprotty_1.MouseListener {
         return anchor;
     }
     dispose() {
-        this.feedbackDispatcher.deregisterFeedback(this);
+        this.feedback.dispose();
     }
 }
 exports.FeedbackEdgeSourceMovingMouseListener = FeedbackEdgeSourceMovingMouseListener;
-class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
-    constructor(positionSnapper, edgeRouterRegistry) {
+class FeedbackEdgeRouteMovingMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
+    constructor(changeBoundsManager, edgeRouterRegistry) {
         super();
-        this.positionSnapper = positionSnapper;
+        this.changeBoundsManager = changeBoundsManager;
         this.edgeRouterRegistry = edgeRouterRegistry;
-        this.pointPositionUpdater = new point_position_updater_1.PointPositionUpdater(positionSnapper);
+        this.tracker = this.changeBoundsManager.createTracker();
     }
     mouseDown(target, event) {
-        const result = [];
+        const result = super.mouseDown(target, event);
         if (event.button === 0) {
             const routingHandle = (0, sprotty_1.findParentByFeature)(target, gmodel_util_1.isRoutingHandle);
             if (routingHandle !== undefined) {
                 result.push(SwitchRoutingModeAction.create({ elementsToActivate: [target.id] }));
-                this.pointPositionUpdater.updateLastDragPosition(event);
+                this.tracker.startTracking();
             }
             else {
-                this.pointPositionUpdater.resetPosition();
+                this.tracker.dispose();
             }
         }
         return result;
     }
-    mouseMove(target, event) {
-        const result = [];
-        if (event.buttons === 0) {
-            return this.mouseUp(target, event);
-        }
-        const positionUpdate = this.pointPositionUpdater.updatePosition(target, event);
-        if (positionUpdate) {
-            const moveActions = this.handleMoveOnClient(target, positionUpdate, (0, snap_1.useSnap)(event));
-            result.push(...moveActions);
-        }
-        return result;
-    }
-    handleMoveOnClient(target, positionUpdate, isSnap) {
-        const handleMoves = [];
-        target.root.index
-            .all()
-            .filter(element => (0, sprotty_1.isSelected)(element))
-            .forEach(element => {
-            if ((0, gmodel_util_1.isRoutingHandle)(element)) {
-                const elementMove = this.toElementMove(element, positionUpdate, isSnap);
-                if (elementMove) {
-                    handleMoves.push(elementMove);
-                }
-            }
-        });
-        if (handleMoves.length > 0) {
-            return [sprotty_1.MoveAction.create(handleMoves, { animate: false })];
+    draggingMouseMove(target, event) {
+        super.draggingMouseMove(target, event);
+        if (this.tracker.isTracking()) {
+            return this.moveRoutingHandles(target, event);
         }
         return [];
     }
-    toElementMove(element, positionDelta, isSnap) {
-        const point = this.getHandlePosition(element);
-        if (point !== undefined) {
-            const snappedPoint = this.getSnappedHandlePosition(element, point, isSnap);
-            return {
-                elementId: element.id,
-                fromPosition: point,
-                toPosition: {
-                    x: snappedPoint.x + positionDelta.x,
-                    y: snappedPoint.y + positionDelta.y
-                }
-            };
+    moveRoutingHandles(target, event) {
+        const routingHandlesToMove = this.getRoutingHandlesToMove(target);
+        const move = this.tracker.moveElements(routingHandlesToMove, { snap: event, restrict: event });
+        if (move.elementMoves.length === 0) {
+            return [];
         }
-        return undefined;
+        this.tracker.updateTrackingPosition(move);
+        return [
+            sprotty_1.MoveAction.create(move.elementMoves.map(elementMove => ({ elementId: elementMove.element.id, toPosition: elementMove.toPosition })), { animate: false })
+        ];
     }
-    getSnappedHandlePosition(element, point, isSnap) {
-        var _a;
-        return (_a = this.positionSnapper) === null || _a === void 0 ? void 0 : _a.snapPosition(point, element, isSnap);
+    getRoutingHandlesToMove(context) {
+        const selectedRoutingHandles = (0, gmodel_util_1.getMatchingElements)(context.root.index, (0, sprotty_1.typeGuard)(gmodel_util_1.isRoutingHandle, sprotty_1.isSelected));
+        return selectedRoutingHandles
+            .map(handle => {
+            const position = this.getHandlePosition(handle);
+            return position ? new change_bounds_tracker_1.MoveableRoutingHandle(handle, position) : undefined;
+        })
+            .filter((0, sprotty_1.toTypeGuard)(change_bounds_tracker_1.MoveableRoutingHandle));
     }
     getHandlePosition(handle) {
         if (this.edgeRouterRegistry) {
@@ -291,10 +266,22 @@ class FeedbackEdgeRouteMovingMouseListener extends sprotty_1.MouseListener {
         }
         return undefined;
     }
-    mouseUp(_target, _event) {
-        this.pointPositionUpdater.resetPosition();
+    nonDraggingMouseUp(element, event) {
+        // should reset everything that may have happend on mouse down
+        this.tracker.stopTracking();
         return [];
     }
+    draggingMouseUp(_target, _event) {
+        if (!this.tracker.isTracking()) {
+            return [];
+        }
+        this.dispose();
+        return [];
+    }
+    dispose() {
+        this.tracker.dispose();
+        super.dispose();
+    }
 }
 exports.FeedbackEdgeRouteMovingMouseListener = FeedbackEdgeRouteMovingMouseListener;
 /**