Cut duplicated and speculative code across the package
An over-engineering audit of the whole tree, applied in five reviewed batches. Behaviour stays the same except where UPGRADE.md says otherwise. PHP: the showcase and error-page stylesheets are prebuilt into resources/dist by bin/stylesheets.mjs, through Vite's own postcss-import (first occurrence kept, the order an application's build gives), instead of Stylesheets::bundle() inlining imports on every request; only the import walk DesignGuard needs stays. SchemeStylesheet::withProfiles() replaces three copies of the scheme-plus-profiles loop, material:scheme leaves spec and contrast checks to the node script that already made them, and the error page's scheme cache, the hashed view namespace, the translations path with no lang/ folder and DesignGuard's 1.x-name hints are gone. JS: the androidx shape port progress.js and both bin scripts each carried lives once in resources/js/shapes.js (the generated SVGs are unchanged); util.js holds ringIndex(), ms(), reopenGuard() and remember(), which were written out several times; listeners are released through AbortController; tooltip.js's hoverPopover() serves the rich tooltip too. CSS: every rule for an element inside the navigation rail queries `--md-navigation-rail-value` instead of repeating the seven collapsed conditions under five media branches; badge, alert, progress, slider and button read one non-inheriting colour-role table (components/color.css); the dialog chrome, the submenu's popover chrome, the chip's state layer and touch target, and the visually-hidden inputs use the shared rules they copied; foundation/tokens.css is folded into foundation.css. Views: Support\Field and Support\Link replace the error-key, bound-value and link-attribute blocks copied into the fields and link components; the timepicker period group, the menu filter and the showcase head are partials; the datepicker's steppers and entry fields are loops; component docblocks no longer restate SKILL.md. Tests and tooling: one dataset-driven ComponentStylesheetsTest replaces four per-group files, DesignGuardTest and the layout-component tests use datasets, browser tests share one ready() helper, CSS parsing lives in ComponentStylesheet alone. docs/audits and the finding IDs citing it are removed, as are pestphp/pest-plugin-laravel, the unused composer scripts and check:font; the lint job runs in the feature job, which now installs node packages so the prebuilt-stylesheet staleness test runs in CI. Feature suite 1177 passed, Chrome browser suite 299 passed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Andreas Reinhold / reini
co-authored by
Claude Opus 5
Claude Opus 5
parent
471d927e64
commit
247c596c3a
@@ -5,7 +5,7 @@
|
||||
* that can hover, at once on keyboard focus (not the focus a sheet or dialog moves to it as it
|
||||
* opens, layers.js), and standing for 1.5s once the pointer or the focus
|
||||
* leaves, which M3 gives plain and rich tooltips alike (docs/reference/m3/
|
||||
* components-actions-communication-containment.md § Tooltips, ACT-25). The bubble is inside the
|
||||
* components-actions-communication-containment.md § Tooltips). The bubble is inside the
|
||||
* wrapper, so moving onto it to reach its actions, by pointer or by Tab, is no leave at all; Escape
|
||||
* hides it at once. Persistent: a press on the trigger opens it as a light-dismiss popover.
|
||||
*
|
||||
@@ -16,20 +16,12 @@
|
||||
* A Livewire morph strips attributes the server did not render and gives the bubble a new id, so
|
||||
* they are written again whenever the trigger is reached.
|
||||
*/
|
||||
import { openingFocus } from './layers.js'
|
||||
|
||||
const HOVER_DELAY_MS = 500
|
||||
const LEAVE_GRACE_MS = 1500
|
||||
|
||||
// A persistent bubble is a `popover="auto"`, and its trigger is outside it: the press on the
|
||||
// trigger light-dismisses the open bubble, and the click that follows would open it again, so a
|
||||
// second press never closed it. A close the browser made this recently is taken as that press, as
|
||||
// menu.js's REOPEN_GUARD_MS does; `beforetoggle` times it, because `toggle` is queued past the click.
|
||||
const REOPEN_GUARD_MS = 250
|
||||
import { hoverPopover, LEAVE_DELAY_MS } from './tooltip.js'
|
||||
import { reopenGuard } from './util.js'
|
||||
|
||||
document.addEventListener('alpine:init', () => {
|
||||
window.Alpine.data('materialRichTooltip', (persistent = false) => ({
|
||||
timer: null,
|
||||
stop: null,
|
||||
|
||||
init() {
|
||||
const bubble = this.$refs.bubble
|
||||
@@ -59,16 +51,12 @@ document.addEventListener('alpine:init', () => {
|
||||
wrapper.addEventListener('pointerenter', describe)
|
||||
|
||||
if (persistent) {
|
||||
let dismissedAt = -Infinity
|
||||
let closingExplicitly = false
|
||||
// A persistent bubble is a `popover="auto"`, and its trigger is outside it: the
|
||||
// press on the trigger light-dismisses the open bubble, and the click that
|
||||
// follows would open it again, so a second press never closed it.
|
||||
const guard = reopenGuard()
|
||||
|
||||
bubble.addEventListener('beforetoggle', (event) => {
|
||||
if (event.newState === 'closed' && !closingExplicitly) {
|
||||
dismissedAt = performance.now()
|
||||
}
|
||||
|
||||
closingExplicitly = false
|
||||
})
|
||||
bubble.addEventListener('beforetoggle', (event) => guard.beforeToggle(event))
|
||||
|
||||
wrapper.addEventListener('click', (event) => {
|
||||
if (bubble.contains(event.target)) {
|
||||
@@ -76,9 +64,9 @@ document.addEventListener('alpine:init', () => {
|
||||
}
|
||||
|
||||
if (open()) {
|
||||
closingExplicitly = true
|
||||
guard.closing()
|
||||
bubble.hidePopover()
|
||||
} else if (performance.now() - dismissedAt > REOPEN_GUARD_MS) {
|
||||
} else if (guard.canOpen()) {
|
||||
bubble.showPopover()
|
||||
}
|
||||
})
|
||||
@@ -86,25 +74,20 @@ document.addEventListener('alpine:init', () => {
|
||||
return
|
||||
}
|
||||
|
||||
const show = (delay) => {
|
||||
clearTimeout(this.timer)
|
||||
this.timer = setTimeout(() => !open() && bubble.showPopover(), delay)
|
||||
}
|
||||
const popover = hoverPopover(wrapper, {
|
||||
open,
|
||||
show: () => bubble.showPopover(),
|
||||
hide: () => bubble.hidePopover(),
|
||||
focusable: (event) => event.target.matches(':focus-visible'),
|
||||
})
|
||||
|
||||
const hide = (delay = 0) => {
|
||||
clearTimeout(this.timer)
|
||||
this.timer = setTimeout(() => open() && bubble.hidePopover(), delay)
|
||||
}
|
||||
wrapper.addEventListener('focusout', (event) => !wrapper.contains(event.relatedTarget) && popover.hide(LEAVE_DELAY_MS), { signal: popover.signal })
|
||||
|
||||
wrapper.addEventListener('pointerenter', (event) => event.pointerType === 'mouse' && show(HOVER_DELAY_MS))
|
||||
wrapper.addEventListener('pointerleave', () => hide(LEAVE_GRACE_MS))
|
||||
wrapper.addEventListener('focusin', (event) => !openingFocus(event) && event.target.matches(':focus-visible') && show(0))
|
||||
wrapper.addEventListener('focusout', (event) => !wrapper.contains(event.relatedTarget) && hide(LEAVE_GRACE_MS))
|
||||
document.addEventListener('keydown', (event) => event.key === 'Escape' && hide())
|
||||
this.stop = popover.destroy
|
||||
},
|
||||
|
||||
destroy() {
|
||||
clearTimeout(this.timer)
|
||||
this.stop?.()
|
||||
},
|
||||
}))
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user