@eclipse-glsp/client 0.9.0-rc-01 → 0.10.0-next.146a812.165

package/lib/features/change-bounds/movement-restrictor.js

@@ -7,52 +7,37 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.areOverlapping = exports.NoOverlapMovmentRestrictor = exports.removeMovementRestrictionFeedback = exports.createMovementRestrictionFeedback = void 0;
-/********************************************************************************
- * Copyright (c) 2019 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
- ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var viewpoint_util_1 = require("../../utils/viewpoint-util");
-var css_feedback_1 = require("../tool-feedback/css-feedback");
-var model_1 = require("./model");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const viewpoint_util_1 = require("../../utils/viewpoint-util");
+const css_feedback_1 = require("../tool-feedback/css-feedback");
+const model_1 = require("./model");
 function createMovementRestrictionFeedback(element, movementRestrictor) {
-    var elements = [element];
+    const elements = [element];
     if (element instanceof sprotty_1.SParentElement) {
-        element.children.filter(function (child) { return child instanceof model_1.SResizeHandle; }).forEach(function (e) { return elements.push(e); });
+        element.children.filter(child => child instanceof model_1.SResizeHandle).forEach(e => elements.push(e));
     }
     return new css_feedback_1.ModifyCSSFeedbackAction(elements, movementRestrictor.cssClasses);
 }
 exports.createMovementRestrictionFeedback = createMovementRestrictionFeedback;
 function removeMovementRestrictionFeedback(element, movementRestrictor) {
-    var elements = [element];
+    const elements = [element];
     if (element instanceof sprotty_1.SParentElement) {
-        element.children.filter(function (child) { return child instanceof model_1.SResizeHandle; }).forEach(function (e) { return elements.push(e); });
+        element.children.filter(child => child instanceof model_1.SResizeHandle).forEach(e => elements.push(e));
     }
     return new css_feedback_1.ModifyCSSFeedbackAction(elements, undefined, movementRestrictor.cssClasses);
 }
 exports.removeMovementRestrictionFeedback = removeMovementRestrictionFeedback;
-var NoOverlapMovmentRestrictor = /** @class */ (function () {
-    function NoOverlapMovmentRestrictor() {
+let NoOverlapMovmentRestrictor = class NoOverlapMovmentRestrictor {
+    constructor() {
         this.cssClasses = ['movement-not-allowed'];
     }
-    NoOverlapMovmentRestrictor.prototype.validate = function (newLocation, element) {
-        if (!model_1.isBoundsAwareMoveable(element)) {
+    validate(newLocation, element) {
+        if (!(0, model_1.isBoundsAwareMoveable)(element)) {
             return false;
         }
         // Create ghost element at the newLocation
-        var ghostElement = Object.create(element);
+        const ghostElement = Object.create(element);
         ghostElement.bounds = {
             x: newLocation.x,
             y: newLocation.y,
@@ -61,22 +46,23 @@ var NoOverlapMovmentRestrictor = /** @class */ (function () {
         };
         ghostElement.type = 'Ghost';
         ghostElement.id = element.id;
-        return !Array.from(element.root.index.all().filter(function (e) { return e.id !== ghostElement.id && e !== ghostElement.root && (e instanceof sprotty_1.SNode); })
-            .map(function (e) { return e; })).some(function (e) { return areOverlapping(e, ghostElement); });
-    };
-    NoOverlapMovmentRestrictor = __decorate([
-        inversify_1.injectable()
-    ], NoOverlapMovmentRestrictor);
-    return NoOverlapMovmentRestrictor;
-}());
+        return !Array.from(element.root.index
+            .all()
+            .filter(e => e.id !== ghostElement.id && e !== ghostElement.root && e instanceof sprotty_1.SNode)
+            .map(e => e)).some(e => areOverlapping(e, ghostElement));
+    }
+};
+NoOverlapMovmentRestrictor = __decorate([
+    (0, inversify_1.injectable)()
+], NoOverlapMovmentRestrictor);
 exports.NoOverlapMovmentRestrictor = NoOverlapMovmentRestrictor;
 function areOverlapping(element1, element2) {
-    var b1 = viewpoint_util_1.toAbsoluteBounds(element1);
-    var b2 = viewpoint_util_1.toAbsoluteBounds(element2);
-    var r1TopLeft = b1;
-    var r1BottomRight = { x: b1.x + b1.width, y: b1.y + b1.height };
-    var r2TopLeft = b2;
-    var r2BottomRight = { x: b2.x + b2.width, y: b2.y + b2.height };
+    const b1 = (0, viewpoint_util_1.toAbsoluteBounds)(element1);
+    const b2 = (0, viewpoint_util_1.toAbsoluteBounds)(element2);
+    const r1TopLeft = b1;
+    const r1BottomRight = { x: b1.x + b1.width, y: b1.y + b1.height };
+    const r2TopLeft = b2;
+    const r2BottomRight = { x: b2.x + b2.width, y: b2.y + b2.height };
     // If one rectangle is on left side of other
     if (r1TopLeft.x > r2BottomRight.x || r2TopLeft.x > r1BottomRight.x) {
         return false;

package/lib/features/change-bounds/movement-restrictor.js.map

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

package/lib/features/change-bounds/snap.d.ts

@@ -1,7 +1,64 @@
-import { ISnapper, Point, SModelElement } from 'sprotty';
+/********************************************************************************
+ * 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 { Point } from '@eclipse-glsp/protocol';
+import { ISnapper, SModelElement } from 'sprotty';
+import { WriteablePoint } from '../../utils/layout-utils';
 export declare class GridSnapper implements ISnapper {
     get gridX(): number;
     get gridY(): number;
     snap(position: Point, element: SModelElement): Point;
 }
+/**
+ * This class can be used to calculate the current position, when an element is
+ * moved. This includes node movements, node resizing (resize handle movement)
+ * or edge routing-point movements.
+ *
+ * You can initialize a this class with a optional {@link ISnapper}. If a
+ * snapper is present, the positions will be snapped to the defined grid.
+ */
+export declare class PointPositionUpdater {
+    protected snapper?: ISnapper | undefined;
+    protected lastDragPosition?: Point;
+    protected positionDelta: WriteablePoint;
+    constructor(snapper?: ISnapper | undefined);
+    /**
+     * Init the position with the {@link Point} of your mouse cursor.
+     * This method is normally called in the `mouseDown` event.
+     * @param mousePosition current mouse position e.g `{x: event.pageX, y: event.pageY }`
+     */
+    updateLastDragPosition(mousePosition: Point): void;
+    /**
+     * Check if the mouse is currently not in a drag mode.
+     * @returns true if the last drag position is undefined
+     */
+    isLastDragPositionUndefined(): boolean;
+    /**
+     * Reset the updater for new movements.
+     * This method is normally called in the `mouseUp` event.
+     */
+    resetPosition(): void;
+    /**
+     * Calculate the current position of your movement.
+     * This method is normally called in the `mouseMove` event.
+     * @param target node which is moved around
+     * @param mousePosition current mouse position e.g `{x: event.pageX, y: event.pageY }`
+     * @param isSnapEnabled if a snapper is defined you can disable it, e.g when a specific key is pressed `!event.altKey`
+     * @returns current position or undefined if updater has no last drag position initialized
+     */
+    updatePosition(target: SModelElement, mousePosition: Point, isSnapEnabled: boolean): Point | undefined;
+    protected snap(position: Point, element: SModelElement, isSnap: boolean): Point;
+}
 //# sourceMappingURL=snap.d.ts.map

package/lib/features/change-bounds/snap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snap.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/snap.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEzD,qBACa,WAAY,YAAW,QAAQ;IACxC,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;CAMvD"}
+{"version":3,"file":"snap.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/snap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAuB,QAAQ,EAAc,aAAa,EAAE,MAAM,SAAS,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,qBACa,WAAY,YAAW,QAAQ;IACxC,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;CAMvD;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAIjB,SAAS,CAAC,OAAO,CAAC;IAH9B,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACnC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAkB;gBAEnC,OAAO,CAAC,sBAAU;IAExC;;;;OAIG;IACI,sBAAsB,CAAC,aAAa,EAAE,KAAK,GAAG,IAAI;IAIzD;;;OAGG;IACI,2BAA2B,IAAI,OAAO;IAI7C;;;OAGG;IACI,aAAa,IAAI,IAAI;IAK5B;;;;;;;OAOG;IACI,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,GAAG,KAAK,GAAG,SAAS;IA8B7G,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,KAAK;CAGlF"}

package/lib/features/change-bounds/snap.js

@@ -6,50 +6,100 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GridSnapper = void 0;
-/********************************************************************************
- * Copyright (c) 2020 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
- ********************************************************************************/
-var inversify_1 = require("inversify");
-var GridSnapper = /** @class */ (function () {
-    function GridSnapper() {
-    }
-    Object.defineProperty(GridSnapper.prototype, "gridX", {
-        get: function () {
-            return 10;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(GridSnapper.prototype, "gridY", {
-        get: function () {
-            return 10;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    GridSnapper.prototype.snap = function (position, element) {
+exports.PointPositionUpdater = exports.GridSnapper = void 0;
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+let GridSnapper = class GridSnapper {
+    get gridX() {
+        return 10;
+    }
+    get gridY() {
+        return 10;
+    }
+    snap(position, element) {
         return {
             x: Math.round(position.x / this.gridX) * this.gridX,
             y: Math.round(position.y / this.gridY) * this.gridY
         };
-    };
-    GridSnapper = __decorate([
-        inversify_1.injectable()
-    ], GridSnapper);
-    return GridSnapper;
-}());
+    }
+};
+GridSnapper = __decorate([
+    (0, inversify_1.injectable)()
+], GridSnapper);
 exports.GridSnapper = GridSnapper;
+/**
+ * This class can be used to calculate the current position, when an element is
+ * moved. This includes node movements, node resizing (resize handle movement)
+ * or edge routing-point movements.
+ *
+ * You can initialize a this class with a optional {@link ISnapper}. If a
+ * snapper is present, the positions will be snapped to the defined grid.
+ */
+class PointPositionUpdater {
+    constructor(snapper) {
+        this.snapper = snapper;
+        this.positionDelta = { x: 0, y: 0 };
+    }
+    /**
+     * Init the position with the {@link Point} of your mouse cursor.
+     * This method is normally called in the `mouseDown` event.
+     * @param mousePosition current mouse position e.g `{x: event.pageX, y: event.pageY }`
+     */
+    updateLastDragPosition(mousePosition) {
+        this.lastDragPosition = mousePosition;
+    }
+    /**
+     * Check if the mouse is currently not in a drag mode.
+     * @returns true if the last drag position is undefined
+     */
+    isLastDragPositionUndefined() {
+        return this.lastDragPosition === undefined;
+    }
+    /**
+     * Reset the updater for new movements.
+     * This method is normally called in the `mouseUp` event.
+     */
+    resetPosition() {
+        this.lastDragPosition = undefined;
+        this.positionDelta = { x: 0, y: 0 };
+    }
+    /**
+     * Calculate the current position of your movement.
+     * This method is normally called in the `mouseMove` event.
+     * @param target node which is moved around
+     * @param mousePosition current mouse position e.g `{x: event.pageX, y: event.pageY }`
+     * @param isSnapEnabled if a snapper is defined you can disable it, e.g when a specific key is pressed `!event.altKey`
+     * @returns current position or undefined if updater has no last drag position initialized
+     */
+    updatePosition(target, mousePosition, isSnapEnabled) {
+        var _a;
+        if (this.lastDragPosition) {
+            const newDragPosition = mousePosition;
+            const viewport = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isViewport);
+            const zoom = (_a = viewport === null || viewport === void 0 ? void 0 : viewport.zoom) !== null && _a !== void 0 ? _a : 1;
+            const dx = (mousePosition.x - this.lastDragPosition.x) / zoom;
+            const dy = (mousePosition.y - this.lastDragPosition.y) / zoom;
+            const deltaToLastPosition = { x: dx, y: dy };
+            this.lastDragPosition = newDragPosition;
+            // update position delta with latest delta
+            this.positionDelta.x += deltaToLastPosition.x;
+            this.positionDelta.y += deltaToLastPosition.y;
+            // snap our delta and only send update if the position actually changes
+            // otherwise accumulate delta until we do snap to an update
+            const positionUpdate = this.snap(this.positionDelta, target, isSnapEnabled);
+            if (positionUpdate.x === 0 && positionUpdate.y === 0) {
+                return undefined;
+            }
+            // we update our position so we update our delta by the snapped position
+            this.positionDelta.x -= positionUpdate.x;
+            this.positionDelta.y -= positionUpdate.y;
+            return positionUpdate;
+        }
+        return undefined;
+    }
+    snap(position, element, isSnap) {
+        return isSnap && this.snapper ? this.snapper.snap(position, element) : { x: position.x, y: position.y };
+    }
+}
+exports.PointPositionUpdater = PointPositionUpdater;
 //# sourceMappingURL=snap.js.map

package/lib/features/change-bounds/snap.js.map

@@ -1 +1 @@
-{"version":3,"file":"snap.js","sourceRoot":"","sources":["../../../src/features/change-bounds/snap.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,uCAAuC;AAIvC;IAAA;IAeA,CAAC;IAdG,sBAAI,8BAAK;aAAT;YACI,OAAO,EAAE,CAAC;QACd,CAAC;;;OAAA;IAED,sBAAI,8BAAK;aAAT;YACI,OAAO,EAAE,CAAC;QACd,CAAC;;;OAAA;IAED,0BAAI,GAAJ,UAAK,QAAe,EAAE,OAAsB;QACxC,OAAO;YACH,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK;YACnD,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK;SACtD,CAAC;IACN,CAAC;IAdQ,WAAW;QADvB,sBAAU,EAAE;OACA,WAAW,CAevB;IAAD,kBAAC;CAAA,AAfD,IAeC;AAfY,kCAAW"}
+{"version":3,"file":"snap.js","sourceRoot":"","sources":["../../../src/features/change-bounds/snap.ts"],"names":[],"mappings":"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"}

package/{src/features/undo-redo/model.ts → lib/features/change-bounds/snap.spec.d.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 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
@@ -13,14 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Operation } from '../../base/operations/operation';
-
-export class UndoOperation implements Operation {
-    static readonly KIND = 'glspUndo';
-    constructor(public readonly kind = UndoOperation.KIND) { }
-}
-
-export class RedoOperation implements Operation {
-    static readonly KIND = 'glspRedo';
-    constructor(public readonly kind = RedoOperation.KIND) { }
-}
+export {};
+//# sourceMappingURL=snap.spec.d.ts.map

package/lib/features/change-bounds/snap.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snap.spec.d.ts","sourceRoot":"","sources":["../../../src/features/change-bounds/snap.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}

package/lib/features/change-bounds/snap.spec.js

@@ -0,0 +1,82 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const sprotty_1 = require("sprotty");
+const snap_1 = require("./snap");
+describe('GridSnapper', () => {
+    it('snap', () => {
+        const element = new sprotty_1.SModelElement();
+        const snapper = new snap_1.GridSnapper();
+        (0, chai_1.expect)(snapper.snap({ x: 0, y: 0 }, element)).to.be.deep.equals({ x: 0, y: 0 });
+        (0, chai_1.expect)(snapper.snap({ x: 4, y: 5 }, element)).to.be.deep.equals({ x: 0, y: 10 });
+        (0, chai_1.expect)(snapper.snap({ x: 8, y: 11 }, element)).to.be.deep.equals({ x: 10, y: 10 });
+        (0, chai_1.expect)(snapper.snap({ x: -7, y: -4 }, element)).to.be.deep.equals({ x: -10, y: -0 });
+    });
+});
+describe('PointPositionUpdater', () => {
+    it('updatePosition with no last drag position', () => {
+        const element = new sprotty_1.SModelElement();
+        const updater = new snap_1.PointPositionUpdater();
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, false)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, true)).to.be.undefined;
+    });
+    it('update last position and reset', () => {
+        const updater = new snap_1.PointPositionUpdater();
+        (0, chai_1.expect)(updater.isLastDragPositionUndefined()).to.be.true;
+        updater.updateLastDragPosition({ x: 0, y: 0 });
+        (0, chai_1.expect)(updater.isLastDragPositionUndefined()).to.be.false;
+        updater.resetPosition();
+        (0, chai_1.expect)(updater.isLastDragPositionUndefined()).to.be.true;
+    });
+    it('updatePosition with no snapper', () => {
+        const element = new sprotty_1.SModelElement();
+        const updater = new snap_1.PointPositionUpdater();
+        resetUpdater(updater);
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, false)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, true)).to.be.undefined;
+        resetUpdater(updater);
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, false)).to.be.deep.equals({ x: 5, y: 3 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, true)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 11, y: 6 }, false)).to.be.deep.equals({ x: 6, y: 3 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: -3, y: 2 }, true)).to.be.deep.equals({ x: -14, y: -4 });
+    });
+    it('updatePosition with snapper', () => {
+        const element = new sprotty_1.SModelElement();
+        const snapper = new snap_1.GridSnapper();
+        const updater = new snap_1.PointPositionUpdater(snapper);
+        resetUpdater(updater);
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, false)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 0, y: 0 }, true)).to.be.undefined;
+        resetUpdater(updater);
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, true)).to.be.deep.equals({ x: 10, y: 0 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, true)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 11, y: 6 }, true)).to.be.deep.equals({ x: 0, y: 10 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: -3, y: 2 }, true)).to.be.deep.equals({ x: -10, y: -10 });
+        // disable snapping (alt key)
+        resetUpdater(updater);
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, false)).to.be.deep.equals({ x: 5, y: 3 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 5, y: 3 }, false)).to.be.undefined;
+        (0, chai_1.expect)(updater.updatePosition(element, { x: 11, y: 6 }, false)).to.be.deep.equals({ x: 6, y: 3 });
+        (0, chai_1.expect)(updater.updatePosition(element, { x: -3, y: 2 }, false)).to.be.deep.equals({ x: -14, y: -4 });
+    });
+    function resetUpdater(updater) {
+        updater.resetPosition();
+        updater.updateLastDragPosition({ x: 0, y: 0 });
+    }
+});
+//# sourceMappingURL=snap.spec.js.map

package/lib/features/change-bounds/snap.spec.js.map

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

package/lib/features/command-palette/command-palette-tool.js

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var CommandPaletteTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandPaletteTool = void 0;
 /********************************************************************************
@@ -25,47 +26,38 @@ exports.CommandPaletteTool = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var CommandPaletteTool = /** @class */ (function () {
-    function CommandPaletteTool() {
-    }
-    CommandPaletteTool_1 = CommandPaletteTool;
-    CommandPaletteTool.prototype.postConstruct = function () {
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+let CommandPaletteTool = CommandPaletteTool_1 = class CommandPaletteTool {
+    postConstruct() {
         this.commandPaletteKeyListener = this.createCommandPaleteKeyListener();
-    };
-    Object.defineProperty(CommandPaletteTool.prototype, "id", {
-        get: function () {
-            return CommandPaletteTool_1.ID;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    CommandPaletteTool.prototype.enable = function () {
+    }
+    get id() {
+        return CommandPaletteTool_1.ID;
+    }
+    enable() {
         this.keyTool.register(this.commandPaletteKeyListener);
-    };
-    CommandPaletteTool.prototype.disable = function () {
+    }
+    disable() {
         this.keyTool.deregister(this.commandPaletteKeyListener);
-    };
-    CommandPaletteTool.prototype.createCommandPaleteKeyListener = function () {
+    }
+    createCommandPaleteKeyListener() {
         return new sprotty_1.CommandPaletteKeyListener();
-    };
-    var CommandPaletteTool_1;
-    CommandPaletteTool.ID = 'glsp.command-palette-tool';
-    __decorate([
-        inversify_1.inject(sprotty_1.KeyTool),
-        __metadata("design:type", sprotty_1.KeyTool)
-    ], CommandPaletteTool.prototype, "keyTool", void 0);
-    __decorate([
-        inversify_1.postConstruct(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], CommandPaletteTool.prototype, "postConstruct", null);
-    CommandPaletteTool = CommandPaletteTool_1 = __decorate([
-        inversify_1.injectable()
-    ], CommandPaletteTool);
-    return CommandPaletteTool;
-}());
+    }
+};
+CommandPaletteTool.ID = 'glsp.command-palette-tool';
+__decorate([
+    (0, inversify_1.inject)(sprotty_1.KeyTool),
+    __metadata("design:type", sprotty_1.KeyTool)
+], CommandPaletteTool.prototype, "keyTool", void 0);
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], CommandPaletteTool.prototype, "postConstruct", null);
+CommandPaletteTool = CommandPaletteTool_1 = __decorate([
+    (0, inversify_1.injectable)()
+], CommandPaletteTool);
 exports.CommandPaletteTool = CommandPaletteTool;
 //# sourceMappingURL=command-palette-tool.js.map

package/lib/features/command-palette/command-palette-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-palette-tool.js","sourceRoot":"","sources":["../../../src/features/command-palette/command-palette-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,uCAA8D;AAC9D,mCAAgF;AAGhF;IAAA;IA0BA,CAAC;2BA1BY,kBAAkB;IAOjB,0CAAa,GAAvB;QACI,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,8BAA8B,EAAE,CAAC;IAC3E,CAAC;IAED,sBAAI,kCAAE;aAAN;YACI,OAAO,oBAAkB,CAAC,EAAE,CAAC;QACjC,CAAC;;;OAAA;IAED,mCAAM,GAAN;QACI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1D,CAAC;IAED,oCAAO,GAAP;QACI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC5D,CAAC;IAES,2DAA8B,GAAxC;QACI,OAAO,IAAI,mCAAyB,EAAE,CAAC;IAC3C,CAAC;;IAxBM,qBAAE,GAAG,2BAA2B,CAAC;IAGvB;QAAhB,kBAAM,CAAC,iBAAO,CAAC;kCAAoB,iBAAO;uDAAC;IAG5C;QADC,yBAAa,EAAE;;;;2DAGf;IATQ,kBAAkB;QAD9B,sBAAU,EAAE;OACA,kBAAkB,CA0B9B;IAAD,yBAAC;CAAA,AA1BD,IA0BC;AA1BY,gDAAkB"}
+{"version":3,"file":"command-palette-tool.js","sourceRoot":"","sources":["../../../src/features/command-palette/command-palette-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA8D;AAC9D,qCAAgF;AAGhF,IAAa,kBAAkB,0BAA/B,MAAa,kBAAkB;IAOjB,aAAa;QACnB,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,8BAA8B,EAAE,CAAC;IAC3E,CAAC;IAED,IAAI,EAAE;QACF,OAAO,oBAAkB,CAAC,EAAE,CAAC;IACjC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC5D,CAAC;IAES,8BAA8B;QACpC,OAAO,IAAI,mCAAyB,EAAE,CAAC;IAC3C,CAAC;CACJ,CAAA;AAzBU,qBAAE,GAAG,2BAA2B,CAAC;AAGvB;IAAhB,IAAA,kBAAM,EAAC,iBAAO,CAAC;8BAAoB,iBAAO;mDAAC;AAG5C;IADC,IAAA,yBAAa,GAAE;;;;uDAGf;AATQ,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CA0B9B;AA1BY,gDAAkB"}

package/lib/features/command-palette/di.config.js

@@ -16,12 +16,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 require("../../../css/command-palette.css");
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var types_1 = require("../../base/types");
-var command_palette_tool_1 = require("./command-palette-tool");
-var server_command_palette_provider_1 = require("./server-command-palette-provider");
-var glspCommandPaletteModule = new inversify_1.ContainerModule(function (bind) {
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const types_1 = require("../../base/types");
+const command_palette_tool_1 = require("./command-palette-tool");
+const server_command_palette_provider_1 = require("./server-command-palette-provider");
+const glspCommandPaletteModule = new inversify_1.ContainerModule(bind => {
     bind(sprotty_1.CommandPalette).toSelf().inSingletonScope();
     bind(sprotty_1.TYPES.IUIExtension).toService(sprotty_1.CommandPalette);
     bind(sprotty_1.CommandPaletteActionProviderRegistry).toSelf().inSingletonScope();

package/lib/features/command-palette/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/command-palette/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4CAA0C;AAE1C,uCAA4C;AAC5C,mCAAsF;AAEtF,0CAA8C;AAC9C,+DAA4D;AAC5D,qFAAuF;AAEvF,IAAM,wBAAwB,GAAG,IAAI,2BAAe,CAAC,UAAA,IAAI;IACrD,IAAI,CAAC,wBAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjD,IAAI,CAAC,eAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,wBAAc,CAAC,CAAC;IACnD,IAAI,CAAC,8CAAoC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvE,IAAI,CAAC,eAAK,CAAC,qCAAqC,CAAC,CAAC,SAAS,CAAC,8CAAoC,CAAC,CAAC;IAClG,IAAI,CAAC,eAAK,CAAC,6BAA6B,CAAC,CAAC,EAAE,CAAC,oEAAkC,CAAC,CAAC;IACjF,IAAI,CAAC,kBAAU,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yCAAkB,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,kBAAe,wBAAwB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/command-palette/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4CAA0C;AAE1C,yCAA4C;AAC5C,qCAAsF;AAEtF,4CAA8C;AAC9C,iEAA4D;AAC5D,uFAAuF;AAEvF,MAAM,wBAAwB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACxD,IAAI,CAAC,wBAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjD,IAAI,CAAC,eAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,wBAAc,CAAC,CAAC;IACnD,IAAI,CAAC,8CAAoC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvE,IAAI,CAAC,eAAK,CAAC,qCAAqC,CAAC,CAAC,SAAS,CAAC,8CAAoC,CAAC,CAAC;IAClG,IAAI,CAAC,eAAK,CAAC,6BAA6B,CAAC,CAAC,EAAE,CAAC,oEAAkC,CAAC,CAAC;IACjF,IAAI,CAAC,kBAAU,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yCAAkB,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,kBAAe,wBAAwB,CAAC"}

package/lib/features/command-palette/server-command-palette-provider.d.ts

@@ -1,6 +1,22 @@
-import { Action, ICommandPaletteActionProvider, LabeledAction, Point, SModelElement } from 'sprotty';
+/********************************************************************************
+ * Copyright (c) 2019-2021 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, LabeledAction, Point } from '@eclipse-glsp/protocol';
+import { ICommandPaletteActionProvider, SModelElement } from 'sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { EditorContextService } from '../../base/editor-context';
+import { EditorContextService } from '../../base/editor-context-service';
 export declare namespace ServerCommandPalette {
     const CONTEXT_ID = "command-palette";
     const TEXT = "text";

package/lib/features/command-palette/server-command-palette-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-command-palette-provider.d.ts","sourceRoot":"","sources":["../../../src/features/command-palette/server-command-palette-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,6BAA6B,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAS,MAAM,SAAS,CAAC;AAE5G,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,UAAU,oBAAoB,CAAC;IACrC,MAAM,IAAI,SAAS,CAAC;IACpB,MAAM,KAAK,UAAU,CAAC;CAChC;AAED,qBACa,kCAAmC,YAAW,6BAA6B;IACnD,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IACpD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE5E,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAQ9H,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE;CAMjE"}
+{"version":3,"file":"server-command-palette-provider.d.ts","sourceRoot":"","sources":["../../../src/features/command-palette/server-command-palette-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAA6B,aAAa,EAAE,KAAK,EAAyB,MAAM,wBAAwB,CAAC;AAExH,OAAO,EAAE,6BAA6B,EAAE,aAAa,EAAS,MAAM,SAAS,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,UAAU,oBAAoB,CAAC;IACrC,MAAM,IAAI,SAAS,CAAC;IACpB,MAAM,KAAK,UAAU,CAAC;CAChC;AAED,qBACa,kCAAmC,YAAW,6BAA6B;IACnD,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IACpD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE5E,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAW9H,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE;CAMjE"}