@instructure/ui-a11y-utils 8.12.0 → 8.12.1-snapshot.15

package/src/KeyboardFocusRegion.ts

@@ -41,71 +41,65 @@ import { logError as error } from '@instructure/console'
 import keycode from 'keycode'
 
 import { scopeTab } from './scopeTab'
+import type { UIElement } from '@instructure/shared-types'
+import { FocusRegionOptions } from './FocusRegionOptions'
 
 class KeyboardFocusRegion {
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'element' implicitly has an 'any' type.
-  constructor(element, options) {
-    this._contextElement = findDOMNode(element)
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
+  private readonly _options: FocusRegionOptions
+  private _focusLaterElement: Element | null = null
+  private _needToFocus = false
+  private _listeners: ReturnType<typeof addEventListener>[] = []
+  private _raf: RequestAnimationFrameType[] = []
+  private _active = false
+  private _wasDocumentClick?: boolean
+  public _contextElement?: Node
+
+  constructor(element: UIElement, options: FocusRegionOptions) {
+    this._contextElement = findDOMNode(element) as Node
     this._options = options || {
       shouldContainFocus: true,
       shouldReturnFocus: true,
-      // @ts-expect-error ts-migrate(6133) FIXME: 'event' is declared but its value is never read.
-      onBlur: (event) => {},
-      // @ts-expect-error ts-migrate(6133) FIXME: 'event' is declared but its value is never read.
-      onDismiss: (event) => {},
       defaultFocusElement: null
     }
-
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
     if (this._options.shouldReturnFocus) {
-      this._focusLaterElement = this.activeElement
+      this._focusLaterElement = getActiveElement(this.doc)
     }
   }
 
-  public _contextElement: null | undefined | Node | Window = null
-  _focusLaterElement: Element | null = null
-  _needToFocus = false
-  _listeners = []
-  _raf: RequestAnimationFrameType[] = []
-  _active = false
-
   get focused() {
     return containsActiveElement(this._contextElement)
   }
 
   get shouldContainFocus() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
     const { shouldContainFocus } = this._options
     return (
       shouldContainFocus === true ||
       (Array.isArray(shouldContainFocus) &&
-        // @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-        shouldContainFocus.includes['keyboard'])
+        shouldContainFocus.includes('keyboard'))
     )
   }
 
-  get focusable() {
+  get focusable(): Element[] {
     return findFocusable(this._contextElement, () => true, true) || []
   }
 
-  get tabbable() {
+  get tabbable(): Element[] {
     return findTabbable(this._contextElement) || []
   }
 
-  get firstTabbable() {
+  get firstTabbable(): Element | undefined {
     return this.tabbable[0]
   }
 
-  get lastTabbable() {
+  get lastTabbable(): Element | undefined {
     return this.tabbable.pop()
   }
 
-  get firstFocusable() {
+  get firstFocusable(): Element | undefined {
     return this.focusable[0]
   }
 
-  get lastFocusable() {
+  get lastFocusable(): Element | undefined {
     return this.focusable.pop()
   }
 
@@ -117,65 +111,50 @@ class KeyboardFocusRegion {
     return ownerWindow(this._contextElement)
   }
 
-  get activeElement() {
-    return getActiveElement(this.doc)
-  }
-
-  get defaultFocusElement(): any {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
+  get defaultFocusElement() {
     const { defaultFocusElement } = this._options
-
-    const element = findDOMNode(
+    const element: Node | undefined = findDOMNode(
       typeof defaultFocusElement === 'function'
         ? defaultFocusElement()
         : defaultFocusElement
-    )
-
+    ) as Node
     if (
       element &&
       this._contextElement &&
-      // @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
       this._contextElement.contains(element)
     ) {
       return element
     }
-
-    const { firstTabbable } = this
-    if (firstTabbable) {
-      return firstTabbable
+    if (this.firstTabbable) {
+      return this.firstTabbable
     }
-
     if (
       this._contextElement &&
       this.focusable.includes(this._contextElement as Element)
     ) {
       return this._contextElement
     }
-
     return null
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'element' implicitly has an 'any' type.
-  updateElement(element) {
-    this._contextElement = findDOMNode(element)
+  updateElement(element: UIElement) {
+    this._contextElement = findDOMNode(element) as Node
   }
 
   focusDefaultElement() {
-    const { defaultFocusElement, shouldContainFocus, activeElement } = this
-
-    if (defaultFocusElement) {
-      defaultFocusElement.focus()
+    if (this.defaultFocusElement) {
+      ;(this.defaultFocusElement as HTMLElement).focus()
     } else {
-      if (shouldContainFocus) {
+      if (this.shouldContainFocus) {
         // Blur the active element to place focus on the document body
-        activeElement && (activeElement as HTMLElement).blur()
-
+        getActiveElement(this.doc) &&
+          (getActiveElement(this.doc) as HTMLElement).blur()
         error(
           true,
           `
-          [KeyboardFocusRegion] No \`defaultFocusElement\` was provided and \`shouldContainFocus\`
-          was set to \`true\`. Focus has been moved to the document body instead.
-          `
+          [KeyboardFocusRegion] No \`defaultFocusElement\` was provided and
+          \`shouldContainFocus\` was set to \`true\` or \`keyboard\`. Focus has
+          been moved to the document body instead.`
         )
       }
     }
@@ -194,12 +173,10 @@ class KeyboardFocusRegion {
   }
 
   blur() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
     if (this._options.shouldReturnFocus && this._focusLaterElement) {
       try {
-        // @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
-        this._focusLaterElement.focus()
-      } catch (e: any) {
+        ;(this._focusLaterElement as HTMLElement).focus()
+      } catch (e: unknown) {
         error(
           false,
           `
@@ -212,46 +189,31 @@ class KeyboardFocusRegion {
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
-  handleDismiss = (event) => {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
-    this._options.onDismiss(event)
-  }
-
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
-  handleKeyDown = (event) => {
+  handleKeyDown = (event: KeyboardEvent) => {
     if (event.keyCode === keycode.codes.tab) {
-      // @ts-expect-error ts-migrate(2554) FIXME: Expected 3 arguments, but got 2.
       scopeTab(this._contextElement, event)
     }
   }
 
-  // @ts-expect-error ts-migrate(6133) FIXME: 'event' is declared but its value is never read.
-  handleClick = (event) => {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_wasDocumentClick' does not exist on typ... Remove this comment to see the full error message
+  handleClick = () => {
     this._wasDocumentClick = true
   }
 
-  // @ts-expect-error ts-migrate(6133) FIXME: 'event' is declared but its value is never read.
-  handleWindowBlur = (event) => {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_wasDocumentClick' does not exist on typ... Remove this comment to see the full error message
+  handleWindowBlur = () => {
     if (this._wasDocumentClick) {
-      // @ts-expect-error ts-migrate(2339) FIXME: Property '_wasDocumentClick' does not exist on typ... Remove this comment to see the full error message
       this._wasDocumentClick = false
       return
     }
     this._needToFocus = true
   }
 
-  // @ts-expect-error ts-migrate(6133) FIXME: 'event' is declared but its value is never read.
-  handleFocus = (event) => {
+  handleFocus = () => {
     if (this._needToFocus) {
       this._needToFocus = false
 
       if (!this._contextElement) {
         return
       }
-
       // need to see how jQuery shims document.on('focusin') so we don't need the
       // setTimeout, firefox doesn't support focusin, if it did, we could focus
       // the element outside of a setTimeout. Side-effect of this implementation
@@ -268,62 +230,55 @@ class KeyboardFocusRegion {
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
-  handleFirstTabbableKeyDown = (event) => {
+  handleFirstTabbableKeyDown = (event: KeyboardEvent) => {
     if (event.keyCode === keycode.codes.tab && event.shiftKey) {
-      // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
-      this._options.onBlur(event)
+      this._options.onBlur?.(event)
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
-  handleLastTabbableKeyDown = (event) => {
+  handleLastTabbableKeyDown = (event: KeyboardEvent) => {
     if (event.keyCode === keycode.codes.tab && !event.shiftKey) {
-      // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Keyboa... Remove this comment to see the full error message
-      this._options.onBlur(event)
+      this._options.onBlur?.(event)
     }
   }
 
   activate() {
     const { defaultFocusElement, shouldContainFocus } = this
-
     if (!this._active) {
       if (defaultFocusElement || shouldContainFocus) {
         if (shouldContainFocus) {
           this._listeners.push(
-            // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
-            addEventListener(this.doc, 'keydown', this.handleKeyDown)
+            addEventListener(
+              this.doc,
+              'keydown',
+              this.handleKeyDown as EventListener
+            )
           )
         } else {
           this._listeners.push(
-            // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
             addEventListener(
-              this.firstTabbable || defaultFocusElement,
+              this.firstTabbable || defaultFocusElement!,
               'keydown',
-              this.handleFirstTabbableKeyDown
+              this.handleFirstTabbableKeyDown as EventListener
             )
           )
           this._listeners.push(
-            // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
             addEventListener(
-              this.lastTabbable || defaultFocusElement,
+              this.lastTabbable || defaultFocusElement!,
               'keydown',
-              this.handleLastTabbableKeyDown
+              this.handleLastTabbableKeyDown as EventListener
             )
           )
         }
 
         this._listeners.push(
-          // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
           addEventListener(this.doc, 'click', this.handleClick, true)
         )
 
         this._listeners.push(
-          // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
-          addEventListener(this.win, 'blur', this.handleWindowBlur, false)
+          addEventListener(this.win!, 'blur', this.handleWindowBlur, false)
         )
         this._listeners.push(
-          // @ts-expect-error ts-migrate(2345) FIXME: Argument of type '{ remove(): void; }' is not assi... Remove this comment to see the full error message
           addEventListener(this.doc, 'focus', this.handleFocus, true)
         )
 
@@ -335,17 +290,11 @@ class KeyboardFocusRegion {
   deactivate() {
     if (this._active) {
       this._listeners.forEach((listener) => {
-        // @ts-expect-error ts-migrate(2339) FIXME: Property 'remove' does not exist on type 'never'.
         listener.remove()
       })
       this._listeners = []
-
       this._raf.forEach((request) => request.cancel())
       this._raf = []
-
-      // @ts-expect-error ts-migrate(2339) FIXME: Property '_preventCloseOnDocumentClick' does not e... Remove this comment to see the full error message
-      this._preventCloseOnDocumentClick = false
-
       this._active = false
     }
   }
@@ -357,11 +306,12 @@ export {
    * ---
    * category: utilities/a11y
    * ---
-   * @module KeyboardFocusRegion
+   *
    * Class for focus operations.
    * - Scoping focus within a given context (DOM node),
    * - Mark active element for focus later
    * - Return focus to the marked element
+   * @module KeyboardFocusRegion
    */
   KeyboardFocusRegion
 }

package/src/ScreenReaderFocusRegion.ts

@@ -23,42 +23,38 @@
  */
 
 import { logWarn as warn } from '@instructure/console'
+import { FocusRegionOptions } from './FocusRegionOptions'
 
 class ScreenReaderFocusRegion {
+  private _parents: HTMLElement[] = []
+  private _nodes: Element[] = []
+  private _liveRegion: (Element | undefined)[]
+  private _contextElement?: Element | Node
+  private _options: FocusRegionOptions
+  private _observer: MutationObserver | null = null
+  private _attributes: [Element, string, string][] = []
+
   constructor(
-    // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'element' implicitly has an 'any' type.
-    element,
-    options = {
+    element: Element | Node,
+    options: FocusRegionOptions = {
       shouldContainFocus: true,
       liveRegion: []
     }
   ) {
     const liveRegion =
       typeof options.liveRegion === 'function'
-        ? // @ts-expect-error ts-migrate(2349) FIXME: This expression is not callable.
-          options.liveRegion()
+        ? options.liveRegion()
         : options.liveRegion
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_liveRegion' does not exist on type 'Scr... Remove this comment to see the full error message
     this._liveRegion = Array.isArray(liveRegion) ? liveRegion : [liveRegion]
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_contextElement' does not exist on type ... Remove this comment to see the full error message
     this._contextElement = element
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Screen... Remove this comment to see the full error message
     this._options = options
   }
 
-  _observer = null
-  _attributes = []
-  _nodes = []
-  _parents = []
-
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'element' implicitly has an 'any' type.
-  updateElement(element) {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_contextElement' does not exist on type ... Remove this comment to see the full error message
+  updateElement(element: Element | Node) {
     this._contextElement = element
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'node' implicitly has an 'any' type.
-  muteNode(node) {
+  muteNode(node: Element) {
     if (node && node.tagName.toLowerCase() !== 'script') {
       // When we are trapping screen reader focus on an element that
       // is deep inside the DOM, we can't apply aria-hidden to the
@@ -74,20 +70,15 @@ class ScreenReaderFocusRegion {
         const value = node.getAttribute(attribute)
 
         if (value !== null) {
-          // @ts-expect-error ts-migrate(2322) FIXME: Type 'any' is not assignable to type 'never'.
           this._attributes.push([node, attribute, value])
           node.removeAttribute(attribute)
         }
       })
-
-      // @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
-      this._observer.observe(node, { childList: true })
+      this._observer!.observe(node, { childList: true })
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'nodes' implicitly has an 'any' type.
-  hideNodes(nodes) {
-    // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'node' implicitly has an 'any' type.
+  hideNodes(nodes: Element[]) {
     nodes.forEach((node) => {
       const ariaLive =
         typeof node.getAttribute === 'function' &&
@@ -98,21 +89,16 @@ class ScreenReaderFocusRegion {
         node.tagName.toLowerCase() !== 'script' &&
         ariaLive !== 'assertive' &&
         ariaLive !== 'polite' &&
-        // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'any' is not assignable to parame... Remove this comment to see the full error message
-        this._parents.indexOf(node) === -1 &&
-        // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'any' is not assignable to parame... Remove this comment to see the full error message
+        this._parents.indexOf(node as HTMLElement) === -1 &&
         this._nodes.indexOf(node) === -1 &&
-        // @ts-expect-error ts-migrate(2339) FIXME: Property '_liveRegion' does not exist on type 'Scr... Remove this comment to see the full error message
         this._liveRegion.indexOf(node) === -1 &&
-        // @ts-expect-error ts-migrate(2339) FIXME: Property '_contextElement' does not exist on type ... Remove this comment to see the full error message
-        !this._contextElement.contains(node)
+        !this._contextElement!.contains(node)
       ) {
         if (node.tagName.toLowerCase() !== 'iframe') {
           this.hideNode(node)
         }
 
         const iframeBodies = this.parseIframeBodies(node)
-
         iframeBodies.forEach((iframeBody) => {
           this.hideNode(iframeBody)
         })
@@ -120,32 +106,26 @@ class ScreenReaderFocusRegion {
     })
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'node' implicitly has an 'any' type.
-  hideNode(node) {
+  hideNode(node: Element) {
     if (node.getAttribute('aria-hidden') !== 'true') {
       node.setAttribute('aria-hidden', 'true')
-      // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'any' is not assignable to parame... Remove this comment to see the full error message
       this._nodes.push(node)
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'records' implicitly has an 'any' type.
-  handleDOMMutation = (records) => {
-    // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'record' implicitly has an 'any' type.
+  handleDOMMutation = (records: MutationRecord[]) => {
     records.forEach((record) => {
-      const addedNodes = Array.from(record.addedNodes)
-      const removedNodes = Array.from(record.removedNodes)
+      const addedNodes = Array.from(record.addedNodes) as Element[]
+      const removedNodes = Array.from(record.removedNodes) as Element[]
 
       this.hideNodes(addedNodes)
 
       removedNodes.forEach((removedNode) => {
         // Node has been removed from the DOM, make sure it is
         // removed from our list of hidden nodes as well
-        // @ts-expect-error ts-migrate(2571) FIXME: Object is of type 'unknown'.
         if (removedNode.tagName.toLowerCase() !== 'iframe') {
           this.restoreNode(removedNode)
         }
-
         const iframeBodies = this.parseIframeBodies(removedNode)
         iframeBodies.forEach((iframeBody) => {
           this.restoreNode(iframeBody)
@@ -154,9 +134,7 @@ class ScreenReaderFocusRegion {
     })
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'removedNode' implicitly has an 'any' ty... Remove this comment to see the full error message
-  restoreNode(removedNode) {
-    // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'any' is not assignable to parame... Remove this comment to see the full error message
+  restoreNode(removedNode: Element) {
     const index = this._nodes.indexOf(removedNode)
 
     if (index >= 0) {
@@ -165,26 +143,22 @@ class ScreenReaderFocusRegion {
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'node' implicitly has an 'any' type.
-  parseIframeBodies(node) {
+  parseIframeBodies(node: Element): HTMLElement[] {
     if (!node) return []
-
-    let iframes = []
-
+    let iframes: HTMLIFrameElement[] = []
     if (node.tagName.toLowerCase() === 'iframe') {
-      iframes.push(node)
+      iframes.push(node as HTMLIFrameElement)
     } else {
       if (node.getElementsByTagName) {
         iframes = Array.from(node.getElementsByTagName('iframe'))
       }
     }
-
     return iframes
       .map((iframe) => {
         let body = null
         try {
-          body = iframe.contentDocument.body
-        } catch (e: any) {
+          body = iframe.contentDocument!.body
+        } catch (e: unknown) {
           warn(
             false,
             `[ui-a11y] could not find a document for iframe: ${e} ${iframe}`
@@ -192,60 +166,43 @@ class ScreenReaderFocusRegion {
         }
         return body
       })
-      .filter((body) => body !== null)
+      .filter((body) => body !== null) as HTMLElement[]
   }
 
   activate() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_options' does not exist on type 'Screen... Remove this comment to see the full error message
     if (!this._options.shouldContainFocus) {
       return
     }
-
-    // @ts-expect-error ts-migrate(2322) FIXME: Type 'MutationObserver' is not assignable to type ... Remove this comment to see the full error message
     this._observer = new MutationObserver(this.handleDOMMutation)
-
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_contextElement' does not exist on type ... Remove this comment to see the full error message
     let node = this._contextElement
-
     while (
       node &&
-      node.nodeType === 1 &&
-      node.tagName.toLowerCase() !== 'body'
+      node.nodeType === Node.ELEMENT_NODE &&
+      (node as Element).tagName.toLowerCase() !== 'body'
     ) {
-      const parent = node.parentElement // can be null
-
+      const parent = node.parentElement
       if (parent) {
-        // @ts-expect-error ts-migrate(2345) FIXME: Argument of type 'any' is not assignable to parame... Remove this comment to see the full error message
         this._parents.push(parent)
-
         this.muteNode(parent)
-
         this.hideNodes(Array.prototype.slice.call(parent.childNodes))
       }
-
-      node = node.parentNode // should never be null, will default to doc element
+      node = node.parentNode as Element // should never be null, will default to doc element
     }
   }
 
   deactivate() {
     if (this._observer) {
-      // @ts-expect-error ts-migrate(2531) FIXME: Object is possibly 'null'.
       this._observer.disconnect()
       this._observer = null
     }
-
     this._nodes.forEach((node) => {
-      // @ts-expect-error ts-migrate(2339) FIXME: Property 'removeAttribute' does not exist on type ... Remove this comment to see the full error message
       node.removeAttribute('aria-hidden')
     })
     this._nodes = []
-
     this._attributes.forEach((attribute) => {
-      // @ts-expect-error ts-migrate(2339) FIXME: Property 'setAttribute' does not exist on type 'ne... Remove this comment to see the full error message
       attribute[0].setAttribute(attribute[1], attribute[2] || '')
     })
     this._attributes = []
-
     this._parents = []
   }
 }
@@ -256,10 +213,11 @@ export {
    * ---
    * category: utilities/a11y
    * ---
-   * @module ScreenReaderFocusRegion
+   *
    * Utility that hides all DOM elements outside of a specified node. Used,
    * for example, in overlay components where we want to restrict the screen
-   * readers to the overlay content
+   * readers to the overlay content.
+   * @module ScreenReaderFocusRegion
    */
   ScreenReaderFocusRegion
 }

package/src/hasVisibleChildren.ts

@@ -22,21 +22,18 @@
  * SOFTWARE.
  */
 
-import React from 'react'
+import React, { ReactNode } from 'react'
 import { matchComponentTypes } from '@instructure/ui-react-utils'
 
 import { ScreenReaderContent } from '@instructure/ui-a11y-content'
 
-// @ts-expect-error ts-migrate(7006) FIXME: Parameter 'children' implicitly has an 'any' type.
-function hasVisibleChildren(children) {
+function hasVisibleChildren(children: ReactNode) {
   let visible = false
-
   React.Children.forEach(children, (child) => {
     if (child && !matchComponentTypes(child, [ScreenReaderContent])) {
       visible = true
     }
   })
-
   return visible
 }
 

package/src/index.ts

@@ -28,3 +28,4 @@ export { hasVisibleChildren } from './hasVisibleChildren'
 export { KeyboardFocusRegion } from './KeyboardFocusRegion'
 export { scopeTab } from './scopeTab'
 export { ScreenReaderFocusRegion } from './ScreenReaderFocusRegion'
+export type { FocusRegionOptions } from './FocusRegionOptions'

package/src/scopeTab.ts

@@ -29,9 +29,13 @@ import {
   containsActiveElement,
   getActiveElement
 } from '@instructure/ui-dom-utils'
+import type { UIElement } from '@instructure/shared-types'
 
-// @ts-expect-error ts-migrate(7006) FIXME: Parameter 'element' implicitly has an 'any' type.
-function scopeTab(element, event, onLeavingFinalTabbable) {
+function scopeTab(
+  element: UIElement | undefined,
+  event: KeyboardEvent,
+  onLeavingFinalTabbable?: () => void
+) {
   const node = findDOMNode(element)
   const tabbable = findTabbable(node)
 
@@ -66,8 +70,7 @@ function scopeTab(element, event, onLeavingFinalTabbable) {
 
   event.preventDefault()
   const target = tabbable[event.shiftKey ? tabbable.length - 1 : 0]
-  // @ts-expect-error ts-migrate(2571) FIXME: Object is of type 'unknown'.
-  target.focus()
+  ;(target as HTMLElement).focus()
 }
 
 export default scopeTab