@eclipse-glsp/client 1.1.0-RC03 → 1.1.0-RC05

package/src/features/select/select-mouse-listener.ts

@@ -15,7 +15,6 @@
  ********************************************************************************/
 import { Action, SelectAction } from '@eclipse-glsp/protocol';
 import {
-    BringToFrontAction,
     findParentByFeature,
     isCtrlOrCmd,
     isSelectable,
@@ -27,6 +26,7 @@ import {
     SRoutingHandle,
     SwitchEditModeAction
 } from 'sprotty';
+import { BringToFrontAction } from 'sprotty-protocol/lib/actions';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { DEFAULT_RANK, Ranked } from '../rank/model';
 
@@ -37,7 +37,7 @@ import { DEFAULT_RANK, Ranked } from '../rank/model';
 export class RankedSelectMouseListener extends SelectMouseListener implements Ranked {
     rank: number = DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
 
-    override mouseDown(target: SModelElement, event: MouseEvent): Action[] {
+    override mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
         const result: Action[] = [];
         if (this.buttonHandlerRegistry !== undefined && target instanceof SButton && target.enabled) {
             const buttonHandler = this.buttonHandlerRegistry.get(target.type);

package/src/features/source-model-watcher/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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

package/src/features/tool-feedback/change-bounds-tool-feedback.ts

@@ -25,12 +25,12 @@ import {
     isSelectable,
     isViewport,
     MouseListener,
-    MoveAction,
     SChildElement,
     SModelElement,
     SModelRoot,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { forEachElement } from '../../utils/smodel-util';
 import { addResizeHandles, isResizable, removeResizeHandles, SResizeHandle } from '../change-bounds/model';
 import { createMovementRestrictionFeedback, removeMovementRestrictionFeedback } from '../change-bounds/movement-restrictor';

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

@@ -24,7 +24,6 @@ import {
     isBoundsAware,
     isConnectable,
     MouseListener,
-    MoveAction,
     PolylineEdgeRouter,
     SChildElement,
     SConnectableElement,
@@ -35,6 +34,7 @@ import {
     SRoutableElement,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { BoundsAwareModelElement, isRoutable } from '../../utils/smodel-util';
 import { getAbsolutePosition, toAbsoluteBounds, toAbsolutePosition } from '../../utils/viewpoint-util';
 import { FeedbackCommand } from './model';

package/src/features/tool-feedback/edge-edit-tool-feedback.ts

@@ -29,16 +29,15 @@ import {
     ISnapper,
     isSelected,
     MouseListener,
-    MoveAction,
     PolylineEdgeRouter,
     SConnectableElement,
     SModelElement,
-    SModelRoot,
     SRoutingHandle,
     SwitchEditModeAction,
     SwitchEditModeCommand,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { forEachElement, isRoutable, isRoutingHandle } from '../../utils/smodel-util';
 import { getAbsolutePosition, toAbsoluteBounds } from '../../utils/viewpoint-util';
 import { PointPositionUpdater } from '../change-bounds/snap';
@@ -326,14 +325,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         return undefined;
     }
 
-    override mouseEnter(target: SModelElement, event: MouseEvent): Action[] {
-        if (target instanceof SModelRoot && event.buttons === 0) {
-            this.mouseUp(target, event);
-        }
-        return [];
-    }
-
-    override mouseUp(_target: SModelElement, event: MouseEvent): Action[] {
+    override mouseUp(_target: SModelElement, _event: MouseEvent): Action[] {
         this.pointPositionUpdater.resetPosition();
         return [];
     }

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * 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
@@ -18,7 +18,6 @@ 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';
@@ -53,9 +52,6 @@ export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind)
     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);
 });

package/src/features/validation/issue-marker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * 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

package/src/lib/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * 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
@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { exportFeature, SGraph, SModelElement, viewportFeature } from 'sprotty';
+import { Bounds, isBounds, Point, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { exportFeature, getRouteBounds, SEdge, SGraph, SModelElement, viewportFeature } from 'sprotty';
 import { Containable, containerFeature } from '../features/hints/model';
 import { Saveable, saveFeature } from '../features/save/model';
 
@@ -25,3 +25,35 @@ export class GLSPGraph extends SGraph implements Saveable, Containable {
         return true;
     }
 }
+
+export class GEdge extends SEdge {
+    override localToParent(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x + bounds.x,
+            y: point.y + bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+
+    override parentToLocal(point: Point | Bounds): Bounds {
+        const bounds = getRouteBounds(this.routingPoints);
+        const result = {
+            x: point.x - bounds.x,
+            y: point.y - bounds.y,
+            width: -1,
+            height: -1
+        };
+        if (isBounds(point)) {
+            result.width = point.width;
+            result.height = point.height;
+        }
+        return result;
+    }
+}

package/src/sprotty-reexport.ts

@@ -22,7 +22,10 @@
 
 export * from '@eclipse-glsp/protocol';
 // sprotty-protocol
-export { CollapseExpandAction, CollapseExpandAllAction, ElementAndAlignment, SetBoundsAction } from 'sprotty-protocol/lib/actions';
+export {
+    BringToFrontAction, CollapseExpandAction, CollapseExpandAllAction,
+    ElementAndAlignment, HoverFeedbackAction, MoveAction, SetBoundsAction
+} from 'sprotty-protocol/lib/actions';
 export { Viewport } from 'sprotty-protocol/lib/model';
 // ------------------ Base ------------------
 export * from 'sprotty/lib/base/actions/action-dispatcher';
@@ -144,7 +147,6 @@ export * from 'sprotty/lib/features/fade/model';
 export {
     AbstractHoverMouseListener,
     ClosePopupActionHandler,
-    HoverFeedbackAction,
     HoverFeedbackCommand,
     HoverKeyListener,
     HoverMouseListener,
@@ -154,7 +156,10 @@ export {
 } from 'sprotty/lib/features/hover/hover';
 export * from 'sprotty/lib/features/hover/model';
 export * from 'sprotty/lib/features/move/model';
-export * from 'sprotty/lib/features/move/move';
+export {
+    ElementMove, LocationPostprocessor, MorphEdgesAnimation, MoveAnimation,
+    MoveCommand, MoveMouseListener, ResolvedElementMove, ResolvedHandleMove
+} from 'sprotty/lib/features/move/move';
 export * from 'sprotty/lib/features/move/snap';
 export * from 'sprotty/lib/features/nameable/model';
 export * from 'sprotty/lib/features/open/model';
@@ -182,7 +187,7 @@ export {
     SelectKeyboardListener,
     SelectMouseListener
 } from 'sprotty/lib/features/select/select';
-export * from 'sprotty/lib/features/undo-redo/undo-redo';
+export { UndoRedoKeyListener } from 'sprotty/lib/features/undo-redo/undo-redo';
 export * from 'sprotty/lib/features/update/model-matching';
 export { UpdateAnimationData, UpdateModelCommand } from 'sprotty/lib/features/update/update-model';
 export {
@@ -202,7 +207,7 @@ export {
 } from 'sprotty/lib/features/viewport/viewport';
 export * from 'sprotty/lib/features/viewport/viewport-root';
 export * from 'sprotty/lib/features/viewport/zoom';
-export * from 'sprotty/lib/features/zorder/zorder';
+export { BringToFrontCommand, ZOrderElement } from 'sprotty/lib/features/zorder/zorder';
 export { SCompartment, SEdge, SGraph, SGraphIndex, SLabel, SNode, SPort } from 'sprotty/lib/graph/sgraph';
 // ------------------ Graph ------------------
 export * from 'sprotty/lib/graph/sgraph-factory';
@@ -286,3 +291,4 @@ import viewportModule from 'sprotty/lib/features/viewport/di.config';
 import zorderModule from 'sprotty/lib/features/zorder/di.config';
 import graphModule from 'sprotty/lib/graph/di.config';
 import modelSourceModule from 'sprotty/lib/model-source/di.config';
+

package/src/utils/html-utils.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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

package/src/views/base-view-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * 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

package/src/views/glsp-projection-view.tsx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2017-2018 TypeFox and others.
+ * Copyright (c) 2017-2022 TypeFox 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

package/src/views/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * 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