@eclipse-glsp/client 1.0.0 → 1.1.0-RC01

package/src/features/layout/vbox-layout.ts

@@ -49,6 +49,9 @@ export class VBoxLayouterExt extends VBoxLayouter {
 
         const fixedSize = this.getFixedContainerBounds(container, options, layouter);
 
+        const currentWidth = (boundsData.bounds?.width || 0) - options.paddingLeft - options.paddingRight;
+        const currentHeight = (boundsData.bounds?.height || 0) - options.paddingTop - options.paddingBottom;
+
         const maxWidth =
             options.paddingFactor *
             (options.resizeContainer
@@ -60,8 +63,11 @@ export class VBoxLayouterExt extends VBoxLayouter {
                 ? Math.max(fixedSize.height - options.paddingTop - options.paddingBottom, childrenSize.height)
                 : Math.max(0, fixedSize.height - options.paddingTop - options.paddingBottom));
 
+        const width = Math.max(currentWidth, maxWidth);
+        const height = Math.max(currentHeight, maxHeight);
+
         // Remaining size that can be grabbed by children with the vGrab option
-        const grabHeight: number = maxHeight - childrenSize.height;
+        const grabHeight: number = height - childrenSize.height;
         // Number of children that request vGrab
         // FIXME: This approach works fine when only 1 child uses VGrab, but may cause rounding issues
         // when the grabHeight can't be equally shared by all children.
@@ -70,7 +76,7 @@ export class VBoxLayouterExt extends VBoxLayouter {
             .filter(opt => opt.vGrab).length;
 
         if (maxWidth > 0 && maxHeight > 0) {
-            const offset = this.layoutChildren(container, layouter, options, maxWidth, maxHeight, grabHeight, grabbingChildren);
+            const offset = this.layoutChildren(container, layouter, options, width, height, grabHeight, grabbingChildren);
             boundsData.bounds = this.getFinalContainerBounds(container, offset, options, childrenSize.width, childrenSize.height);
             boundsData.boundsChanged = true;
         }
@@ -155,7 +161,14 @@ export class VBoxLayouterExt extends VBoxLayouter {
         grabHeight?: number,
         grabbingChildren?: number
     ): Point {
+        const hAlign = childOptions.hGrab ? 'left' : childOptions.hAlign;
+        const dx = this.getDx(hAlign, bounds, maxWidth);
         let offset = super.layoutChild(child, boundsData, bounds, childOptions, containerOptions, currentOffset, maxWidth, maxHeight);
+        boundsData.bounds = {
+            ...boundsData.bounds!,
+            x: currentOffset.x + dx,
+            y: currentOffset.y
+        };
         if (childOptions.hGrab) {
             boundsData.bounds = {
                 x: boundsData.bounds!.x,
@@ -197,7 +210,7 @@ export class VBoxLayouterExt extends VBoxLayouter {
     }
 
     protected override getChildLayoutOptions(child: SChildElement, containerOptions: VBoxLayoutOptionsExt): VBoxLayoutOptionsExt {
-        return super.getChildLayoutOptions(child, containerOptions) as VBoxLayoutOptionsExt;
+        return super.getChildLayoutOptions(child, this.filterContainerOptions(containerOptions)) as VBoxLayoutOptionsExt;
     }
 
     protected override getLayoutOptions(element: SModelElement): VBoxLayoutOptionsExt {
@@ -250,7 +263,11 @@ export class VBoxLayouterExt extends VBoxLayouter {
         };
     }
 
-    protected override spread(a: VBoxLayoutOptionsExt, b: VBoxLayoutOptionsExt): VBoxLayoutOptionsExt {
-        return { ...a, ...b };
+    protected filterContainerOptions(containerOptions: VBoxLayoutOptionsExt): VBoxLayoutOptionsExt {
+        // Reset object-specific layout options to default before merging,
+        // to make sure they won't be inherited (grab, prefSize)
+        // eslint-disable-next-line no-null/no-null
+        const localOptions = { vGrab: false, hGrab: false, prefHeight: null, prefWidth: null };
+        return { ...containerOptions, ...localOptions };
     }
 }

package/src/sprotty-reexport.ts

@@ -104,7 +104,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';

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

@@ -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 {