From 966f5236cd8e720ead5d6dc5131eac8c9fcdaab6 Mon Sep 17 00:00:00 2001
From: William Martin <contact@willmartian.com>
Date: Tue, 27 May 2025 22:08:56 -0400
Subject: [PATCH] only focus FocusableElement or host element

---
 libs/components/src/a11y/a11y-cell.directive.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/libs/components/src/a11y/a11y-cell.directive.ts b/libs/components/src/a11y/a11y-cell.directive.ts
index 1a89bd5fb62..926d3388bf9 100644
--- a/libs/components/src/a11y/a11y-cell.directive.ts
+++ b/libs/components/src/a11y/a11y-cell.directive.ts
@@ -14,19 +14,7 @@ export class A11yCellDirective implements FocusableElement {
   private focusableChild = contentChild(FocusableElement);
 
   getFocusTarget() {
-    let focusTarget: HTMLElement | undefined | null;
-    const focusableChild = this.focusableChild();
-    if (focusableChild) {
-      focusTarget = focusableChild.getFocusTarget();
-    } else {
-      focusTarget = this.elementRef.nativeElement.querySelector<HTMLElement>("button, a");
-    }
-
-    if (!focusTarget) {
-      return this.elementRef.nativeElement;
-    }
-
-    return focusTarget;
+    return this.focusableChild()?.getFocusTarget() ?? this.elementRef.nativeElement;
   }
 
   constructor(private elementRef: ElementRef<HTMLElement>) {}