@eclipse-glsp/client 1.1.0-next.2a56928.248 → 1.1.0-next.3208dc6.262

package/lib/features/tools/base-glsp-tool.d.ts

@@ -1,36 +1,38 @@
-/********************************************************************************
- * Copyright (c) 2020-2022 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
- ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
-import { IActionDispatcher, KeyTool } from 'sprotty';
+import { Action, Disposable, DisposableCollection, IActionDispatcher } from '../../glsp-sprotty/index';
 import { EditorContextService } from '../../base/editor-context-service';
+import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
 import { GLSPTool } from '../../base/tool-manager/glsp-tool-manager';
-import { IMouseTool } from '../mouse-tool/mouse-tool';
-import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
+import { GLSPKeyTool } from '../../base/view/key-tool';
+import { GLSPMouseTool } from '../../base/view/mouse-tool';
 export declare abstract class BaseGLSPTool implements GLSPTool {
     protected feedbackDispatcher: IFeedbackActionDispatcher;
     protected actionDispatcher: IActionDispatcher;
-    protected mouseTool: IMouseTool;
-    protected keyTool: KeyTool;
+    protected mouseTool: GLSPMouseTool;
+    protected keyTool: GLSPKeyTool;
     protected readonly editorContext: EditorContextService;
+    protected readonly toDisposeOnDisable: DisposableCollection;
     abstract enable(): void;
-    abstract disable(): void;
+    disable(): void;
     abstract id: string;
     get isEditTool(): boolean;
     dispatchActions(actions: Action[]): void;
-    dispatchFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void;
-    deregisterFeedback(actions: Action[], feedbackEmitter?: IFeedbackEmitter): void;
+    /**
+     * 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: Action[], feedbackEmitter?: IFeedbackEmitter, cleanupActions?: Action[]): Disposable;
+    /**
+     * 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?: IFeedbackEmitter, cleanupActions?: Action[]): void;
 }
 //# sourceMappingURL=base-glsp-tool.d.ts.map

package/lib/features/tools/base-glsp-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-glsp-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAE1G,8BACsB,YAAa,YAAW,QAAQ;IACT,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAChE,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IACtD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IACxC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAErF,QAAQ,CAAC,MAAM,IAAI,IAAI;IACvB,QAAQ,CAAC,OAAO,IAAI,IAAI;IAExB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAI7E,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,GAAG,IAAI;CAGlF"}
+{"version":3,"file":"base-glsp-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/base-glsp-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAS,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,8BACsB,YAAa,YAAW,QAAQ;IACT,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAChE,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;IACrC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAErF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,uBAA8B;IAEnE,QAAQ,CAAC,MAAM,IAAI,IAAI;IAEvB,OAAO,IAAI,IAAI;IAIf,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxC;;;;;;;;OAQG;IACH,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,UAAU;IAItH;;;;;;OAMG;IACH,kBAAkB,CAAC,eAAe,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;CAG1F"}

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

@@ -10,46 +10,83 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGLSPTool = void 0;
+/********************************************************************************
+ * Copyright (c) 2020-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 inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const editor_context_service_1 = require("../../base/editor-context-service");
-const types_1 = require("../../base/types");
-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([
-    (0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher),
     __metadata("design:type", Object)
 ], BaseGLSPTool.prototype, "feedbackDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
     __metadata("design:type", Object)
 ], BaseGLSPTool.prototype, "actionDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_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)(sprotty_1.KeyTool),
-    __metadata("design:type", 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":";;;;;;;;;;;;AAgBA,yCAA+C;AAC/C,qCAAqD;AACrD,8EAAyE;AAEzE,4CAAyC;AAKlC,IAAe,YAAY,GAA3B,MAAe,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;AA1BG;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,yBAAyB,CAAC;;wDAAyD;AACjG;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,iBAAiB,CAAC;;sDAA+C;AAC/E;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,SAAS,CAAC;;+CAAiC;AACzD;IAAC,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAAoB,iBAAO;6CAAC;AAC5C;IAAC,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/tools/change-bounds/change-boounds-tool-module.d.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+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,24 +1,7 @@
-/********************************************************************************
- * 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
- ********************************************************************************/
-import { Action, Point } from '@eclipse-glsp/protocol';
 import { VNode } from 'snabbdom';
-import { CommandExecutionContext, CommandReturn, MouseListener, SModelElement, SModelRoot } from 'sprotty';
-import { MoveAction } from 'sprotty-protocol/lib/actions';
-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;
@@ -53,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[];
@@ -64,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

@@ -25,20 +25,18 @@ exports.FeedbackMoveMouseListener = exports.HideChangeBoundsToolResizeFeedbackCo
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const actions_1 = require("sprotty-protocol/lib/actions");
-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';
     function is(object) {
-        return protocol_1.Action.hasKind(object, ShowChangeBoundsToolResizeFeedbackAction.KIND) && (0, protocol_1.hasStringProp)(object, 'elementId');
+        return _glsp_sprotty_1.Action.hasKind(object, ShowChangeBoundsToolResizeFeedbackAction.KIND) && (0, _glsp_sprotty_1.hasStringProp)(object, 'elementId');
     }
     ShowChangeBoundsToolResizeFeedbackAction.is = is;
     function create(elementId) {
@@ -48,20 +46,20 @@ var ShowChangeBoundsToolResizeFeedbackAction;
         };
     }
     ShowChangeBoundsToolResizeFeedbackAction.create = create;
-})(ShowChangeBoundsToolResizeFeedbackAction = exports.ShowChangeBoundsToolResizeFeedbackAction || (exports.ShowChangeBoundsToolResizeFeedbackAction = {}));
+})(ShowChangeBoundsToolResizeFeedbackAction || (exports.ShowChangeBoundsToolResizeFeedbackAction = ShowChangeBoundsToolResizeFeedbackAction = {}));
 var HideChangeBoundsToolResizeFeedbackAction;
 (function (HideChangeBoundsToolResizeFeedbackAction) {
     HideChangeBoundsToolResizeFeedbackAction.KIND = 'hideChangeBoundsToolResizeFeedback';
     function is(object) {
-        return protocol_1.Action.hasKind(object, HideChangeBoundsToolResizeFeedbackAction.KIND);
+        return _glsp_sprotty_1.Action.hasKind(object, HideChangeBoundsToolResizeFeedbackAction.KIND);
     }
     HideChangeBoundsToolResizeFeedbackAction.is = is;
     function create() {
         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);
@@ -76,14 +74,13 @@ let ShowChangeBoundsToolResizeFeedbackCommand = class ShowChangeBoundsToolResize
 };
 ShowChangeBoundsToolResizeFeedbackCommand.KIND = ShowChangeBoundsToolResizeFeedbackAction.KIND;
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.Action),
+    (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);
@@ -92,13 +89,12 @@ let HideChangeBoundsToolResizeFeedbackCommand = class HideChangeBoundsToolResize
 };
 HideChangeBoundsToolResizeFeedbackCommand.KIND = HideChangeBoundsToolResizeFeedbackAction.KIND;
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.Action),
+    (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
@@ -106,7 +102,7 @@ exports.HideChangeBoundsToolResizeFeedbackCommand = HideChangeBoundsToolResizeFe
  * the visual feedback but also the basis for sending the change to the server
  * (see also `tools/MoveTool`).
  */
-class FeedbackMoveMouseListener extends sprotty_1.MouseListener {
+class FeedbackMoveMouseListener extends _glsp_sprotty_1.MouseListener {
     constructor(tool) {
         super();
         this.tool = tool;
@@ -115,7 +111,7 @@ class FeedbackMoveMouseListener extends sprotty_1.MouseListener {
     }
     mouseDown(target, event) {
         if (event.button === 0 && !(target instanceof model_1.SResizeHandle)) {
-            const moveable = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isMoveable);
+            const moveable = (0, _glsp_sprotty_1.findParentByFeature)(target, _glsp_sprotty_1.isMoveable);
             if (moveable !== undefined) {
                 this.startDragPosition = { x: event.pageX, y: event.pageY };
             }
@@ -142,21 +138,23 @@ class FeedbackMoveMouseListener extends 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) {
-        const selectedElements = root.index.all().filter(element => (0, sprotty_1.isSelectable)(element) && element.selected);
+        this.rootElement = root;
+        const selectedElements = root.index.all().filter(element => (0, _glsp_sprotty_1.isSelectable)(element) && element.selected);
         const elementsSet = new Set(selectedElements);
         selectedElements
             .filter(element => !this.isChildOfSelected(elementsSet, element))
             .forEach(element => {
-            if ((0, sprotty_1.isMoveable)(element)) {
+            if ((0, _glsp_sprotty_1.isMoveable)(element)) {
                 this.elementId2startPos.set(element.id, element.position);
             }
         });
     }
     isChildOfSelected(selectedElements, element) {
-        while (element instanceof sprotty_1.SChildElement) {
+        while (element instanceof _glsp_sprotty_1.SChildElement) {
             element = element.parent;
             if (selectedElements.has(element)) {
                 return true;
@@ -168,21 +166,30 @@ class FeedbackMoveMouseListener extends sprotty_1.MouseListener {
         if (!this.startDragPosition) {
             return undefined;
         }
-        const elementMoves = [];
-        const viewport = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isViewport);
+        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);
-                if ((0, sprotty_1.isMoveable)(element)) {
+                }, element, isSnap);
+                if ((0, _glsp_sprotty_1.isMoveable)(element)) {
                     toPosition = this.validateMove(startPosition, toPosition, element, finished);
                     elementMoves.push({
                         elementId: element.id,
@@ -195,12 +202,7 @@ class FeedbackMoveMouseListener extends sprotty_1.MouseListener {
                 }
             }
         });
-        if (elementMoves.length > 0) {
-            return actions_1.MoveAction.create(elementMoves, { animate: false, finished });
-        }
-        else {
-            return undefined;
-        }
+        return elementMoves;
     }
     validateMove(startPosition, toPosition, element, isFinished) {
         let newPosition = toPosition;
@@ -216,7 +218,7 @@ class FeedbackMoveMouseListener extends 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;
     }
@@ -229,7 +231,7 @@ class FeedbackMoveMouseListener extends sprotty_1.MouseListener {
         }
     }
     mouseEnter(target, event) {
-        if (target instanceof sprotty_1.SModelRoot && event.buttons === 0 && !this.startDragPosition) {
+        if (target instanceof _glsp_sprotty_1.SModelRoot && event.buttons === 0 && !this.startDragPosition) {
             this.mouseUp(target, event);
         }
         return [];
@@ -241,19 +243,33 @@ class FeedbackMoveMouseListener extends 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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"}