fix: convert modules to typescript (#609)

* fix: convert modules to typescript * fix: convert modules to typescript * test: istanbul ignore activeElement being null
testing-library · Mar 22, 2021 · 0fe1fec · 0fe1fec
1 parent 74d191c
commit 0fe1fec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/blur.js → src/blur.ts b/src/blur.js → src/blur.ts
@@ -1,6 +1,6 @@
 import {getActiveElement, isFocusable, eventWrapper} from './utils'
 
-function blur(element) {
+function blur(element: Element) {
   if (!isFocusable(element)) return
 
   const wasActive = getActiveElement(element.ownerDocument) === element

diff --git a/src/focus.js → src/focus.ts b/src/focus.js → src/focus.ts
@@ -1,6 +1,6 @@
 import {getActiveElement, isFocusable, eventWrapper} from './utils'
 
-function focus(element) {
+function focus(element: Element) {
   if (!isFocusable(element)) return
 
   const isAlreadyActive = getActiveElement(element.ownerDocument) === element

diff --git a/src/hover.js → src/hover.ts b/src/hover.js → src/hover.ts
@@ -2,19 +2,20 @@ import {fireEvent} from '@testing-library/dom'
 import {
   isLabelWithInternallyDisabledControl,
   getMouseEventOptions,
+  isDisabled,
 } from './utils'
 
 // includes `element`
-function getParentElements(element) {
+function getParentElements(element: Element) {
   const parentElements = [element]
-  let currentElement = element
+  let currentElement: Element | null = element
   while ((currentElement = currentElement.parentElement) != null) {
     parentElements.push(currentElement)
   }
   return parentElements
 }
 
-function hover(element, init) {
+function hover(element: Element, init?: MouseEventInit) {
   if (isLabelWithInternallyDisabledControl(element)) return
 
   const parentElements = getParentElements(element).reverse()
@@ -23,32 +24,32 @@ function hover(element, init) {
   for (const el of parentElements) {
     fireEvent.pointerEnter(el, init)
   }
-  if (!element.disabled) {
+  if (!isDisabled(element)) {
     fireEvent.mouseOver(element, getMouseEventOptions('mouseover', init))
     for (const el of parentElements) {
       fireEvent.mouseEnter(el, getMouseEventOptions('mouseenter', init))
     }
   }
   fireEvent.pointerMove(element, init)
-  if (!element.disabled) {
+  if (!isDisabled(element)) {
     fireEvent.mouseMove(element, getMouseEventOptions('mousemove', init))
   }
 }
 
-function unhover(element, init) {
+function unhover(element: Element, init?: MouseEventInit) {
   if (isLabelWithInternallyDisabledControl(element)) return
 
   const parentElements = getParentElements(element)
 
   fireEvent.pointerMove(element, init)
-  if (!element.disabled) {
+  if (!isDisabled(element)) {
     fireEvent.mouseMove(element, getMouseEventOptions('mousemove', init))
   }
   fireEvent.pointerOut(element, init)
   for (const el of parentElements) {
     fireEvent.pointerLeave(el, init)
   }
-  if (!element.disabled) {
+  if (!isDisabled(element)) {
     fireEvent.mouseOut(element, getMouseEventOptions('mouseout', init))
     for (const el of parentElements) {
       fireEvent.mouseLeave(el, getMouseEventOptions('mouseleave', init))

diff --git a/src/tab.ts b/src/tab.ts
@@ -143,7 +143,10 @@ function tab({shift = false, focusTrap}: tabOptions = {}) {
 
   if (continueToTab) {
     if (nextElement === document.body) {
-      blur(previousElement)
+      /* istanbul ignore else */
+      if (previousElement) {
+        blur(previousElement)
+      }
     } else {
       focus(nextElement)
     }