@eclipse-glsp/client 0.9.0-rc-01 → 0.10.0-next.bb1c2fd.157

package/src/features/navigation/navigation-target-resolver.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 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,96 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import {
+    isSetResolvedNavigationTargets,
+    NavigationTarget,
+    ResolveNavigationTargetAction,
+    SetResolvedNavigationTargetAction
+} from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Action, generateRequestId, IActionDispatcher, ILogger, RequestAction, ResponseAction, TYPES } from 'sprotty';
-
-import { Args } from '../../base/args';
-import { EditorContextServiceProvider } from '../../base/editor-context';
+import { IActionDispatcher, ILogger, ResponseAction, TYPES } from 'sprotty';
+import { EditorContextServiceProvider } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
 
-export interface NavigationTarget {
-    uri: string;
-    label?: string;
-    args?: Args;
-}
-
-export namespace NavigationTarget {
-
-    export const ELEMENT_IDS = 'elementIds';
-    export const ELEMENT_IDS_SEPARATOR = '&';
-    export const TEXT_LINE = 'line';
-    export const TEXT_COLUMN = 'column';
-
-    export function hasArguments(target: NavigationTarget): boolean {
-        return target.args !== undefined && Object.keys(target.args).length > 0;
-    }
-
-    export function addArgument(target: NavigationTarget, key: string, value: string | number | boolean): void {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        target.args[key] = value;
-    }
-
-    export function getElementIds(target: NavigationTarget): string[] {
-        if (target.args === undefined || target.args[NavigationTarget.ELEMENT_IDS] === undefined) {
-            return [];
-        }
-        const elementIdsValue = target.args[NavigationTarget.ELEMENT_IDS].toString();
-        return elementIdsValue.split(NavigationTarget.ELEMENT_IDS_SEPARATOR);
-    }
-
-    export function setElementIds(target: NavigationTarget, elementIds: string[]): string {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        return target.args[NavigationTarget.ELEMENT_IDS] = elementIds.join(NavigationTarget.ELEMENT_IDS_SEPARATOR);
-    }
-
-    export function setTextPosition(target: NavigationTarget, position: TextPosition | undefined): void {
-        if (position) {
-            if (target.args === undefined) {
-                target.args = {};
-            }
-            target.args[NavigationTarget.TEXT_LINE] = position.line;
-            target.args[NavigationTarget.TEXT_COLUMN] = position.character;
-        }
-    }
-
-    export function getTextPosition(target: NavigationTarget): TextPosition | undefined {
-        if (target.args === undefined
-            || target.args[NavigationTarget.TEXT_LINE] === undefined
-            || target.args[NavigationTarget.TEXT_COLUMN] === undefined) {
-            return undefined;
-        }
-        return {
-            line: Number(target.args[NavigationTarget.TEXT_LINE]),
-            character: Number(target.args[NavigationTarget.TEXT_COLUMN])
-        };
-    }
-}
-
-export interface TextPosition {
-    line: number;
-    character: number;
-}
-
-export class ResolveNavigationTargetAction implements RequestAction<SetResolvedNavigationTargetAction> {
-    static readonly KIND = 'resolveNavigationTarget';
-    kind = ResolveNavigationTargetAction.KIND;
-    constructor(readonly navigationTarget: NavigationTarget, public readonly requestId: string = generateRequestId()) { }
-}
-
-export class SetResolvedNavigationTargetAction implements ResponseAction {
-    static readonly KIND = 'setResolvedNavigationTarget';
-    kind = SetResolvedNavigationTargetAction.KIND;
-    constructor(readonly elementIds: string[] = [], readonly args?: Args, readonly responseId: string = '') { }
-}
-
-export function isSetResolvedNavigationTargets(action: Action): action is SetResolvedNavigationTargetAction {
-    return action !== undefined && (action.kind === SetResolvedNavigationTargetAction.KIND);
-}
-
 /**
  * Resolves `NavigationTargets` to element ids.
  *
@@ -111,7 +32,6 @@ export function isSetResolvedNavigationTargets(action: Action): action is SetRes
  */
 @injectable()
 export class NavigationTargetResolver {
-
     @inject(GLSP_TYPES.IEditorContextServiceProvider) protected editorContextService: EditorContextServiceProvider;
     @inject(TYPES.IActionDispatcher) protected dispatcher: IActionDispatcher;
     @inject(TYPES.ILogger) protected readonly logger: ILogger;
@@ -122,7 +42,10 @@ export class NavigationTargetResolver {
         return this.resolveWithSourceUri(sourceUri, navigationTarget);
     }
 
-    async resolveWithSourceUri(sourceUri: string | undefined, target: NavigationTarget): Promise<SetResolvedNavigationTargetAction | undefined> {
+    async resolveWithSourceUri(
+        sourceUri: string | undefined,
+        target: NavigationTarget
+    ): Promise<SetResolvedNavigationTargetAction | undefined> {
         const targetUri = decodeURIComponent(target.uri);
         if (sourceUri && sourceUri !== targetUri && `file://${sourceUri}` !== targetUri) {
             // different URI, so we can't resolve it locally
@@ -143,4 +66,3 @@ export class NavigationTargetResolver {
         return this.dispatcher.request(new ResolveNavigationTargetAction(target));
     }
 }
-

package/src/features/rank/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -21,7 +21,7 @@ export interface Ranked {
 }
 
 export function isRanked(arg: any): arg is Ranked {
-    return arg !== undefined && arg.rank !== undefined && typeof (arg.rank) === 'number';
+    return arg !== undefined && arg.rank !== undefined && typeof arg.rank === 'number';
 }
 
 export function getRank(arg: any): number {

package/src/features/reconnect/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -26,8 +26,7 @@ import {
 
 export const reconnectFeature = Symbol('reconnectFeature');
 
-export interface Reconnectable extends SModelExtension {
-}
+export interface Reconnectable extends SModelExtension {}
 
 export function isReconnectable(element: SModelElement): element is SRoutableElement & Reconnectable {
     return element instanceof SRoutableElement && element.hasFeature(reconnectFeature);

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -16,7 +16,7 @@
 import { ContainerModule } from 'inversify';
 import { TYPES } from 'sprotty';
 
-import { SaveModelKeyboardListener } from './save';
+import { SaveModelKeyboardListener } from './save-keylistener';
 
 /**
  * This module is not required the diagram is deployed in Theia with the `GLSPDiagramWidget`
@@ -24,7 +24,6 @@ import { SaveModelKeyboardListener } from './save';
  */
 const saveModule = new ContainerModule(bind => {
     bind(TYPES.KeyListener).to(SaveModelKeyboardListener);
-
 });
 
 export default saveModule;

package/src/features/save/{save.ts → save-keylistener.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,18 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, KeyListener, SModelRoot } from 'sprotty';
+import { Action, SaveModelAction } from '@eclipse-glsp/protocol';
+import { KeyListener, SModelRoot } from 'sprotty';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 
-export class SaveModelAction implements Action {
-    static readonly KIND = 'saveModel';
-    constructor(public readonly fileUri?: string, public readonly kind: string = SaveModelAction.KIND) { }
-}
-
-export function isSaveModelAction(action: Action): action is SaveModelAction {
-    return action.kind === SaveModelAction.KIND;
-}
-
 export class SaveModelKeyboardListener extends KeyListener {
     keyDown(_element: SModelRoot, event: KeyboardEvent): Action[] {
         if (matchesKeystroke(event, 'KeyS', 'ctrlCmd')) {

package/src/features/select/select-feedback-action.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 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
@@ -27,16 +27,15 @@ export class SelectFeedbackAction {
     constructor(
         public readonly selectedElementsIDs: string[] = [],
         public readonly deselectedElementsIDs: string[] = [],
-        public readonly kind: string = SelectFeedbackCommand.KIND) {
-    }
+        public readonly kind: string = SelectFeedbackCommand.KIND
+    ) {}
 }
 
 export class SelectAllFeedbackAction {
     /**
      * If `select` is true, all elements are selected, othewise they are deselected.
      */
-    constructor(public readonly select: boolean = true, public readonly kind: string = SelectFeedbackCommand.KIND) {
-    }
+    constructor(public readonly select: boolean = true, public readonly kind: string = SelectFeedbackCommand.KIND) {}
 }
 
 @injectable()
@@ -84,4 +83,3 @@ export class SelectAllFeedbackCommand extends Command {
         return this.sprottySelectAllCommand.redo(context);
     }
 }
-

package/src/features/select/selection-service.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 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
@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable import/no-deprecated,no-unused-expressions */
+import { Action } from '@eclipse-glsp/protocol';
 import { AssertionError, expect } from 'chai';
 import { Container, injectable } from 'inversify';
-import { Action, defaultModule, SGraphFactory, SModelElementSchema, SModelRoot, TYPES } from 'sprotty';
-
+import { defaultModule, SGraphFactory, SModelElementSchema, SModelRoot, TYPES } from 'sprotty';
 import { GLSP_TYPES } from '../../base/types';
 import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
 import { SelectFeedbackAction } from './select-feedback-action';
@@ -25,7 +25,7 @@ import { SelectionListener, SelectionService } from './selection-service';
 
 @injectable()
 class MockFeedbackActionDispatcher implements IFeedbackActionDispatcher {
-    protected feedbackEmitters: Map<IFeedbackEmitter, Action[]> = new Map;
+    protected feedbackEmitters: Map<IFeedbackEmitter, Action[]> = new Map();
 
     registerFeedback(feedbackEmitter: IFeedbackEmitter, actions: Action[]): void {
         this.feedbackEmitters.set(feedbackEmitter, actions);
@@ -43,7 +43,7 @@ class MockFeedbackActionDispatcher implements IFeedbackActionDispatcher {
 
     getSingleFeedbackAction(): SelectFeedbackAction | undefined {
         const actions = this.getRegisteredFeedback();
-        return actions.length === 1 ? actions[0] as SelectFeedbackAction : undefined;
+        return actions.length === 1 ? (actions[0] as SelectFeedbackAction) : undefined;
     }
 }
 
@@ -363,7 +363,12 @@ describe('SelectionService', () => {
         }
     }
 
-    function assertListener(listener: MockSelectionListener, expectedRoot: SModelRoot | undefined, expectedSelection: string[], expectedCalled: number): void {
+    function assertListener(
+        listener: MockSelectionListener,
+        expectedRoot: SModelRoot | undefined,
+        expectedSelection: string[],
+        expectedCalled: number
+    ): void {
         expect(listener.getRoot()).to.equal(expectedRoot);
         expect(listener.getSelectedElements()).to.have.lengthOf(expectedSelection.length);
         expect(listener.getSelectedElements()).to.have.ordered.members(expectedSelection);

package/src/features/select/selection-service.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,17 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, distinctAdd, remove, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
 import {
-    Action,
     Command,
     CommandExecutionContext,
     ILogger,
     isSelectable,
     isSelected,
     SChildElement,
-    SelectAction,
-    SelectAllAction,
     SelectAllCommand as SprottySelectAllCommand,
     SelectCommand as SprottySelectCommand,
     SModelElement,
@@ -31,10 +29,8 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-
 import { SModelRootListener } from '../../base/model/update-model-command';
 import { GLSP_TYPES } from '../../base/types';
-import { distinctAdd, remove } from '../../utils/array-utils';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import { SelectFeedbackAction } from './select-feedback-action';
 
@@ -50,7 +46,7 @@ export class SelectionService implements SModelRootListener {
     @inject(GLSP_TYPES.IFeedbackActionDispatcher) protected feedbackDispatcher: IFeedbackActionDispatcher;
     @inject(TYPES.ILogger) protected logger: ILogger;
 
-    constructor(@multiInject(GLSP_TYPES.SelectionListener) @optional() protected selectionListeners: SelectionListener[] = []) { }
+    constructor(@multiInject(GLSP_TYPES.SelectionListener) @optional() protected selectionListeners: SelectionListener[] = []) {}
 
     register(selectionListener: SelectionListener): void {
         distinctAdd(this.selectionListeners, selectionListener);
@@ -99,7 +95,9 @@ export class SelectionService implements SModelRootListener {
         }
 
         // only send out changes if there actually are changes, i.e., the root or the selected elements changed
-        const selectionChanged = prevSelectedElementIDs.size !== this.selectedElementIDs.size || ![...prevSelectedElementIDs].every(value => this.selectedElementIDs.has(value));
+        const selectionChanged =
+            prevSelectedElementIDs.size !== this.selectedElementIDs.size ||
+            ![...prevSelectedElementIDs].every(value => this.selectedElementIDs.has(value));
         if (selectionChanged) {
             // aggregate to feedback action handling all elements as only the last feedback is restored
             this.dispatchFeedback([new SelectFeedbackAction([...this.selectedElementIDs], [...deselectedElementIDs])]);
@@ -156,7 +154,10 @@ export class SelectCommand extends Command {
     protected selected: SModelElement[] = [];
     protected deselected: SModelElement[] = [];
 
-    constructor(@inject(TYPES.Action) public action: SelectAction, @inject(GLSP_TYPES.SelectionService) public selectionService: SelectionService) {
+    constructor(
+        @inject(TYPES.Action) public action: SelectAction,
+        @inject(GLSP_TYPES.SelectionService) public selectionService: SelectionService
+    ) {
         super();
     }
 
@@ -197,7 +198,10 @@ export class SelectAllCommand extends Command {
     static readonly KIND = SprottySelectAllCommand.KIND;
     protected previousSelection: Map<string, boolean> = new Map<string, boolean>();
 
-    constructor(@inject(TYPES.Action) public action: SelectAllAction, @inject(GLSP_TYPES.SelectionService) public selectionService: SelectionService) {
+    constructor(
+        @inject(TYPES.Action) public action: SelectAllAction,
+        @inject(GLSP_TYPES.SelectionService) public selectionService: SelectionService
+    ) {
         super();
     }
 

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 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,10 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { VNode } from 'snabbdom/vnode';
+import { VNode } from 'snabbdom';
 import {
-    Action,
     CommandExecutionContext,
     CommandReturn,
     ElementMove,
@@ -26,24 +26,24 @@ import {
     isViewport,
     MouseListener,
     MoveAction,
-    Point,
+    SChildElement,
     SModelElement,
     SModelRoot,
     TYPES
 } from 'sprotty';
-
 import { isNotUndefined } from '../../utils/smodel-util';
 import { addResizeHandles, isResizable, removeResizeHandles, SResizeHandle } from '../change-bounds/model';
 import { createMovementRestrictionFeedback, removeMovementRestrictionFeedback } from '../change-bounds/movement-restrictor';
+import { CursorCSS, cursorFeedbackAction } from '../tool-feedback/css-feedback';
 import { ChangeBoundsTool } from '../tools/change-bounds-tool';
 import { FeedbackCommand } from './model';
 
 export class ShowChangeBoundsToolResizeFeedbackAction implements Action {
-    constructor(readonly elementId?: string, public readonly kind: string = ShowChangeBoundsToolResizeFeedbackCommand.KIND) { }
+    constructor(readonly elementId?: string, public readonly kind: string = ShowChangeBoundsToolResizeFeedbackCommand.KIND) {}
 }
 
 export class HideChangeBoundsToolResizeFeedbackAction implements Action {
-    constructor(public readonly kind: string = HideChangeBoundsToolResizeFeedbackCommand.KIND) { }
+    constructor(public readonly kind: string = HideChangeBoundsToolResizeFeedbackCommand.KIND) {}
 }
 
 @injectable()
@@ -54,10 +54,7 @@ export class ShowChangeBoundsToolResizeFeedbackCommand extends FeedbackCommand {
 
     execute(context: CommandExecutionContext): CommandReturn {
         const index = context.root.index;
-        index
-            .all()
-            .filter(isResizable)
-            .forEach(removeResizeHandles);
+        index.all().filter(isResizable).forEach(removeResizeHandles);
 
         if (isNotUndefined(this.action.elementId)) {
             const resizeElement = index.getById(this.action.elementId);
@@ -77,10 +74,7 @@ export class HideChangeBoundsToolResizeFeedbackCommand extends FeedbackCommand {
 
     execute(context: CommandExecutionContext): CommandReturn {
         const index = context.root.index;
-        index
-            .all()
-            .filter(isResizable)
-            .forEach(removeResizeHandles);
+        index.all().filter(isResizable).forEach(removeResizeHandles);
         return context.root;
     }
 }
@@ -126,15 +120,17 @@ export class FeedbackMoveMouseListener extends MouseListener {
             const moveAction = this.getElementMoves(target, event, false);
             if (moveAction) {
                 result.push(moveAction);
+                result.push(cursorFeedbackAction(CursorCSS.MOVE));
             }
         }
         return result;
     }
 
     protected collectStartPositions(root: SModelRoot): void {
-        root.index
-            .all()
-            .filter(element => isSelectable(element) && element.selected)
+        const selectedElements = root.index.all().filter(element => isSelectable(element) && element.selected);
+        const elementsSet = new Set(selectedElements);
+        selectedElements
+            .filter(element => !this.isChildOfSelected(elementsSet, element))
             .forEach(element => {
                 if (isMoveable(element)) {
                     this.elementId2startPos.set(element.id, element.position);
@@ -142,6 +138,16 @@ export class FeedbackMoveMouseListener extends MouseListener {
             });
     }
 
+    protected isChildOfSelected(selectedElements: Set<SModelElement>, element: SModelElement): boolean {
+        while (element instanceof SChildElement) {
+            element = element.parent;
+            if (selectedElements.has(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected getElementMoves(target: SModelElement, event: MouseEvent, isFinished: boolean): MoveAction | undefined {
         if (!this.startDragPosition) {
             return undefined;
@@ -214,7 +220,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
     }
 
     mouseEnter(target: SModelElement, event: MouseEvent): Action[] {
-        if (target instanceof SModelRoot && event.buttons === 0) {
+        if (target instanceof SModelRoot && event.buttons === 0 && !this.startDragPosition) {
             this.mouseUp(target, event);
         }
         return [];
@@ -230,7 +236,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
             if (this.tool.movementRestrictor) {
                 this.tool.deregisterFeedback([removeMovementRestrictionFeedback(target, this.tool.movementRestrictor)], this);
             }
-
+            result.push(cursorFeedbackAction(CursorCSS.DEFAULT));
         }
         this.hasDragged = false;
         this.startDragPosition = undefined;

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

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    Action,
     add,
     AnchorComputerRegistry,
     center,
@@ -28,7 +28,6 @@ import {
     isConnectable,
     MouseListener,
     MoveAction,
-    Point,
     PolylineEdgeRouter,
     SChildElement,
     SConnectableElement,
@@ -39,8 +38,7 @@ import {
     SRoutableElement,
     TYPES
 } from 'sprotty';
-
-import { isRoutable } from '../../utils/smodel-util';
+import { isRoutable, BoundsAwareModelElement } from '../../utils/smodel-util';
 import { getAbsolutePosition, toAbsoluteBounds, toAbsolutePosition } from '../../utils/viewpoint-util';
 import { FeedbackCommand } from './model';
 
@@ -49,7 +47,8 @@ export class DrawFeedbackEdgeAction implements Action {
         public readonly elementTypeId: string,
         public readonly sourceId: string,
         public readonly edgeSchema?: SEdgeSchema,
-        public readonly kind: string = DrawFeedbackEdgeCommand.KIND) { }
+        public readonly kind: string = DrawFeedbackEdgeCommand.KIND
+    ) {}
 }
 
 @injectable()
@@ -68,7 +67,7 @@ export class DrawFeedbackEdgeCommand extends FeedbackCommand {
 }
 
 export class RemoveFeedbackEdgeAction implements Action {
-    constructor(public readonly kind: string = RemoveFeedbackEdgeCommand.KIND) { }
+    constructor(public readonly kind: string = RemoveFeedbackEdgeCommand.KIND) {}
 }
 
 @injectable()
@@ -83,10 +82,12 @@ export class RemoveFeedbackEdgeCommand extends FeedbackCommand {
 
 export class FeedbackEdgeEnd extends SDanglingAnchor {
     static readonly TYPE = 'feedback-edge-end';
-    constructor(readonly sourceId: string,
+    constructor(
+        readonly sourceId: string,
         readonly elementTypeId: string,
         public feedbackEdge: SRoutableElement | undefined = undefined,
-        public readonly type: string = FeedbackEdgeEnd.TYPE) {
+        public readonly type: string = FeedbackEdgeEnd.TYPE
+    ) {
         super();
     }
 }
@@ -105,11 +106,12 @@ export class FeedbackEdgeEndMovingMouseListener extends MouseListener {
 
         const edge = edgeEnd.feedbackEdge;
         const position = getAbsolutePosition(edgeEnd, event);
-        const endAtMousePosition = findChildrenAtPosition(target.root, position)
-            .find(element => isConnectable(element) && element.canConnect(edge, 'target'));
+        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, center(edge.source.bounds));
+            const anchor = this.computeAbsoluteAnchor(endAtMousePosition, center(toAbsoluteBounds(edge.source)));
             if (euclideanDistance(anchor, edgeEnd.position) > 1) {
                 return [new MoveAction([{ elementId: edgeEnd.id, toPosition: anchor }], false)];
             }
@@ -120,9 +122,10 @@ export class FeedbackEdgeEndMovingMouseListener extends MouseListener {
         return [];
     }
 
-    protected computeAbsoluteAnchor(element: SConnectableElement, referencePoint: Point, offset?: number): Point {
+    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, referencePoint, offset);
+        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) {
@@ -136,6 +139,33 @@ export class FeedbackEdgeEndMovingMouseListener extends MouseListener {
     }
 }
 
+/**
+ * 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';
 }
@@ -149,7 +179,12 @@ export const defaultFeedbackEdgeSchema: SEdgeSchema = {
     opacity: 0.3
 } as SEdgeSchema;
 
-export function drawFeedbackEdge(context: CommandExecutionContext, sourceId: string, elementTypeId: string, feedbackEdgeSchema: SEdgeSchema): void {
+export function drawFeedbackEdge(
+    context: CommandExecutionContext,
+    sourceId: string,
+    elementTypeId: string,
+    feedbackEdgeSchema: SEdgeSchema
+): void {
     const root = context.root;
     const sourceChild = root.index.getById(sourceId);
     if (!sourceChild) {