@eclipse-glsp/client 1.1.0-next.e193103.187 → 1.1.0-next.ee71b2a.218

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';
@@ -104,7 +107,12 @@ export {
 export * from 'sprotty/lib/features/bounds/stack-layout';
 export * from 'sprotty/lib/features/bounds/vbox-layout';
 export * from 'sprotty/lib/features/bounds/views';
-export * from 'sprotty/lib/features/button/button-handler';
+export {
+    ButtonHandlerRegistry,
+    configureButtonHandler,
+    IButtonHandler,
+    IButtonHandlerRegistration
+} from 'sprotty/lib/features/button/button-handler';
 export * from 'sprotty/lib/features/button/model';
 export * from 'sprotty/lib/features/command-palette/action-providers';
 export * from 'sprotty/lib/features/command-palette/command-palette';
@@ -139,7 +147,6 @@ export * from 'sprotty/lib/features/fade/model';
 export {
     AbstractHoverMouseListener,
     ClosePopupActionHandler,
-    HoverFeedbackAction,
     HoverFeedbackCommand,
     HoverKeyListener,
     HoverMouseListener,
@@ -149,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';
@@ -177,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 {
@@ -197,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';
@@ -281,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/utils/smodel-util.ts

@@ -13,14 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { distinctAdd, ElementAndBounds, ElementAndRoutingPoints, remove, SModelElementSchema, TypeGuard } from '@eclipse-glsp/protocol';
+import {
+    distinctAdd, ElementAndBounds, ElementAndRoutingPoints, Point, remove, SModelElementSchema,
+    TypeGuard
+} from '@eclipse-glsp/protocol';
 import {
     BoundsAware,
+    EdgeRouterRegistry,
     isBoundsAware,
     isMoveable,
     isSelectable,
-    isSelected,
-    ModelIndexImpl,
+    isSelected, ModelIndexImpl,
+    RoutedPoint,
     Selectable,
     SModelElement,
     SRoutableElement,
@@ -214,7 +218,7 @@ export function toElementAndBounds(element: BoundsAwareModelElement): ElementAnd
 
 /**
  * Helper function to translate a given {@link SRoutableElement} into its corresponding
- * {@ElementAndRoutingPoints ElementAndBounds} representation.
+ * {@link ElementAndRoutingPoints} representation.
  * @param element The element to translate.
  * @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
  */
@@ -225,6 +229,57 @@ export function toElementAndRoutingPoints(element: SRoutableElement): ElementAnd
     };
 }
 
+/** Pure routing point data kinds. */
+export const ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
+
+/** Pure route data kinds. */
+export const ROUTE_KINDS = [...ROUTING_POINT_KINDS, 'source', 'target'];
+
+/**
+ * Helper function to calculate the {@link ElementAndRoutingPoints} for a given {@link SRoutableElement}.
+ * If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the routing
+ * points from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
+ * @param element The element to translate.
+ * @param routerRegistry the edge router registry.
+ * @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
+ */
+export function calcElementAndRoutingPoints(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
+    const newRoutingPoints = routerRegistry ? calcRoute(element, routerRegistry, ROUTING_POINT_KINDS) : element.routingPoints;
+    return { elementId: element.id, newRoutingPoints };
+}
+
+/**
+ * Helper function to calculate the route for a given {@link SRoutableElement}.
+ * If client layout is activated, i.e., the edge routing registry is given and has a router for the element, then the points
+ * from the calculated route are used, otherwise we use the already specified routing points of the {@link SRoutableElement}.
+ * @param element The element to translate.
+ * @param routerRegistry the edge router registry.
+ * @returns The corresponding route for the given element.
+ */
+export function calcElementAndRoute(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints {
+    let route: Point[] | undefined = routerRegistry ? calcRoute(element, routerRegistry, ROUTE_KINDS) : undefined;
+    if (!route) {
+        // add source and target to the routing points
+        route = [...element.routingPoints];
+        route.splice(0, 0, element.source?.position || Point.ORIGIN);
+        route.push(element.target?.position || Point.ORIGIN);
+    }
+    return { elementId: element.id, newRoutingPoints: route };
+}
+
+/**
+ * Helper function to calculate the route for a given {@link SRoutableElement}.
+ * @param element The element to translate.
+ * @param routerRegistry the edge router registry.
+ * @param pointKinds the routing point kinds that should be considered.
+ * @returns The corresponding route for the given element.
+ */
+export function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined {
+    return routerRegistry?.get(element.routerKind).route(element)
+        .filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y))
+        .filter(point => !pointKinds || pointKinds.includes(point.kind));
+}
+
 /**
  * Checks if the model is compatible with the passed type string.
  * (either has the same type or a subtype of this type)
@@ -247,3 +302,4 @@ export function getElementTypeId(input: SModelElement | SModelElementSchema | st
         return (input as any)['type'] as string;
     }
 }
+

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
@@ -25,6 +25,7 @@ import {
     ProjectedViewportView,
     ProjectionParams,
     RenderingContext,
+    setAttr,
     setClass,
     ViewportRootElement,
     ViewProjection
@@ -36,12 +37,18 @@ import {
 @injectable()
 export class GLSPProjectionView extends ProjectedViewportView {
     override render(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode {
-        return (
-            <div class-sprotty-graph={true} style={{ width: '100%' }}>
-                {this.renderSvg(model, context, args)}
+        const svgElem = this.renderSvg(model, context, args);
+        if (svgElem.data) {
+            svgElem.data!.class = { 'sprotty-graph': true };
+        }
+        const rootNode: VNode = (
+            <div class-sprotty-graph={false} style={{ width: '100%', height: '100%' }}>
+                {svgElem}
                 {this.renderProjections(model, context, args)}
             </div>
         );
+        setAttr(rootNode, 'tabindex', 0);
+        return rootNode;
     }
 
     protected override renderSvg(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode {

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