Skip to content

fix(ui5-form): correct label and content alignment #11944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(ui5-form): correct label and content alignment #11944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8bf0d5
fix(ui5-form): correct label and content alignment
nnaydenow Jul 18, 2025
415f635
chore: fix
nnaydenow Jul 18, 2025
a8292d0
chore: fix
nnaydenow Jul 21, 2025
d2f35a9
chore: fix
nnaydenow Jul 22, 2025
c0bade2
chore: form item background
nnaydenow Jul 23, 2025
d0b4c71
Merge branch 'main' into form-label
nnaydenow Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/main/src/Form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ class Form extends UI5Element {

getItemsInfo(items?: Array<IFormItem>): Array<ItemsInfo> {
return (items || this.items).map((item: IFormItem) => {
item.setAttribute("data-sap-ui5-label-span", this.labelSpan);

return {
item,
// eslint-disable-next-line
Expand Down
10 changes: 7 additions & 3 deletions packages/main/src/themes/Form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
display: flex;
flex-direction: column;
background-color: var(--sapGroup_ContentBackground);
border-radius: 0.75rem;
border-radius: 0.75rem;
container-type: inline-size;
}

Expand Down Expand Up @@ -42,10 +42,14 @@

.ui5-form-column {
padding-top: 0.5rem;
padding-bottom: 1rem;
box-sizing: border-box;
padding-bottom: 1rem;
box-sizing: border-box;
}

::slotted([ui5-form-group]) {
display: contents;
}

.ui5-form-item {
display: contents;
}
39 changes: 35 additions & 4 deletions packages/main/src/themes/FormItem.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,29 @@
grid-column: span 6;
}

:host {
display: contents;
}

.ui5-form-item-root {
display: contents;
height: 100%;
container-type: inline-size;
background-color: inherit;
color: inherit;
order: inherit;
}

.ui5-form-item-layout {
order: inherit;
background-color: inherit;
height: inherit;
color: inherit;
display: grid;
grid-template-columns: var(--ui5-form-item-layout);
align-items: center;
grid-template-rows: subgrid;
grid-row: var(--ui5-grid-row, span 1);
align-items: var(--ui5-grid-row-align, center);
}

.ui5-form-item-label {
Expand Down Expand Up @@ -65,24 +78,38 @@
}

@container (max-width: 600px) {
:host {
:host .ui5-form-item-layout {
order: var(--ui5-form-item-order-S, unset);
}

:host([data-sap-ui5-label-span~="S12"]) .ui5-form-item-root {
--ui5-grid-row: span 2;
--ui5-grid-row-align: start;
}
}

/* M - 1 column by default, up to 2 columns */
@container (width > 600px) and (width <= 1024px) {
@container (width > 600px) and (width <=1024px) {
:host {
order: var(--ui5-form-item-order-M, unset);
}

:host([data-sap-ui5-label-span~="M12"]) .ui5-form-item-root {
--ui5-grid-row: span 2;
--ui5-grid-row-align: start;
}
}

/* L - 2 columns by default, up to 3 columns */
@container (width > 1024px) and (width <= 1440px) {
@container (width > 1024px) and (width <=1440px) {
:host {
order: var(--ui5-form-item-order-L, unset);
}

:host([data-sap-ui5-label-span~="L12"]) .ui5-form-item-root {
--ui5-grid-row: span 2;
--ui5-grid-row-align: start;
}
}

/* XL - 3 columns by default, up to 6 */
Expand All @@ -91,4 +118,8 @@
order: var(--ui5-form-item-order-Xl, unset);
}

:host([data-sap-ui5-label-span~="XL12"]) .ui5-form-item-root {
--ui5-grid-row: span 2;
--ui5-grid-row-align: start;
}
}
108 changes: 108 additions & 0 deletions packages/main/test/pages/form/FormAlignment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<!DOCTYPE html>
<html>

<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta charset="utf-8">
<title>Form Basic</title>
<script src="../%VITE_BUNDLE_PATH%" type="module"></script>
<link rel="stylesheet" type="text/css" href="../styles/FormLayout.css">
</head>

<body>
<div>
<!-- <div style="width: 700px;"></div> -->
<h1>With group element</h1>
<ui5-form label-span="S12 M12 L12 XL12" layout="S1 M2 L4 XL4">
<ui5-form-group>
<ui5-form-item>
<ui5-label slot="labelContent" required>Number of Replicas</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Request/Limit CPU</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required> Maximum Java Memory (Gi) Maximum Java Memory (Gi) Maximum
Java Memory (Gi) Maximum Java Memory (Gi)</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Memory Scale Factor</ui5-label>
<ui5-input type="Text" style="height: 150px;" />
</ui5-form-item>
</ui5-form-group>
</ui5-form>
<h1>Without group element</h1>
<ui5-form label-span="S12 M12 L12 XL12" layout="S1 M2 L4 XL4">
<ui5-form-item>
<ui5-label slot="labelContent" required>Number of Replicas</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Request/Limit CPU</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required> Maximum Java Memory (Gi) Maximum Java Memory (Gi) Maximum Java
Memory (Gi) Maximum Java Memory (Gi)</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Memory Scale Factor</ui5-label>
<ui5-input type="Text" style="height: 150px;" />
</ui5-form-group>
</ui5-form>
</div>
<hr />


<div>
<!-- <div style="width: 700px;"></div> -->
<h1>With group element</h1>
<ui5-form label-span="S6 M6 L6 XL6" layout="S1 M2 L4 XL4">
<ui5-form-group>
<ui5-form-item>
<ui5-label slot="labelContent" required>Number of Replicas</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Request/Limit CPU</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required> Maximum Java Memory (Gi) Maximum Java Memory (Gi) Maximum
Java Memory (Gi) Maximum Java Memory (Gi)</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Memory Scale Factor</ui5-label>
<ui5-input type="Text" style="height: 150px;" />
</ui5-form-item>
</ui5-form-group>
</ui5-form>
<h1>Without group element</h1>
<ui5-form label-span="S6 M6 L6 XL6" layout="S1 M2 L4 XL4">
<ui5-form-item>
<ui5-label slot="labelContent" required>Number of Replicas</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Request/Limit CPU</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required> Maximum Java Memory (Gi) Maximum Java Memory (Gi) Maximum Java
Memory (Gi) Maximum Java Memory (Gi)</ui5-label>
<ui5-input type="Text" />
</ui5-form-item>
<ui5-form-item>
<ui5-label slot="labelContent" required>Memory Scale Factor</ui5-label>
<ui5-input type="Text" style="height: 150px;" />
</ui5-form-group>
</ui5-form>
</div>
</body>

</html>
Loading