@eclipse-glsp/client 1.1.0-next.0d35bd0.205 → 1.1.0-next.0e4a7fc.263

package/src/features/tool-feedback/creation-tool-feedback.ts

@@ -1,246 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2019-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, Bounds, Point } from '@eclipse-glsp/protocol';
-import { inject, injectable } from 'inversify';
-import {
-    AnchorComputerRegistry,
-    CommandExecutionContext,
-    CommandReturn,
-    findChildrenAtPosition,
-    findParentByFeature,
-    isBoundsAware,
-    isConnectable,
-    MouseListener,
-    MoveAction,
-    PolylineEdgeRouter,
-    SChildElement,
-    SConnectableElement,
-    SDanglingAnchor,
-    SEdge as SEdgeSchema,
-    SModelElement,
-    SModelRoot,
-    SRoutableElement,
-    TYPES
-} from 'sprotty';
-import { BoundsAwareModelElement, isRoutable } from '../../utils/smodel-util';
-import { getAbsolutePosition, toAbsoluteBounds, toAbsolutePosition } from '../../utils/viewpoint-util';
-import { FeedbackCommand } from './model';
-export interface DrawFeedbackEdgeAction extends Action {
-    kind: typeof DrawFeedbackEdgeAction.KIND;
-    elementTypeId: string;
-    sourceId: string;
-    edgeSchema?: SEdgeSchema;
-}
-
-export namespace DrawFeedbackEdgeAction {
-    export const KIND = 'drawFeedbackEdge';
-
-    export function is(object: any): object is DrawFeedbackEdgeAction {
-        return Action.hasKind(object, KIND);
-    }
-
-    export function create(options: { elementTypeId: string; sourceId: string; edgeSchema?: SEdgeSchema }): DrawFeedbackEdgeAction {
-        return {
-            kind: KIND,
-            ...options
-        };
-    }
-}
-
-@injectable()
-export class DrawFeedbackEdgeCommand extends FeedbackCommand {
-    static readonly KIND = DrawFeedbackEdgeAction.KIND;
-
-    constructor(@inject(TYPES.Action) protected action: DrawFeedbackEdgeAction) {
-        super();
-    }
-
-    execute(context: CommandExecutionContext): CommandReturn {
-        const feedbackEdgeSchema = this.action.edgeSchema ? this.action.edgeSchema : defaultFeedbackEdgeSchema;
-        drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, feedbackEdgeSchema);
-        return context.root;
-    }
-}
-
-export interface RemoveFeedbackEdgeAction extends Action {
-    kind: typeof RemoveFeedbackEdgeAction.KIND;
-}
-
-export namespace RemoveFeedbackEdgeAction {
-    export const KIND = 'removeFeedbackEdgeCommand';
-
-    export function is(object: any): object is RemoveFeedbackEdgeAction {
-        return Action.hasKind(object, KIND);
-    }
-
-    export function create(): RemoveFeedbackEdgeAction {
-        return { kind: KIND };
-    }
-}
-
-@injectable()
-export class RemoveFeedbackEdgeCommand extends FeedbackCommand {
-    static readonly KIND = RemoveFeedbackEdgeAction.KIND;
-
-    execute(context: CommandExecutionContext): CommandReturn {
-        removeFeedbackEdge(context.root);
-        return context.root;
-    }
-}
-
-export class FeedbackEdgeEnd extends SDanglingAnchor {
-    static readonly TYPE = 'feedback-edge-end';
-    constructor(
-        readonly sourceId: string,
-        readonly elementTypeId: string,
-        public feedbackEdge: SRoutableElement | undefined = undefined,
-        override readonly type: string = FeedbackEdgeEnd.TYPE
-    ) {
-        super();
-    }
-}
-
-export class FeedbackEdgeEndMovingMouseListener extends MouseListener {
-    constructor(protected anchorRegistry: AnchorComputerRegistry) {
-        super();
-    }
-
-    override mouseMove(target: SModelElement, event: MouseEvent): Action[] {
-        const root = target.root;
-        const edgeEnd = root.index.getById(feedbackEdgeEndId(root));
-        if (!(edgeEnd instanceof FeedbackEdgeEnd) || !edgeEnd.feedbackEdge) {
-            return [];
-        }
-
-        const edge = edgeEnd.feedbackEdge;
-        const position = getAbsolutePosition(edgeEnd, event);
-        const endAtMousePosition = findChildrenAtPosition(target.root, position)
-            .reverse()
-            .find(element => isConnectable(element) && element.canConnect(edge, 'target'));
-
-        if (endAtMousePosition instanceof SConnectableElement && edge.source && isBoundsAware(edge.source)) {
-            const anchor = this.computeAbsoluteAnchor(endAtMousePosition, Bounds.center(toAbsoluteBounds(edge.source)));
-            if (Point.euclideanDistance(anchor, edgeEnd.position) > 1) {
-                return [MoveAction.create([{ elementId: edgeEnd.id, toPosition: anchor }], { animate: false })];
-            }
-        } else {
-            return [MoveAction.create([{ elementId: edgeEnd.id, toPosition: position }], { animate: false })];
-        }
-
-        return [];
-    }
-
-    protected computeAbsoluteAnchor(element: SConnectableElement, absoluteReferencePoint: Point, offset?: number): Point {
-        const referencePointInParent = absoluteToParent(element, absoluteReferencePoint);
-        const anchorComputer = this.anchorRegistry.get(PolylineEdgeRouter.KIND, element.anchorKind);
-        let anchor = anchorComputer.getAnchor(element, referencePointInParent, offset);
-        // The anchor is computed in the local coordinate system of the element.
-        // If the element is a nested child element we have to add the absolute position of its parent to the anchor.
-        if (element.parent !== element.root) {
-            const parent = findParentByFeature(element.parent, isBoundsAware);
-            if (parent) {
-                const absoluteParentPosition = toAbsoluteBounds(parent);
-                anchor = Point.add(absoluteParentPosition, anchor);
-            }
-        }
-        return anchor;
-    }
-}
-
-/**
- * Convert a point, specified in absolute coordinates, to a point relative
- * to the parent of the specified child element.
- * @param element the child element
- * @param absolutePoint a point in absolute coordinates
- * @returns the equivalent point, relative to the element's parent coordinates
- */
-function absoluteToParent(element: BoundsAwareModelElement & SChildElement, absolutePoint: Point): Point {
-    if (isBoundsAware(element.parent)) {
-        return absoluteToLocal(element.parent, absolutePoint);
-    }
-    // If the parent is not bounds-aware, assume it's at 0; 0 and proceed
-    return absoluteToLocal(element, absolutePoint);
-}
-
-/**
- * Convert a point, specified in absolute coordinates, to a point relative
- * to the specified element.
- * @param element the element
- * @param absolutePoint a point in absolute coordinates
- * @returns the equivalent point, relative to the element's coordinates
- */
-function absoluteToLocal(element: BoundsAwareModelElement, absolutePoint: Point): Point {
-    const absoluteElementBounds = toAbsoluteBounds(element);
-    return { x: absolutePoint.x - absoluteElementBounds.x, y: absolutePoint.y - absoluteElementBounds.y };
-}
-
-export function feedbackEdgeId(root: SModelRoot): string {
-    return root.id + '_feedback_edge';
-}
-
-export function feedbackEdgeEndId(root: SModelRoot): string {
-    return root.id + '_feedback_anchor';
-}
-
-export const defaultFeedbackEdgeSchema: SEdgeSchema = {
-    cssClasses: ['feedback-edge'],
-    opacity: 0.3
-} as SEdgeSchema;
-
-export function drawFeedbackEdge(
-    context: CommandExecutionContext,
-    sourceId: string,
-    elementTypeId: string,
-    feedbackEdgeSchema: SEdgeSchema
-): void {
-    const root = context.root;
-    const sourceChild = root.index.getById(sourceId);
-    if (!sourceChild) {
-        return;
-    }
-
-    const source = findParentByFeature(sourceChild, isConnectable);
-    if (!source || !isBoundsAware(source)) {
-        return;
-    }
-
-    const edgeEnd = new FeedbackEdgeEnd(source.id, elementTypeId);
-    edgeEnd.id = feedbackEdgeEndId(root);
-    edgeEnd.position = toAbsolutePosition(source);
-
-    feedbackEdgeSchema.id = feedbackEdgeId(root);
-    feedbackEdgeSchema.type = elementTypeId;
-    feedbackEdgeSchema.sourceId = source.id;
-    feedbackEdgeSchema.targetId = edgeEnd.id;
-
-    const feedbackEdge = context.modelFactory.createElement(feedbackEdgeSchema);
-    if (isRoutable(feedbackEdge)) {
-        edgeEnd.feedbackEdge = feedbackEdge;
-        root.add(edgeEnd);
-        root.add(feedbackEdge);
-    }
-}
-
-export function removeFeedbackEdge(root: SModelRoot): void {
-    const feedbackEdge = root.index.getById(feedbackEdgeId(root));
-    const feedbackEdgeEnd = root.index.getById(feedbackEdgeEndId(root));
-    if (feedbackEdge instanceof SChildElement) {
-        root.remove(feedbackEdge);
-    }
-    if (feedbackEdgeEnd instanceof SChildElement) {
-        root.remove(feedbackEdgeEnd);
-    }
-}

package/src/features/tool-feedback/di.config.ts

@@ -1,65 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2019-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 { ContainerModule } from 'inversify';
-import { configureCommand, configureView, LocationPostprocessor, MoveCommand } from 'sprotty';
-import { TYPES } from '../../base/types';
-import { SResizeHandle } from '../change-bounds/model';
-import { HideChangeBoundsToolResizeFeedbackCommand, ShowChangeBoundsToolResizeFeedbackCommand } from './change-bounds-tool-feedback';
-import { DrawFeedbackEdgeCommand, FeedbackEdgeEnd, RemoveFeedbackEdgeCommand } from './creation-tool-feedback';
-import { ModifyCssFeedbackCommand } from './css-feedback';
-import {
-    DrawFeedbackEdgeSourceCommand,
-    HideEdgeReconnectHandlesFeedbackCommand,
-    ShowEdgeReconnectHandlesFeedbackCommand,
-    SwitchRoutingModeCommand
-} from './edge-edit-tool-feedback';
-import { FeedbackActionDispatcher } from './feedback-action-dispatcher';
-import { DrawMarqueeCommand, RemoveMarqueeCommand } from './marquee-tool-feedback';
-import { FeedbackEdgeEndView, SResizeHandleView } from './view';
-
-const toolFeedbackModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(TYPES.IFeedbackActionDispatcher).to(FeedbackActionDispatcher).inSingletonScope();
-
-    configureCommand({ bind, isBound }, ModifyCssFeedbackCommand);
-
-    // create node and edge tool feedback
-    configureCommand({ bind, isBound }, DrawFeedbackEdgeCommand);
-    configureCommand({ bind, isBound }, RemoveFeedbackEdgeCommand);
-
-    configureCommand({ bind, isBound }, DrawMarqueeCommand);
-    configureCommand({ bind, isBound }, RemoveMarqueeCommand);
-
-    configureView({ bind, isBound }, FeedbackEdgeEnd.TYPE, FeedbackEdgeEndView);
-    // move tool feedback: we use sprotties MoveCommand as client-side visual feedback
-    configureCommand({ bind, isBound }, MoveCommand);
-
-    // resize tool feedback
-    configureCommand({ bind, isBound }, ShowChangeBoundsToolResizeFeedbackCommand);
-    configureCommand({ bind, isBound }, HideChangeBoundsToolResizeFeedbackCommand);
-    configureView({ bind, isBound }, SResizeHandle.TYPE, SResizeHandleView);
-
-    // reconnect edge tool feedback
-    configureCommand({ bind, isBound }, ShowEdgeReconnectHandlesFeedbackCommand);
-    configureCommand({ bind, isBound }, HideEdgeReconnectHandlesFeedbackCommand);
-    configureCommand({ bind, isBound }, DrawFeedbackEdgeSourceCommand);
-
-    configureCommand({ bind, isBound }, SwitchRoutingModeCommand);
-
-    bind(TYPES.IVNodePostprocessor).to(LocationPostprocessor);
-    bind(TYPES.HiddenVNodePostprocessor).to(LocationPostprocessor);
-});
-
-export default toolFeedbackModule;

package/src/features/tools/di.config.ts

@@ -1,74 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2019-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 { TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
-import { ContainerModule, interfaces } from 'inversify';
-import { configureActionHandler, configureModelElement, ManhattanEdgeRouter } from 'sprotty';
-import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
-import { TYPES } from '../../base/types';
-import { GLSPSvgExporter } from '../export/glsp-svg-exporter';
-import { MARQUEE } from '../tool-feedback/marquee-tool-feedback';
-import { ChangeBoundsTool } from './change-bounds-tool';
-import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
-import { EdgeCreationTool } from './edge-creation-tool';
-import { EdgeEditTool } from './edge-edit-tool';
-import { EnableDefaultToolsOnFocusLossHandler } from './enable-default-tools-on-focus-loss';
-import { GSLPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
-import { MarqueeMouseTool } from './marquee-mouse-tool';
-import { MarqueeTool } from './marquee-tool';
-import { MarqueeNode } from './model';
-import { NodeCreationTool } from './node-creation-tool';
-import { MarqueeView } from './view';
-
-/**
- * Registers the default tools of GLSP (node and edge creation, changing bounds, edge editing, deletion)
- * and adds the marquee selection tool.
- */
-export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
-    // Register default tools
-    bind(TYPES.IDefaultTool).to(ChangeBoundsTool);
-    bind(TYPES.IDefaultTool).to(EdgeEditTool);
-    bind(TYPES.IDefaultTool).to(DelKeyDeleteTool);
-
-    // Register  tools
-    bind(TYPES.ITool).to(MouseDeleteTool);
-    bind(NodeCreationTool).toSelf().inSingletonScope();
-    bind(EdgeCreationTool).toSelf().inSingletonScope();
-    bind(TYPES.ITool).toService(EdgeCreationTool);
-    bind(TYPES.ITool).toService(NodeCreationTool);
-
-    configureMarqueeTool({ bind, isBound });
-    configureActionHandler({ bind, isBound }, TriggerNodeCreationAction.KIND, NodeCreationTool);
-    configureActionHandler({ bind, isBound }, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
-
-    bind(GLSPSvgExporter).toSelf().inSingletonScope();
-    rebind(TYPES.SvgExporter).toService(GLSPSvgExporter);
-
-    bind(GSLPManhattanEdgeRouter).toSelf().inSingletonScope();
-    rebind(ManhattanEdgeRouter).toService(GSLPManhattanEdgeRouter);
-});
-
-export function configureMarqueeTool(context: { bind: interfaces.Bind; isBound: interfaces.IsBound }): void {
-    configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
-    context.bind(TYPES.IDefaultTool).to(MarqueeTool);
-    context.bind(TYPES.ITool).to(MarqueeMouseTool);
-}
-
-/**
- * Enables the default tools in the tool manager if the diagram looses focus.
- */
-export const enableDefaultToolsOnFocusLossModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
-});

package/src/features/viewport/di.config.ts

@@ -1,46 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2021-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 { ContainerModule } from 'inversify';
-import {
-    CenterCommand,
-    CenterKeyboardListener,
-    configureActionHandler,
-    configureCommand,
-    EnableDefaultToolsAction,
-    EnableToolsAction,
-    FitToScreenCommand,
-    GetViewportCommand,
-    SetViewportCommand,
-    TYPES,
-    ZoomMouseListener
-} from 'sprotty';
-import { GLSPScrollMouseListener } from './glsp-scroll-mouse-listener';
-
-const glspViewportModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureCommand({ bind, isBound }, CenterCommand);
-    configureCommand({ bind, isBound }, FitToScreenCommand);
-    configureCommand({ bind, isBound }, GetViewportCommand);
-    configureCommand({ bind, isBound }, SetViewportCommand);
-    bind(TYPES.KeyListener).to(CenterKeyboardListener);
-    bind(TYPES.MouseListener).to(ZoomMouseListener);
-    bind(GLSPScrollMouseListener).toSelf().inSingletonScope();
-    bind(TYPES.MouseListener).toService(GLSPScrollMouseListener);
-
-    configureActionHandler({ bind, isBound }, EnableToolsAction.KIND, GLSPScrollMouseListener);
-    configureActionHandler({ bind, isBound }, EnableDefaultToolsAction.KIND, GLSPScrollMouseListener);
-});
-
-export default glspViewportModule;