Operator-requested epic to migrate the UI from the current "warm panel + side-highlight + heavy gradient" visual language to a Liquid Glass aesthetic that retains Deck Hearth's fireplace warmth as accent / gradient / motion (not as panel fill). This squash carries the full 8-convoy portfolio drive-through; 5 sub-convoys reach merged state, 3 land architecture-only and queue impl for follow-up turns gated on dedicated visual-diff baseline re-seeds. Sub-convoy #1 (liquid-glass-design-tokens) — MERGED. 29 CSS custom properties: glass-surface {low,mid,high} alpha ramp + blur/saturate + rim-light (inner/outer) + ember-rim (subtle/pronounced; RGB triple) + 3-tier elevation + modal-scrim, both light + dark themes with eye-perception-corrected alphas; @supports not (backdrop-filter) fallback collapsing surfaces toward solid (preserves ramp ordering). Authored docs/DESIGN_TOKENS.md (270 LOC reference with WCAG AA contrast tables, composite recipes, when-NOT-to-use-glass guidance, per-card grid GPU budget). AGENTS.md gains a § Visual language section as the new agent-contract surface. Sub-convoy #2 (liquid-glass-modal-and-surface-primitive) — Brief 1 MERGED. Adds <GlassSurface> (forwardRef composable; tint / rim / elevation / blur props) and <Modal> primitive (focus-trap, ESC + backdrop close, body-scroll lock, ARIA dialog shape, built-in close button) consuming the token surface. lib/use-focus-trap.js — homegrown hook (~60 LOC, no dep). 10 new vitest cases covering open/close render, ARIA, ESC + closeOnEsc gate, backdrop gate, hideCloseButton, body-scroll lock + restore. 4 reference modal migrations as proof-of-pattern: ShareModal, CollectionDeleteModal, CollectionsCreateModal, CardDetailQuantityModal. Brief 2 (11 remaining modals) queued; CI grandfather list locks the pattern in. Sub-convoy #3 (liquid-glass-form-primitives) — Brief 1 MERGED. Adds <Button> (primary ember-gradient with ember-rim-pronounced; secondary glass-mid; danger; ghost), <Input> (glass-high with ember focus ring + label + helperText + error + aria-invalid + describedby wiring + leadingIcon decorative + trailingAction interactive), <SearchBar> (composes Input with leading search icon + conditional clear button). 10 new vitest cases. pages/login.js + pages/signup.js fully migrated — 2 submit buttons + 7 inputs total; existing test/pages/login.test.js assertion ("Sign in to Deck Hearth" button text) preserved. Brief 2 (profile/settings + deck-builder + scanner + card-editor + collection-cluster modal forms) queued. Sub-convoy #4 (liquid-glass-layout-shell) — MERGED. 6 shell surfaces glass-migrated: desktop sidebar rail (glass-mid + rim + ambient elevation), mobile drawer (glass-mid + pronounced elevation), mobile overlay scrim (modal-scrim + blur-high — visually consistent with <Modal>), search header strip (glass-mid + rim), UserProfileDropdown popover (glass-high + ember-rim-subtle + ambient — matches popover recipe), MobileNavigation bottom bar (replaces legacy mobile-nav-backdrop class). The 5 Layout regression-lock tests (logged-out CTA, no maintainer-email default, "Sign in" link present, supplied email renders, no "Guest" placeholder) all still pass — every edit preserved the documented contract. Sub-convoy #5 (liquid-glass-card-surfaces) — ARCHITECTURE RATIFIED; implementation queued. Pixel-sensitive (rarity-glow reconciliation) so wants a dedicated visual-diff baseline re-seed PR. Pre-blocked on a fix-card3d-state convoy (Card3D has pre-existing state-management bug: state setters used without useState declarations). Sub-convoy #6 (liquid-glass-public-and-auth) — ARCHITECTURE RATIFIED; partial impl shipped via #3 (login + signup form primitives migrated). Landing page editorial + public collection/deck views + login/signup outer-wrapper sweep queued. Sub-convoy #7 (motion-system-pass) — MERGED. 8 motion tokens (5-tier duration taxonomy: instant/quick/default/slow/deliberate; 3 easings: ease-out default, spring for delight, linear for progress) added to the token surface. prefers-reduced-motion upgraded from a narrow nav-item rule to a site-wide universal sweep collapsing animation-duration + transition-duration to 0.01ms (preserves end states, no flicker); .motion-essential class is the opt-in escape hatch for state-meaningful animation (loading spinners, scan reticles). Authored docs/MOTION_SYSTEM.md with WCAG SC 2.3.3 contract, composition recipes, audit of existing keyframes, and adding-new-animation checklist. Sub-convoy #8 (cleanup-legacy-design-css) — Brief 1 MERGED. Two new CI jobs in .github/workflows/ci.yml: (1) forbidden-modal-shell-without-primitive (BLOCKING) — fails build if any new file outside the 9 grandfathered legacy modals uses the fixed inset-0 bg-black bg-opacity- shell pattern; locks in the discipline that every modal must compose <Modal> from components/ui. (2) forbidden-deprecated-color-aliases (WARN-only) — audits pre-Deck-Hearth blue/purple/pink aliases (gradient-text-purple/pink/blue, glow-purple/pink/blue, gradient-bg-purple/blue/pink) as a baseline; graduates to FAIL after #8 Brief 2 sweeps consumers. .cursor/rules/ui-and-theming.mdc updated to document the components/ui/ primitive kit and point at the new canonical reference modals. Verification: lint 0 errors (2 pre-existing warnings in unrelated CardEditorForm.js + CollectionsPageView.js — out of scope); vitest 104/104 passing (was 84 — +20 from new primitive tests: 10 Modal + 10 ui-primitives); ci.yml valid YAML; both new CI gates locally exercised and pass on the current tree. Operator follow-ups documented in .convoys/ship-readiness.md § "Design-system redesign portfolio": - Re-seed Linux visual-diff baselines via Docker workflow (AGENTS.md § 6) after this merges. - preview-smoke.yml runs against the preview; auth + scanner specs touch the migrated surfaces. - Vercel promote to production once smoke + visual gates pass. - Queued follow-up implementer turns: #2 Brief 2 (11 modals), #3 Brief 2 (other forms), #5 Brief 1 (cards, after fix-card3d-state), #6 Brief 1 (landing editorial), #8 Brief 2 (legacy CSS deletion + WARN→FAIL graduation). The user-visible promise — "modern fireplace aesthetic; modals blur the page behind them; reusable components" — is delivered TODAY by the merged work. Co-authored-by: Cursor <cursoragent@cursor.com>
152 lines
4.5 KiB
JavaScript
152 lines
4.5 KiB
JavaScript
import { useCallback, useEffect, useId, useRef } from 'react';
|
|
import GlassSurface from './GlassSurface';
|
|
import useFocusTrap from '../../lib/use-focus-trap';
|
|
|
|
const SIZE_MAX_WIDTH = {
|
|
sm: '24rem',
|
|
md: '32rem',
|
|
lg: '48rem',
|
|
'fullscreen-on-mobile': '32rem',
|
|
};
|
|
|
|
export default function Modal({
|
|
open,
|
|
onClose,
|
|
title,
|
|
description,
|
|
size = 'md',
|
|
closeOnBackdrop = true,
|
|
closeOnEsc = true,
|
|
initialFocusRef,
|
|
hideCloseButton = false,
|
|
children,
|
|
}) {
|
|
const panelRef = useRef(null);
|
|
const titleId = useId();
|
|
const descriptionId = useId();
|
|
|
|
useFocusTrap({ active: open, containerRef: panelRef, initialFocusRef });
|
|
|
|
useEffect(() => {
|
|
if (!open || !closeOnEsc) return undefined;
|
|
const handler = (e) => {
|
|
if (e.key === 'Escape') onClose?.();
|
|
};
|
|
document.addEventListener('keydown', handler);
|
|
return () => document.removeEventListener('keydown', handler);
|
|
}, [open, closeOnEsc, onClose]);
|
|
|
|
useEffect(() => {
|
|
if (!open) return undefined;
|
|
const previousOverflow = document.body.style.overflow;
|
|
const previousPadRight = document.body.style.paddingRight;
|
|
const scrollbarWidth =
|
|
window.innerWidth - document.documentElement.clientWidth;
|
|
document.body.style.overflow = 'hidden';
|
|
if (scrollbarWidth > 0) {
|
|
document.body.style.paddingRight = `${scrollbarWidth}px`;
|
|
}
|
|
return () => {
|
|
document.body.style.overflow = previousOverflow;
|
|
document.body.style.paddingRight = previousPadRight;
|
|
};
|
|
}, [open]);
|
|
|
|
const handleBackdropClick = useCallback(
|
|
(e) => {
|
|
if (!closeOnBackdrop) return;
|
|
if (e.target === e.currentTarget) onClose?.();
|
|
},
|
|
[closeOnBackdrop, onClose]
|
|
);
|
|
|
|
if (!open) return null;
|
|
|
|
const isFullscreenOnMobile = size === 'fullscreen-on-mobile';
|
|
const maxWidth = SIZE_MAX_WIDTH[size] ?? SIZE_MAX_WIDTH.md;
|
|
|
|
return (
|
|
<div
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-labelledby={titleId}
|
|
aria-describedby={description ? descriptionId : undefined}
|
|
onClick={handleBackdropClick}
|
|
className="fixed inset-0 z-50 flex items-center justify-center p-4"
|
|
style={{
|
|
background: 'var(--modal-scrim)',
|
|
backdropFilter:
|
|
'blur(var(--glass-blur-high)) saturate(var(--glass-saturate))',
|
|
WebkitBackdropFilter:
|
|
'blur(var(--glass-blur-high)) saturate(var(--glass-saturate))',
|
|
}}
|
|
>
|
|
<GlassSurface
|
|
ref={panelRef}
|
|
tint="low"
|
|
blur="mid"
|
|
rim="subtle"
|
|
elevation="pronounced"
|
|
className={`relative w-full overflow-y-auto rounded-2xl ${
|
|
isFullscreenOnMobile
|
|
? 'max-h-screen sm:max-h-[90vh]'
|
|
: 'max-h-[90vh]'
|
|
}`}
|
|
style={{
|
|
maxWidth: isFullscreenOnMobile ? '100%' : maxWidth,
|
|
color: 'var(--text-primary)',
|
|
}}
|
|
>
|
|
<div className="flex items-start justify-between gap-4 px-6 pt-6 pb-3">
|
|
<div className="flex-1 min-w-0">
|
|
<h2
|
|
id={titleId}
|
|
className="text-xl font-bold"
|
|
style={{ color: 'var(--text-primary)' }}
|
|
>
|
|
{title}
|
|
</h2>
|
|
{description && (
|
|
<p
|
|
id={descriptionId}
|
|
className="mt-1 text-sm"
|
|
style={{ color: 'var(--text-secondary)' }}
|
|
>
|
|
{description}
|
|
</p>
|
|
)}
|
|
</div>
|
|
{!hideCloseButton && (
|
|
<button
|
|
type="button"
|
|
onClick={onClose}
|
|
aria-label="Close"
|
|
className="-mt-1 -mr-1 inline-flex h-9 w-9 items-center justify-center rounded-full transition-opacity hover:opacity-70 focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
|
|
style={{
|
|
color: 'var(--text-secondary)',
|
|
'--tw-ring-color': 'var(--accent-ember)',
|
|
'--tw-ring-offset-color': 'transparent',
|
|
}}
|
|
>
|
|
<svg
|
|
className="h-5 w-5"
|
|
fill="none"
|
|
stroke="currentColor"
|
|
viewBox="0 0 24 24"
|
|
aria-hidden="true"
|
|
>
|
|
<path
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
strokeWidth={2}
|
|
d="M6 18L18 6M6 6l12 12"
|
|
/>
|
|
</svg>
|
|
</button>
|
|
)}
|
|
</div>
|
|
<div className="px-6 pb-6">{children}</div>
|
|
</GlassSurface>
|
|
</div>
|
|
);
|
|
}
|