feat(FormLayout): add FormItem and labelsAside support to autoResponsive mode

dev/form-layout-auto-responsive.html

@@ -191,6 +191,37 @@ <h1>autoResponsive inside Dialog + expandColumns</h1>
             ></vaadin-dialog>
             <vaadin-button @click="${this.openPrevSiblingDialog}">Open</vaadin-button>
 
+            <h1>autoResponsive inside Dialog + labelsAside</h1>
+            <vaadin-dialog
+              ${dialogRenderer(
+                (dialog) => html`
+                  <vaadin-form-layout auto-responsive auto-rows max-columns="2" labels-aside>
+                    <vaadin-form-item>
+                      <label slot="label"> First name </label>
+                      <vaadin-text-field></vaadin-text-field>
+                    </vaadin-form-item>
+                    <vaadin-form-item>
+                      <label slot="label"> Last name </label>
+                      <vaadin-text-field></vaadin-text-field>
+                    </vaadin-form-item>
+                    <vaadin-form-item colspan="2">
+                      <label slot="label"> Username </label>
+                      <vaadin-text-field colspan="2"></vaadin-text-field>
+                    </vaadin-form-item>
+                    <vaadin-form-item>
+                      <label slot="label"> Password </label>
+                      <vaadin-password-field></vaadin-password-field>
+                    </vaadin-form-item>
+                    <vaadin-form-item>
+                      <label slot="label"> Confirm </label>
+                      <vaadin-password-field></vaadin-password-field>
+                    </vaadin-form-item>
+                  </vaadin-form-layout>
+                `,
+              )}
+            ></vaadin-dialog>
+            <vaadin-button @click="${this.openPrevSiblingDialog}">Open</vaadin-button>
+
             <h1>autoResponsive inside Dialog 80%</h1>
             <vaadin-dialog
               width="80%"

packages/form-layout/src/vaadin-form-layout-mixin.d.ts

@@ -108,6 +108,21 @@ export declare class FormLayoutMixinClass {
    */
   autoRows: boolean;
 
+  /**
+   * When enabled with `autoResponsive`, `<vaadin-form-item>` prefers positioning
+   * labels beside the fields. If the layout is too narrow to fit a single column
+   * with side labels, they revert to their default position above the fields.
+   *
+   * To customize the label width and the gap between the label and the field,
+   * use the following CSS properties:
+   *
+   * - `--vaadin-form-layout-label-width`
+   * - `--vaadin-form-layout-label-spacing`
+   *
+   * @attr {boolean} labels-aside
+   */
+  labelsAside: boolean;
+
   /**
    * Update the layout.
    */

packages/form-layout/src/vaadin-form-layout-mixin.js

@@ -146,6 +146,26 @@ export const FormLayoutMixin = (superClass) =>
           reflectToAttribute: true,
         },
 
+        /**
+         * When enabled with `autoResponsive`, `<vaadin-form-item>` prefers positioning
+         * labels beside the fields. If the layout is too narrow to fit a single column
+         * with side labels, they revert to their default position above the fields.
+         *
+         * To customize the label width and the gap between the label and the field,
+         * use the following CSS properties:
+         *
+         * - `--vaadin-form-layout-label-width`
+         * - `--vaadin-form-layout-label-spacing`
+         *
+         * @attr {boolean} labels-aside
+         */
+        labelsAside: {
+          type: Boolean,
+          sync: true,
+          value: false,
+          reflectToAttribute: true,
+        },
+
         /**
          * Current number of columns in the layout
          * @private
@@ -392,8 +412,10 @@ export const FormLayoutMixin = (superClass) =>
 
     /** @private */
     __updateCSSGridLayout() {
-      let resetColumn = false;
+      const fitsLabelsAside = this.offsetWidth >= this.__columnWidthWithLabelsAside;
+      this.$.layout.toggleAttribute('fits-labels-aside', this.labelsAside && fitsLabelsAside);
 
+      let resetColumn = false;
       [...this.children]
         .flatMap((child) => {
           return child.localName === 'vaadin-form-row' ? [...child.children] : child;
@@ -448,4 +470,10 @@ export const FormLayoutMixin = (superClass) =>
         this.style.removeProperty('--_max-columns');
       }
     }
+
+    /** @private */
+    get __columnWidthWithLabelsAside() {
+      const { backgroundPositionY } = getComputedStyle(this.$.layout, '::before');
+      return parseFloat(backgroundPositionY);
+    }
   };

packages/form-layout/src/vaadin-form-layout-styles.js

@@ -46,16 +46,22 @@ export const formLayoutStyles = css`
 
   :host([auto-responsive]) {
     --_column-gap: var(--vaadin-form-layout-column-spacing);
+    --_column-width-with-labels-above: var(--_column-width);
+    --_column-width-with-labels-aside: calc(
+      var(--_column-width) + var(--vaadin-form-layout-label-width) + var(--vaadin-form-layout-label-spacing)
+    );
     --_max-total-gap-width: calc((var(--_max-columns) - 1) * var(--_column-gap));
-    --_max-total-col-width: calc(var(--_max-columns) * var(--_column-width));
+    --_max-total-column-width: calc(var(--_max-columns) * var(--_column-width-with-labels-above));
 
     display: flex;
-    min-width: var(--_column-width);
+    min-width: var(--_column-width-with-labels-above);
   }
 
   :host([auto-responsive]) #layout {
+    --_effective-column-width: var(--_column-width-with-labels-above);
+
     display: grid;
-    grid-template-columns: repeat(auto-fit, var(--_column-width));
+    grid-template-columns: repeat(auto-fit, var(--_effective-column-width));
     justify-items: start;
     gap: var(--vaadin-form-layout-row-spacing) var(--_column-gap);
 
@@ -71,7 +77,7 @@ export const formLayoutStyles = css`
       number of columns inside <vaadin-overlay>, which creates a new stacking context
       without a predefined width.
     */
-    width: calc(var(--_max-total-col-width) + var(--_max-total-gap-width));
+    width: calc(var(--_max-total-column-width) + var(--_max-total-gap-width));
 
     /*
       Firefox requires min-width on both :host and #layout to allow the layout
@@ -80,13 +86,33 @@ export const formLayoutStyles = css`
     min-width: inherit;
   }
 
+  :host([auto-responsive]) #layout::before {
+    background-position-y: var(--_column-width-with-labels-aside);
+  }
+
   :host([auto-responsive]) #layout ::slotted(*) {
+    --_label-position-above: initial;
+    --_label-position-aside: ' ';
+
     grid-column-start: 1;
   }
 
   :host([auto-responsive][auto-rows]) #layout ::slotted(*) {
     grid-column-start: var(--_column-start, auto);
   }
+
+  :host([auto-responsive][labels-aside]) {
+    --_max-total-column-width: calc(var(--_max-columns) * var(--_column-width-with-labels-aside));
+  }
+
+  :host([auto-responsive][labels-aside]) #layout[fits-labels-aside] {
+    --_effective-column-width: var(--_column-width-with-labels-aside);
+  }
+
+  :host([auto-responsive][labels-aside]) #layout[fits-labels-aside] ::slotted(*) {
+    --_label-position-above: ' ';
+    --_label-position-aside: initial;
+  }
 `;
 
 export const formRowStyles = css`
@@ -109,30 +135,33 @@ export const formRowStyles = css`
 
 export const formItemStyles = css`
   :host {
+    --_label-position-above: ' ';
+    --_label-position-aside: initial;
+
     display: inline-flex;
-    flex-direction: row;
-    align-items: baseline;
+    align-items: var(--_label-position-aside, baseline);
+    flex-flow: var(--_label-position-above, column) nowrap;
+    justify-self: stretch;
     margin: calc(0.5 * var(--vaadin-form-item-row-spacing, var(--vaadin-form-layout-row-spacing, 1em))) 0;
   }
 
   :host([label-position='top']) {
-    flex-direction: column;
-    align-items: stretch;
+    --_label-position-above: initial;
+    --_label-position-aside: ' ';
   }
 
   :host([hidden]) {
     display: none !important;
   }
 
   #label {
-    width: var(--vaadin-form-item-label-width, var(--vaadin-form-layout-label-width, 8em));
+    width: var(
+      --_label-position-aside,
+      var(--vaadin-form-item-label-width, var(--vaadin-form-layout-label-width, 8em))
+    );
     flex: 0 0 auto;
   }
 
-  :host([label-position='top']) #label {
-    width: auto;
-  }
-
   #spacing {
     width: var(--vaadin-form-item-label-spacing, var(--vaadin-form-layout-label-spacing, 1em));
     flex: 0 0 auto;

packages/form-layout/test/dom/__snapshots__/form-layout.test.snap.js

@@ -1,7 +1,7 @@
 /* @web/test-runner snapshot v1 */
 export const snapshots = {};
 
-snapshots["vaadin-form-layout auto-responsive basic host default"] = 
+snapshots["vaadin-form-layout auto-responsive basic host default"] =
 `<vaadin-form-layout
   auto-responsive=""
   style="--_column-width: 13em; --_max-columns: 10;"
@@ -14,7 +14,7 @@ snapshots["vaadin-form-layout auto-responsive basic host default"] =
 `;
 /* end snapshot vaadin-form-layout auto-responsive basic host default */
 
-snapshots["vaadin-form-layout auto-responsive basic host maxColumns"] = 
+snapshots["vaadin-form-layout auto-responsive basic host maxColumns"] =
 `<vaadin-form-layout
   auto-responsive=""
   style="--_column-width: 13em; --_max-columns: 3;"
@@ -27,7 +27,7 @@ snapshots["vaadin-form-layout auto-responsive basic host maxColumns"] =
 `;
 /* end snapshot vaadin-form-layout auto-responsive basic host maxColumns */
 
-snapshots["vaadin-form-layout auto-responsive basic host columnWidth"] = 
+snapshots["vaadin-form-layout auto-responsive basic host columnWidth"] =
 `<vaadin-form-layout
   auto-responsive=""
   style="--_column-width: 15em; --_max-columns: 10;"
@@ -40,15 +40,15 @@ snapshots["vaadin-form-layout auto-responsive basic host columnWidth"] =
 `;
 /* end snapshot vaadin-form-layout auto-responsive basic host columnWidth */
 
-snapshots["vaadin-form-layout auto-responsive basic shadow default"] = 
+snapshots["vaadin-form-layout auto-responsive basic shadow default"] =
 `<div id="layout">
   <slot id="slot">
   </slot>
 </div>
 `;
 /* end snapshot vaadin-form-layout auto-responsive basic shadow default */
 
-snapshots["vaadin-form-layout auto-responsive autoRows default"] = 
+snapshots["vaadin-form-layout auto-responsive autoRows default"] =
 `<vaadin-form-layout
   auto-responsive=""
   auto-rows=""
@@ -70,3 +70,36 @@ snapshots["vaadin-form-layout auto-responsive autoRows default"] =
 `;
 /* end snapshot vaadin-form-layout auto-responsive autoRows default */
 
+snapshots["vaadin-form-layout auto-responsive basic host labelsAside"] =
+`<vaadin-form-layout
+  auto-responsive=""
+  labels-aside=""
+  style="--_column-width: 13em; --_max-columns: 10;"
+>
+  <input placeholder="First name">
+  <input placeholder="Last name">
+  <input placeholder="Email">
+  <input placeholder="Phone">
+</vaadin-form-layout>
+`;
+/* end snapshot vaadin-form-layout auto-responsive basic host labelsAside */
+
+snapshots["vaadin-form-layout auto-responsive basic shadow labelsAside"] =
+`<div
+  fits-labels-aside=""
+  id="layout"
+>
+  <slot id="slot">
+  </slot>
+</div>
+`;
+/* end snapshot vaadin-form-layout auto-responsive basic shadow labelsAside */
+
+snapshots["vaadin-form-layout auto-responsive basic shadow labelsAside with too narrow layout"] =
+`<div id="layout">
+  <slot id="slot">
+  </slot>
+</div>
+`;
+/* end snapshot vaadin-form-layout auto-responsive basic shadow labelsAside with too narrow layout */
+

packages/form-layout/test/dom/form-layout.test.js

@@ -1,5 +1,5 @@
 import { expect } from '@vaadin/chai-plugins';
-import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
+import { fixtureSync, nextFrame, nextResize } from '@vaadin/testing-helpers';
 import '../../src/vaadin-form-layout.js';
 
 describe('vaadin-form-layout', () => {
@@ -33,12 +33,31 @@ describe('vaadin-form-layout', () => {
           layout.columnWidth = '15em';
           await expect(layout).dom.to.equalSnapshot();
         });
+
+        it('labelsAside', async () => {
+          layout.labelsAside = true;
+          await nextResize(layout);
+          await expect(layout).dom.to.equalSnapshot();
+        });
       });
 
       describe('shadow', () => {
         it('default', async () => {
           await expect(layout).shadowDom.to.equalSnapshot();
         });
+
+        it('labelsAside', async () => {
+          layout.labelsAside = true;
+          await nextResize(layout);
+          await expect(layout).shadowDom.to.equalSnapshot();
+        });
+
+        it('labelsAside with too narrow layout', async () => {
+          layout.style.width = '8em';
+          layout.labelsAside = true;
+          await nextResize(layout);
+          await expect(layout).shadowDom.to.equalSnapshot();
+        });
       });
     });
 

packages/form-layout/test/form-item.test.js

@@ -75,7 +75,7 @@ describe('form-item', () => {
       item.setAttribute('label-position', 'top');
 
       expect(getComputedStyle(item).getPropertyValue('flex-direction')).to.equal('column');
-      expect(getComputedStyle(item).getPropertyValue('align-items')).to.equal('stretch');
+      expect(getComputedStyle(item).getPropertyValue('align-items')).to.equal('normal');
     });
   });