@eclipse-glsp/client 1.1.0-RC10 → 1.1.0-next.0363f0b.261

package/lib/features/tools/base-glsp-tool.js

@@ -28,18 +28,42 @@ exports.BaseGLSPTool = void 0;
 const inversify_1 = require("inversify");
 const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const editor_context_service_1 = require("../../base/editor-context-service");
-let BaseGLSPTool = class BaseGLSPTool {
+const key_tool_1 = require("../../base/view/key-tool");
+const mouse_tool_1 = require("../../base/view/mouse-tool");
+let BaseGLSPTool = exports.BaseGLSPTool = class BaseGLSPTool {
+    constructor() {
+        this.toDisposeOnDisable = new _glsp_sprotty_1.DisposableCollection();
+    }
+    disable() {
+        this.toDisposeOnDisable.dispose();
+    }
     get isEditTool() {
         return true;
     }
     dispatchActions(actions) {
         this.actionDispatcher.dispatchAll(actions);
     }
-    dispatchFeedback(actions, feedbackEmitter) {
-        this.feedbackDispatcher.registerFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, actions);
+    /**
+     * Registers `actions` to be sent out as feedback, i.e., changes that are re-established whenever the `SModelRoot`
+     * has been set or updated.
+     *
+     * @param feedbackActions the actions to be sent out.
+     * @param feedbackEmitter the emitter sending out feedback actions (this tool by default).
+     * @param cleanupActions the actions to be sent out when the feedback is de-registered through the returned Disposable.
+     * @returns A 'Disposable' that de-registers the feedback and cleans up any pending feedback with the given `cleanupActions`.
+     */
+    registerFeedback(feedbackActions, feedbackEmitter, cleanupActions) {
+        return this.feedbackDispatcher.registerFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, feedbackActions, cleanupActions);
     }
-    deregisterFeedback(actions, feedbackEmitter) {
-        this.feedbackDispatcher.deregisterFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, actions);
+    /**
+     * De-registers all feedback from the given `feedbackEmitter` (this tool by default) and cleans up any pending feedback with the
+     * given `cleanupActions`.
+     *
+     * @param feedbackEmitter the emitter to be deregistered (this tool by default).
+     * @param cleanupActions the actions to be dispatched right after the deregistration to clean up any pending feedback.
+     */
+    deregisterFeedback(feedbackEmitter, cleanupActions) {
+        this.feedbackDispatcher.deregisterFeedback(feedbackEmitter !== null && feedbackEmitter !== void 0 ? feedbackEmitter : this, cleanupActions);
     }
 };
 __decorate([
@@ -51,19 +75,18 @@ __decorate([
     __metadata("design:type", Object)
 ], BaseGLSPTool.prototype, "actionDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.MouseTool),
-    __metadata("design:type", Object)
+    (0, inversify_1.inject)(mouse_tool_1.GLSPMouseTool),
+    __metadata("design:type", mouse_tool_1.GLSPMouseTool)
 ], BaseGLSPTool.prototype, "mouseTool", void 0);
 __decorate([
-    (0, inversify_1.inject)(_glsp_sprotty_1.KeyTool),
-    __metadata("design:type", _glsp_sprotty_1.KeyTool)
+    (0, inversify_1.inject)(key_tool_1.GLSPKeyTool),
+    __metadata("design:type", key_tool_1.GLSPKeyTool)
 ], BaseGLSPTool.prototype, "keyTool", void 0);
 __decorate([
     (0, inversify_1.inject)(editor_context_service_1.EditorContextService),
     __metadata("design:type", editor_context_service_1.EditorContextService)
 ], BaseGLSPTool.prototype, "editorContext", void 0);
-BaseGLSPTool = __decorate([
+exports.BaseGLSPTool = BaseGLSPTool = __decorate([
     (0, inversify_1.injectable)()
 ], BaseGLSPTool);
-exports.BaseGLSPTool = BaseGLSPTool;
 //# sourceMappingURL=base-glsp-tool.js.map

package/lib/features/tools/base-glsp-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-glsp-tool.js","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,iDAA0E;AAC1E,8EAAyE;AAMzE,IAAsB,YAAY,GAAlC,MAAsB,YAAY;IAY9B,IAAI,UAAU;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,OAAiB;QAC7B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB,CAAC,OAAiB,EAAE,eAAkC;QAClE,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,kBAAkB,CAAC,OAAiB,EAAE,eAAkC;QACpE,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AA1BsD;IAAlD,IAAA,kBAAM,EAAC,qBAAK,CAAC,yBAAyB,CAAC;;wDAAyD;AACtD;IAA1C,IAAA,kBAAM,EAAC,qBAAK,CAAC,iBAAiB,CAAC;;sDAA+C;AAC5C;IAAlC,IAAA,kBAAM,EAAC,qBAAK,CAAC,SAAS,CAAC;;+CAAiC;AAC9B;IAA1B,IAAA,kBAAM,EAAC,uBAAO,CAAC;8BAAoB,uBAAO;6CAAC;AACK;IAAhD,IAAA,kBAAM,EAAC,6CAAoB,CAAC;8BAAmC,6CAAoB;mDAAC;AALnE,YAAY;IADjC,IAAA,sBAAU,GAAE;GACS,YAAY,CA2BjC;AA3BqB,oCAAY"}
+{"version":3,"file":"base-glsp-tool.js","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,iDAAmG;AACnG,8EAAyE;AAGzE,uDAAuD;AACvD,2DAA2D;AAGpD,IAAe,YAAY,0BAA3B,MAAe,YAAY;IAA3B;QAOgB,uBAAkB,GAAG,IAAI,oCAAoB,EAAE,CAAC;IAyCvE,CAAC;IArCG,OAAO;QACH,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAID,IAAI,UAAU;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,OAAiB;QAC7B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;OAQG;IACH,gBAAgB,CAAC,eAAyB,EAAE,eAAkC,EAAE,cAAyB;QACrG,OAAO,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;IAC9G,CAAC;IAED;;;;;;OAMG;IACH,kBAAkB,CAAC,eAAkC,EAAE,cAAyB;QAC5E,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAI,EAAE,cAAc,CAAC,CAAC;IACxF,CAAC;CACJ,CAAA;AA/CsD;IAAlD,IAAA,kBAAM,EAAC,qBAAK,CAAC,yBAAyB,CAAC;;wDAAyD;AACtD;IAA1C,IAAA,kBAAM,EAAC,qBAAK,CAAC,iBAAiB,CAAC;;sDAA+C;AAC9C;IAAhC,IAAA,kBAAM,EAAC,0BAAa,CAAC;8BAAsB,0BAAa;+CAAC;AAC3B;IAA9B,IAAA,kBAAM,EAAC,sBAAW,CAAC;8BAAoB,sBAAW;6CAAC;AACH;IAAhD,IAAA,kBAAM,EAAC,6CAAoB,CAAC;8BAAmC,6CAAoB;mDAAC;uBALnE,YAAY;IADjC,IAAA,sBAAU,GAAE;GACS,YAAY,CAgDjC"}

package/lib/features/{context-menu/di.config.d.ts → tools/change-bounds/change-boounds-tool-module.d.ts}

@@ -13,7 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-declare const glspContextMenuModule: ContainerModule;
-export default glspContextMenuModule;
-//# sourceMappingURL=di.config.d.ts.map
+import { FeatureModule } from '../../../glsp-sprotty/index';
+export declare const changeBoundsToolModule: FeatureModule;
+//# sourceMappingURL=change-boounds-tool-module.d.ts.map

package/lib/features/tools/change-bounds/change-boounds-tool-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-boounds-tool-module.d.ts","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-boounds-tool-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAyD,MAAM,eAAe,CAAC;AAMrG,eAAO,MAAM,sBAAsB,eAMjC,CAAC"}

package/lib/features/tools/change-bounds/change-boounds-tool-module.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeBoundsToolModule = void 0;
+/********************************************************************************
+ * Copyright (c) 2019-2023 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
+ ********************************************************************************/
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+const model_1 = require("../../change-bounds/model");
+const change_bounds_tool_1 = require("./change-bounds-tool");
+const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
+const view_1 = require("./view");
+exports.changeBoundsToolModule = new _glsp_sprotty_1.FeatureModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.IDefaultTool, change_bounds_tool_1.ChangeBoundsTool);
+    (0, _glsp_sprotty_1.configureCommand)(context, change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackCommand);
+    (0, _glsp_sprotty_1.configureCommand)(context, change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackCommand);
+    (0, _glsp_sprotty_1.configureView)(context, model_1.SResizeHandle.TYPE, view_1.SResizeHandleView);
+});
+//# sourceMappingURL=change-boounds-tool-module.js.map

package/lib/features/tools/change-bounds/change-boounds-tool-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-boounds-tool-module.js","sourceRoot":"","sources":["../../../../src/features/tools/change-bounds/change-boounds-tool-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAqG;AACrG,qDAA0D;AAC1D,6DAAwD;AACxD,+EAAqI;AACrI,iCAA2C;AAE9B,QAAA,sBAAsB,GAAG,IAAI,6BAAa,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,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,YAAY,EAAE,qCAAgB,CAAC,CAAC;IAC7D,IAAA,gCAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,gCAAgB,EAAC,OAAO,EAAE,uEAAyC,CAAC,CAAC;IACrE,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAa,CAAC,IAAI,EAAE,wBAAiB,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}

package/lib/features/{tool-feedback → tools/change-bounds}/change-bounds-tool-feedback.d.ts

@@ -1,7 +1,7 @@
 import { VNode } from 'snabbdom';
-import { Action, CommandExecutionContext, CommandReturn, MouseListener, MoveAction, Point, SModelElement, SModelRoot } from '../../glsp-sprotty/index';
-import { ChangeBoundsTool } from '../tools/change-bounds-tool';
-import { FeedbackCommand } from './model';
+import { Action, CommandExecutionContext, CommandReturn, Disposable, ElementMove, MouseListener, MoveAction, Point, SModelElement, SModelRoot } from '../../../glsp-sprotty/index';
+import { FeedbackCommand } from '../../../base/feedback/feedback-command';
+import { ChangeBoundsTool } from './change-bounds-tool';
 export interface ShowChangeBoundsToolResizeFeedbackAction extends Action {
     kind: typeof ShowChangeBoundsToolResizeFeedbackAction.KIND;
     elementId: string;
@@ -36,10 +36,11 @@ export declare class HideChangeBoundsToolResizeFeedbackCommand extends FeedbackC
  * the visual feedback but also the basis for sending the change to the server
  * (see also `tools/MoveTool`).
  */
-export declare class FeedbackMoveMouseListener extends MouseListener {
+export declare class FeedbackMoveMouseListener extends MouseListener implements Disposable {
     protected tool: ChangeBoundsTool;
     protected hasDragged: boolean;
-    protected startDragPosition: Point | undefined;
+    protected rootElement?: SModelRoot;
+    protected startDragPosition?: Point;
     protected elementId2startPos: Map<string, Point>;
     constructor(tool: ChangeBoundsTool);
     mouseDown(target: SModelElement, event: MouseEvent): Action[];
@@ -47,10 +48,16 @@ export declare class FeedbackMoveMouseListener extends MouseListener {
     protected collectStartPositions(root: SModelRoot): void;
     protected isChildOfSelected(selectedElements: Set<SModelElement>, element: SModelElement): boolean;
     protected getElementMoves(target: SModelElement, event: MouseEvent, finished: boolean): MoveAction | undefined;
+    protected getElementMovesForDelta(target: SModelElement, delta: {
+        x: number;
+        y: number;
+    }, isSnap: boolean, finished: boolean): ElementMove[];
     protected validateMove(startPosition: Point, toPosition: Point, element: SModelElement, isFinished: boolean): Point;
     protected snap(position: Point, element: SModelElement, isSnap: boolean): Point;
     mouseEnter(target: SModelElement, event: MouseEvent): Action[];
     mouseUp(target: SModelElement, event: MouseEvent): Action[];
+    protected reset(resetFeedback?: boolean): void;
     decorate(vnode: VNode, _element: SModelElement): VNode;
+    dispose(): void;
 }
 //# sourceMappingURL=change-bounds-tool-feedback.d.ts.map

package/lib/features/tools/change-bounds/change-bounds-tool-feedback.d.ts.map

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

package/lib/features/{tool-feedback → tools/change-bounds}/change-bounds-tool-feedback.js

@@ -26,12 +26,12 @@ exports.FeedbackMoveMouseListener = exports.HideChangeBoundsToolResizeFeedbackCo
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
-const smodel_util_1 = require("../../utils/smodel-util");
-const model_1 = require("../change-bounds/model");
-const movement_restrictor_1 = require("../change-bounds/movement-restrictor");
-const css_feedback_1 = require("../tool-feedback/css-feedback");
-const model_2 = require("./model");
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+const css_feedback_1 = require("../../../base/feedback/css-feedback");
+const feedback_command_1 = require("../../../base/feedback/feedback-command");
+const smodel_util_1 = require("../../../utils/smodel-util");
+const model_1 = require("../../change-bounds/model");
+const movement_restrictor_1 = require("../../change-bounds/movement-restrictor");
 var ShowChangeBoundsToolResizeFeedbackAction;
 (function (ShowChangeBoundsToolResizeFeedbackAction) {
     ShowChangeBoundsToolResizeFeedbackAction.KIND = 'showChangeBoundsToolResizeFeedback';
@@ -46,7 +46,7 @@ var ShowChangeBoundsToolResizeFeedbackAction;
         };
     }
     ShowChangeBoundsToolResizeFeedbackAction.create = create;
-})(ShowChangeBoundsToolResizeFeedbackAction = exports.ShowChangeBoundsToolResizeFeedbackAction || (exports.ShowChangeBoundsToolResizeFeedbackAction = {}));
+})(ShowChangeBoundsToolResizeFeedbackAction || (exports.ShowChangeBoundsToolResizeFeedbackAction = ShowChangeBoundsToolResizeFeedbackAction = {}));
 var HideChangeBoundsToolResizeFeedbackAction;
 (function (HideChangeBoundsToolResizeFeedbackAction) {
     HideChangeBoundsToolResizeFeedbackAction.KIND = 'hideChangeBoundsToolResizeFeedback';
@@ -58,8 +58,8 @@ var HideChangeBoundsToolResizeFeedbackAction;
         return { kind: HideChangeBoundsToolResizeFeedbackAction.KIND };
     }
     HideChangeBoundsToolResizeFeedbackAction.create = create;
-})(HideChangeBoundsToolResizeFeedbackAction = exports.HideChangeBoundsToolResizeFeedbackAction || (exports.HideChangeBoundsToolResizeFeedbackAction = {}));
-let ShowChangeBoundsToolResizeFeedbackCommand = class ShowChangeBoundsToolResizeFeedbackCommand extends model_2.FeedbackCommand {
+})(HideChangeBoundsToolResizeFeedbackAction || (exports.HideChangeBoundsToolResizeFeedbackAction = HideChangeBoundsToolResizeFeedbackAction = {}));
+let ShowChangeBoundsToolResizeFeedbackCommand = exports.ShowChangeBoundsToolResizeFeedbackCommand = class ShowChangeBoundsToolResizeFeedbackCommand extends feedback_command_1.FeedbackCommand {
     execute(context) {
         const index = context.root.index;
         (0, smodel_util_1.forEachElement)(index, model_1.isResizable, model_1.removeResizeHandles);
@@ -77,11 +77,10 @@ __decorate([
     (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action),
     __metadata("design:type", Object)
 ], ShowChangeBoundsToolResizeFeedbackCommand.prototype, "action", void 0);
-ShowChangeBoundsToolResizeFeedbackCommand = __decorate([
+exports.ShowChangeBoundsToolResizeFeedbackCommand = ShowChangeBoundsToolResizeFeedbackCommand = __decorate([
     (0, inversify_1.injectable)()
 ], ShowChangeBoundsToolResizeFeedbackCommand);
-exports.ShowChangeBoundsToolResizeFeedbackCommand = ShowChangeBoundsToolResizeFeedbackCommand;
-let HideChangeBoundsToolResizeFeedbackCommand = class HideChangeBoundsToolResizeFeedbackCommand extends model_2.FeedbackCommand {
+let HideChangeBoundsToolResizeFeedbackCommand = exports.HideChangeBoundsToolResizeFeedbackCommand = class HideChangeBoundsToolResizeFeedbackCommand extends feedback_command_1.FeedbackCommand {
     execute(context) {
         const index = context.root.index;
         (0, smodel_util_1.forEachElement)(index, model_1.isResizable, model_1.removeResizeHandles);
@@ -93,10 +92,9 @@ __decorate([
     (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action),
     __metadata("design:type", Object)
 ], HideChangeBoundsToolResizeFeedbackCommand.prototype, "action", void 0);
-HideChangeBoundsToolResizeFeedbackCommand = __decorate([
+exports.HideChangeBoundsToolResizeFeedbackCommand = HideChangeBoundsToolResizeFeedbackCommand = __decorate([
     (0, inversify_1.injectable)()
 ], HideChangeBoundsToolResizeFeedbackCommand);
-exports.HideChangeBoundsToolResizeFeedbackCommand = HideChangeBoundsToolResizeFeedbackCommand;
 /**
  * This mouse listener provides visual feedback for moving by sending client-side
  * `MoveAction`s while elements are selected and dragged. This will also update
@@ -140,9 +138,11 @@ class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
                 result.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.MOVE));
             }
         }
-        return result;
+        this.tool.registerFeedback(result, this);
+        return [];
     }
     collectStartPositions(root) {
+        this.rootElement = root;
         const selectedElements = root.index.all().filter(element => (0, _glsp_sprotty_1.isSelectable)(element) && element.selected);
         const elementsSet = new Set(selectedElements);
         selectedElements
@@ -166,20 +166,29 @@ class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
         if (!this.startDragPosition) {
             return undefined;
         }
-        const elementMoves = [];
         const viewport = (0, _glsp_sprotty_1.findParentByFeature)(target, _glsp_sprotty_1.isViewport);
         const zoom = viewport ? viewport.zoom : 1;
         const delta = {
             x: (event.pageX - this.startDragPosition.x) / zoom,
             y: (event.pageY - this.startDragPosition.y) / zoom
         };
+        const elementMoves = this.getElementMovesForDelta(target, delta, !event.shiftKey, finished);
+        if (elementMoves.length > 0) {
+            return _glsp_sprotty_1.MoveAction.create(elementMoves, { animate: false, finished });
+        }
+        else {
+            return undefined;
+        }
+    }
+    getElementMovesForDelta(target, delta, isSnap, finished) {
+        const elementMoves = [];
         this.elementId2startPos.forEach((startPosition, elementId) => {
             const element = target.root.index.getById(elementId);
             if (element) {
                 let toPosition = this.snap({
                     x: startPosition.x + delta.x,
                     y: startPosition.y + delta.y
-                }, element, !event.shiftKey);
+                }, element, isSnap);
                 if ((0, _glsp_sprotty_1.isMoveable)(element)) {
                     toPosition = this.validateMove(startPosition, toPosition, element, finished);
                     elementMoves.push({
@@ -193,12 +202,7 @@ class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
                 }
             }
         });
-        if (elementMoves.length > 0) {
-            return _glsp_sprotty_1.MoveAction.create(elementMoves, { animate: false, finished });
-        }
-        else {
-            return undefined;
-        }
+        return elementMoves;
     }
     validateMove(startPosition, toPosition, element, isFinished) {
         let newPosition = toPosition;
@@ -214,7 +218,7 @@ class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
             else {
                 action = (0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor);
             }
-            this.tool.dispatchFeedback([action], this);
+            this.tool.registerFeedback([action], this);
         }
         return newPosition;
     }
@@ -239,19 +243,33 @@ class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
             if (moveAction) {
                 result.push(moveAction);
             }
+            const resetFeedback = [];
             if (this.tool.movementRestrictor) {
-                this.tool.deregisterFeedback([(0, movement_restrictor_1.removeMovementRestrictionFeedback)(target, this.tool.movementRestrictor)], this);
+                resetFeedback.push((0, movement_restrictor_1.removeMovementRestrictionFeedback)(target, this.tool.movementRestrictor));
             }
-            result.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
+            resetFeedback.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
+            this.tool.deregisterFeedback(this, resetFeedback);
+        }
+        this.reset();
+        return result;
+    }
+    reset(resetFeedback = false) {
+        if (this.rootElement && resetFeedback) {
+            const elementMoves = this.getElementMovesForDelta(this.rootElement, { x: 0, y: 0 }, true, true);
+            const moveAction = _glsp_sprotty_1.MoveAction.create(elementMoves, { animate: false, finished: true });
+            this.tool.deregisterFeedback(this, [moveAction]);
         }
         this.hasDragged = false;
         this.startDragPosition = undefined;
+        this.rootElement = undefined;
         this.elementId2startPos.clear();
-        return result;
     }
     decorate(vnode, _element) {
         return vnode;
     }
+    dispose() {
+        this.reset(true);
+    }
 }
 exports.FeedbackMoveMouseListener = FeedbackMoveMouseListener;
 //# sourceMappingURL=change-bounds-tool-feedback.js.map

package/lib/features/tools/change-bounds/change-bounds-tool-feedback.js.map

@@ -0,0 +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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"}

package/lib/features/tools/{change-bounds-tool.d.ts → change-bounds/change-bounds-tool.d.ts}

@@ -1,10 +1,10 @@
-import { Action, Bounds, BoundsAware, Dimension, EdgeRouterRegistry, ElementAndBounds, ISnapper, MouseListener, Operation, Point, SModelElement, SModelRoot, SParentElement } from '../../glsp-sprotty/index';
-import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
-import { Resizable, SResizeHandle } from '../change-bounds/model';
-import { IMovementRestrictor } from '../change-bounds/movement-restrictor';
-import { PointPositionUpdater } from '../change-bounds/snap';
-import { SelectionListener, SelectionService } from '../select/selection-service';
-import { BaseGLSPTool } from './base-glsp-tool';
+import { Action, Bounds, BoundsAware, Dimension, Disposable, EdgeRouterRegistry, ElementAndBounds, ISnapper, MouseListener, Operation, Point, SModelElement, SModelRoot, SParentElement } from '../../../glsp-sprotty/index';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { ISelectionListener, SelectionService } from '../../../base/selection-service';
+import { PointPositionUpdater } from '../../../features/change-bounds/snap';
+import { Resizable, SResizeHandle } from '../../change-bounds/model';
+import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
+import { BaseGLSPTool } from '../base-glsp-tool';
 /**
  * The change bounds tool has the license to move multiple elements or resize a single element by implementing the ChangeBounds operation.
  * In contrast to Sprotty's implementation this tool only sends a `ChangeBoundsOperationAction` when an operation has finished and does not
@@ -24,15 +24,12 @@ export declare class ChangeBoundsTool extends BaseGLSPTool {
     readonly edgeRouterRegistry?: EdgeRouterRegistry;
     readonly snapper?: ISnapper;
     readonly movementRestrictor?: IMovementRestrictor;
-    protected feedbackMoveMouseListener: MouseListener;
-    protected changeBoundsListener: MouseListener & SelectionListener;
     get id(): string;
     enable(): void;
     protected createMoveMouseListener(): MouseListener;
-    protected createChangeBoundsListener(): MouseListener & SelectionListener;
-    disable(): void;
+    protected createChangeBoundsListener(): MouseListener & ISelectionListener;
 }
-export declare class ChangeBoundsListener extends DragAwareMouseListener implements SelectionListener {
+export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener, Disposable {
     protected tool: ChangeBoundsTool;
     static readonly CSS_CLASS_ACTIVE = "active";
     protected initialBounds: Bounds | undefined;
@@ -42,7 +39,7 @@ export declare class ChangeBoundsListener extends DragAwareMouseListener impleme
     constructor(tool: ChangeBoundsTool);
     mouseDown(target: SModelElement, event: MouseEvent): Action[];
     mouseMove(target: SModelElement, event: MouseEvent): Action[];
-    draggingMouseUp(target: SModelElement, event: MouseEvent): Action[];
+    draggingMouseUp(target: SModelElement, _event: MouseEvent): Action[];
     protected handleMoveOnServer(target: SModelElement): Action[];
     protected handleMoveElementsOnServer(target: SModelElement): Operation[];
     protected isChildOfSelected(selectedElements: Set<SModelElement>, element: SModelElement): boolean;
@@ -52,7 +49,9 @@ export declare class ChangeBoundsListener extends DragAwareMouseListener impleme
     protected setActiveResizeElement(target: SModelElement): boolean;
     protected isActiveResizeElement(element?: SModelElement): element is SParentElement & BoundsAware;
     protected initPosition(event: MouseEvent): void;
-    protected reset(): void;
+    dispose(): void;
+    protected reset(resetBounds?: boolean): void;
+    protected resetFeedback(resetBounds?: boolean): void;
     protected resetPosition(): void;
     protected handleResizeOnClient(positionUpdate: Point): Action[];
     protected handleTopLeftResize(resizeElement: SParentElement & Resizable, positionUpdate: Point): Action[];

package/lib/features/tools/change-bounds/change-bounds-tool.d.ts.map

@@ -0,0 +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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"}

package/lib/features/tools/{change-bounds-tool.js → change-bounds/change-bounds-tool.js}

@@ -27,17 +27,17 @@ exports.ChangeBoundsListener = exports.ChangeBoundsTool = void 0;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
-const drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
-const layout_utils_1 = require("../../utils/layout-utils");
-const smodel_util_1 = require("../../utils/smodel-util");
-const model_1 = require("../change-bounds/model");
-const movement_restrictor_1 = require("../change-bounds/movement-restrictor");
-const snap_1 = require("../change-bounds/snap");
-const selection_service_1 = require("../select/selection-service");
-const change_bounds_tool_feedback_1 = require("../tool-feedback/change-bounds-tool-feedback");
-const css_feedback_1 = require("../tool-feedback/css-feedback");
-const base_glsp_tool_1 = require("./base-glsp-tool");
+const _glsp_sprotty_1 = require("../../../glsp-sprotty/index");
+const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
+const css_feedback_1 = require("../../../base/feedback/css-feedback");
+const selection_service_1 = require("../../../base/selection-service");
+const snap_1 = require("../../../features/change-bounds/snap");
+const layout_utils_1 = require("../../../utils/layout-utils");
+const smodel_util_1 = require("../../../utils/smodel-util");
+const model_1 = require("../../change-bounds/model");
+const movement_restrictor_1 = require("../../change-bounds/movement-restrictor");
+const base_glsp_tool_1 = require("../base-glsp-tool");
+const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
 /**
  * The change bounds tool has the license to move multiple elements or resize a single element by implementing the ChangeBounds operation.
  * In contrast to Sprotty's implementation this tool only sends a `ChangeBoundsOperationAction` when an operation has finished and does not
@@ -51,18 +51,22 @@ const base_glsp_tool_1 = require("./base-glsp-tool");
  * To provide a visual client updates during move we install the `FeedbackMoveMouseListener` and to provide visual client updates during
  * resize and send the server updates we install the `ChangeBoundsListener`.
  */
-let ChangeBoundsTool = ChangeBoundsTool_1 = class ChangeBoundsTool extends base_glsp_tool_1.BaseGLSPTool {
+let ChangeBoundsTool = exports.ChangeBoundsTool = ChangeBoundsTool_1 = class ChangeBoundsTool extends base_glsp_tool_1.BaseGLSPTool {
     get id() {
         return ChangeBoundsTool_1.ID;
     }
     enable() {
         // install feedback move mouse listener for client-side move updates
-        this.feedbackMoveMouseListener = this.createMoveMouseListener();
-        this.mouseTool.register(this.feedbackMoveMouseListener);
+        const feedbackMoveMouseListener = this.createMoveMouseListener();
+        if (_glsp_sprotty_1.Disposable.is(feedbackMoveMouseListener)) {
+            this.toDisposeOnDisable.push(feedbackMoveMouseListener);
+        }
         // install change bounds listener for client-side resize updates and server-side updates
-        this.changeBoundsListener = this.createChangeBoundsListener();
-        this.mouseTool.register(this.changeBoundsListener);
-        this.selectionService.register(this.changeBoundsListener);
+        const changeBoundsListener = this.createChangeBoundsListener();
+        if (_glsp_sprotty_1.Disposable.is(changeBoundsListener)) {
+            this.toDisposeOnDisable.push(changeBoundsListener);
+        }
+        this.toDisposeOnDisable.push(this.mouseTool.registerListener(feedbackMoveMouseListener), this.mouseTool.registerListener(changeBoundsListener), _glsp_sprotty_1.Disposable.create(() => this.deregisterFeedback(feedbackMoveMouseListener)), _glsp_sprotty_1.Disposable.create(() => this.deregisterFeedback(changeBoundsListener, [change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()])), this.selectionService.onSelectionChanged(change => changeBoundsListener.selectionChanged(change.root, change.selectedElements)));
     }
     createMoveMouseListener() {
         return new change_bounds_tool_feedback_1.FeedbackMoveMouseListener(this);
@@ -70,17 +74,10 @@ let ChangeBoundsTool = ChangeBoundsTool_1 = class ChangeBoundsTool extends base_
     createChangeBoundsListener() {
         return new ChangeBoundsListener(this);
     }
-    disable() {
-        this.mouseTool.deregister(this.changeBoundsListener);
-        this.selectionService.deregister(this.changeBoundsListener);
-        this.mouseTool.deregister(this.feedbackMoveMouseListener);
-        this.deregisterFeedback([], this.feedbackMoveMouseListener);
-        this.deregisterFeedback([change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()], this.changeBoundsListener);
-    }
 };
 ChangeBoundsTool.ID = 'glsp.change-bounds-tool';
 __decorate([
-    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], ChangeBoundsTool.prototype, "selectionService", void 0);
 __decorate([
@@ -98,10 +95,9 @@ __decorate([
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], ChangeBoundsTool.prototype, "movementRestrictor", void 0);
-ChangeBoundsTool = ChangeBoundsTool_1 = __decorate([
+exports.ChangeBoundsTool = ChangeBoundsTool = ChangeBoundsTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], ChangeBoundsTool);
-exports.ChangeBoundsTool = ChangeBoundsTool;
 class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
     constructor(tool) {
         super();
@@ -144,11 +140,11 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
                 const resizeActions = this.handleResizeOnClient(positionUpdate);
                 actions.push(...resizeActions);
             }
-            return actions;
+            this.tool.registerFeedback(actions, this);
         }
         return [];
     }
-    draggingMouseUp(target, event) {
+    draggingMouseUp(target, _event) {
         if (this.pointPositionUpdater.isLastDragPositionUndefined()) {
             this.resetPosition();
             return [];
@@ -163,6 +159,7 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             actions.push(...this.handleMoveOnServer(target));
         }
         this.resetPosition();
+        this.tool.deregisterFeedback(this, [(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT)]);
         return actions;
     }
     handleMoveOnServer(target) {
@@ -251,7 +248,7 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             // only allow one element to have the element resize handles
             this.activeResizeElement = moveableElement;
             if ((0, model_1.isResizable)(this.activeResizeElement)) {
-                this.tool.dispatchFeedback([change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackAction.create(this.activeResizeElement.id)], this);
+                this.tool.registerFeedback([change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackAction.create(this.activeResizeElement.id)], this.activeResizeElement);
             }
             return true;
         }
@@ -272,12 +269,30 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             };
         }
     }
-    reset() {
+    dispose() {
+        this.reset(true);
+    }
+    reset(resetBounds = false) {
+        this.resetFeedback(resetBounds);
+        this.resetPosition();
+    }
+    resetFeedback(resetBounds = false) {
+        const resetFeedback = [];
         if (this.activeResizeElement && (0, model_1.isResizable)(this.activeResizeElement)) {
-            this.tool.dispatchFeedback([change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()], this);
+            if (this.initialBounds && this.activeResizeHandle && resetBounds) {
+                // we only reset the bounds if an active resize operation was cancelled due to the tool being disabled
+                resetFeedback.push(_glsp_sprotty_1.SetBoundsAction.create([
+                    {
+                        elementId: this.activeResizeElement.id,
+                        newPosition: this.initialBounds,
+                        newSize: this.initialBounds
+                    }
+                ]));
+            }
+            this.tool.deregisterFeedback(this.activeResizeElement, [change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()]);
         }
-        this.tool.dispatchActions([(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT)]);
-        this.resetPosition();
+        resetFeedback.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
+        this.tool.deregisterFeedback(this, resetFeedback);
     }
     resetPosition() {
         this.activeResizeHandle = undefined;
@@ -365,6 +380,6 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
         return (0, layout_utils_1.isValidMove)(element, newPosition, this.tool.movementRestrictor);
     }
 }
-ChangeBoundsListener.CSS_CLASS_ACTIVE = 'active';
 exports.ChangeBoundsListener = ChangeBoundsListener;
+ChangeBoundsListener.CSS_CLASS_ACTIVE = 'active';
 //# sourceMappingURL=change-bounds-tool.js.map