Skip to content

fix(f6navigation): backward navigation in N level nesting #12279

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
merged 2 commits into from
Sep 10, 2025
Merged

fix(f6navigation): backward navigation in N level nesting #12279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b88a69
fix(f6navigation): backward navigation in N level nesting
nnaydenow Sep 9, 2025
81a464c
Merge branch 'main' into f6-nested
nnaydenow Sep 10, 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
16 changes: 13 additions & 3 deletions packages/base/src/features/F6Navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,20 @@ class F6Navigation {
// </ui5-list>
// </ui5-flexible-column-layout>
// Here for both FCL & List the firstFoccusableElement is the same (the ui5-li)
const firstFocusable = await this.groupElementToFocus(this.groups[currentIndex - 1]);
const shouldSkipParent = firstFocusable === await this.groupElementToFocus(this.groups[currentIndex]);
const currentGroupFocusable = await this.groupElementToFocus(this.groups[currentIndex]);
let distanceToNextGroup = 1;

currentIndex = shouldSkipParent ? currentIndex - 2 : currentIndex - 1;
for (let distanceIndex = 1; distanceIndex < this.groups.length; distanceIndex++) {
const firstFocusable = await this.groupElementToFocus(this.groups[currentIndex - distanceIndex]);

if (firstFocusable === currentGroupFocusable) {
distanceToNextGroup++;
} else {
break;
}
}

currentIndex -= distanceToNextGroup;

if (currentIndex < 0) {
currentIndex = this.groups.length - 1;
Expand Down
28 changes: 22 additions & 6 deletions packages/main/cypress/specs/F6.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,22 +256,30 @@ describe("F6 navigation", () => {
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="first">First focusable</Button>
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="first">First focusable</Button>
</div>
</div>
</div>
<div class="section">
<Button>Something focusable</Button>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="second">First focusable</Button>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="second">Second focusable</Button>
</div>
</div>
</div>
</div>
</div>
<div class="section">
<Button>Something focusable</Button>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="third">Second focusable</Button>
<Button id="third">Third focusable</Button>
</div>
<div class="section">
<Button>After Element</Button>
Expand Down Expand Up @@ -670,22 +678,30 @@ describe("F6 navigation", () => {
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="first">First focusable</Button>
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="first">First focusable</Button>
</div>
</div>
</div>
<div class="section">
<Button>Something focusable</Button>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="second">First focusable</Button>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="second">Second focusable</Button>
</div>
</div>
</div>
</div>
</div>
<div class="section">
<Button>Something focusable</Button>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<Button id="third">Second focusable</Button>
<Button id="third">Third focusable</Button>
</div>
<div class="section">
<Button>After Element</Button>
Expand Down
52 changes: 52 additions & 0 deletions packages/main/test/pages/F6Test9.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">

<title>Avatar</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta charset="utf-8">


<script src="%VITE_BUNDLE_PATH%" type="module"></script>
<link rel="stylesheet" type="text/css" href="./styles/F6Test.css">
</head>

<body>
<div class="section">
<ui5-button id="before">Before element</ui5-button>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<ui5-button id="first">First focusable</ui5-utton>
</div>
</div>
</div>
<div class="section">
<ui5-button>Something focusable</ui5-utton>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<div class="section" data-sap-ui-fastnavgroup="true">
<ui5-button id="second">Second focusable</ui5-utton>
</div>
</div>
</div>
</div>
</div>
<div class="section">
<ui5-button>Something focusable</ui5-utton>
</div>
<div class="section" data-sap-ui-fastnavgroup="true">
<ui5-button id="third">Third focusable</ui5-utton>
</div>
<div class="section">
<ui5-button>After Element</ui5-utton>
</div>
</body>

</html>
Loading