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

Support onMouseMove handler #80

Merged
merged 1 commit into from
Aug 2, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/@react-facet/dom-fiber/src/setupHostConfig.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ describe('mount', () => {
let onFocus: jest.Mock
let onBlur: jest.Mock
let onMouseDown: jest.Mock
let onMouseMove: jest.Mock
let onMouseUp: jest.Mock
let onTouchStart: jest.Mock
let onTouchMove: jest.Mock
Expand All @@ -741,6 +742,7 @@ describe('mount', () => {
onFocus = jest.fn()
onBlur = jest.fn()
onMouseDown = jest.fn()
onMouseMove = jest.fn()
onMouseUp = jest.fn()
onTouchStart = jest.fn()
onTouchMove = jest.fn()
Expand All @@ -758,6 +760,7 @@ describe('mount', () => {
onFocus={onFocus}
onBlur={onBlur}
onMouseDown={onMouseDown}
onMouseMove={onMouseMove}
onMouseUp={onMouseUp}
onTouchStart={onTouchStart}
onTouchMove={onTouchMove}
Expand Down Expand Up @@ -796,6 +799,11 @@ describe('mount', () => {
expect(onMouseDown).toHaveBeenCalled()
})

it('supports onMouseMove', () => {
div.dispatchEvent(new Event('mousemove'))
expect(onMouseMove).toHaveBeenCalled()
})

it('supports onMouseUp', () => {
div.dispatchEvent(new Event('mouseup'))
expect(onMouseUp).toHaveBeenCalled()
Expand Down Expand Up @@ -1437,6 +1445,7 @@ describe('update', () => {
let firstOnFocus: jest.Mock
let firstOnBlur: jest.Mock
let firstOnMouseDown: jest.Mock
let firstOnMouseMove: jest.Mock
let firstOnMouseUp: jest.Mock
let firstOnTouchStart: jest.Mock
let firstOnTouchMove: jest.Mock
Expand All @@ -1451,6 +1460,7 @@ describe('update', () => {
let secondOnFocus: jest.Mock
let secondOnBlur: jest.Mock
let secondOnMouseDown: jest.Mock
let secondOnMouseMove: jest.Mock
let secondOnMouseUp: jest.Mock
let secondOnTouchStart: jest.Mock
let secondOnTouchMove: jest.Mock
Expand Down Expand Up @@ -1479,6 +1489,7 @@ describe('update', () => {
onFocus={second ? secondOnFocus : firstOnFocus}
onBlur={second ? secondOnBlur : firstOnBlur}
onMouseDown={second ? secondOnMouseDown : firstOnMouseDown}
onMouseMove={second ? secondOnMouseMove : firstOnMouseMove}
onMouseUp={second ? secondOnMouseUp : firstOnMouseUp}
onTouchStart={second ? secondOnTouchStart : firstOnTouchStart}
onTouchMove={second ? secondOnTouchMove : firstOnTouchMove}
Expand All @@ -1499,6 +1510,7 @@ describe('update', () => {
firstOnFocus = jest.fn()
firstOnBlur = jest.fn()
firstOnMouseDown = jest.fn()
firstOnMouseMove = jest.fn()
firstOnMouseUp = jest.fn()
firstOnTouchStart = jest.fn()
firstOnTouchMove = jest.fn()
Expand All @@ -1513,6 +1525,7 @@ describe('update', () => {
secondOnFocus = jest.fn()
secondOnBlur = jest.fn()
secondOnMouseDown = jest.fn()
secondOnMouseMove = jest.fn()
secondOnMouseUp = jest.fn()
secondOnTouchStart = jest.fn()
secondOnTouchMove = jest.fn()
Expand Down Expand Up @@ -1585,6 +1598,20 @@ describe('update', () => {
expect(secondOnMouseDown).toHaveBeenCalled()
})

it('supports onMouseMove', () => {
div.dispatchEvent(new Event('mousemove'))
expect(firstOnMouseMove).toHaveBeenCalled()
expect(secondOnMouseMove).not.toHaveBeenCalled()

firstOnMouseMove.mockClear()
secondOnMouseMove.mockClear()
jest.runAllTimers()

div.dispatchEvent(new Event('mousemove'))
expect(firstOnMouseMove).not.toHaveBeenCalled()
expect(secondOnMouseMove).toHaveBeenCalled()
})

it('supports onMouseUp', () => {
div.dispatchEvent(new Event('mouseup'))
expect(firstOnMouseUp).toHaveBeenCalled()
Expand Down
9 changes: 9 additions & 0 deletions packages/@react-facet/dom-fiber/src/setupHostConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ export const setupHostConfig = (): HostConfig<
element.addEventListener('mousedown', newProps.onMouseDown as EventListener)
}

if (newProps.onMouseMove) {
element.addEventListener('mousemove', newProps.onMouseMove as EventListener)
}

if (newProps.onMouseUp) {
element.addEventListener('mouseup', newProps.onMouseUp as EventListener)
}
Expand Down Expand Up @@ -829,6 +833,11 @@ export const setupHostConfig = (): HostConfig<
if (newProps.onMouseDown) element.addEventListener('mousedown', newProps.onMouseDown)
}

if (newProps.onMouseMove !== oldProps.onMouseMove) {
if (oldProps.onMouseMove) element.removeEventListener('mousemove', oldProps.onMouseMove)
if (newProps.onMouseMove) element.addEventListener('mousemove', newProps.onMouseMove)
}

if (newProps.onMouseEnter !== oldProps.onMouseEnter) {
if (oldProps.onMouseEnter) element.removeEventListener('mouseenter', oldProps.onMouseEnter)
if (newProps.onMouseEnter) element.addEventListener('mouseenter', newProps.onMouseEnter)
Expand Down
1 change: 1 addition & 0 deletions packages/@react-facet/dom-fiber/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export type MouseCallback = (event: MouseEvent) => void
export interface PointerEvents {
onClick?: MouseCallback
onMouseDown?: MouseCallback
onMouseMove?: MouseCallback
onMouseUp?: MouseCallback
onTouchStart?: TouchCallback
onTouchMove?: TouchCallback
Expand Down