Andreas Reinhold / reiniandClaude Opus 5
b62c83f244
A modal side sheet, bottom sheet and the modal rail move the focus to their first control as they open (x-trap), and `<x-modal>` does in `showModal()`. On a page loaded with the sheet already open (a `wire:model` set from `?workout=` in the URL) the browsers count that focus as `:focus-visible`, and so they do for a sheet or dialog opened from the keyboard, so tooltip.js showed the close button's "Close" tooltip the moment the layer appeared, over its title, with no keyboard use. Confirmed in Chrome, Firefox and Safari for the deep-linked sheet and a full-screen dialog opened with Enter; a deep-linked `<x-modal>`'s own focus was not counted as keyboard focus. M3 lets a tooltip appear on hover or focus and says nothing that asks for one on a focus the component moves itself. layers.js gains `openingFocus(event)`: a focus is a modal layer's own when the nearest open dialog, `aria-modal` panel or modal rail around its target is entered from outside it, or from nowhere, and no Tab is moving it (a Tab moves the focus while its keydown is handled, by the browser or by focus-trap wrapping round the panel). tooltip.js and rich-tooltip.js leave such a focus out; focus moved within the layer, a Tab onto the control and a focus returned to it from a menu inside still show the tooltip. The docblocks, the skill and UPGRADE.md say so. A browser test loads a page with a modal sheet open at 393px, opens a full-screen dialog and a dialog whose first control is a rich tooltip's trigger from the keyboard, and checks that no tooltip is up on the focused control, then that Tab wrapping round to the close button shows its tooltip; it fails without the change in Chrome, Firefox and Safari, each part on its own. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
84 lines
3.1 KiB
JavaScript
84 lines
3.1 KiB
JavaScript
/**
|
|
* `materialTooltip`: shows an `<x-tooltip>` popover for the control it belongs to.
|
|
*
|
|
* The trigger is the popover's parent element (the button, or the standalone wrapper). Hover
|
|
* counts only for a pointer that can hover, after a short delay so a pointer passing over a
|
|
* toolbar does not flash every label; keyboard focus shows it at once — but not the focus a sheet,
|
|
* a dialog or the modal rail moves to its first control as it opens (layers.js), which would put
|
|
* a tooltip over a sheet's close button the moment the sheet appears. A press and Escape hide it
|
|
* at once; leaving and blur let it stand for M3's 1.5s, so the words can still be read while the
|
|
* pointer moves on. Only one tooltip is up at a time: showing one takes the last one down, which
|
|
* the browser will not do for us because these are `popover="manual"`.
|
|
*/
|
|
import { openingFocus } from './layers.js'
|
|
|
|
const HOVER_DELAY_MS = 500
|
|
const LEAVE_DELAY_MS = 1500
|
|
|
|
let visible = null
|
|
|
|
document.addEventListener('alpine:init', () => {
|
|
window.Alpine.data('materialTooltip', () => ({
|
|
timer: null,
|
|
listeners: [],
|
|
|
|
init() {
|
|
const tip = this.$el
|
|
const trigger = tip.parentElement
|
|
|
|
const open = () => tip.matches(':popover-open')
|
|
|
|
const show = (delay) => {
|
|
clearTimeout(this.timer)
|
|
this.timer = setTimeout(() => {
|
|
if (!tip.isConnected || open()) {
|
|
return
|
|
}
|
|
|
|
if (visible && visible !== tip && visible.matches(':popover-open')) {
|
|
visible.hidePopover()
|
|
}
|
|
|
|
visible = tip
|
|
tip.showPopover()
|
|
}, delay)
|
|
}
|
|
|
|
const hide = (delay = 0) => {
|
|
clearTimeout(this.timer)
|
|
this.timer = setTimeout(() => {
|
|
if (open()) {
|
|
tip.hidePopover()
|
|
}
|
|
|
|
if (visible === tip) {
|
|
visible = null
|
|
}
|
|
}, delay)
|
|
}
|
|
|
|
this.listen(trigger, 'pointerenter', (event) => event.pointerType === 'mouse' && show(HOVER_DELAY_MS))
|
|
this.listen(trigger, 'pointerleave', () => hide(LEAVE_DELAY_MS))
|
|
this.listen(trigger, 'pointerdown', () => hide())
|
|
this.listen(trigger, 'focusin', (event) => !openingFocus(event) && trigger.matches(':focus-within:has(:focus-visible), :focus-visible') && show(0))
|
|
this.listen(trigger, 'focusout', () => hide(LEAVE_DELAY_MS))
|
|
this.listen(document, 'keydown', (event) => event.key === 'Escape' && hide())
|
|
},
|
|
|
|
listen(target, type, handler) {
|
|
target.addEventListener(type, handler)
|
|
this.listeners.push(() => target.removeEventListener(type, handler))
|
|
},
|
|
|
|
destroy() {
|
|
clearTimeout(this.timer)
|
|
|
|
if (visible === this.$el) {
|
|
visible = null
|
|
}
|
|
|
|
this.listeners.forEach((remove) => remove())
|
|
},
|
|
}))
|
|
})
|