chore: fix

taiga-family · Jul 17, 2024 · 2f209fc · 2f209fc
1 parent 6058236
commit 2f209fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/projects/core/directives/dropdown/dropdown-open.directive.ts b/projects/core/directives/dropdown/dropdown-open.directive.ts
@@ -188,8 +188,6 @@ export class TuiDropdownOpen implements OnChanges {
 
     private focusDropdown(previous: boolean): void {
         if (!this.dropdown) {
-            this.update(true);
-
             return;
         }
 

diff --git a/projects/demo-playwright/tests/core/data-list/data-list.spec.ts b/projects/demo-playwright/tests/core/data-list/data-list.spec.ts
@@ -37,7 +37,6 @@ test.describe('DataList', () => {
         await example.locator('button').click();
         await documentationPagePO.prepareBeforeScreenshot();
         await page.keyboard.down('ArrowDown');
-        await page.keyboard.down('ArrowDown');
         await page.waitForTimeout(100);
         await page.keyboard.down('Enter');
         await page.waitForTimeout(100);

diff --git a/projects/kit/directives/data-list-dropdown-manager/data-list-dropdown-manager.directive.ts b/projects/kit/directives/data-list-dropdown-manager/data-list-dropdown-manager.directive.ts
@@ -148,21 +148,10 @@ export class TuiDataListDropdownManager implements AfterViewInit {
     }
 
     private tryToFocus(index: number): void {
-        const content = this.dropdowns.get(index)?.dropdownBoxRef?.location.nativeElement;
+        const root = this.dropdowns.get(index)?.dropdownBoxRef?.location.nativeElement;
 
-        if (!content) {
-            return;
-        }
-
-        // First item is focus trap
-        const focusTrap = tuiGetClosestFocusable({initial: content, root: content});
-        const item = tuiGetClosestFocusable({
-            initial: focusTrap || content,
-            root: content,
-        });
-
-        if (item) {
-            item.focus();
+        if (root) {
+            tuiGetClosestFocusable({initial: root, root})?.focus();
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,8 +188,6 @@ export class TuiDropdownOpen implements OnChanges { @@
         private focusDropdown(previous: boolean): void {
             if (!this.dropdown) {
-                this.update(true);
                 return;
             }
@@ Expand Down @@