Skip to content
Draft
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
43 changes: 42 additions & 1 deletion packages/vuetify/src/components/VOverlay/useActivator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ interface ActivatorProps extends DelayProps {
activatorProps: Record<string, any>

openOnClick: boolean | undefined
openOnTouchHold: boolean | undefined
openOnHover: boolean
openOnFocus: boolean | undefined

Expand All @@ -60,6 +61,7 @@ export const makeActivatorProps = propsFactory({
type: Boolean,
default: undefined,
},
openOnTouchHold: Boolean,
openOnHover: Boolean,
openOnFocus: {
type: Boolean,
Expand All @@ -83,16 +85,18 @@ export function useActivator (
const activatorEl = ref<HTMLElement>()

let isHovered = false
let isTouched = false
let isFocused = false
let firstEnter = true

const openOnFocus = computed(() => props.openOnFocus || (props.openOnFocus == null && props.openOnHover))
const openOnClick = computed(() => props.openOnClick || (props.openOnClick == null && !props.openOnHover && !openOnFocus.value))

const { runOpenDelay, runCloseDelay } = useDelay(props, value => {
const { clearDelay, runOpenDelay, runCloseDelay } = useDelay(props, value => {
if (
value === (
(props.openOnHover && isHovered) ||
(props.openOnTouchHold && isTouched) ||
(openOnFocus.value && isFocused)
) && !(props.openOnHover && isActive.value && !isTop.value)
) {
Expand All @@ -113,6 +117,37 @@ export function useActivator (
}
isActive.value = !isActive.value
},
oncontextmenu: (e: Event) => {
e.preventDefault()
},
onTouchstart: (e: TouchEvent) => {
if (!e.touches) return
e.stopPropagation()
clearDelay()
activatorEl.value = (e.currentTarget || e.target) as HTMLElement
if (!isActive.value) {
const { clientX, clientY } = e.touches[0]
cursorTarget.value = [clientX, clientY]
}
isTouched = true
runOpenDelay()
},
onTouchmove: (e: TouchEvent) => {
if (!e.touches || !cursorTarget.value) return
e.stopPropagation()

const sensitivity = 7
const [x, y] = cursorTarget.value
const { clientX, clientY } = e.touches[0]
if (Math.abs(x - clientX) > sensitivity || Math.abs(y - clientY) > sensitivity) {
isTouched = false
clearDelay()
}
},
onTouchend: (e: TouchEvent) => {
isTouched = false
clearDelay()
},
onMouseenter: (e: MouseEvent) => {
if (e.sourceCapabilities?.firesTouchEvents) return

Expand Down Expand Up @@ -147,6 +182,12 @@ export function useActivator (
if (openOnClick.value) {
events.onClick = availableEvents.onClick
}
if (props.openOnTouchHold) {
events.onTouchstart = availableEvents.onTouchstart
events.onTouchmove = availableEvents.onTouchmove
events.onTouchend = availableEvents.onTouchend
events.oncontextmenu = availableEvents.oncontextmenu
}
if (props.openOnHover) {
events.onMouseenter = availableEvents.onMouseenter
events.onMouseleave = availableEvents.onMouseleave
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/src/components/VTooltip/VTooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export const VTooltip = genericComponent<OverlaySlots>()({
role="tooltip"
activatorProps={ activatorProps.value }
_disableGlobalStack
onClick:outside={ () => isActive.value = false }
{ ...scopeId }
>
{{
Expand Down