Skip to content

fix(ui5-dynamic-page): toggle button reading fixed #13990

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

Draft
PetyaMarkovaBogdanova wants to merge 7 commits into
base: main
Choose a base branch
from
+151 −3
Draft

fix(ui5-dynamic-page): toggle button reading fixed #13990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8dba182
fix(ui5-dynamic-page): toggle button reading fixed
PetyaMarkovaBogdanova Aug 27, 2026
5fe8434
fix(ui5-dynamic-page): fixed pin button announcement
PetyaMarkovaBogdanova Aug 27, 2026
69800f9
fix(ui5-dynamic-page): fixed announcement mode for pin/unpin header b…
PetyaMarkovaBogdanova Aug 28, 2026
991f9a3
fix(ui5-dynamic-page): toggle button reading fixed
PetyaMarkovaBogdanova Aug 28, 2026
6cda7ad
fix(ui5-dynamic-page): toggle button reading fixed- #13990
PetyaMarkovaBogdanova Sep 1, 2026
d64d859
fix(ui5-dynamic-page): toggle button reading fixed
PetyaMarkovaBogdanova Sep 1, 2026
7dac5ab
fix(ui5-dynamic-page): toggle button reading fixed
PetyaMarkovaBogdanova Sep 1, 2026
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
145 changes: 145 additions & 0 deletions packages/fiori/cypress/specs/DynamicPage.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,151 @@ describe("Page layout when content overflows", () => {
});
});

describe("Header actions DOM order", () => {
it("renders header actions after the header slot when expanded", () => {
cy.mount(
<DynamicPage style={{ height: "600px" }}>
<DynamicPageTitle slot="titleArea">
<div slot="heading">Page Title</div>
</DynamicPageTitle>
<DynamicPageHeader slot="headerArea">
<div>Header Content</div>
</DynamicPageHeader>
<div style={{ height: "1000px" }}>content</div>
</DynamicPage>
);

cy.get("[ui5-dynamic-page]").should("have.prop", "headerSnapped", false);

// Actions must NOT be inside the sticky title-header-wrapper
cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-title-header-wrapper [ui5-dynamic-page-header-actions]")
.should("not.exist");

// Actions must be a direct child of the scroll container (after the header slot)
cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("exist");

// DOM order: header slot must come before actions in the scroll container
cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container")
.then(($container) => {
const children = Array.from($container[0].children);
const headerSlotIdx = children.findIndex(
(el) => el.tagName === "SLOT" && el.getAttribute("name") === "headerArea"
);
const actionsIdx = children.findIndex((el) =>
el.hasAttribute("ui5-dynamic-page-header-actions")
);
expect(headerSlotIdx).to.be.greaterThan(-1);
expect(actionsIdx).to.be.greaterThan(headerSlotIdx);
});
});

it("renders header actions inside the sticky wrapper when snapped", () => {
cy.mount(
<DynamicPage style={{ height: "600px" }}>
<DynamicPageTitle slot="titleArea">
<div slot="heading">Page Title</div>
</DynamicPageTitle>
<DynamicPageHeader slot="headerArea">
<div>Header Content</div>
</DynamicPageHeader>
<div style={{ height: "1000px" }}>content</div>
</DynamicPage>
);

cy.get("[ui5-dynamic-page]").invoke("prop", "headerSnapped", true);

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-title-header-wrapper [ui5-dynamic-page-header-actions]")
.should("exist");

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("not.exist");
});

it("renders header actions inside the sticky wrapper when pinned", () => {
cy.mount(
<DynamicPage style={{ height: "600px" }}>
<DynamicPageTitle slot="titleArea">
<div slot="heading">Page Title</div>
</DynamicPageTitle>
<DynamicPageHeader slot="headerArea">
<div>Header Content</div>
</DynamicPageHeader>
<div style={{ height: "1000px" }}>content</div>
</DynamicPage>
);

cy.get("[ui5-dynamic-page]").invoke("prop", "headerPinned", true);

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-title-header-wrapper [ui5-dynamic-page-header-actions]")
.should("exist");

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("not.exist");
});

it("moves header actions back inside the sticky wrapper when snapping after being expanded", () => {
cy.mount(
<DynamicPage style={{ height: "600px" }}>
<DynamicPageTitle slot="titleArea">
<div slot="heading">Page Title</div>
</DynamicPageTitle>
<DynamicPageHeader slot="headerArea">
<div>Header Content</div>
</DynamicPageHeader>
<div style={{ height: "1000px" }}>content</div>
</DynamicPage>
);

// Expanded: actions outside the sticky wrapper
cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("exist");

// Snap the header
cy.get("[ui5-dynamic-page]").invoke("prop", "headerSnapped", true);

// Snapped: actions move inside the sticky wrapper
cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-title-header-wrapper [ui5-dynamic-page-header-actions]")
.should("exist");

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("not.exist");

// Expand again: actions return outside the sticky wrapper
cy.get("[ui5-dynamic-page]").invoke("prop", "headerSnapped", false);

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-scroll-container > [ui5-dynamic-page-header-actions]")
.should("exist");

cy.get("[ui5-dynamic-page]")
.shadow()
.find(".ui5-dynamic-page-title-header-wrapper [ui5-dynamic-page-header-actions]")
.should("not.exist");
});
});

describe("ARIA attributes", () => {
it("sets expanded state attributes", () => {
cy.mount(
Expand Down
4 changes: 4 additions & 0 deletions packages/fiori/src/DynamicPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,10 @@ class DynamicPage extends UI5Element {
return !this.showHeaderInStickArea && !this.headerInTitle && !this.hasSnappedTitleOnMobile;
}

get headerActionsAfterHeader(): boolean {
return this.headerInContent && !this._headerSnapped;
}

get _headerLabel() {
return this._headerSnapped
? DynamicPage.i18nBundle.getText(DYNAMIC_PAGE_ARIA_LABEL_SNAPPED_HEADER)
Expand Down
5 changes: 2 additions & 3 deletions packages/fiori/src/DynamicPageTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function DynamicPageTemplate(this: DynamicPage) {
name="headerArea"
></slot>
}
{this.actionsInTitle && headerActions.call(this)}
{!this.headerActionsAfterHeader && headerActions.call(this)}
</div>

{this.headerInContent &&
Expand All @@ -30,8 +30,7 @@ export default function DynamicPageTemplate(this: DynamicPage) {
name="headerArea"
></slot>
}

{!this.actionsInTitle && headerActions.call(this)}
{this.headerActionsAfterHeader && headerActions.call(this)}

<div
part="content"
Expand Down
Loading