Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: convert modules to typescript #609

Merged
merged 3 commits into from Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
17 changes: 9 additions & 8 deletions src/hover.js → src/hover.ts
Expand Up @@ -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()
Expand All @@ -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))
Expand Down
5 changes: 4 additions & 1 deletion src/tab.ts
Expand Up @@ -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)
}
Expand Down