Skip to content

Recreate event listener functions on preventSwipe change #31

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.

Sign up for GitHub

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

Open
benkaiser wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Recreate event listener functions on preventSwipe change #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6198881
Recreate event listener functions on preventSwipe change, fixes #30
benkaiser Dec 16, 2020
4b1ea8c
Handle case of re-render mid-drag by remembering position in state
benkaiser Dec 16, 2020
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
75 changes: 46 additions & 29 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,62 +182,79 @@ const TinderCard = React.forwardRef(({ flickOnSwipe = true, children, onSwipe, o
swipeAlreadyReleased.current = false
}, [swipeAlreadyReleased])

React.useLayoutEffect(() => {
let offset = { x: null, y: null }
let speed = { x: 0, y: 0 }
let lastLocation = { x: 0, y: 0, time: new Date().getTime() }
let mouseIsClicked = false
const [offset, setOffset] = React.useState({ x: null, y: null })
Copy link
Author

@benkaiser benkaiser Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3DJakob needed to move these to state, since they would get 'reset' every time useLayoutEffect was called. So if it got called on an element you were mid-way through dragging then the element would jump to the wrong position.

Copy link
Author

@benkaiser benkaiser Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I'm open to better options that don't require re-calling useLayoutEffect many times)

const [speed, setSpeed] = React.useState({ x: 0, y: 0 })
const [lastLocation, setLastLocation] = React.useState({ x: 0, y: 0, time: new Date().getTime() })
const [mouseIsClicked, setMouseIsClicked] = React.useState(false)

element.current.addEventListener(('touchstart'), (ev) => {
React.useLayoutEffect(() => {
const touchStart = (ev) => {
ev.preventDefault()
handleSwipeStart()
offset = { x: -touchCoordinatesFromEvent(ev).x, y: -touchCoordinatesFromEvent(ev).y }
})
setOffset({ x: -touchCoordinatesFromEvent(ev).x, y: -touchCoordinatesFromEvent(ev).y })
}
element.current.addEventListener(('touchstart'), touchStart)

element.current.addEventListener(('mousedown'), (ev) => {
const mouseDown = (ev) => {
ev.preventDefault()
mouseIsClicked = true
setMouseIsClicked(true)
handleSwipeStart()
offset = { x: -mouseCoordinatesFromEvent(ev).x, y: -mouseCoordinatesFromEvent(ev).y }
})
setOffset({ x: -mouseCoordinatesFromEvent(ev).x, y: -mouseCoordinatesFromEvent(ev).y })
}
element.current.addEventListener(('mousedown'), mouseDown)

element.current.addEventListener(('touchmove'), (ev) => {
const touchMove = (ev) => {
ev.preventDefault()
const newLocation = dragableTouchmove(touchCoordinatesFromEvent(ev), element.current, offset, lastLocation)
speed = calcSpeed(lastLocation, newLocation)
lastLocation = newLocation
})
setSpeed(calcSpeed(lastLocation, newLocation))
setLastLocation(newLocation)
}
element.current.addEventListener(('touchmove'), touchMove)

element.current.addEventListener(('mousemove'), (ev) => {
const mouseMove = (ev) => {
ev.preventDefault()
if (mouseIsClicked) {
const newLocation = dragableTouchmove(mouseCoordinatesFromEvent(ev), element.current, offset, lastLocation)
speed = calcSpeed(lastLocation, newLocation)
lastLocation = newLocation
setSpeed(calcSpeed(lastLocation, newLocation))
setLastLocation(newLocation)
}
})
}
element.current.addEventListener(('mousemove'), mouseMove)

element.current.addEventListener(('touchend'), (ev) => {
const touchEnd = (ev) => {
ev.preventDefault()
handleSwipeReleased(element.current, speed)
})
}
element.current.addEventListener(('touchend'), touchEnd)

element.current.addEventListener(('mouseup'), (ev) => {
const mouseUp = (ev) => {
if (mouseIsClicked) {
ev.preventDefault()
mouseIsClicked = false
setMouseIsClicked(false)
handleSwipeReleased(element.current, speed)
}
})
}
element.current.addEventListener(('mouseup'), mouseUp)

element.current.addEventListener(('mouseleave'), (ev) => {
const mouseLeave = (ev) => {
if (mouseIsClicked) {
ev.preventDefault()
mouseIsClicked = false
setMouseIsClicked(false)
handleSwipeReleased(element.current, speed)
}
})
}, [])
}
element.current.addEventListener(('mouseleave'), mouseLeave)

return () => {
element.current.removeEventListener(('touchstart'), touchStart)
element.current.removeEventListener(('mousedown'), mouseDown)
element.current.removeEventListener(('touchmove'), touchMove)
element.current.removeEventListener(('mousemove'), mouseMove)
element.current.removeEventListener(('touchend'), touchEnd)
element.current.removeEventListener(('mouseup'), mouseUp)
element.current.removeEventListener(('mouseleave'), mouseLeave)
}
}, [preventSwipe, offset, speed, lastLocation, mouseIsClicked])

return (
React.createElement('div', { ref: element, className }, children)
Expand Down