From ca72f09ca9b87f782f89dd4d4d7cf26b6bdc6c64 Mon Sep 17 00:00:00 2001
From: Guilherme Ventura <1488378+danguilherme@users.noreply.github.com>
Date: Wed, 25 Oct 2023 08:21:12 -0300
Subject: [PATCH] fix: traverse to next focusable widget (#28340)

## Description
Traverses all tabbable widget until a focusable widget is found, then
focuses it.

#### PR fixes following issue(s)
_Fixes #28341_

#### Media

<table>
<tr>
 <td><strong>Before
 <td><strong>After
<tr>
 <td>


https://github.com/appsmithorg/appsmith/assets/1488378/6cac6e01-a8ff-47cf-bf6b-b95e7c599128

 <td>


https://github.com/appsmithorg/appsmith/assets/1488378/db48f4d4-498f-4516-8d09-6303daea953a

</table>

#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)

## Testing
_I'm not sure how to test this..._

#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [ ] Manual
- [ ] JUnit
- [ ] Jest
- [ ] Cypress

#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
_I'm not sure what this is about..._

#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
_Same here..._

## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 .../src/utils/hooks/useWidgetFocus/handleTab.ts       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts b/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
index 9c4bc2a889..6478ae7c0e 100644
--- a/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
+++ b/app/client/src/utils/hooks/useWidgetFocus/handleTab.ts
@@ -31,7 +31,16 @@ export function handleTab(event: KeyboardEvent) {
     default:
       const tabbable = getTabbableDescendants(currentNode, shiftKey);
 
-      nextTabbableDescendant = getNextTabbableDescendant(tabbable, shiftKey);
+      let isNextWidgetElementFocusable = false;
+      do {
+        nextTabbableDescendant = getNextTabbableDescendant(tabbable, shiftKey);
+        if (nextTabbableDescendant) {
+          isNextWidgetElementFocusable = !!getFocussableElementOfWidget(
+            nextTabbableDescendant,
+          );
+        }
+        tabbable.shift();
+      } while (!isNextWidgetElementFocusable && tabbable.length > 0);
   }
 
   // if nextTabbableDescendant is found, focus