From 44891dacb725794d08b951ff80f54f124b6ba933 Mon Sep 17 00:00:00 2001
From: i518532 <ivaylo.plashkov@sap.com>
Date: Wed, 13 Aug 2025 15:40:39 +0300
Subject: [PATCH 1/2] fix(ui5-page): prevent content overlap with fixed footer

- Added margin-bottom styling to content section when footer is fixed
- Uses existing _contentBottom getter (2.75rem) to match footer height
- Ensures content is not covered by fixed footer positioning
---
 packages/fiori/src/Page.ts          | 10 ----------
 packages/fiori/src/PageTemplate.tsx |  1 +
 packages/fiori/src/themes/Page.css  |  8 ++++----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/fiori/src/Page.ts b/packages/fiori/src/Page.ts
index 08fe1a4fd9b0..d37a5a1f637c 100644
--- a/packages/fiori/src/Page.ts
+++ b/packages/fiori/src/Page.ts
@@ -133,16 +133,6 @@ class Page extends UI5Element {
 		return this.header.length ? "2.75rem" : "0rem";
 	}
 
-	get styles() {
-		return {
-			content: {
-				"padding-bottom": this.footer.length && this._contentPaddingBottom,
-				"scroll-padding-bottom": this.footer.length && this._contentPaddingBottom,
-				"bottom": this.footer.length && this._contentBottom,
-				"top": this._contentTop,
-			},
-		};
-	}
 }
 
 Page.define();
diff --git a/packages/fiori/src/PageTemplate.tsx b/packages/fiori/src/PageTemplate.tsx
index 8a8a2c1633eb..42efb03f6ec0 100644
--- a/packages/fiori/src/PageTemplate.tsx
+++ b/packages/fiori/src/PageTemplate.tsx
@@ -15,6 +15,7 @@ export default function PageTemplate(this: Page) {
 				class="ui5-page-content-root" style={{
 					"padding-bottom": this.footer.length && this._contentPaddingBottom,
 					"scroll-padding-bottom": this.footer.length && this._contentPaddingBottom,
+					"margin-bottom": this.footer.length && this._contentBottom,
 					"bottom": this.footer.length && this._contentBottom,
 					"top": this._contentTop,
 				}}>
diff --git a/packages/fiori/src/themes/Page.css b/packages/fiori/src/themes/Page.css
index 4f2aab14a50b..7c389bf12a89 100644
--- a/packages/fiori/src/themes/Page.css
+++ b/packages/fiori/src/themes/Page.css
@@ -13,19 +13,19 @@
 	z-index: 0;
 	box-sizing: border-box;
 	background-color: inherit;
+	display: flex;
+	flex-direction: column;
 }
 
 .ui5-page-header-root {
 	z-index: 1;
+	flex-shrink: 0;
 }
 
 .ui5-page-content-root {
 	overflow: hidden auto;
-	position: absolute;
 	will-change: scroll-position;
-	width: 100%;
-	top: 2.75rem;
-	bottom: 0;
+	flex: 1;
 	box-sizing: border-box;
 	font-size: var(--sapFontSize);
 	color: var(--sapTextColor);

From b037791defba1103fa936961364c508810fd4c79 Mon Sep 17 00:00:00 2001
From: i518532 <ivaylo.plashkov@sap.com>
Date: Fri, 15 Aug 2025 08:41:26 +0300
Subject: [PATCH 2/2] fix(ui5-page): lint

---
 packages/fiori/src/Page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/fiori/src/Page.ts b/packages/fiori/src/Page.ts
index d37a5a1f637c..30216a259ae2 100644
--- a/packages/fiori/src/Page.ts
+++ b/packages/fiori/src/Page.ts
@@ -132,7 +132,6 @@ class Page extends UI5Element {
 	get _contentTop() {
 		return this.header.length ? "2.75rem" : "0rem";
 	}
-
 }
 
 Page.define();