@eclipse-glsp/client 2.2.0-next.328 → 2.2.0-next.330

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

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

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

@@ -0,0 +1,227 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeedbackMoveMouseListener = exports.ValidatedElementMove = 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 sprotty_1 = require("@eclipse-glsp/sprotty");
+const lodash_1 = require("lodash");
+const drag_aware_mouse_listener_1 = require("../../../base/drag-aware-mouse-listener");
+const css_feedback_1 = require("../../../base/feedback/css-feedback");
+const utils_1 = require("../../../utils");
+const change_bounds_1 = require("../../change-bounds");
+const model_1 = require("../../change-bounds/model");
+const movement_restrictor_1 = require("../../change-bounds/movement-restrictor");
+const change_bounds_tool_feedback_1 = require("./change-bounds-tool-feedback");
+var ValidatedElementMove;
+(function (ValidatedElementMove) {
+    function isValid(move) {
+        var _a;
+        return (_a = move.valid) !== null && _a !== void 0 ? _a : true;
+    }
+    ValidatedElementMove.isValid = isValid;
+})(ValidatedElementMove || (exports.ValidatedElementMove = ValidatedElementMove = {}));
+/**
+ * This mouse listener provides visual feedback for moving by sending client-side
+ * `MoveAction`s while elements are selected and dragged. This will also update
+ * their bounds, which is important, as it is not only required for rendering
+ * the visual feedback but also the basis for sending the change to the server
+ * (see also `tools/MoveTool`).
+ */
+class FeedbackMoveMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
+    constructor(tool) {
+        super();
+        this.tool = tool;
+        this.elementId2startPos = new Map();
+        this.positionUpdater = new change_bounds_1.PointPositionUpdater(tool.positionSnapper);
+        this.moveInitializedFeedback = tool.createFeedbackEmitter();
+        this.moveFeedback = tool.createFeedbackEmitter();
+    }
+    mouseDown(target, event) {
+        super.mouseDown(target, event);
+        if (event.button === 0) {
+            this.initializeMove(target, event);
+            return [];
+        }
+        this.positionUpdater.resetPosition();
+        return [];
+    }
+    initializeMove(target, event) {
+        if (target instanceof model_1.SResizeHandle) {
+            // avoid conflict with resize tool
+            return;
+        }
+        const moveable = (0, sprotty_1.findParentByFeature)(target, this.isValidMoveable);
+        if (moveable !== undefined) {
+            this.positionUpdater.updateLastDragPosition(event);
+            this.scheduleMoveInitialized();
+        }
+        else {
+            this.positionUpdater.resetPosition();
+        }
+    }
+    scheduleMoveInitialized() {
+        var _a;
+        (_a = this.pendingMoveInitialized) === null || _a === void 0 ? void 0 : _a.cancel();
+        this.pendingMoveInitialized = (0, lodash_1.debounce)(() => {
+            this.moveInitialized();
+            this.pendingMoveInitialized = undefined;
+        }, 750);
+        this.pendingMoveInitialized();
+    }
+    moveInitializationTimeout() {
+        return 750;
+    }
+    moveInitialized() {
+        if (this.isMouseDown) {
+            this.moveInitializedFeedback
+                .add(change_bounds_tool_feedback_1.MoveInitializedEventAction.create(), change_bounds_tool_feedback_1.MoveFinishedEventAction.create())
+                .add((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.MOVE), (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT))
+                .submit();
+        }
+    }
+    isValidMoveable(element) {
+        return !!element && (0, utils_1.isNonRoutableSelectedMovableBoundsAware)(element) && !(element instanceof model_1.SResizeHandle);
+    }
+    nonDraggingMouseUp(element, event) {
+        // should reset everything that may have happend on mouse down
+        this.moveInitializedFeedback.dispose();
+        this.positionUpdater.resetPosition();
+        return [];
+    }
+    mouseMove(target, event) {
+        super.mouseMove(target, event);
+        if (event.buttons === 0) {
+            return this.mouseUp(target, event);
+        }
+        else if (!this.positionUpdater.isLastDragPositionUndefined()) {
+            return this.moveElements(target, event);
+        }
+        return [];
+    }
+    moveElements(target, event) {
+        var _a;
+        if (this.elementId2startPos.size === 0) {
+            this.initializeElementsToMove(target.root);
+        }
+        const moveAction = this.getElementMoves(target, event, false);
+        if (!moveAction) {
+            return [];
+        }
+        // cancel any pending move
+        (_a = this.pendingMoveInitialized) === null || _a === void 0 ? void 0 : _a.cancel();
+        this.moveFeedback.add(moveAction, () => this.resetElementPositions(target));
+        this.addMovementFeedback(moveAction, target);
+        this.moveFeedback.submit();
+        return [];
+    }
+    addMovementFeedback(movement, ctx) {
+        // cursor feedback
+        this.moveFeedback.add((0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.MOVE), (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.DEFAULT));
+        // restriction feedback
+        movement.moves.forEach(move => {
+            const element = ctx.root.index.getById(move.elementId);
+            if (element && this.tool.movementRestrictor) {
+                if (!ValidatedElementMove.isValid(move)) {
+                    this.moveFeedback.add((0, movement_restrictor_1.createMovementRestrictionFeedback)(element, this.tool.movementRestrictor), () => (0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
+                }
+                else {
+                    this.moveFeedback.add((0, movement_restrictor_1.removeMovementRestrictionFeedback)(element, this.tool.movementRestrictor));
+                }
+            }
+        });
+    }
+    initializeElementsToMove(root) {
+        const elementsToMove = this.collectElementsToMove(root);
+        elementsToMove.forEach(element => this.elementId2startPos.set(element.id, element.position));
+    }
+    collectElementsToMove(root) {
+        const moveableElements = (0, utils_1.filter)(root.index, this.isValidMoveable);
+        const topLevelElements = (0, utils_1.removeDescendants)(moveableElements);
+        return Array.from(topLevelElements);
+    }
+    getElementsToMove(context) {
+        return (0, utils_1.getElements)(context.root.index, Array.from(this.elementId2startPos.keys()), this.isValidMoveable);
+    }
+    getElementMoves(target, event, finished) {
+        const delta = this.positionUpdater.updatePosition(target, event);
+        if (!delta) {
+            return undefined;
+        }
+        const elementMoves = this.getElementMovesForDelta(target, delta, finished).filter(move => this.filterElementMove(move));
+        if (elementMoves.length > 0) {
+            // we never want to animate the move action as this interferes with the move feedback
+            return sprotty_1.MoveAction.create(elementMoves, { animate: false, finished });
+        }
+        else {
+            return undefined;
+        }
+    }
+    filterElementMove(elementMove) {
+        return !!elementMove.fromPosition && !sprotty_1.Point.equals(elementMove.fromPosition, elementMove.toPosition);
+    }
+    getElementMovesForDelta(target, delta, finished) {
+        return this.getElementsToMove(target).flatMap(element => {
+            var _a, _b;
+            const startPosition = this.elementId2startPos.get(element.id);
+            if (!startPosition) {
+                return [];
+            }
+            const targetPosition = sprotty_1.Point.add(element.position, delta);
+            const valid = (_b = (_a = this.tool.movementRestrictor) === null || _a === void 0 ? void 0 : _a.validate(element, targetPosition)) !== null && _b !== void 0 ? _b : true;
+            return [this.createElementMove(element, targetPosition, valid, finished)];
+        });
+    }
+    createElementMove(element, toPosition, valid, finished) {
+        // if we are finished and have an invalid move, we want to move the element back to its start position
+        return !valid && finished
+            ? { elementId: element.id, fromPosition: element.position, toPosition: element.position, valid }
+            : { elementId: element.id, fromPosition: element.position, toPosition, valid };
+    }
+    resetElementPositions(context) {
+        const elementMoves = this.revertElementMoves(context);
+        return sprotty_1.MoveAction.create(elementMoves, { animate: false, finished: true });
+    }
+    revertElementMoves(context) {
+        var _a;
+        const elementMoves = [];
+        if ((_a = context === null || context === void 0 ? void 0 : context.root) === null || _a === void 0 ? void 0 : _a.index) {
+            const movableElements = this.getElementsToMove(context);
+            movableElements.forEach(element => elementMoves.push({ elementId: element.id, toPosition: this.elementId2startPos.get(element.id) }));
+        }
+        return elementMoves;
+    }
+    draggingMouseUp(target, event) {
+        if (this.positionUpdater.isLastDragPositionUndefined()) {
+            return [];
+        }
+        // only reset the move of invalid elements, the others will be handled by the change bounds tool itself
+        const moves = this.getElementMovesForDelta(target, sprotty_1.Point.ORIGIN, false);
+        moves.filter(move => move.valid).forEach(move => this.elementId2startPos.delete(move.elementId));
+        this.dispose();
+        return [];
+    }
+    dispose() {
+        var _a;
+        (_a = this.pendingMoveInitialized) === null || _a === void 0 ? void 0 : _a.cancel();
+        this.moveInitializedFeedback.dispose();
+        this.moveFeedback.dispose();
+        this.positionUpdater.resetPosition();
+        this.elementId2startPos.clear();
+        super.dispose();
+    }
+}
+exports.FeedbackMoveMouseListener = FeedbackMoveMouseListener;
+//# sourceMappingURL=change-bounds-tool-move-feedback.js.map

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

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

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

@@ -1,8 +1,10 @@
-import { Action, Bounds, BoundsAware, Dimension, Disposable, EdgeRouterRegistry, ElementAndBounds, GModelElement, GModelRoot, GParentElement, MouseListener, Operation, Point } from '@eclipse-glsp/sprotty';
+import { Action, BoundsAware, Dimension, Disposable, EdgeRouterRegistry, ElementAndBounds, GModelElement, GModelRoot, GParentElement, MouseListener, Operation, Point } from '@eclipse-glsp/sprotty';
 import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { FeedbackEmitter } from '../../../base/feedback/feeback-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 } from '../../../utils/gmodel-util';
+import { PointPositionUpdater } from '../../change-bounds';
+import { SResizeHandle } from '../../change-bounds/model';
 import { IMovementRestrictor } from '../../change-bounds/movement-restrictor';
 import { PositionSnapper } from '../../change-bounds/position-snapper';
 import { BaseEditTool } from '../base-tools';
@@ -30,40 +32,48 @@ export declare class ChangeBoundsTool extends BaseEditTool {
     protected createMoveMouseListener(): MouseListener;
     protected createChangeBoundsListener(): MouseListener & ISelectionListener;
 }
+export interface ValidatedElementAndBounds extends ElementAndBounds {
+    valid: boolean;
+}
+export declare namespace ValidatedElementAndBounds {
+    function isValid(move: ElementAndBounds): boolean;
+}
 export declare class ChangeBoundsListener extends DragAwareMouseListener implements ISelectionListener, Disposable {
     protected tool: ChangeBoundsTool;
     static readonly CSS_CLASS_ACTIVE = "active";
-    protected initialBounds: Bounds | undefined;
-    protected pointPositionUpdater: PointPositionUpdater;
-    protected activeResizeElement?: GModelElement;
+    protected initialBounds: ElementAndBounds | undefined;
+    protected positionUpdater: PointPositionUpdater;
+    protected activeResizeElement?: ResizableModelElement;
     protected activeResizeHandle?: SResizeHandle;
+    protected handleFeedback: FeedbackEmitter;
+    protected resizeFeedback: FeedbackEmitter;
     constructor(tool: ChangeBoundsTool);
     mouseDown(target: GModelElement, event: MouseEvent): Action[];
-    mouseMove(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 filterResizeOnClient(resize: ValidatedElementAndBounds, positionUpdate: Point): boolean;
+    protected addResizeFeedback(resizeActions: ValidatedElementAndBounds[], handle: SResizeHandle, target: GModelElement, event: MouseEvent): void;
+    protected resetBoundsAction(): Action[];
     draggingMouseUp(target: GModelElement, _event: MouseEvent): Action[];
+    nonDraggingMouseUp(element: GModelElement, event: MouseEvent): Action[];
     protected handleMoveOnServer(target: GModelElement): Action[];
     protected handleMoveElementsOnServer(target: GModelElement): Operation[];
+    protected isValidElement(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 handleResizeOnServer(activeResizeHandle: SResizeHandle): Action[];
     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 handleResizeOnClient(positionUpdate: Point): ValidatedElementAndBounds[];
+    protected handleTopLeftResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
+    protected handleTopRightResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
+    protected handleBottomLeftResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
+    protected handleBottomRightResize(resizeElement: ResizableModelElement, positionUpdate: Point): ValidatedElementAndBounds[];
+    protected createSetBoundsAction(element: BoundsAwareModelElement, newPosition: Point, newSize: Dimension): ValidatedElementAndBounds[];
+    protected isValidSize(element: BoundsAwareModelElement, size: Dimension): boolean;
+    protected isValidMove(element: BoundsAwareModelElement, newPosition: Point): boolean;
+    protected disposeAllButHandles(): 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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"}