mirror of
https://github.com/supabase/supabase.git
synced 2026-09-09 11:30:17 +08:00
## What kind of change does this PR introduce? Accessibility cleanup (DEPR-628). ## What is the current behavior? Leftover call sites still use ad-hoc focus recipes (`ring-foreground-muted`, `outline-brand`, Dialog/Sheet `focus:` rings, etc.) instead of the shared utilities from #41575. ## What is the new behavior? Converts those leftovers across `packages/ui`, Studio, www, docs, and design-system to `focus-ring`, preferring `focus-visible`. Keeps documented exceptions (`group-focus-visible`, InputGroup `:has()`). ## To test Tab through controls (keyboard only). Expect a consistent offset ring on `:focus-visible`, not a green/brand/custom stack, and no ring animation. ### www (marketing) Preview: https://zone-www-dot-com-git-danny-depr-628-focus-ring-fbccf9-supabase.vercel.app - Global nav on `/`: Product, Developers, Solutions dropdowns; logo; hamburger + mobile menu - `/features`: view toggles and feature cards - `/company`: card links - `/changelog`: timeline / entry links - `/partners/catalog`: grid/list toggle and partner cards - `/pricing`: compute section expand control - Product / Modules / Solutions sticky navs on product pages (e.g. `/database`, `/storage`) - `/state-of-startups`: TwoOptionToggle if present ### docs Preview: https://docs-git-danny-depr-628-focus-ring-long-tail-supabase.vercel.app - Any guide page: top nav dropdowns and items - Narrow viewport: hamburger, then mobile menu links + close - Guide with PromptPanel / tabs: tab to prompt actions and tab list ### studio (dashboard) Preview: https://studio-staging-git-danny-depr-628-focus-ring-long-tail-supabase.vercel.app - Project home: Connect section tiles; drag-handle focus on sortable sections - Integrations marketplace (`/project/<ref>/integrations`): featured cards, list/grid toggle, list rows - Auth (`/project/<ref>/auth/oauth-apps`, `/project/<ref>/auth/providers`): open create/edit sheet, tab to close (X) - Database policies (`/project/<ref>/database/policies`): open policy editor sheet, tab to close - Storage policies (`/project/<ref>/storage/files/policies`): bucket section links; policy modal close - Query performance (`/project/<ref>/observability/query-performance`): info icon buttons on metrics - Replication pipeline detail (if available): slot lag / status info icons - Support (`/support/new`): attachment add/remove controls - Table editor: spreadsheet import preview checkboxes; row text/JSON editor TwoOptionToggle - Any Dialog/Sheet/toast close (X): ring on keyboard focus only, not mouse click ### design-system Preview: https://design-system-git-danny-depr-628-focus-ring-long-tail-supabase.vercel.app - Colour palette swatches (keyboard focus) - Form patterns sidepanel example: avatar / focusable control in the example ## Additional context - Linear: [DEPR-628](https://linear.app/supabase/issue/DEPR-628) - Follow-ups: form-group CSS (DEPR-629), Storage columns selection (DEPR-630), ESLint rule (DEPR-632) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Accessibility & Usability** * Standardized keyboard focus indicators across navigation, dialogs, forms, buttons, toggles, links, and tooltips using a consolidated focus style. * Improved toggle controls to use proper button semantics (instead of clickable text), including `aria-pressed`/disabled handling and better keyboard navigation. * **Visual Updates** * Harmonized hover/focus ring visuals across the design system, Studio, documentation, and marketing pages while preserving existing layout and interaction behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
89 lines
2.8 KiB
TypeScript
89 lines
2.8 KiB
TypeScript
import { cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
|
|
|
|
interface TwoOptionToggleProps {
|
|
options: string[]
|
|
width?: number
|
|
activeOption: string
|
|
onClickOption: (value: string) => void
|
|
borderOverride: string
|
|
disabledOptions?: string[]
|
|
disabledOptionTooltip?: string
|
|
}
|
|
|
|
export const TwoOptionToggle = ({
|
|
options,
|
|
width = 50,
|
|
activeOption,
|
|
onClickOption,
|
|
borderOverride = 'border-stronger',
|
|
disabledOptions = [],
|
|
disabledOptionTooltip,
|
|
}: TwoOptionToggleProps) => {
|
|
const buttonStyle = (
|
|
isActive: boolean
|
|
) => `absolute top-0 z-1 text-xs inline-flex h-full items-center justify-center font-medium
|
|
${
|
|
isActive ? 'hover:text-foreground-light hover:text-foreground' : 'hover:text-foreground'
|
|
} hover:text-foreground focus-visible:z-10 focus-ring`
|
|
|
|
return (
|
|
<div
|
|
className={`relative border ${borderOverride} rounded-md h-7`}
|
|
style={{ padding: 1, width: (width + 1) * 2 }}
|
|
role="group"
|
|
>
|
|
<span
|
|
style={{ width, translate: activeOption === options[1] ? '0px' : `${width - 2}px` }}
|
|
aria-hidden="true"
|
|
className={cn(
|
|
'z-0 inline-block rounded-sm h-full bg-overlay-hover shadow-sm transform',
|
|
'transition-all ease-in-out border border-strong'
|
|
)}
|
|
/>
|
|
{options.map((option, index: number) => {
|
|
const isDisabled = disabledOptions.includes(option)
|
|
const isActive = activeOption === option
|
|
const optionButton = (
|
|
<button
|
|
key={`toggle_${index}`}
|
|
type="button"
|
|
tabIndex={0}
|
|
aria-pressed={isActive}
|
|
// Prefer aria-disabled so TooltipTrigger asChild still receives hover/focus
|
|
aria-disabled={isDisabled || undefined}
|
|
style={{ width: width + 1 }}
|
|
className={cn(
|
|
isActive ? 'text-foreground' : 'text-foreground-light',
|
|
index === 0 ? 'right-0' : 'left-0',
|
|
buttonStyle(isActive),
|
|
isDisabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer'
|
|
)}
|
|
onClick={() => {
|
|
if (!isDisabled) onClickOption(option)
|
|
}}
|
|
>
|
|
<span
|
|
className={cn(
|
|
'capitalize hover:text-foreground',
|
|
isActive ? 'text-foreground' : 'text-foreground-light',
|
|
isDisabled && 'hover:text-foreground-light'
|
|
)}
|
|
>
|
|
{option}
|
|
</span>
|
|
</button>
|
|
)
|
|
|
|
if (!isDisabled || !disabledOptionTooltip) return optionButton
|
|
|
|
return (
|
|
<Tooltip key={`toggle_${index}`}>
|
|
<TooltipTrigger asChild>{optionButton}</TooltipTrigger>
|
|
<TooltipContent side="top">{disabledOptionTooltip}</TooltipContent>
|
|
</Tooltip>
|
|
)
|
|
})}
|
|
</div>
|
|
)
|
|
}
|