@eclipse-glsp/client 2.3.0-next.321 → 2.3.0-next.363

package/src/features/accessibility/toast/toast-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, configureActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import '../../../../css/toast.css';
 import { HideToastAction, ShowToastMessageAction } from './toast-handler';
 import { Toast } from './toast-tool';
@@ -23,10 +22,13 @@ import { Toast } from './toast-tool';
  * Handles toast/user notification actions.
  */
 
-export const glspToastModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureToastTool(context);
-});
+export const toastModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureToastTool(context);
+    },
+    { featureId: Symbol('toast') }
+);
 
 export function configureToastTool(context: BindingContext): void {
     bindAsService(context, TYPES.IUIExtension, Toast);
@@ -34,3 +36,8 @@ export function configureToastTool(context: BindingContext): void {
     configureActionHandler(context, ShowToastMessageAction.KIND, Toast);
     configureActionHandler(context, HideToastAction.KIND, Toast);
 }
+
+export {
+    /** Deprecated use {@link toastModule} instead */
+    toastModule as glspToastModule
+};

package/src/features/accessibility/toast/toast-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,18 +14,19 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { injectable, inject } from 'inversify';
-import { Action, AbstractUIExtension, IActionHandler, ICommand, TYPES } from '@eclipse-glsp/sprotty';
-import { IDiagramStartup } from '../../../base/model/diagram-loader';
+import { Action, IActionHandler, ICommand, TYPES } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
 import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
 import { EditorContextService } from '../../../base/editor-context-service';
+import { IDiagramStartup } from '../../../base/model/diagram-loader';
+import { GLSPAbstractUIExtension } from '../../../base/ui-extension/ui-extension';
 import { HideToastAction, ShowToastMessageAction, ToastOptions } from './toast-handler';
 
 /**
  * This extension is used to create customized user notifications as toast messages.
  */
 @injectable()
-export class Toast extends AbstractUIExtension implements IActionHandler, IDiagramStartup {
+export class Toast extends GLSPAbstractUIExtension implements IActionHandler, IDiagramStartup {
     static readonly ID = 'toast';
     protected messages: { [key: symbol]: ToastOptions } = {};
 

package/src/features/accessibility/view-key-tools/deselect-key-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,21 +14,21 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { inject, injectable } from 'inversify';
-import { toArray } from 'sprotty/lib/utils/iterable';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import {
     Action,
-    KeyListener,
-    KeyTool,
     GModelElement,
     GRoutableElement,
+    KeyListener,
+    KeyTool,
     SelectAction,
     SwitchEditModeAction,
     isSelectable
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+import { toArray } from 'sprotty/lib/utils/iterable';
+import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import { Tool } from '../../../base/tool-manager/tool';
-import { SResizeHandle } from '../../change-bounds/model';
+import { GResizeHandle } from '../../change-bounds/model';
 
 /**
  * Deselects the element if there is no interaction possible with element.
@@ -59,7 +59,7 @@ export class DeselectKeyTool implements Tool {
 export class DeselectKeyListener extends KeyListener {
     override keyDown(target: GModelElement, event: KeyboardEvent): Action[] {
         if (this.matchesDeselectKeystroke(event)) {
-            const isResizeHandleActive = toArray(target.root.index.all().filter(el => el instanceof SResizeHandle)).length > 0;
+            const isResizeHandleActive = toArray(target.root.index.all().filter(el => el instanceof GResizeHandle)).length > 0;
 
             if (isResizeHandleActive) {
                 return [];

package/src/features/accessibility/view-key-tools/movement-key-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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
@@ -20,7 +20,8 @@ import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import { GLSPActionDispatcher } from '../../../base/action-dispatcher';
 import { SelectionService } from '../../../base/selection-service';
 import { Tool } from '../../../base/tool-manager/tool';
-import { GridSnapper, unsnapModifier, useSnap } from '../../change-bounds/snap';
+import { Grid } from '../../grid/grid';
+import { ChangeBoundsManager } from '../../tools/change-bounds/change-bounds-manager';
 import { AccessibleKeyShortcutProvider, SetAccessibleKeyShortcutAction } from '../key-shortcut/accessible-key-shortcut';
 import { MoveElementAction, MoveViewportAction } from '../move-zoom/move-handler';
 
@@ -33,18 +34,23 @@ export class MovementKeyTool implements Tool {
 
     isEditTool = true;
 
-    protected readonly movementKeyListener = new MoveKeyListener(this);
+    protected movementKeyListener: MoveKeyListener;
 
     @inject(KeyTool) protected readonly keytool: KeyTool;
     @inject(SelectionService) selectionService: SelectionService;
     @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
     @inject(TYPES.IActionDispatcher) readonly actionDispatcher: GLSPActionDispatcher;
+    @inject(TYPES.Grid) @optional() protected grid: Grid;
+    @inject(ChangeBoundsManager) readonly changeBoundsManager: ChangeBoundsManager;
 
     get id(): string {
         return MovementKeyTool.ID;
     }
 
     enable(): void {
+        if (!this.movementKeyListener) {
+            this.movementKeyListener = new MoveKeyListener(this, this.grid);
+        }
         this.keytool.register(this.movementKeyListener);
         this.movementKeyListener.registerShortcutKey();
     }
@@ -55,22 +61,19 @@ export class MovementKeyTool implements Tool {
 }
 
 export class MoveKeyListener extends KeyListener implements AccessibleKeyShortcutProvider {
-    // Default x distance used if GridSnapper is not provided
+    // Default x distance used if grid is not provided
     static readonly defaultMoveX = 20;
 
-    // Default y distance used if GridSnapper is not provided
+    // Default y distance used if grid is not provided
     static readonly defaultMoveY = 20;
 
     protected readonly token = MoveKeyListener.name;
 
-    protected grid = { x: MoveKeyListener.defaultMoveX, y: MoveKeyListener.defaultMoveY };
-
-    constructor(protected readonly tool: MovementKeyTool) {
+    constructor(
+        protected readonly tool: MovementKeyTool,
+        protected grid: Grid = { x: MoveKeyListener.defaultMoveX, y: MoveKeyListener.defaultMoveY }
+    ) {
         super();
-
-        if (this.tool.snapper instanceof GridSnapper) {
-            this.grid = this.tool.snapper.grid;
-        }
     }
 
     registerShortcutKey(): void {
@@ -84,7 +87,7 @@ export class MoveKeyListener extends KeyListener implements AccessibleKeyShortcu
 
     override keyDown(_element: GModelElement, event: KeyboardEvent): Action[] {
         const selectedElementIds = this.tool.selectionService.getSelectedElementIDs();
-        const snap = useSnap(event);
+        const snap = this.tool.changeBoundsManager.usePositionSnap(event);
         const offsetX = snap ? this.grid.x : 1;
         const offsetY = snap ? this.grid.y : 1;
 
@@ -113,18 +116,22 @@ export class MoveKeyListener extends KeyListener implements AccessibleKeyShortcu
     }
 
     protected matchesMoveUpKeystroke(event: KeyboardEvent): boolean {
-        return matchesKeystroke(event, 'ArrowUp') || matchesKeystroke(event, 'ArrowUp', unsnapModifier());
+        const unsnap = this.tool.changeBoundsManager.unsnapModifier();
+        return matchesKeystroke(event, 'ArrowUp') || (!!unsnap && matchesKeystroke(event, 'ArrowUp', unsnap));
     }
 
     protected matchesMoveDownKeystroke(event: KeyboardEvent): boolean {
-        return matchesKeystroke(event, 'ArrowDown') || matchesKeystroke(event, 'ArrowDown', unsnapModifier());
+        const unsnap = this.tool.changeBoundsManager.unsnapModifier();
+        return matchesKeystroke(event, 'ArrowDown') || (!!unsnap && matchesKeystroke(event, 'ArrowDown', unsnap));
     }
 
     protected matchesMoveRightKeystroke(event: KeyboardEvent): boolean {
-        return matchesKeystroke(event, 'ArrowRight') || matchesKeystroke(event, 'ArrowRight', unsnapModifier());
+        const unsnap = this.tool.changeBoundsManager.unsnapModifier();
+        return matchesKeystroke(event, 'ArrowRight') || (!!unsnap && matchesKeystroke(event, 'ArrowRight', unsnap));
     }
 
     protected matchesMoveLeftKeystroke(event: KeyboardEvent): boolean {
-        return matchesKeystroke(event, 'ArrowLeft') || matchesKeystroke(event, 'ArrowLeft', unsnapModifier());
+        const unsnap = this.tool.changeBoundsManager.unsnapModifier();
+        return matchesKeystroke(event, 'ArrowLeft') || (!!unsnap && matchesKeystroke(event, 'ArrowLeft', unsnap));
     }
 }

package/src/features/accessibility/view-key-tools/view-key-tools-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 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
@@ -15,15 +15,20 @@
  ********************************************************************************/
 
 import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
+import { KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
 import { DeselectKeyTool } from './deselect-key-tool';
 import { MovementKeyTool } from './movement-key-tool';
 import { ZoomKeyTool } from './zoom-key-tool';
-import { KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
 
-export const viewKeyToolsModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
-    const context = { bind, isBound, rebind };
-    configureViewKeyTools(context);
-});
+export const viewKeyToolsModule = new FeatureModule(
+    (bind, _unbind, isBound, rebind) => {
+        const context = { bind, isBound, rebind };
+        configureViewKeyTools(context);
+    },
+    {
+        featureId: Symbol('viewKeyTools')
+    }
+);
 
 export function configureViewKeyTools(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
     bindAsService(context, TYPES.IDefaultTool, MovementKeyTool);

package/src/features/bounds/bounds-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -35,22 +35,27 @@ import { LocalComputedBoundsCommand } from './local-bounds';
 import { SetBoundsFeedbackCommand } from './set-bounds-feedback-command';
 import { VBoxLayouterExt } from './vbox-layout';
 
-export const boundsModule = new FeatureModule((bind, _unbind, isBound, _rebind) => {
-    const context = { bind, isBound };
-    configureCommand(context, SetBoundsCommand);
-    configureCommand(context, RequestBoundsCommand);
-    bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
-    bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
+export const boundsModule = new FeatureModule(
+    (bind, _unbind, isBound, _rebind) => {
+        const context = { bind, isBound };
+        configureCommand(context, SetBoundsCommand);
+        configureCommand(context, RequestBoundsCommand);
+        bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
+        bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
 
-    configureCommand(context, LocalComputedBoundsCommand);
-    configureCommand(context, SetBoundsFeedbackCommand);
+        configureCommand(context, LocalComputedBoundsCommand);
+        configureCommand(context, SetBoundsFeedbackCommand);
 
-    bind(TYPES.Layouter).to(LayouterExt).inSingletonScope();
-    bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
+        bind(TYPES.Layouter).to(LayouterExt).inSingletonScope();
+        bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
 
-    configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
-    configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
-    configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
+        configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
+        configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
+        configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
 
-    bind(PositionSnapper).toSelf();
-});
+        // backwards compatibility
+        // eslint-disable-next-line deprecation/deprecation
+        bind(PositionSnapper).toSelf();
+    },
+    { featureId: Symbol('bounds') }
+);

package/src/features/bounds/freeform-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 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,7 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from 'inversify';
 import {
     AbstractLayout,
     AbstractLayoutOptions,
@@ -21,11 +20,13 @@ import {
     BoundsData,
     Dimension,
     GChildElement,
+    GParentElement,
     LayoutContainer,
     Point,
-    GParentElement,
     StatefulLayouter
 } from '@eclipse-glsp/sprotty';
+import { injectable } from 'inversify';
+import { LayoutAware } from './layout-data';
 
 /**
  * Layouts children of a container with explicit X/Y positions
@@ -44,9 +45,11 @@ export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {
 
         const maxWidth = childrenSize.width > 0 ? childrenSize.width + options.paddingLeft + options.paddingRight : 0;
         const maxHeight = childrenSize.height > 0 ? childrenSize.height + options.paddingTop + options.paddingBottom : 0;
-        if (maxWidth > 0 && maxHeight > 0) {
+        if (childrenSize.width > 0 && childrenSize.height > 0) {
             const offset = this.layoutChildren(container, layouter, options, maxWidth, maxHeight);
-            boundsData.bounds = this.getFinalContainerBounds(container, offset, options, maxWidth, maxHeight);
+            const computed = this.getComputedContainerDimensions(options, childrenSize.width, childrenSize.height);
+            LayoutAware.setComputedDimensions(boundsData, computed);
+            boundsData.bounds = this.getFinalContainerBounds(container, offset, options, computed.width, computed.height);
             boundsData.boundsChanged = true;
         } else {
             boundsData.bounds = { x: boundsData.bounds!.x, y: boundsData.bounds!.y, width: 0, height: 0 };
@@ -96,6 +99,13 @@ export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {
         return currentOffset;
     }
 
+    protected getComputedContainerDimensions(options: AbstractLayoutOptions, maxWidth: number, maxHeight: number): Dimension {
+        return {
+            width: maxWidth + options.paddingLeft + options.paddingRight,
+            height: maxHeight + options.paddingTop + options.paddingBottom
+        };
+    }
+
     protected override getFinalContainerBounds(
         container: GParentElement & LayoutContainer,
         lastOffset: Point,
@@ -106,8 +116,8 @@ export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {
         const result = {
             x: container.bounds.x,
             y: container.bounds.y,
-            width: Math.max(options.minWidth, maxWidth + options.paddingLeft + options.paddingRight),
-            height: Math.max(options.minHeight, maxHeight + options.paddingTop + options.paddingBottom)
+            width: Math.max(options.minWidth, maxWidth),
+            height: Math.max(options.minHeight, maxHeight)
         };
 
         return result;

package/src/features/bounds/glsp-hidden-bounds-updater.ts

@@ -18,21 +18,29 @@ import {
     Action,
     BoundsData,
     ComputedBoundsAction,
-    Deferred,
     EdgeRouterRegistry,
+    ElementAndAlignment,
+    ElementAndBounds,
+    ElementAndLayoutData,
     ElementAndRoutingPoints,
+    GChildElement,
     GModelElement,
     HiddenBoundsUpdater,
-    IActionDispatcher,
+    LayoutData,
     ModelIndexImpl,
-    RequestAction,
-    ResponseAction
+    RequestBoundsAction,
+    isLayoutContainer
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable, optional } from 'inversify';
 import { VNode } from 'snabbdom';
 import { BoundsAwareModelElement, calcElementAndRoute, getDescendantIds, isRoutable } from '../../utils/gmodel-util';
+import { LayoutAware } from './layout-data';
 import { LocalComputedBoundsAction, LocalRequestBoundsAction } from './local-bounds';
 
+export class BoundsDataExt extends BoundsData {
+    layoutData?: LayoutData;
+}
+
 /**
  * Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
  *
@@ -44,7 +52,7 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
 
     protected element2route: ElementAndRoutingPoints[] = [];
 
-    protected getElement2BoundsData(): Map<BoundsAwareModelElement, BoundsData> {
+    protected getElement2BoundsData(): Map<BoundsAwareModelElement, BoundsDataExt> {
         return this['element2boundsData'];
     }
 
@@ -60,10 +68,56 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
         if (LocalRequestBoundsAction.is(cause) && cause.elementIDs) {
             this.focusOnElements(cause.elementIDs);
         }
-        const actions = this.captureActions(() => super.postUpdate(cause));
-        actions
-            .filter(action => ComputedBoundsAction.is(action))
-            .forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action as ComputedBoundsAction, cause)));
+
+        // collect bounds and layout data in element2BoundsData
+        this.getBoundsFromDOM();
+        this.layouter.layout(this.getElement2BoundsData());
+
+        // prepare data for action
+        const resizes: ElementAndBounds[] = [];
+        const alignments: ElementAndAlignment[] = [];
+        const layoutData: ElementAndLayoutData[] = [];
+        this.getElement2BoundsData().forEach((boundsData, element) => {
+            if (boundsData.boundsChanged && boundsData.bounds !== undefined) {
+                const resize: ElementAndBounds = {
+                    elementId: element.id,
+                    newSize: {
+                        width: boundsData.bounds.width,
+                        height: boundsData.bounds.height
+                    }
+                };
+                // don't copy position if the element is layouted by the server
+                if (element instanceof GChildElement && isLayoutContainer(element.parent)) {
+                    resize.newPosition = {
+                        x: boundsData.bounds.x,
+                        y: boundsData.bounds.y
+                    };
+                }
+                resizes.push(resize);
+            }
+            if (boundsData.alignmentChanged && boundsData.alignment !== undefined) {
+                alignments.push({
+                    elementId: element.id,
+                    newAlignment: boundsData.alignment
+                });
+            }
+            if (LayoutAware.is(boundsData)) {
+                layoutData.push({ elementId: element.id, layoutData: boundsData.layoutData });
+            }
+        });
+        const routes = this.element2route.length === 0 ? undefined : this.element2route;
+
+        // prepare and dispatch action
+        const responseId = (cause as RequestBoundsAction).requestId;
+        const revision = this.root !== undefined ? this.root.revision : undefined;
+        const computedBoundsAction = ComputedBoundsAction.create(resizes, { revision, alignments, layoutData, routes, responseId });
+        if (LocalRequestBoundsAction.is(cause)) {
+            LocalComputedBoundsAction.mark(computedBoundsAction);
+        }
+        this.actionDispatcher.dispatch(computedBoundsAction);
+
+        // cleanup
+        this.getElement2BoundsData().clear();
         this.element2route = [];
     }
 
@@ -82,41 +136,4 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
     protected expandElementId(id: string, index: ModelIndexImpl, elementIDs: string[]): string[] {
         return getDescendantIds(index.getById(id));
     }
-
-    protected captureActions(call: () => void): Action[] {
-        const capturingActionDispatcher = new CapturingActionDispatcher();
-        const actualActionDispatcher = this.actionDispatcher;
-        this.actionDispatcher = capturingActionDispatcher;
-        try {
-            call();
-            return capturingActionDispatcher.actions;
-        } finally {
-            this.actionDispatcher = actualActionDispatcher;
-        }
-    }
-
-    protected enhanceAction(action: ComputedBoundsAction, cause?: Action): ComputedBoundsAction {
-        if (LocalRequestBoundsAction.is(cause)) {
-            LocalComputedBoundsAction.mark(action);
-        }
-        action.routes = this.element2route.length === 0 ? undefined : this.element2route;
-        return action;
-    }
-}
-
-class CapturingActionDispatcher implements IActionDispatcher {
-    readonly actions: Action[] = [];
-
-    async dispatch(action: Action): Promise<void> {
-        this.actions.push(action);
-    }
-
-    async dispatchAll(actions: Action[]): Promise<void> {
-        this.actions.push(...actions);
-    }
-
-    async request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
-        // ignore, not needed for our purposes
-        return new Deferred<Res>().promise;
-    }
 }

package/src/features/bounds/hbox-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 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,22 +13,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from 'inversify';
 import {
     Bounds,
     BoundsData,
     Dimension,
     GChildElement,
+    GModelElement,
+    GParentElement,
     HBoxLayoutOptions,
     HBoxLayouter,
     LayoutContainer,
     Point,
-    GModelElement,
-    GParentElement,
     StatefulLayouter,
     isBoundsAware,
     isLayoutableChild
 } from '@eclipse-glsp/sprotty';
+import { injectable } from 'inversify';
+import { LayoutAware } from './layout-data';
 
 export interface HBoxLayoutOptionsExt extends HBoxLayoutOptions {
     hGrab: boolean;
@@ -79,7 +80,9 @@ export class HBoxLayouterExt extends HBoxLayouter {
 
         if (width > 0 && height > 0) {
             const offset = this.layoutChildren(container, layouter, options, width, height, grabWidth, grabbingChildren);
-            boundsData.bounds = this.getFinalContainerBounds(container, offset, options, childrenSize.width, childrenSize.height);
+            const computed = this.getComputedContainerDimensions(options, childrenSize.width, childrenSize.height);
+            LayoutAware.setComputedDimensions(boundsData, computed);
+            boundsData.bounds = this.getFinalContainerBounds(container, offset, options, computed.width, computed.height);
             boundsData.boundsChanged = true;
         }
     }
@@ -223,22 +226,28 @@ export class HBoxLayouterExt extends HBoxLayouter {
         return (element as any).layoutOptions;
     }
 
+    protected getComputedContainerDimensions(options: HBoxLayoutOptionsExt, maxWidth: number, maxHeight: number): Dimension {
+        return {
+            width: maxWidth + options.paddingLeft + options.paddingRight,
+            height: maxHeight + options.paddingTop + options.paddingBottom
+        };
+    }
+
     protected override getFinalContainerBounds(
         container: GParentElement & LayoutContainer,
         lastOffset: Point,
         options: HBoxLayoutOptionsExt,
-        maxWidth: number,
-        maxHeight: number
+        computedWidth: number,
+        computedHeight: number
     ): Bounds {
         const elementOptions = this.getElementLayoutOptions(container);
         const width = elementOptions?.prefWidth ?? options.minWidth;
         const height = elementOptions?.prefHeight ?? options.minHeight;
-
         const result = {
             x: container.bounds.x,
             y: container.bounds.y,
-            width: Math.max(width, maxWidth + options.paddingLeft + options.paddingRight),
-            height: Math.max(height, maxHeight + options.paddingTop + options.paddingBottom)
+            width: Math.max(width, computedWidth),
+            height: Math.max(height, computedHeight)
         };
 
         return result;

package/src/features/bounds/layout-data.ts

@@ -0,0 +1,48 @@
+/********************************************************************************
+ * Copyright (c) 2024 Axon Ivy AG 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 { Dimension, LayoutData } from '@eclipse-glsp/sprotty';
+
+export interface LayoutAware {
+    layoutData: LayoutData;
+}
+
+export namespace LayoutAware {
+    export function is<T extends object>(element: T): element is T & LayoutAware {
+        return 'layoutData' in element;
+    }
+
+    export function getLayoutData<T extends object>(element: T): LayoutData | undefined {
+        return is(element) ? element.layoutData : undefined;
+    }
+
+    export function setLayoutData<T extends object>(element: T, data: LayoutData): void {
+        (element as LayoutAware).layoutData = data;
+    }
+
+    export function setComputedDimensions<T extends object>(element: T, computedDimensions: Dimension): void {
+        ensureLayoutAware(element).layoutData.computedDimensions = computedDimensions;
+    }
+
+    export function getComputedDimensions<T extends object>(element: T): Dimension | undefined {
+        return getLayoutData(element)?.computedDimensions;
+    }
+
+    function ensureLayoutAware<T extends object>(element: T): T & LayoutAware {
+        (element as LayoutAware).layoutData = (element as LayoutAware).layoutData ?? {};
+        return element as T & LayoutAware;
+    }
+}