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

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

@@ -1,11 +1,14 @@
-import { Action, Bounds, BoundsAware, Dimension, Disposable, EdgeRouterRegistry, ElementAndBounds, GModelElement, GModelRoot, GParentElement, MouseListener, Operation, Point } from '@eclipse-glsp/sprotty';
+import { Action, BoundsAware, EdgeRouterRegistry, ElementAndBounds, GModelElement, GModelRoot, GParentElement, MouseListener, Operation } from '@eclipse-glsp/sprotty';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { FeedbackEmitter } from '../../../base/feedback/feedback-emitter';
 import { ISelectionListener, SelectionService } from '../../../base/selection-service';
-import { PointPositionUpdater } from '../../../features/change-bounds/point-position-updater';
-import { Resizable, SResizeHandle } from '../../change-bounds/model';
+import { BoundsAwareModelElement, ResizableModelElement, SelectableBoundsAware } from '../../../utils/gmodel-util';
+import { SetBoundsFeedbackAction } from '../../bounds/set-bounds-feedback-command';
+import { GResizeHandle } from '../../change-bounds/model';
 import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
-import { PositionSnapper } from '../../change-bounds/position-snapper';
 import { BaseEditTool } from '../base-tools';
+import { ChangeBoundsManager } from './change-bounds-manager';
+import { ChangeBoundsTracker, TrackedElementResize, TrackedResize } from './change-bounds-tracker';
 /**
  * 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,46 +27,46 @@ export declare class ChangeBoundsTool extends BaseEditTool {
     protected selectionService: SelectionService;
     readonly edgeRouterRegistry?: EdgeRouterRegistry;
     readonly movementRestrictor?: IMovementRestrictor;
-    readonly positionSnapper: PositionSnapper;
+    readonly changeBoundsManager: ChangeBoundsManager;
     get id(): string;
     enable(): void;
+    createChangeBoundsTracker(): ChangeBoundsTracker;
     protected createMoveMouseListener(): MouseListener;
     protected createChangeBoundsListener(): MouseListener & ISelectionListener;
 }
-export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener, Disposable {
+export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener {
     protected tool: ChangeBoundsTool;
     static readonly CSS_CLASS_ACTIVE = "active";
-    protected initialBounds: Bounds | undefined;
-    protected pointPositionUpdater: PointPositionUpdater;
-    protected activeResizeElement?: GModelElement;
-    protected activeResizeHandle?: SResizeHandle;
+    protected initialBounds: ElementAndBounds | undefined;
+    protected tracker: ChangeBoundsTracker;
+    protected activeResizeElement?: ResizableModelElement;
+    protected activeResizeHandle?: GResizeHandle;
+    protected handleFeedback: FeedbackEmitter;
+    protected resizeFeedback: FeedbackEmitter;
     constructor(tool: ChangeBoundsTool);
     mouseDown(target: GModelElement, event: MouseEvent): Action[];
-    mouseMove(target: GModelElement, event: MouseEvent): Action[];
-    draggingMouseUp(target: GModelElement, _event: MouseEvent): Action[];
+    protected updateResizeElement(target: GModelElement, event?: MouseEvent): boolean;
+    protected findResizeElement(target: GModelElement): ResizableModelElement | undefined;
+    protected draggingMouseMove(target: GModelElement, event: MouseEvent): Action[];
+    protected resizeBoundsAction(resize: TrackedResize): SetBoundsFeedbackAction;
+    protected toElementAndBounds(elementResize: TrackedElementResize): ElementAndBounds;
+    protected addResizeFeedback(resize: TrackedResize, target: GModelElement, event: MouseEvent): void;
+    protected resetBounds(): Action[];
+    draggingMouseUp(target: GModelElement, event: MouseEvent): Action[];
+    nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[];
     protected handleMoveOnServer(target: GModelElement): Action[];
-    protected handleMoveElementsOnServer(target: GModelElement): Operation[];
+    protected getElementsToMove(target: GModelElement): SelectableBoundsAware[];
+    protected handleMoveElementsOnServer(elementsToMove: SelectableBoundsAware[]): Operation[];
+    protected isValidMove(element: BoundsAwareModelElement, selectedElements?: Set<BoundsAwareModelElement>): boolean;
     protected isChildOfSelected(selectedElements: Set<GModelElement>, element: GModelElement): boolean;
-    protected handleMoveRoutingPointsOnServer(target: GModelElement): Operation[];
-    protected handleResize(activeResizeHandle: SResizeHandle): Action[];
+    protected handleMoveRoutingPointsOnServer(elementsToMove: SelectableBoundsAware[]): Operation[];
+    protected handleResizeOnServer(activeResizeHandle: GResizeHandle): Action[];
+    protected isValidResize(element: BoundsAwareModelElement): boolean;
     selectionChanged(root: GModelRoot, selectedElements: string[]): void;
-    protected setActiveResizeElement(target: GModelElement): boolean;
     protected isActiveResizeElement(element?: GModelElement): element is GParentElement & BoundsAware;
-    protected initPosition(event: MouseEvent): void;
+    protected disposeResize(opts?: {
+        keepHandles: boolean;
+    }): void;
     dispose(): void;
-    protected reset(resetBounds?: boolean): void;
-    protected resetFeedback(resetBounds?: boolean): void;
-    protected resetPosition(): void;
-    protected handleResizeOnClient(positionUpdate: Point): Action[];
-    protected handleTopLeftResize(resizeElement: GParentElement & Resizable, positionUpdate: Point): Action[];
-    protected handleTopRightResize(resizeElement: GParentElement & Resizable, positionUpdate: Point): Action[];
-    protected handleBottomLeftResize(resizeElement: GParentElement & Resizable, positionUpdate: Point): Action[];
-    protected handleBottomRightResize(resizeElement: GParentElement & Resizable, positionUpdate: Point): Action[];
-    protected createChangeBoundsAction(element: GModelElement & BoundsAware): Action[];
-    protected createElementAndBounds(element: GModelElement & BoundsAware): ElementAndBounds[];
-    protected createSetBoundsAction(element: GModelElement & BoundsAware, x: number, y: number, width: number, height: number): Action[];
-    protected isValidBoundChange(element: GModelElement & BoundsAware, newPosition: Point, newSize: Dimension): boolean;
-    protected isValidSize(element: GModelElement & BoundsAware, size: Dimension): boolean;
-    protected isValidMove(element: GModelElement & BoundsAware, newPosition: Point): boolean;
 }
 //# sourceMappingURL=change-bounds-tool.d.ts.map

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

@@ -1 +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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"}
+{"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/change-bounds-tool.js

@@ -12,7 +12,7 @@ var ChangeBoundsTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeBoundsListener = exports.ChangeBoundsTool = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,18 +29,15 @@ exports.ChangeBoundsListener = exports.ChangeBoundsTool = void 0;
 const inversify_1 = require("inversify");
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 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 point_position_updater_1 = require("../../../features/change-bounds/point-position-updater");
 const gmodel_util_1 = require("../../../utils/gmodel-util");
-const layout_utils_1 = require("../../../utils/layout-utils");
+const local_bounds_1 = require("../../bounds/local-bounds");
 const set_bounds_feedback_command_1 = require("../../bounds/set-bounds-feedback-command");
 const model_1 = require("../../change-bounds/model");
-const movement_restrictor_1 = require("../../change-bounds/movement-restrictor");
-const position_snapper_1 = require("../../change-bounds/position-snapper");
-const model_2 = require("../../helper-lines/model");
 const base_tools_1 = require("../base-tools");
+const change_bounds_manager_1 = require("./change-bounds-manager");
 const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
+const change_bounds_tool_move_feedback_1 = require("./change-bounds-tool-move-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
@@ -69,10 +66,13 @@ let ChangeBoundsTool = ChangeBoundsTool_1 = class ChangeBoundsTool extends base_
         if (sprotty_1.Disposable.is(changeBoundsListener)) {
             this.toDisposeOnDisable.push(changeBoundsListener);
         }
-        this.toDisposeOnDisable.push(this.mouseTool.registerListener(feedbackMoveMouseListener), this.mouseTool.registerListener(changeBoundsListener), sprotty_1.Disposable.create(() => this.deregisterFeedback(feedbackMoveMouseListener)), sprotty_1.Disposable.create(() => this.deregisterFeedback(changeBoundsListener, [change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()])), this.selectionService.onSelectionChanged(change => changeBoundsListener.selectionChanged(change.root, change.selectedElements)));
+        this.toDisposeOnDisable.push(this.mouseTool.registerListener(feedbackMoveMouseListener), this.mouseTool.registerListener(changeBoundsListener), this.selectionService.onSelectionChanged(change => changeBoundsListener.selectionChanged(change.root, change.selectedElements)));
+    }
+    createChangeBoundsTracker() {
+        return this.changeBoundsManager.createTracker();
     }
     createMoveMouseListener() {
-        return new change_bounds_tool_feedback_1.FeedbackMoveMouseListener(this);
+        return new change_bounds_tool_move_feedback_1.FeedbackMoveMouseListener(this);
     }
     createChangeBoundsListener() {
         return new ChangeBoundsListener(this);
@@ -95,9 +95,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ChangeBoundsTool.prototype, "movementRestrictor", void 0);
 __decorate([
-    (0, inversify_1.inject)(position_snapper_1.PositionSnapper),
-    __metadata("design:type", position_snapper_1.PositionSnapper)
-], ChangeBoundsTool.prototype, "positionSnapper", void 0);
+    (0, inversify_1.inject)(change_bounds_manager_1.ChangeBoundsManager),
+    __metadata("design:type", change_bounds_manager_1.ChangeBoundsManager)
+], ChangeBoundsTool.prototype, "changeBoundsManager", void 0);
 exports.ChangeBoundsTool = ChangeBoundsTool = ChangeBoundsTool_1 = __decorate([
     (0, inversify_1.injectable)()
 ], ChangeBoundsTool);
@@ -105,7 +105,9 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
     constructor(tool) {
         super();
         this.tool = tool;
-        this.pointPositionUpdater = new point_position_updater_1.PointPositionUpdater(tool.positionSnapper);
+        this.tracker = tool.createChangeBoundsTracker();
+        this.handleFeedback = tool.createFeedbackEmitter();
+        this.resizeFeedback = tool.createFeedbackEmitter();
     }
     mouseDown(target, event) {
         super.mouseDown(target, event);
@@ -115,83 +117,118 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
             return [];
         }
         // check if we have a resize handle (only single-selection)
-        if (this.activeResizeElement && target instanceof model_1.SResizeHandle) {
-            this.activeResizeHandle = target;
-        }
-        else {
-            this.setActiveResizeElement(target);
-        }
+        this.updateResizeElement(target, event);
+        return [];
+    }
+    updateResizeElement(target, event) {
+        var _a, _b;
+        this.activeResizeHandle = target instanceof model_1.GResizeHandle ? target : undefined;
+        this.activeResizeElement = (_b = (_a = this.activeResizeHandle) === null || _a === void 0 ? void 0 : _a.parent) !== null && _b !== void 0 ? _b : this.findResizeElement(target);
         if (this.activeResizeElement) {
-            this.initPosition(event);
+            if (event) {
+                this.tracker.startTracking();
+            }
+            this.initialBounds = {
+                newSize: this.activeResizeElement.bounds,
+                newPosition: this.activeResizeElement.bounds,
+                elementId: this.activeResizeElement.id
+            };
+            // we trigger the local bounds calculation once to get the correct layout information for reszing
+            // for any sub-sequent calls the layout information will be updated automatically
+            this.tool
+                .createFeedbackEmitter()
+                .add(local_bounds_1.LocalRequestBoundsAction.create(target.root, [this.activeResizeElement.id]))
+                .submit()
+                .dispose();
+            this.handleFeedback.add(change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackAction.create({ elementId: this.activeResizeElement.id }), change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create());
+            this.handleFeedback.submit();
+            return true;
         }
         else {
-            this.reset();
+            this.disposeResize();
+            return false;
         }
-        return [];
     }
-    mouseMove(target, event) {
-        super.mouseMove(target, event);
-        if (this.isMouseDrag && this.activeResizeHandle) {
-            // rely on the FeedbackMoveMouseListener to update the element bounds of selected elements
-            // consider resize handles ourselves
-            const actions = [
-                (0, css_feedback_1.cursorFeedbackAction)(this.activeResizeHandle.isNwSeResize() ? css_feedback_1.CursorCSS.RESIZE_NWSE : css_feedback_1.CursorCSS.RESIZE_NESW),
-                (0, css_feedback_1.applyCssClasses)(this.activeResizeHandle, ChangeBoundsListener.CSS_CLASS_ACTIVE)
-            ];
-            const positionUpdate = this.pointPositionUpdater.updatePosition(target, event, (0, model_2.getDirectionFrom)(this.activeResizeHandle.location));
-            if (positionUpdate) {
-                const resizeActions = this.handleResizeOnClient(positionUpdate);
-                actions.push(...resizeActions);
+    findResizeElement(target) {
+        // check if we have a selected, moveable element (multi-selection allowed)
+        // but only allow one element to have the element resize handles
+        return (0, sprotty_1.findParentByFeature)(target, model_1.isResizable);
+    }
+    draggingMouseMove(target, event) {
+        // rely on the FeedbackMoveMouseListener to update the element bounds of selected elements
+        // consider resize handles ourselves
+        if (this.activeResizeHandle && this.tracker.isTracking()) {
+            const resize = this.tracker.resizeElements(this.activeResizeHandle, { snap: event, symmetric: event, restrict: event });
+            const resizeAction = this.resizeBoundsAction(resize);
+            if (resizeAction.bounds.length > 0) {
+                this.resizeFeedback.add(resizeAction, () => this.resetBounds());
+                this.tracker.updateTrackingPosition(resize.handleMove.moveVector);
+                this.addResizeFeedback(resize, target, event);
+                this.resizeFeedback.submit();
             }
-            this.tool.registerFeedback(actions, this);
-        }
-        return [];
-    }
-    draggingMouseUp(target, _event) {
-        if (this.pointPositionUpdater.isLastDragPositionUndefined()) {
-            this.resetPosition();
-            return [];
         }
+        return super.draggingMouseMove(target, event);
+    }
+    resizeBoundsAction(resize) {
+        // we do not want to resize elements beyond their valid size, not even for feedback, as the next layout cycle usually corrects this
+        const elementResizes = resize.elementResizes.filter(elementResize => elementResize.valid.size);
+        return set_bounds_feedback_command_1.SetBoundsFeedbackAction.create(elementResizes.map(elementResize => this.toElementAndBounds(elementResize)));
+    }
+    toElementAndBounds(elementResize) {
+        return {
+            elementId: elementResize.element.id,
+            newSize: elementResize.toBounds,
+            newPosition: elementResize.toBounds
+        };
+    }
+    addResizeFeedback(resize, target, event) {
+        this.tool.changeBoundsManager.addResizeFeedback(this.resizeFeedback, resize, target, event);
+    }
+    resetBounds() {
+        // reset the bounds to the initial bounds and ensure that we do not show helper line feedback anymore (MoveFinishedEventAction)
+        return this.initialBounds
+            ? [set_bounds_feedback_command_1.SetBoundsFeedbackAction.create([this.initialBounds]), change_bounds_tool_feedback_1.MoveFinishedEventAction.create()]
+            : [change_bounds_tool_feedback_1.MoveFinishedEventAction.create()];
+    }
+    draggingMouseUp(target, event) {
         const actions = [];
         if (this.activeResizeHandle) {
-            // Resize
-            actions.push(...this.handleResize(this.activeResizeHandle));
+            actions.push(...this.handleResizeOnServer(this.activeResizeHandle));
         }
         else {
-            // Move
+            // since the move feedback is handled by another class we just see whether there is something to move
             actions.push(...this.handleMoveOnServer(target));
         }
-        this.resetPosition();
-        this.tool.deregisterFeedback(this, [(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT)]);
+        this.disposeResize({ keepHandles: true });
         return actions;
     }
+    nonDraggingMouseUp(element, event) {
+        this.disposeResize({ keepHandles: true });
+        return super.nonDraggingMouseUp(element, event);
+    }
     handleMoveOnServer(target) {
         const operations = [];
-        operations.push(...this.handleMoveElementsOnServer(target));
-        operations.push(...this.handleMoveRoutingPointsOnServer(target));
-        if (operations.length > 0) {
-            return [sprotty_1.CompoundOperation.create(operations)];
-        }
-        return operations;
+        const elementToMove = this.getElementsToMove(target);
+        operations.push(...this.handleMoveElementsOnServer(elementToMove));
+        operations.push(...this.handleMoveRoutingPointsOnServer(elementToMove));
+        return operations.length > 0 ? [sprotty_1.CompoundOperation.create(operations)] : [];
     }
-    handleMoveElementsOnServer(target) {
-        const result = [];
-        const newBounds = [];
-        const selectedElements = [];
-        (0, gmodel_util_1.forEachElement)(target.index, gmodel_util_1.isNonRoutableSelectedMovableBoundsAware, element => {
-            selectedElements.push(element);
-        });
+    getElementsToMove(target) {
+        const selectedElements = (0, gmodel_util_1.getMatchingElements)(target.index, gmodel_util_1.isNonRoutableSelectedMovableBoundsAware);
         const selectionSet = new Set(selectedElements);
-        selectedElements
-            .filter(element => !this.isChildOfSelected(selectionSet, element))
-            .map(element => this.createElementAndBounds(element))
-            .forEach(bounds => newBounds.push(...bounds));
-        if (newBounds.length > 0) {
-            result.push(sprotty_1.ChangeBoundsOperation.create(newBounds));
-        }
-        return result;
+        return selectedElements.filter(element => this.isValidMove(element, selectionSet));
+    }
+    handleMoveElementsOnServer(elementsToMove) {
+        const newBounds = elementsToMove.map(gmodel_util_1.toElementAndBounds);
+        return newBounds.length > 0 ? [sprotty_1.ChangeBoundsOperation.create(newBounds)] : [];
+    }
+    isValidMove(element, selectedElements = new Set()) {
+        return this.tool.changeBoundsManager.hasValidPosition(element) && !this.isChildOfSelected(selectedElements, element);
     }
     isChildOfSelected(selectedElements, element) {
+        if (selectedElements.size === 0) {
+            return false;
+        }
         while (element instanceof sprotty_1.GChildElement) {
             element = element.parent;
             if (selectedElements.has(element)) {
@@ -200,12 +237,12 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
         }
         return false;
     }
-    handleMoveRoutingPointsOnServer(target) {
+    handleMoveRoutingPointsOnServer(elementsToMove) {
         const newRoutingPoints = [];
         const routerRegistry = this.tool.edgeRouterRegistry;
         if (routerRegistry) {
             //  If client routing is enabled -> delegate routing points of connected edges to server
-            (0, gmodel_util_1.forEachElement)(target.index, gmodel_util_1.isNonRoutableSelectedMovableBoundsAware, element => {
+            elementsToMove.forEach(element => {
                 if (element instanceof sprotty_1.GConnectableElement) {
                     element.incomingEdges
                         .map(connectable => (0, gmodel_util_1.calcElementAndRoutingPoints)(connectable, routerRegistry))
@@ -218,168 +255,58 @@ class ChangeBoundsListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
         }
         return newRoutingPoints.length > 0 ? [sprotty_1.ChangeRoutingPointsOperation.create(newRoutingPoints)] : [];
     }
-    handleResize(activeResizeHandle) {
-        const actions = [];
-        actions.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
-        actions.push((0, css_feedback_1.deleteCssClasses)(activeResizeHandle, ChangeBoundsListener.CSS_CLASS_ACTIVE));
-        const resizeElement = (0, sprotty_1.findParentByFeature)(activeResizeHandle, model_1.isResizable);
-        if (this.isActiveResizeElement(resizeElement)) {
-            this.createChangeBoundsAction(resizeElement).forEach(action => actions.push(action));
-        }
-        return actions;
-    }
-    selectionChanged(root, selectedElements) {
-        if (this.activeResizeElement) {
-            if (selectedElements.includes(this.activeResizeElement.id)) {
-                // our active element is still selected, nothing to do
-                return;
-            }
-            // try to find some other selected element and mark that active
-            for (const elementId of selectedElements.reverse()) {
-                const element = root.index.getById(elementId);
-                if (element && this.setActiveResizeElement(element)) {
-                    return;
-                }
-            }
-            this.reset();
-        }
-    }
-    setActiveResizeElement(target) {
-        // check if we have a selected, moveable element (multi-selection allowed)
-        const moveableElement = (0, sprotty_1.findParentByFeature)(target, model_1.isBoundsAwareMoveable);
-        if ((0, sprotty_1.isSelected)(moveableElement)) {
-            // only allow one element to have the element resize handles
-            this.activeResizeElement = moveableElement;
-            if ((0, model_1.isResizable)(this.activeResizeElement)) {
-                this.tool.registerFeedback([change_bounds_tool_feedback_1.ShowChangeBoundsToolResizeFeedbackAction.create(this.activeResizeElement.id)], this.activeResizeElement);
-            }
-            return true;
-        }
-        return false;
-    }
-    isActiveResizeElement(element) {
-        return element !== undefined && this.activeResizeElement !== undefined && element.id === this.activeResizeElement.id;
-    }
-    initPosition(event) {
-        this.pointPositionUpdater.updateLastDragPosition(event);
-        if (this.activeResizeHandle) {
-            const resizeElement = (0, sprotty_1.findParentByFeature)(this.activeResizeHandle, model_1.isResizable);
-            this.initialBounds = {
-                x: resizeElement.bounds.x,
-                y: resizeElement.bounds.y,
-                width: resizeElement.bounds.width,
-                height: resizeElement.bounds.height
-            };
-        }
-    }
-    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)) {
-            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(set_bounds_feedback_command_1.SetBoundsFeedbackAction.create([
-                    {
-                        elementId: this.activeResizeElement.id,
-                        newPosition: this.initialBounds,
-                        newSize: this.initialBounds
-                    }
-                ]));
+    handleResizeOnServer(activeResizeHandle) {
+        if (this.initialBounds && this.isValidResize(activeResizeHandle.parent)) {
+            const elementAndBounds = (0, gmodel_util_1.toElementAndBounds)(activeResizeHandle.parent);
+            if (!this.initialBounds.newPosition || !elementAndBounds.newPosition) {
+                return [];
             }
-            this.tool.deregisterFeedback(this.activeResizeElement, [change_bounds_tool_feedback_1.HideChangeBoundsToolResizeFeedbackAction.create()]);
-        }
-        resetFeedback.push((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
-        this.tool.deregisterFeedback(this, resetFeedback);
-    }
-    resetPosition() {
-        this.activeResizeHandle = undefined;
-        this.pointPositionUpdater.resetPosition();
-    }
-    handleResizeOnClient(positionUpdate) {
-        if (!this.activeResizeHandle) {
-            return [];
-        }
-        const resizeElement = (0, sprotty_1.findParentByFeature)(this.activeResizeHandle, model_1.isResizable);
-        if (this.isActiveResizeElement(resizeElement)) {
-            switch (this.activeResizeHandle.location) {
-                case model_1.ResizeHandleLocation.TopLeft:
-                    return this.handleTopLeftResize(resizeElement, positionUpdate);
-                case model_1.ResizeHandleLocation.TopRight:
-                    return this.handleTopRightResize(resizeElement, positionUpdate);
-                case model_1.ResizeHandleLocation.BottomLeft:
-                    return this.handleBottomLeftResize(resizeElement, positionUpdate);
-                case model_1.ResizeHandleLocation.BottomRight:
-                    return this.handleBottomRightResize(resizeElement, positionUpdate);
+            if (!sprotty_1.Point.equals(this.initialBounds.newPosition, elementAndBounds.newPosition) ||
+                !sprotty_1.Dimension.equals(this.initialBounds.newSize, elementAndBounds.newSize)) {
+                // UX: we do not want the element positions to be reset to their start as they will be moved to their start and
+                // only afterwards moved by the move action again, leading to a ping-pong movement.
+                // We therefore clear our element map so that they cannot be reset.
+                this.initialBounds = undefined;
+                return [sprotty_1.ChangeBoundsOperation.create([elementAndBounds])];
             }
         }
         return [];
     }
-    handleTopLeftResize(resizeElement, positionUpdate) {
-        return this.createSetBoundsAction(resizeElement, resizeElement.bounds.x + positionUpdate.x, resizeElement.bounds.y + positionUpdate.y, resizeElement.bounds.width - positionUpdate.x, resizeElement.bounds.height - positionUpdate.y);
-    }
-    handleTopRightResize(resizeElement, positionUpdate) {
-        return this.createSetBoundsAction(resizeElement, resizeElement.bounds.x, resizeElement.bounds.y + positionUpdate.y, resizeElement.bounds.width + positionUpdate.x, resizeElement.bounds.height - positionUpdate.y);
-    }
-    handleBottomLeftResize(resizeElement, positionUpdate) {
-        return this.createSetBoundsAction(resizeElement, resizeElement.bounds.x + positionUpdate.x, resizeElement.bounds.y, resizeElement.bounds.width - positionUpdate.x, resizeElement.bounds.height + positionUpdate.y);
+    isValidResize(element) {
+        return this.tool.changeBoundsManager.isValid(element);
     }
-    handleBottomRightResize(resizeElement, positionUpdate) {
-        return this.createSetBoundsAction(resizeElement, resizeElement.bounds.x, resizeElement.bounds.y, resizeElement.bounds.width + positionUpdate.x, resizeElement.bounds.height + positionUpdate.y);
-    }
-    createChangeBoundsAction(element) {
-        if (this.isValidBoundChange(element, element.bounds, element.bounds)) {
-            return [sprotty_1.ChangeBoundsOperation.create([(0, gmodel_util_1.toElementAndBounds)(element)])];
+    selectionChanged(root, selectedElements) {
+        if (this.activeResizeElement && selectedElements.includes(this.activeResizeElement.id)) {
+            // our active element is still selected, nothing to do
+            return;
         }
-        else if (this.initialBounds) {
-            const actions = [];
-            if (this.tool.movementRestrictor) {
-                actions.push((0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
+        // try to find some other selected element and mark that active
+        for (const elementId of selectedElements.reverse()) {
+            const element = root.index.getById(elementId);
+            if (element && this.updateResizeElement(element)) {
+                return;
             }
-            actions.push(set_bounds_feedback_command_1.SetBoundsFeedbackAction.create([{ elementId: element.id, newPosition: this.initialBounds, newSize: this.initialBounds }]));
-            return actions;
         }
-        return [];
+        this.dispose();
     }
-    createElementAndBounds(element) {
-        if (this.isValidBoundChange(element, element.bounds, element.bounds)) {
-            return [(0, gmodel_util_1.toElementAndBounds)(element)];
-        }
-        return [];
+    isActiveResizeElement(element) {
+        return element !== undefined && this.activeResizeElement !== undefined && element.id === this.activeResizeElement.id;
     }
-    createSetBoundsAction(element, x, y, width, height) {
-        const newPosition = { x, y };
-        const newSize = { width, height };
-        const result = [];
-        if (this.isValidBoundChange(element, newPosition, newSize)) {
-            if (this.tool.movementRestrictor) {
-                result.push((0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
-            }
-            result.push(set_bounds_feedback_command_1.SetBoundsFeedbackAction.create([{ elementId: element.id, newPosition, newSize }]));
-        }
-        else if (this.isValidSize(element, newSize)) {
-            if (this.tool.movementRestrictor) {
-                result.push((0, movement_restrictor_1.createMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
-            }
-            result.push(set_bounds_feedback_command_1.SetBoundsFeedbackAction.create([{ elementId: element.id, newPosition, newSize }]));
+    disposeResize(opts = { keepHandles: false }) {
+        if (!opts.keepHandles) {
+            this.handleFeedback.dispose();
         }
-        return result;
-    }
-    isValidBoundChange(element, newPosition, newSize) {
-        return this.isValidSize(element, newSize) && this.isValidMove(element, newPosition);
-    }
-    isValidSize(element, size) {
-        return (0, layout_utils_1.isValidSize)(element, size);
+        this.resizeFeedback.dispose();
+        this.tracker.dispose();
+        this.activeResizeElement = undefined;
+        this.activeResizeHandle = undefined;
+        this.initialBounds = undefined;
     }
-    isValidMove(element, newPosition) {
-        return (0, layout_utils_1.isValidMove)(element, newPosition, this.tool.movementRestrictor);
+    dispose() {
+        this.disposeResize();
+        super.dispose();
     }
 }
 exports.ChangeBoundsListener = ChangeBoundsListener;
-ChangeBoundsListener.CSS_CLASS_ACTIVE = 'active';
+ChangeBoundsListener.CSS_CLASS_ACTIVE = change_bounds_manager_1.CSS_ACTIVE_HANDLE;
 //# sourceMappingURL=change-bounds-tool.js.map