Andreas Reinhold / reiniandClaude Opus 5
247c596c3a
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>
112 lines
4.1 KiB
JavaScript
112 lines
4.1 KiB
JavaScript
/**
|
|
* The theme, as one piece of state every toggle on the page shares.
|
|
*
|
|
* <x-theme-script> has already decided the theme before this runs; the store starts from
|
|
* what it wrote on <html> (data-theme-choice, data-theme, data-theme-key). `choice` is what
|
|
* the visitor picked — light, dark or system — and `resolved` is what is showing.
|
|
*
|
|
* `value` is an accessor, so binding a control with `x-model="$store.theme.value"` goes
|
|
* through the same write as `set()` and `toggle()`: the attributes, then localStorage.
|
|
*
|
|
* M3's contrast level is the same pair: `contrast` is the choice (standard, medium, high or
|
|
* system) and `resolvedContrast` the level on screen, which is `standard` wherever <html>
|
|
* carries no data-contrast — the stylesheet's plain blocks are that level. `setContrast()`
|
|
* writes both, through the same attribute the head script wrote before the first paint.
|
|
*
|
|
* `scheme` is the colour profile on screen (<html data-scheme>, which the server chose), and
|
|
* `previewScheme(name)` shows another one on this page without storing anything — the
|
|
* application saves a choice itself, and the next full load draws what it saved.
|
|
*/
|
|
import { remember } from './util.js'
|
|
|
|
document.addEventListener('alpine:init', () => {
|
|
const root = document.documentElement
|
|
const media = window.matchMedia('(prefers-color-scheme: dark)')
|
|
const contrastMedia = window.matchMedia('(prefers-contrast: more)')
|
|
const choices = ['light', 'dark', 'system']
|
|
const levels = ['standard', 'medium', 'high', 'system']
|
|
|
|
const resolve = (choice) => (choice === 'system' ? (media.matches ? 'dark' : 'light') : choice)
|
|
const resolveContrast = (choice) => (choice === 'system' ? (contrastMedia.matches ? 'high' : 'standard') : choice)
|
|
|
|
window.Alpine.store('theme', {
|
|
choice: choices.includes(root.dataset.themeChoice) ? root.dataset.themeChoice : 'system',
|
|
resolved: root.dataset.theme === 'dark' ? 'dark' : 'light',
|
|
contrast: levels.includes(root.dataset.contrastChoice) ? root.dataset.contrastChoice : 'system',
|
|
resolvedContrast: root.dataset.contrast === 'medium' || root.dataset.contrast === 'high' ? root.dataset.contrast : 'standard',
|
|
scheme: root.dataset.scheme || null,
|
|
|
|
get value() {
|
|
return this.choice
|
|
},
|
|
|
|
set value(choice) {
|
|
this.set(choice)
|
|
},
|
|
|
|
set(choice) {
|
|
if (!choices.includes(choice)) {
|
|
return
|
|
}
|
|
|
|
this.choice = choice
|
|
this.resolved = resolve(choice)
|
|
|
|
root.dataset.themeChoice = choice
|
|
root.dataset.theme = this.resolved
|
|
|
|
remember(root.dataset.themeKey || 'material-theme', choice)
|
|
},
|
|
|
|
toggle() {
|
|
this.set(this.resolved === 'dark' ? 'light' : 'dark')
|
|
},
|
|
|
|
setContrast(choice) {
|
|
if (!levels.includes(choice)) {
|
|
return
|
|
}
|
|
|
|
this.contrast = choice
|
|
this.resolvedContrast = resolveContrast(choice)
|
|
|
|
root.dataset.contrastChoice = choice
|
|
|
|
if (this.resolvedContrast === 'standard') {
|
|
delete root.dataset.contrast
|
|
} else {
|
|
root.dataset.contrast = this.resolvedContrast
|
|
}
|
|
|
|
remember(root.dataset.contrastKey || 'material-contrast', choice)
|
|
},
|
|
|
|
previewScheme(name) {
|
|
if (typeof name !== 'string' || !/^[a-z0-9-]+$/.test(name)) {
|
|
return
|
|
}
|
|
|
|
this.scheme = name
|
|
root.dataset.scheme = name
|
|
},
|
|
})
|
|
|
|
// The head script repaints on an OS change while the choice is `system`; this keeps the
|
|
// store's `resolved` — which a toggle's icon reads — in step with it.
|
|
media.addEventListener('change', () => {
|
|
const theme = window.Alpine.store('theme')
|
|
|
|
if (theme.choice === 'system') {
|
|
theme.resolved = resolve('system')
|
|
}
|
|
})
|
|
|
|
contrastMedia.addEventListener('change', () => {
|
|
const theme = window.Alpine.store('theme')
|
|
|
|
if (theme.contrast === 'system') {
|
|
theme.resolvedContrast = resolveContrast('system')
|
|
}
|
|
})
|
|
})
|