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.

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

Jump to bottom

add initial xy to eventData #151

Merged
merged 3 commits into from
Jul 30, 2019
Merged

add initial xy to eventData #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81894be
add initial xy to eventData
hartzis Jul 3, 2019
f255e72
update tests, update types
hartzis Jul 5, 2019
b5c2fe6
Merge branch 'master' into initial-xy
hartzis Jul 20, 2019
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
80 changes: 80 additions & 0 deletions src/__tests__/__snapshots__/index.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Array [
"deltaY": 0,
"dir": "Right",
"event": Object {},
"initial": Array [
100,
100,
],
"velocity": 1.5624999996816769,
},
],
Expand All @@ -31,6 +35,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374825.199999963,
},
"initial": Array [
100,
100,
],
"velocity": 1.592356689012699,
},
],
Expand All @@ -47,6 +55,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374841.3999999757,
},
"initial": Array [
100,
100,
],
"velocity": 1.5673981190353126,
},
],
Expand All @@ -63,6 +75,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374857.399999979,
},
"initial": Array [
100,
100,
],
"velocity": 1.565762004010972,
},
],
Expand All @@ -79,6 +95,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374873.499999987,
},
"initial": Array [
100,
100,
],
"velocity": 1.5624999996816769,
},
],
Expand All @@ -103,6 +123,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.8903591679142773,
},
],
Expand All @@ -128,6 +152,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.0548523197963273,
},
],
Expand All @@ -148,6 +176,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.2626262620442454,
},
],
Expand All @@ -168,6 +200,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.6483516480817324,
},
],
Expand All @@ -188,6 +224,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.8903591679142773,
},
],
Expand All @@ -204,6 +244,10 @@ Array [
"deltaY": 0,
"dir": "Right",
"event": Object {},
"initial": Array [
100,
100,
],
"velocity": 1.5624999996816769,
},
],
Expand All @@ -225,6 +269,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374825.199999963,
},
"initial": Array [
100,
100,
],
"velocity": 1.592356689012699,
},
],
Expand All @@ -241,6 +289,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374841.3999999757,
},
"initial": Array [
100,
100,
],
"velocity": 1.5673981190353126,
},
],
Expand All @@ -257,6 +309,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374857.399999979,
},
"initial": Array [
100,
100,
],
"velocity": 1.565762004010972,
},
],
Expand All @@ -273,6 +329,10 @@ Array [
"preventDefault": [MockFunction],
"timeStamp": 1374873.499999987,
},
"initial": Array [
100,
100,
],
"velocity": 1.5624999996816769,
},
],
Expand All @@ -297,6 +357,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.8903591679142773,
},
],
Expand All @@ -322,6 +386,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.0548523197963273,
},
],
Expand All @@ -342,6 +410,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.2626262620442454,
},
],
Expand All @@ -362,6 +434,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.6483516480817324,
},
],
Expand All @@ -382,6 +458,10 @@ Array [
},
],
},
"initial": Array [
100,
100,
],
"velocity": 1.8903591679142773,
},
],
Expand Down
19 changes: 13 additions & 6 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const defaultProps = {
const initialState = {
xy: [0, 0],
swiping: false,
lastEventData: undefined,
eventData: undefined,
start: undefined
}
export const LEFT = 'Left'
Expand Down Expand Up @@ -58,7 +58,13 @@ function getHandlers(set, handlerProps) {
}
const { clientX, clientY } = event.touches ? event.touches[0] : event
const xy = rotateXYByAngle([clientX, clientY], props.rotationAngle)
return { ...state, ...initialState, xy, start: event.timeStamp || 0 }
return {
...state,
...initialState,
eventData: { initial: [...xy] },
xy,
start: event.timeStamp || 0
}
})
}

Expand All @@ -80,7 +86,7 @@ function getHandlers(set, handlerProps) {
if (absX < props.delta && absY < props.delta && !state.swiping) return state

const dir = getDirection(absX, absY, deltaX, deltaY)
const eventData = { event, absX, absY, deltaX, deltaY, velocity, dir }
const eventData = { ...state.eventData, event, absX, absY, deltaX, deltaY, velocity, dir }

props.onSwiping && props.onSwiping(eventData)

Expand All @@ -99,20 +105,21 @@ function getHandlers(set, handlerProps) {
)
event.preventDefault()

return { ...state, lastEventData: eventData, swiping: true }
return { ...state, eventData, swiping: true }
})
}

const onEnd = event => {
set((state, props) => {
let eventData
if (state.swiping) {
const eventData = { ...state.lastEventData, event }
eventData = { ...state.eventData, event }

props.onSwiped && props.onSwiped(eventData)

props[`onSwiped${eventData.dir}`] && props[`onSwiped${eventData.dir}`](eventData)
}
return { ...state, ...initialState }
return { ...state, ...initialState, eventData }
})
}

Expand Down
2 changes: 2 additions & 0 deletions types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import * as React from 'react'

export type Vector2 = [number, number]
export interface EventData {
event: MouseEvent | TouchEvent
deltaX: number
deltaY: number
absX: number
absY: number
initial: Vector2
velocity: number
dir: 'Left' | 'Right' | 'Up' | 'Down'
}
Expand Down
24 changes: 23 additions & 1 deletion types/test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
import * as React from 'react'
import { Swipeable, SwipeableHandlers, SwipeableProps, SwipeCallback, useSwipeable } from 'react-swipeable'

interface CopyOfEventData {
event: MouseEvent | TouchEvent
deltaX: number
deltaY: number
absX: number
absY: number
// initial: Vector2
velocity: number
dir: 'Left' | 'Right' | 'Up' | 'Down'
}

class SampleComponent extends React.PureComponent<SwipeableProps> {
private readonly handleSwiped: SwipeCallback = () => {}
private readonly handleSwipedLeft: SwipeCallback = () => {}
Expand Down Expand Up @@ -59,7 +70,18 @@ const TestHook = () => {

const handlers: SwipeableHandlers = useSwipeable({
onSwipedLeft: (data) => {
data // $ExpectType EventData
// verify EventData properties
const {
event, // $ExpectType MouseEvent | TouchEvent
deltaX, // $ExpectType number
deltaY, // $ExpectType number
absX, // $ExpectType number
absY, // $ExpectType number
initial, // $ExpectType [number, number]
velocity, // $ExpectType number
dir, // $ExpectType "Left" | "Right" | "Up" | "Down"
...rest // $ExpectType {}
} = data;
},
preventDefaultTouchmoveEvent: true,
trackTouch: true,
Expand Down