Skip to content

chore(ui5-user-settings-dialog): skipping groups with F6 is now correct #13310

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

Merged
SvilenDarvenyashki merged 5 commits into from
Mar 31, 2026
Merged

chore(ui5-user-settings-dialog): skipping groups with F6 is now correct #13310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41d5fed
chore(ui5-user-settings-dialog): Group skipping is not correct
SvilenDarvenyashki Mar 20, 2026
5291700
chore(ui5-user-settings-dialog): group skipping with F6 is now correct
SvilenDarvenyashki Mar 27, 2026
40d0f46
chore(user-settings-dialog): tests issue fixed
SvilenDarvenyashki Mar 30, 2026
ac83fc1
chore(user-settings-dialog): adds tests for F6
SvilenDarvenyashki Mar 30, 2026
a524384
Merge branch 'main' into user-settings
SvilenDarvenyashki Mar 30, 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
155 changes: 155 additions & 0 deletions packages/fiori/cypress/specs/UserSettingsDialog.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "@ui5/webcomponents-base/dist/features/F6Navigation.js";
import UserSettingsItem from "../../src/UserSettingsItem.js";
import UserSettingsView from "../../src/UserSettingsView.js";
import UserSettingsAccountView from "../../src/UserSettingsAccountView.js";
Expand Down Expand Up @@ -1340,3 +1341,157 @@ describe("Appearance view", () => {
cy.get("@list").should("have.class", "user-settings-appearance-view-list");
});
});

describe("F6 Navigation", () => {
it("tests host has fastnavgroup-container attribute", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]")
.should("have.attr", "data-sap-ui-fastnavgroup-container", "true");
});

it("tests side panel has fastnavgroup attribute", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").shadow()
.find(".ui5-user-settings-side")
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
});

it("tests footer toolbar has fastnavgroup attribute", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-toolbar]")
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
});

it("tests lists have fastnavgroup false", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-list]")
.each($list => {
cy.wrap($list).should("have.attr", "data-sap-ui-fastnavgroup", "false");
});
});

it("tests selected item has fastnavgroup attribute", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").find("[ui5-user-settings-item]")
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
});

it("tests non-selected items do not have fastnavgroup attribute", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting 1" selected>
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
<UserSettingsItem text="Setting 2">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").find("[ui5-user-settings-item]").first()
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
cy.get("[ui5-user-settings-dialog]").find("[ui5-user-settings-item]").last()
.should("not.have.attr", "data-sap-ui-fastnavgroup");
});

it("tests fastnavgroup moves to newly selected item", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting 1" selected>
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
<UserSettingsItem text="Setting 2">
<UserSettingsView>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);
cy.get("[ui5-user-settings-dialog]").as("settings");
cy.get("@settings").find("[ui5-user-settings-item]").first()
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
cy.get("@settings").find("[ui5-user-settings-item]").last()
.should("not.have.attr", "data-sap-ui-fastnavgroup");

cy.get("@settings").shadow()
.find("[ui5-list]")
.find("[ui5-li]").last()
.click();

cy.get("@settings").find("[ui5-user-settings-item]").first()
.should("not.have.attr", "data-sap-ui-fastnavgroup");
cy.get("@settings").find("[ui5-user-settings-item]").last()
.should("have.attr", "data-sap-ui-fastnavgroup", "true");
});

it("F6 navigation", () => {
cy.mount(<UserSettingsDialog open>
<UserSettingsItem text="Setting" selected>
<UserSettingsView>
<Button id="content-btn">Content</Button>
</UserSettingsView>
</UserSettingsItem>
</UserSettingsDialog>);

// Initial focus: side panel (first list item)
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-li]").first()
.should("be.focused");

// F6: side → content
cy.realPress("F6");
cy.get("#content-btn").should("be.focused");

// F6: content → footer (Close button)
cy.realPress("F6");
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-toolbar-button]")
.should("be.focused");

// F6: footer → side (wraps, focus stays inside dialog)
cy.realPress("F6");
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-li]").first()
.should("be.focused");

// Shift+F6: side → footer (wraps backward)
cy.realPress(["Shift", "F6"]);
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-toolbar-button]")
.should("be.focused");

// Shift+F6: footer → content
cy.realPress(["Shift", "F6"]);
cy.get("#content-btn").should("be.focused");

// Shift+F6: content → side (back to starting point)
cy.realPress(["Shift", "F6"]);
cy.get("[ui5-user-settings-dialog]").shadow()
.find("[ui5-li]").first()
.should("be.focused");
});
});
2 changes: 1 addition & 1 deletion packages/fiori/src/UserSettingsAppearanceViewTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function UserSettingsAppearanceViewTemplate(this: UserSettingsApp
<div class="ui5-user-settings-view-container">
<div class="ui5-user-settings-view">
<slot name="additionalContent"></slot>
<List class="user-settings-appearance-view-list" onItemClick={this._handleItemClick} >
<List class="user-settings-appearance-view-list" onItemClick={this._handleItemClick} data-sap-ui-fastnavgroup="false">
{this.text && <Title slot="header" level="H3" class="user-settings-appearance-view-list-header">{this.text}</Title>}
<slot></slot>
</List>
Expand Down
13 changes: 13 additions & 0 deletions packages/fiori/src/UserSettingsDialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ class UserSettingsDialog extends UI5Element {
@property({ type: String })
_mediaRange?: any;

onEnterDOM() {
this.setAttribute("data-sap-ui-fastnavgroup-container", "true");
}

onBeforeRendering() {
this._mediaRange = MediaRange.getCurrentRange(MediaRange.RANGESETS.RANGE_4STEPS);
const searchValue = this._searchValue.toLowerCase();
Expand Down Expand Up @@ -229,6 +233,15 @@ class UserSettingsDialog extends UI5Element {
if (!this._selectedSetting) {
this._selectedSetting = this.items[0] || this.fixedItems[0];
}

const allItems = [...this.items, ...this.fixedItems];
allItems.forEach(item => {
if (item === this._selectedSetting) {
item.setAttribute("data-sap-ui-fastnavgroup", "true");
} else {
item.removeAttribute("data-sap-ui-fastnavgroup");
}
});
}

_handleItemClick(e: CustomEvent<ListItemClickEventDetail>) {
Expand Down
6 changes: 3 additions & 3 deletions packages/fiori/src/UserSettingsDialogTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function UserSettingsDialogTemplate(this: UserSettingsDialog) {
initialFocus={`setting-${this._selectedSetting?._id}`}
>
<div class="ui5-user-settings-root">
<div class="ui5-user-settings-side" aria-orientation="vertical" aria-roledescription={this.ariaRoleDescList}>
<div class="ui5-user-settings-side" data-sap-ui-fastnavgroup="true" aria-orientation="vertical" aria-roledescription={this.ariaRoleDescList}>
<div class="ui5-user-settings-side-header">
{this.headerText &&
<Title level="H1" size="H4">{this.headerText}</Title>
Expand All @@ -52,15 +52,15 @@ export default function UserSettingsDialogTemplate(this: UserSettingsDialog) {
</div>
</div>

<Toolbar slot="footer" design="Transparent">
<Toolbar slot="footer" design="Transparent" data-sap-ui-fastnavgroup="true">
<ToolbarButton design="Transparent" text={this.closeButtonText} tooltip={this.closeButtonText} onClick={this._handleCloseButtonClick} />
</Toolbar>
</Dialog>
);
}

function renderList(this: UserSettingsDialog, items: Array<UserSettingsItem> = [], classes: string) {
return <List accessibleRole="Menu" onItemClick={this._handleItemClick} class={classes} separators="None">
return <List accessibleRole="Menu" onItemClick={this._handleItemClick} class={classes} separators="None" data-sap-ui-fastnavgroup="false">
{items.map(item => (
<ListItemStandard
class={!item._icon && item._siblingsWithIcon ? "ui5-user-settings-item-no-icon" : ""}
Expand Down
Loading