Skip to content

Commit cab202d

Browse files
authored
fix: do not ignore labelsAside when using explicit rows (#8760)
1 parent f9334a4 commit cab202d

7 files changed

Lines changed: 102 additions & 6 deletions

File tree

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ export const formLayoutStyles = css`
5555
}
5656
5757
:host([auto-responsive]) #layout {
58+
/* By default, labels should be displayed above the fields */
59+
--_form-item-labels-above: initial; /* true */
60+
--_form-item-labels-aside: ' '; /* false */
61+
62+
/* CSS grid related properties */
5863
--_grid-column-gap: var(--vaadin-form-layout-column-spacing);
5964
--_grid-column-width: var(--_column-width-labels-above);
6065
--_grid-column-max-total-gap: calc((var(--_max-columns) - 1) * var(--_grid-column-gap));
@@ -100,8 +105,9 @@ export const formLayoutStyles = css`
100105
}
101106
102107
:host([auto-responsive]) #layout ::slotted(*) {
103-
--_form-item-labels-above: initial; /* true */
104-
--_form-item-labels-aside: ' '; /* false */
108+
/* Make form items inherit label position from the layout */
109+
--_form-item-labels-above: inherit;
110+
--_form-item-labels-aside: inherit;
105111
106112
/* By default, place each child on a new row */
107113
grid-column: 1 / span min(var(--_grid-colspan, 1), var(--_grid-rendered-column-count));
@@ -116,12 +122,9 @@ export const formLayoutStyles = css`
116122
}
117123
118124
:host([auto-responsive][labels-aside]) #layout[fits-labels-aside] {
119-
--_grid-column-width: var(--_column-width-labels-aside);
120-
}
121-
122-
:host([auto-responsive][labels-aside]) #layout[fits-labels-aside] ::slotted(*) {
123125
--_form-item-labels-above: ' '; /* false */
124126
--_form-item-labels-aside: initial; /* true */
127+
--_grid-column-width: var(--_column-width-labels-aside);
125128
}
126129
127130
:host([auto-responsive][expand-columns]) #layout {
@@ -153,6 +156,10 @@ export const formRowStyles = css`
153156
}
154157
155158
::slotted(*) {
159+
/* Make form items inherit label position from the layout */
160+
--_form-item-labels-above: inherit;
161+
--_form-item-labels-aside: inherit;
162+
156163
grid-column: auto / span min(var(--_grid-colspan, 1), var(--_grid-rendered-column-count));
157164
}
158165
@@ -163,6 +170,7 @@ export const formRowStyles = css`
163170

164171
export const formItemStyles = css`
165172
:host {
173+
/* By default, when auto-responsive mode is disabled, labels should be displayed beside the fields. */
166174
--_form-item-labels-above: ' '; /* false */
167175
--_form-item-labels-aside: initial; /* true */
168176

‎packages/form-layout/test/visual/lumo/form-layout-auto-responsive.test.js‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,50 @@ describe('form-layout auto responsive', () => {
237237
});
238238
});
239239

240+
describe('form items with explicit rows', () => {
241+
beforeEach(async () => {
242+
element = fixtureSync(
243+
`
244+
<vaadin-form-layout auto-responsive>
245+
<vaadin-form-row>
246+
<vaadin-form-item>
247+
<label slot="label">First name</label>
248+
<input />
249+
</vaadin-form-item>
250+
<vaadin-form-item>
251+
<label slot="label">Last name</label>
252+
<input />
253+
</vaadin-form-item>
254+
</vaadin-form-row>
255+
256+
<vaadin-form-row>
257+
<vaadin-form-item>
258+
<label slot="label">Email</label>
259+
<input />
260+
</vaadin-form-item>
261+
<vaadin-form-item>
262+
<label slot="label">Phone</label>
263+
<input />
264+
</vaadin-form-item>
265+
</vaadin-form-row>
266+
</vaadin-form-layout>
267+
`,
268+
container,
269+
);
270+
await nextFrame();
271+
});
272+
273+
it('default', async () => {
274+
await visualDiff(container, 'form-items-with-explicit-rows');
275+
});
276+
277+
it('labelsAside', async () => {
278+
element.labelsAside = true;
279+
await nextResize(element);
280+
await visualDiff(container, 'form-items-with-explicit-rows-labels-aside');
281+
});
282+
});
283+
240284
describe('colspan', () => {
241285
beforeEach(async () => {
242286
element = fixtureSync(
Loading
3.43 KB
Loading

‎packages/form-layout/test/visual/material/form-layout-auto-responsive.test.js‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,50 @@ describe('form-layout auto responsive', () => {
237237
});
238238
});
239239

240+
describe('form items with explicit rows', () => {
241+
beforeEach(async () => {
242+
element = fixtureSync(
243+
`
244+
<vaadin-form-layout auto-responsive>
245+
<vaadin-form-row>
246+
<vaadin-form-item>
247+
<label slot="label">First name</label>
248+
<input />
249+
</vaadin-form-item>
250+
<vaadin-form-item>
251+
<label slot="label">Last name</label>
252+
<input />
253+
</vaadin-form-item>
254+
</vaadin-form-row>
255+
256+
<vaadin-form-row>
257+
<vaadin-form-item>
258+
<label slot="label">Email</label>
259+
<input />
260+
</vaadin-form-item>
261+
<vaadin-form-item>
262+
<label slot="label">Phone</label>
263+
<input />
264+
</vaadin-form-item>
265+
</vaadin-form-row>
266+
</vaadin-form-layout>
267+
`,
268+
container,
269+
);
270+
await nextFrame();
271+
});
272+
273+
it('default', async () => {
274+
await visualDiff(container, 'form-items-with-explicit-rows');
275+
});
276+
277+
it('labelsAside', async () => {
278+
element.labelsAside = true;
279+
await nextResize(element);
280+
await visualDiff(container, 'form-items-with-explicit-rows-labels-aside');
281+
});
282+
});
283+
240284
describe('colspan', () => {
241285
beforeEach(async () => {
242286
element = fixtureSync(
Loading
2.88 KB
Loading

0 commit comments

Comments
 (0)