Simply focusable element type

WordPress · Feb 1, 2023 · 52cbdd9 · 52cbdd9
1 parent 34a29ff
commit 52cbdd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/components/src/tree-grid/index.tsx b/packages/components/src/tree-grid/index.tsx
@@ -12,10 +12,6 @@ import RovingTabIndexContainer from './roving-tab-index';
 import type { TreeGridProps } from './types';
 import type { WordPressComponentProps } from '../ui/context';
 
-type FocusableElement = Element & {
-	focus: ( options?: { preventScroll?: boolean } ) => void;
-};
-
 /**
  * Return focusables in a row element, excluding those from other branches
  * nested within the row.
@@ -27,7 +23,7 @@ type FocusableElement = Element & {
 function getRowFocusables( rowElement: Element ) {
 	const focusablesInRow = focus.focusable.find( rowElement, {
 		sequential: true,
-	} ) as FocusableElement[];
+	} );
 
 	return focusablesInRow.filter( ( focusable ) => {
 		return focusable.closest( '[role="row"]' ) === rowElement;
@@ -89,7 +85,7 @@ function UnforwardedTreeGrid(
 
 			const focusablesInRow = getRowFocusables( activeRow );
 			const currentColumnIndex = focusablesInRow.indexOf(
-				activeElement as FocusableElement
+				activeElement as HTMLElement
 			);
 			const canExpandCollapse = 0 === currentColumnIndex;
 			const cannotFocusNextColumn =

diff --git a/packages/dom/src/focusable.js b/packages/dom/src/focusable.js
@@ -95,7 +95,7 @@ function isValidFocusableArea( element ) {
  *                                       not sequentially focusable.
  *                                       https://html.spec.whatwg.org/multipage/interaction.html#the-tabindex-attribute
  *
- * @return {Element[]} Focusable elements.
+ * @return {HTMLElement[]} Focusable elements.
  */
 export function find( context, { sequential = false } = {} ) {
 	/* eslint-disable jsdoc/no-undefined-types */