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

feat(useDraggable): introduce axis option #2948

Merged
merged 3 commits into from
Apr 12, 2023
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
1 change: 1 addition & 0 deletions packages/core/useDraggable/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const UseDraggable = /* #__PURE__ */ defineComponent<UseDraggableProps>({
'pointerTypes',
'as',
'handle',
'axis',
] as unknown as undefined,
setup(props, { slots }) {
const target = ref()
Expand Down
63 changes: 48 additions & 15 deletions packages/core/useDraggable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ export interface UseDraggableOptions {
* Callback when dragging end.
*/
onEnd?: (position: Position, event: PointerEvent) => void

/**
* Axis to drag on.
antfu marked this conversation as resolved.
Show resolved Hide resolved
*
* @default 'both'
*/
axis?: 'x' | 'y' | 'both'
}

/**
Expand All @@ -78,36 +85,54 @@ export interface UseDraggableOptions {
* @param target
* @param options
*/
export function useDraggable(target: MaybeComputedRef<HTMLElement | SVGElement | null | undefined>, options: UseDraggableOptions = {}) {
const draggingElement = options.draggingElement ?? defaultWindow
const draggingHandle = options.handle ?? target
const position = ref<Position>(resolveUnref(options.initialValue) ?? { x: 0, y: 0 })
export function useDraggable(
target: MaybeComputedRef<HTMLElement | SVGElement | null | undefined>,
options: UseDraggableOptions = {},
) {
const {
pointerTypes,
preventDefault,
stopPropagation,
exact,
onMove,
onEnd,
onStart,
initialValue,
axis = 'both',
draggingElement = defaultWindow,
handle: draggingHandle = target,
} = options

const position = ref<Position>(
resolveUnref(initialValue) ?? { x: 0, y: 0 },
)

const pressedDelta = ref<Position>()

const filterEvent = (e: PointerEvent) => {
if (options.pointerTypes)
return options.pointerTypes.includes(e.pointerType as PointerType)
if (pointerTypes)
return pointerTypes.includes(e.pointerType as PointerType)
return true
}

const handleEvent = (e: PointerEvent) => {
if (resolveUnref(options.preventDefault))
if (resolveUnref(preventDefault))
e.preventDefault()
if (resolveUnref(options.stopPropagation))
if (resolveUnref(stopPropagation))
e.stopPropagation()
}

const start = (e: PointerEvent) => {
if (!filterEvent(e))
return
if (resolveUnref(options.exact) && e.target !== resolveUnref(target))
if (resolveUnref(exact) && e.target !== resolveUnref(target))
return
const rect = resolveUnref(target)!.getBoundingClientRect()
const pos = {
x: e.clientX - rect.left,
y: e.clientY - rect.top,
}
if (options.onStart?.(pos, e) === false)
if (onStart?.(pos, e) === false)
return
pressedDelta.value = pos
handleEvent(e)
Expand All @@ -117,11 +142,17 @@ export function useDraggable(target: MaybeComputedRef<HTMLElement | SVGElement |
return
if (!pressedDelta.value)
return

let { x, y } = position.value
if (axis === 'x' || axis === 'both')
x = e.clientX - pressedDelta.value.x
if (axis === 'y' || axis === 'both')
y = e.clientY - pressedDelta.value.y
position.value = {
x: e.clientX - pressedDelta.value.x,
y: e.clientY - pressedDelta.value.y,
x,
y,
}
options.onMove?.(position.value, e)
onMove?.(position.value, e)
handleEvent(e)
}
const end = (e: PointerEvent) => {
Expand All @@ -130,7 +161,7 @@ export function useDraggable(target: MaybeComputedRef<HTMLElement | SVGElement |
if (!pressedDelta.value)
return
pressedDelta.value = undefined
options.onEnd?.(position.value, e)
onEnd?.(position.value, e)
handleEvent(e)
}

Expand All @@ -144,7 +175,9 @@ export function useDraggable(target: MaybeComputedRef<HTMLElement | SVGElement |
...toRefs(position),
position,
isDragging: computed(() => !!pressedDelta.value),
style: computed(() => `left:${position.value.x}px;top:${position.value.y}px;`),
style: computed(
() => `left:${position.value.x}px;top:${position.value.y}px;`,
),
}
}

Expand Down