diff --git a/src/actions/swipeable/event.js b/src/actions/swipeable/event.js new file mode 100644 index 0000000..49d4d18 --- /dev/null +++ b/src/actions/swipeable/event.js @@ -0,0 +1,29 @@ +// start event +export function addStartEventListener(source, cb) { + source.addEventListener('mousedown', cb) + source.addEventListener('touchstart', cb) +} +export function removeStartEventListener(source, cb) { + source.removeEventListener('mousedown', cb) + source.removeEventListener('touchstart', cb) +} + +// end event +export function addEndEventListener(source, cb) { + source.addEventListener('mouseup', cb) + source.addEventListener('touchend', cb) +} +export function removeEndEventListener(source, cb) { + source.removeEventListener('mouseup', cb) + source.removeEventListener('touchend', cb) +} + +// move event +export function addMoveEventListener(source, cb) { + source.addEventListener('mousemove', cb) + source.addEventListener('touchmove', cb) +} +export function removeMoveEventListener(source, cb) { + source.removeEventListener('mousemove', cb) + source.removeEventListener('touchmove', cb) +} diff --git a/src/actions/swipeable/index.js b/src/actions/swipeable/index.js new file mode 100644 index 0000000..356cf19 --- /dev/null +++ b/src/actions/swipeable/index.js @@ -0,0 +1 @@ +export * from './swipeable' diff --git a/src/utils/swipeable.js b/src/actions/swipeable/swipeable.js similarity index 91% rename from src/utils/swipeable.js rename to src/actions/swipeable/swipeable.js index 01b36fe..e5195c9 100644 --- a/src/utils/swipeable.js +++ b/src/actions/swipeable/swipeable.js @@ -1,4 +1,4 @@ -import { NEXT, PREV } from '../direction' +import { NEXT, PREV } from '../../direction' import { addStartEventListener, removeStartEventListener, @@ -6,20 +6,20 @@ import { removeMoveEventListener, addEndEventListener, removeEndEventListener, - createDispatcher } from './event' +import { createDispatcher } from '../../utils/event' function getCoords(event) { if (event instanceof TouchEvent) { const touch = event.touches[0] return { x: touch ? touch.clientX : 0, - y: touch ? touch.clientY : 0 + y: touch ? touch.clientY : 0, } } return { x: event.clientX, - y: event.clientY + y: event.clientY, } } @@ -55,7 +55,7 @@ export function swipeable(node, { thresholdProvider }) { dispatch('threshold', { direction: moved > 0 ? PREV : NEXT }) removeEndEventListener(window, handleMouseup) removeMoveEventListener(window, handleMousemove) - } + } } function handleMouseup(event) { @@ -71,6 +71,6 @@ export function swipeable(node, { thresholdProvider }) { return { destroy() { removeStartEventListener(node, handleMousedown) - } + }, } } diff --git a/src/components/Carousel/Carousel.svelte b/src/components/Carousel/Carousel.svelte index 91389cd..2f6db8d 100644 --- a/src/components/Carousel/Carousel.svelte +++ b/src/components/Carousel/Carousel.svelte @@ -4,7 +4,7 @@ import Dots from '../Dots/Dots.svelte' import Arrow from '../Arrow/Arrow.svelte' import { NEXT, PREV } from '../../direction' - import { swipeable } from '../../utils/swipeable' + import { swipeable } from '../../actions/swipeable' import { hoverable } from '../../utils/hoverable' import { addResizeEventListener, diff --git a/src/utils/event.js b/src/utils/event.js index 4b488c6..cb348a2 100644 --- a/src/utils/event.js +++ b/src/utils/event.js @@ -1,33 +1,3 @@ -// start event -export function addStartEventListener(source, cb) { - source.addEventListener('mousedown', cb) - source.addEventListener('touchstart', cb) -} -export function removeStartEventListener(source, cb) { - source.removeEventListener('mousedown', cb) - source.removeEventListener('touchstart', cb) -} - -// end event -export function addEndEventListener(source, cb) { - source.addEventListener('mouseup', cb) - source.addEventListener('touchend', cb) -} -export function removeEndEventListener(source, cb) { - source.removeEventListener('mouseup', cb) - source.removeEventListener('touchend', cb) -} - -// move event -export function addMoveEventListener(source, cb) { - source.addEventListener('mousemove', cb) - source.addEventListener('touchmove', cb) -} -export function removeMoveEventListener(source, cb) { - source.removeEventListener('mousemove', cb) - source.removeEventListener('touchmove', cb) -} - // resize event export function addResizeEventListener(cb) { window.addEventListener('resize', cb) @@ -38,9 +8,11 @@ export function removeResizeEventListener(cb) { export function createDispatcher(source) { function dispatch(event, data) { - source.dispatchEvent(new CustomEvent(event, { - detail: data - })) + source.dispatchEvent( + new CustomEvent(event, { + detail: data, + }) + ) } return dispatch -} \ No newline at end of file +}