Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(ui): systematise control surface fills and hover borders (#48887)

Danny White5f9ce727c05d
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectModeButton.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectModeButton.tsx
index 3c6fd80b98e..2d891eacbc1 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectModeButton.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectModeButton.tsx
@@ -30,9 +30,8 @@ const connectModeButtonVariants = cva(
{
variants: {
selected: {
- true: 'z-1 border-foreground-muted bg-surface-300 ring-1 ring-border',
- false:
- 'hover:z-1 hover:border-foreground-muted hover:bg-background dark:hover:bg-surface-200',
+ true: 'z-1 border-control-hover bg-surface-300',
+ false: 'hover:z-1 hover:border-control-hover hover:bg-background dark:hover:bg-surface-200',
},
// Narrow 2-col outer corners
topLeft: {
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
index 629633df830..798e9e25ddb 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
@@ -82,10 +82,8 @@ const DuckLakeModeSelector = ({
onClick={() => onChange(option.value)}
className={cn(
'relative flex flex-col gap-y-3 rounded-md border p-4 text-left transition',
- 'hover:border-foreground-muted',
- selected
- ? 'border-foreground-muted bg-surface-300 ring-1 ring-border'
- : 'border-default bg-surface-100'
+ 'hover:border-control-hover',
+ selected ? 'border-control-hover bg-surface-300' : 'border-default bg-surface-100'
)}
>
<div className="flex items-start justify-between">
diff --git a/apps/studio/components/interfaces/DiskManagement/fields/ComputeSizeField.tsx b/apps/studio/components/interfaces/DiskManagement/fields/ComputeSizeField.tsx
index d0568f8dfa4..2ca4c01d0e6 100644
--- a/apps/studio/components/interfaces/DiskManagement/fields/ComputeSizeField.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/fields/ComputeSizeField.tsx
@@ -288,7 +288,7 @@ export function ComputeSizeField({ form, disabled }: ComputeSizeFieldProps) {
<div
className={cn(
'relative text-sm text-left flex flex-col gap-0 px-0 py-3 w-full h-[110px]',
- 'bg-overlay rounded-md border p-2 hover:border-foreground-muted'
+ 'bg-overlay rounded-md border p-2 hover:border-control-hover'
)}
>
<SupportLink
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx
index e176e4ccfb9..74f182e7dc6 100644
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx
@@ -23,9 +23,9 @@ export function RoleImpersonationRadio<T extends string>({
return (
<label
className={cn(
- 'border border-default rounded-md bg-surface-200 hover:bg-overlay-hover hover:border-control px-4 py-3 cursor-pointer transition-colors',
+ 'border border-default rounded-md bg-surface-200 hover:bg-overlay-hover hover:border-control-hover px-4 py-3 cursor-pointer transition-colors',
fullWidth ? 'w-full' : 'w-44',
- isSelected && 'border-foreground-muted hover:border-foreground-muted bg-surface-300'
+ isSelected && 'border-control-hover hover:border-control-hover bg-surface-300'
)}
tabIndex={0}
onKeyDown={(e) => {
diff --git a/packages/config/css/theme.css b/packages/config/css/theme.css
index 71b0255cd58..e83273b4b1b 100644
--- a/packages/config/css/theme.css
+++ b/packages/config/css/theme.css
@@ -23,6 +23,10 @@
--color-muted-foreground: var(--muted-foreground);
--color-accent: var(--accent);
--color-accent-foreground: var(--accent-foreground);
+ --color-field: var(--field);
+ --color-control-raised: var(--control-raised);
+ /* --control aliases --control-raised. Do not add --color-control — it would
+ collide with border-control and the legacy bg-control (accent) utility. */
--color-warning: var(--warning);
--color-warning-foreground: var(--warning-foreground);
--color-destructive: var(--destructive);
@@ -300,6 +304,8 @@
--background-color-alternative: var(--background-alternative-default);
--background-color-selection: var(--background-selection);
--background-color-control: var(--background-control);
+ --background-color-field: var(--field);
+ --background-color-control-raised: var(--control-raised);
--background-color-surface-75: var(--background-surface-75);
--background-color-surface-100: var(--background-surface-100);
--background-color-surface-200: var(--background-surface-200);
@@ -322,6 +328,7 @@
--color-border-control: var(--border-control);
--color-border-strong: var(--border-strong);
--color-border-stronger: var(--border-stronger);
+ --color-border-control-hover: var(--border-control-hover);
--color-border-destructive: var(--border-destructive);
--color-border-warning: var(--border-warning);
--color-border-info: var(--border-info);
@@ -336,6 +343,7 @@
--border-color-control: var(--border-control);
--border-color-strong: var(--border-strong);
--border-color-stronger: var(--border-stronger);
+ --border-color-control-hover: var(--border-control-hover);
--border-color-secondary: var(--border-secondary);
--border-color-alternative: var(--border-alternative);
--border-color-button: var(--border-button-default);
diff --git a/packages/ui-patterns/src/CommandMenu/api/CommandMenu.tsx b/packages/ui-patterns/src/CommandMenu/api/CommandMenu.tsx
index 4ab24a24862..f71cd830cc0 100644
--- a/packages/ui-patterns/src/CommandMenu/api/CommandMenu.tsx
+++ b/packages/ui-patterns/src/CommandMenu/api/CommandMenu.tsx
@@ -188,9 +188,9 @@ function CommandMenuTriggerInput({
'grow md:min-w-44 xl:min-w-56 h-[30px] rounded-md',
'pl-1.5 md:pl-2 pr-1',
'flex items-center justify-between',
- // Match Button default (Connect): opaque popover hover fill, stronger border.
+ // Match Button default (Connect): opaque popover hover fill, shared control-hover border.
'bg-transparent text-foreground-lighter border border-strong',
- 'hover:bg-popover hover:border-stronger',
+ 'hover:bg-popover hover:border-control-hover',
'focus-ring',
'transition-colors',
className
diff --git a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx b/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
index c86f0621970..928bf4be725 100644
--- a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
+++ b/packages/ui-patterns/src/FilterBar/FilterCondition.tsx
@@ -274,7 +274,7 @@ export function FilterCondition({
onChange={(e) => setPropertySearchText(e.target.value)}
onBlur={handlePropertyBlur}
onKeyDown={handlePropertyKeyDown}
- className="h-full border-none bg-transparent py-0 pl-2 pr-1 text-xs focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 text-foreground-light w-full absolute left-0 top-0"
+ className="h-full border-none bg-transparent py-0 pl-2 pr-1 text-xs hover:border-transparent focus:border-transparent focus-visible:border-transparent focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 text-foreground-light w-full absolute left-0 top-0"
placeholder={property.label}
autoFocus
aria-label={`Change property from ${property.label}`}
@@ -332,7 +332,7 @@ export function FilterCondition({
}}
onBlur={handleOperatorBlur}
onKeyDown={handleOperatorKeyDown}
- className="h-full border-none bg-transparent py-0 px-1 text-center text-xs md:text-xs focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 text-foreground w-full absolute left-0 top-0"
+ className="h-full border-none bg-transparent py-0 px-1 text-center text-xs md:text-xs hover:border-transparent focus:border-transparent focus-visible:border-transparent focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 text-foreground w-full absolute left-0 top-0"
aria-label={`Operator for ${property.label}`}
data-testid={`filter-operator-${property.name}`}
tabIndex={-1}
@@ -379,7 +379,7 @@ export function FilterCondition({
onFocus={() => handleInputFocus(path)}
onBlur={handleValueBlur}
onKeyDown={handleValueKeyDown}
- className="h-full border-none bg-transparent py-0 px-1 text-xs md:text-xs focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full absolute left-0 top-0"
+ className="h-full border-none bg-transparent py-0 px-1 text-xs md:text-xs hover:border-transparent focus:border-transparent focus-visible:border-transparent focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full absolute left-0 top-0"
aria-label={`Value for ${property.label}`}
data-testid={`filter-value-${property.name}`}
tabIndex={-1}
diff --git a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx b/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
index 34d0a143c4d..6f9dae85de5 100644
--- a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
+++ b/packages/ui-patterns/src/FilterBar/FilterGroup.tsx
@@ -206,7 +206,7 @@ export function FilterGroup({ group, path }: FilterGroupProps) {
onFocus={() => handleGroupFreeformFocus(path)}
onBlur={handleFreeformBlur}
onKeyDown={handleFreeformKeyDown}
- className="border-none bg-transparent text-xs focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full flex-1 h-auto min-w-0 px-2 py-1"
+ className="border-none bg-transparent text-xs hover:border-transparent focus:border-transparent focus-visible:border-transparent focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full flex-1 h-auto min-w-0 px-2 py-1"
placeholder={
group.conditions.length === 0 ? emptyPlaceholder : 'Add more filters...'
}
@@ -226,7 +226,7 @@ export function FilterGroup({ group, path }: FilterGroupProps) {
onFocus={() => handleGroupFreeformFocus(path)}
onBlur={handleFreeformBlur}
onKeyDown={handleFreeformKeyDown}
- className="h-full border-none bg-transparent py-0 text-xs md:text-xs focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full absolute left-0 top-0 px-2"
+ className="h-full border-none bg-transparent py-0 text-xs md:text-xs hover:border-transparent focus:border-transparent focus-visible:border-transparent focus:outline-hidden focus:ring-0 focus:shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 w-full absolute left-0 top-0 px-2"
placeholder="+ Add filter"
autoComplete="off"
data-1p-ignore
diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsx
index 2f769935942..5b24bdf5531 100644
--- a/packages/ui-patterns/src/multi-select/multi-select.tsx
+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx
@@ -258,7 +258,7 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTr
}
}, [values, badgeLimit])
- const badgeClasses = 'rounded-sm shrink-0 px-1.5'
+ const badgeClasses = 'rounded-sm shrink-0 px-1.5 bg-surface-75 dark:bg-white/5'
const handleTriggerClick: React.MouseEventHandler<HTMLButtonElement> = React.useCallback(
(event) => {
@@ -294,12 +294,14 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTr
role="combobox"
className={cn(
'flex w-full min-w-[200px] min-h-[34px] items-center justify-between rounded-md border',
- 'border-strong bg-background dark:bg-card px-3 py-1.5 text-sm',
+ 'border-strong px-3 py-1.5 text-sm',
+ // Empty: raised plate. Filled: sunk well for chips.
+ values.length > 0 ? 'bg-field' : 'bg-control-raised',
'placeholder:text-muted-foreground',
'ring-border-control focus-ring',
'disabled:cursor-not-allowed disabled:opacity-50',
- 'hover:border-stronger hover:bg-popover transition-colors duration-200',
- open && 'bg-popover border-stronger',
+ 'hover:border-control-hover transition-colors duration-200',
+ open && 'border-control-hover',
className
)}
{...props}
@@ -381,7 +383,7 @@ const MultiSelectorTrigger = React.forwardRef<HTMLButtonElement, MultiSelectorTr
MultiSelectorTrigger.displayName = 'MultiSelectorTrigger'
MultiSelector.Trigger = MultiSelectorTrigger
-const MultiSelectorInputVariants = cva('bg-control border', {
+const MultiSelectorInputVariants = cva('', {
variants: {
size: {
...SIZE_VARIANTS,
diff --git a/packages/ui/README.md b/packages/ui/README.md
index 1e971f755db..02a7da1ac4a 100644
--- a/packages/ui/README.md
+++ b/packages/ui/README.md
@@ -24,9 +24,12 @@ import { clipboard, cn, mergeDeep } from 'ui' // clsx + tailwind-merge
## Styling conventions
- Tailwind only — no inline styles or CSS modules.
-- Use shadcn semantic pairs (`bg-card text-card-foreground`, `bg-muted text-muted-foreground`,
- `bg-tertiary text-tertiary-foreground`) rather than hardcoded colors. Legacy utilities such as
+- Prefer shadcn semantic pairs (`bg-card text-card-foreground`, `bg-muted text-muted-foreground`,
+ `bg-tertiary text-tertiary-foreground`) over hardcoded colors. Legacy utilities such as
`text-foreground-light` and `border-default` are compatibility aliases only.
+- Control surface roles (`bg-field`, `bg-control-raised`, `border-control-hover`; CSS
+ `--control` aliases raised) live in [`build/css/source/semantic.css`](./build/css/source/semantic.css).
+ Prefer those over inventing fills. Legacy `bg-control` is still the accent wash alias.
- Themes set the core `--hue` (or the split `--surface-hue` / `--primary-hue`), `--chroma`,
`--surface`, `--foreground-lightness`, and `--contrast` inputs, plus their
`--muted-foreground-level` and `--tertiary-foreground-level` hierarchy.
diff --git a/packages/ui/build/css/source/semantic.css b/packages/ui/build/css/source/semantic.css
index 68e4e1c263e..4e9f65d9f09 100644
--- a/packages/ui/build/css/source/semantic.css
+++ b/packages/ui/build/css/source/semantic.css
@@ -194,6 +194,32 @@
--accent: oklch(from var(--foreground) l c h / var(--accent-alpha));
--accent-foreground: var(--foreground);
+ /*
+ * Control surface roles (design sync: sunk fields + raised choosers):
+ * --field sunk text entry (Input, Textarea, filled MultiSelect)
+ * --control-raised raised chooser plate (Select, empty MultiSelect)
+ * --control alias of --control-raised
+ *
+ * Alpha overlays relative to the local plate (page, sheet, card) — not solids
+ * from --background. Page-relative solids sit between canvas (e0) and Sheet
+ * (popover e2) and vanish on light near the white ceiling.
+ *
+ * Field soft always-sink via black. --field-alpha is a theme input (stronger in
+ * dark.css) because the same absolute opacity is obvious on light plates and
+ * near-invisible on dark ones. Default is softer than the old foreground/[.026]
+ * wash. Raised is a soft white lift so selects read button-like without stark
+ * wells. Borders carry most hover chrome (--border-control-hover). Light raises
+ * still have little headroom on sheets; sheets matching app background would
+ * widen that later.
+ *
+ * Default Button stays opaque card/popover for occluding chrome (DEPR-636).
+ * Floating clusters can wrap in a solid Popover as a follow-up.
+ */
+ --field-alpha: 0.015;
+ --field: oklch(0 0 0 / var(--field-alpha));
+ --control-raised: oklch(1 0 0 / calc(var(--muted-alpha) * 0.65));
+ --control: var(--control-raised);
+
--warning: oklch(var(--warning-lightness) var(--expressive-chroma) var(--warning-hue));
--destructive: oklch(
var(--destructive-lightness) var(--expressive-chroma) var(--destructive-hue)
@@ -229,5 +255,13 @@
--input: oklch(
from var(--foreground) l calc(c * 0.5) h / calc(3% + 38% * var(--contrast-border))
);
+ /*
+ * Shared interactive border for control chrome (inputs, selects, default /
+ * dashed Button, radio cards). Pairs with rest --border-control / --border-strong.
+ * Stronger than --border-stronger; softer than a full muted-foreground stroke.
+ */
+ --border-control-hover: oklch(
+ from var(--foreground) l calc(c * 0.5) h / calc(12% + 58% * var(--contrast-border))
+ );
--ring: oklch(from var(--primary) l c h / 55%);
}
diff --git a/packages/ui/build/css/themes/dark.css b/packages/ui/build/css/themes/dark.css
index daf570a706a..d8dd2bd5ee0 100644
--- a/packages/ui/build/css/themes/dark.css
+++ b/packages/ui/build/css/themes/dark.css
@@ -9,6 +9,8 @@
--foreground-lightness: 0.95;
--muted-foreground-level: 0.8;
--tertiary-foreground-level: 0.65;
+ /* Light default --field-alpha (0.015) disappears on dark plates; dig harder. */
+ --field-alpha: 0.12;
--code-block-5: 13.8deg 89.7% 69.6%;
--code-block-4: 276.1deg 67.7% 74.5%;
diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx
index 7b0e556bfce..ff326fb121d 100644
--- a/packages/ui/src/components/Button/Button.tsx
+++ b/packages/ui/src/components/Button/Button.tsx
@@ -38,9 +38,9 @@ const buttonVariants = cva(
default: `
text-foreground
bg-background dark:bg-card hover:bg-popover
- border-strong hover:border-stronger
+ border-strong hover:border-control-hover
data-[state=open]:bg-popover
- data-[state=open]:border-button-hover
+ data-[state=open]:border-control-hover
`,
secondary: `
bg-foreground
@@ -58,9 +58,9 @@ const buttonVariants = cva(
text-foreground
border
border-dashed
- border-strong hover:border-stronger
+ border-strong hover:border-control-hover
bg-transparent
- data-[state=open]:border-stronger
+ data-[state=open]:border-control-hover
`,
link: `
text-brand-600
diff --git a/packages/ui/src/components/radio-group-card.tsx b/packages/ui/src/components/radio-group-card.tsx
index 2bf4330a345..61060593599 100644
--- a/packages/ui/src/components/radio-group-card.tsx
+++ b/packages/ui/src/components/radio-group-card.tsx
@@ -36,11 +36,12 @@ const RadioGroupCardItem = React.forwardRef<
'border',
'p-2',
// 'hover:bg-selection',
- 'hover:border-foreground-muted',
- 'hover:z-1 focus-visible:z-1',
+ 'hover:border-control-hover',
+ 'hover:z-1 focus-visible:z-1 focus-visible:border-control-hover',
'outline-hidden',
'transition-colors',
'group',
+ 'data-[state=checked]:border-control-hover',
props.className
)}
>
@@ -50,9 +51,9 @@ const RadioGroupCardItem = React.forwardRef<
<div
className="
aspect-square h-4 w-4
- rounded-full border group-data-[state=checked]:border-foreground-muted
- group-focus:border-foreground-muted
- group-hover:border-foreground-muted
+ rounded-full border group-data-[state=checked]:border-control-hover
+ group-focus:border-control-hover
+ group-hover:border-control-hover
ring-offset-background
group-focus:outline-hidden
group-focus-visible:ring-2 group-focus-visible:ring-ring group-focus-visible:ring-offset-2 group-focus-visible:ring-offset-background
diff --git a/packages/ui/src/components/radio-group-stacked.tsx b/packages/ui/src/components/radio-group-stacked.tsx
index db83730ef95..c3b4dddf9b1 100644
--- a/packages/ui/src/components/radio-group-stacked.tsx
+++ b/packages/ui/src/components/radio-group-stacked.tsx
@@ -46,14 +46,13 @@ const RadioGroupStackedItem = React.forwardRef<
// Disabled state
'disabled:opacity-50 disabled:cursor-not-allowed',
// Enabled/hover states
- 'enabled:cursor-pointer enabled:hover:bg-surface-300 enabled:hover:border-foreground-muted',
+ 'enabled:cursor-pointer enabled:hover:bg-surface-300 enabled:hover:border-control-hover',
// Focus state
- 'focus-ring enabled:focus-visible:border-control',
+ 'focus-ring enabled:focus-visible:border-control-hover',
// Z-index for interactions
'hover:z-1 focus-visible:z-1 data-[state=checked]:z-1',
// Checked state
- 'data-[state=checked]:ring-1 data-[state=checked]:ring-border',
- 'data-[state=checked]:bg-surface-300 data-[state=checked]:border-foreground-muted',
+ 'data-[state=checked]:bg-surface-300 data-[state=checked]:border-control-hover',
// Colors only — avoid bare `transition` so the focus ring does not animate
'transition-colors group',
props.className
@@ -67,10 +66,10 @@ const RadioGroupStackedItem = React.forwardRef<
'aspect-square h-4 w-4 min-w-4 min-h-4 rounded-full border relative',
'flex items-center justify-center',
// States
- 'group-data-[state=checked]:border-foreground-muted',
- 'group-focus-visible:border-foreground-muted',
+ 'group-data-[state=checked]:border-control-hover',
+ 'group-focus-visible:border-control-hover',
'group-focus-visible:ring-2 group-focus-visible:ring-ring group-focus-visible:ring-offset-2 group-focus-visible:ring-offset-background',
- 'group-hover:border-foreground-muted transition-colors'
+ 'group-hover:border-control-hover transition-colors'
)}
>
<RadioGroupPrimitive.Indicator className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
diff --git a/packages/ui/src/components/shadcn/ui/input-group.tsx b/packages/ui/src/components/shadcn/ui/input-group.tsx
index 0a5752b25b5..d0506aa2216 100644
--- a/packages/ui/src/components/shadcn/ui/input-group.tsx
+++ b/packages/ui/src/components/shadcn/ui/input-group.tsx
@@ -45,7 +45,7 @@ function InputGroup({
role="group"
className={cn(
'group/input-group relative items-center outline-hidden transition-[color,box-shadow]',
- 'flex rounded-md border border-control bg-foreground/[.026] text-sm',
+ 'flex rounded-md border border-control hover:border-control-hover bg-field text-sm transition-colors duration-200',
'has-[>textarea]:h-auto',
// Variants based on alignment.
@@ -57,11 +57,14 @@ function InputGroup({
// Focus state. Parent listens via :has() — cannot use the focus-ring utility
// (that utility targets :focus-visible on the element itself).
- 'has-[[data-slot=input-group-control]:focus-visible]:outline-hidden has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-ring has-[[data-slot=input-group-control]:focus-visible]:ring-offset-2 has-[[data-slot=input-group-control]:focus-visible]:ring-offset-background',
+ 'has-[[data-slot=input-group-control]:focus-visible]:outline-hidden has-[[data-slot=input-group-control]:focus-visible]:border-control-hover has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-ring has-[[data-slot=input-group-control]:focus-visible]:ring-offset-2 has-[[data-slot=input-group-control]:focus-visible]:ring-offset-background',
+ 'has-[[data-slot=input-group-control]:focus]:border-control-hover',
// Error state.
'has-[[data-slot][aria-invalid=true]]:bg-destructive-200 has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[[data-slot][aria-invalid=true]]:border-destructive-400 dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40',
+ 'has-[[data-slot][aria-invalid=true]]:hover:border-destructive',
'has-[[data-slot][aria-invalid=true]]:has-[[data-slot=input-group-control]:focus-visible]:border-destructive',
+ 'has-[[data-slot][aria-invalid=true]]:has-[[data-slot=input-group-control]:focus]:border-destructive',
// Disabled state.
'has-[[data-slot=input-group-control]:disabled]:cursor-not-allowed has-[[data-slot=input-group-control]:disabled]:text-foreground-muted',
@@ -165,10 +168,12 @@ const InputGroupInput = React.forwardRef<HTMLInputElement, InputProps>(
data-slot="input-group-control"
className={cn(
'flex-1 block rounded-none border border-transparent -m-px bg-transparent shadow-none',
- 'focus:border-transparent focus-visible:border-transparent focus-visible:ring-0 focus-visible:ring-offset-0',
+ // Shell owns hover/focus chrome; kill Input's control-hover borders on the inner control.
+ 'hover:border-transparent focus:border-transparent focus-visible:border-transparent',
+ 'focus-visible:ring-0 focus-visible:ring-offset-0',
'read-only:border-transparent',
'aria-[invalid=true]:border-transparent aria-[invalid=true]:bg-transparent',
- 'aria-[invalid=true]:focus:border-transparent aria-[invalid=true]:focus-visible:border-transparent',
+ 'aria-[invalid=true]:hover:border-transparent aria-[invalid=true]:focus:border-transparent aria-[invalid=true]:focus-visible:border-transparent',
className
)}
{...props}
@@ -187,7 +192,10 @@ const InputGroupTextarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
data-slot="input-group-control"
className={cn(
'flex-1 resize-none rounded-none border border-transparent bg-transparent py-0 shadow-none',
- 'focus:border-transparent focus-visible:border-transparent focus-visible:ring-0 focus-visible:ring-offset-0',
+ 'hover:border-transparent focus:border-transparent focus-visible:border-transparent',
+ 'focus-visible:ring-0 focus-visible:ring-offset-0',
+ 'aria-[invalid=true]:border-transparent aria-[invalid=true]:bg-transparent',
+ 'aria-[invalid=true]:hover:border-transparent aria-[invalid=true]:focus:border-transparent aria-[invalid=true]:focus-visible:border-transparent',
className
)}
{...props}
diff --git a/packages/ui/src/components/shadcn/ui/input.tsx b/packages/ui/src/components/shadcn/ui/input.tsx
index b2933fb903a..3e49f3d5a2c 100644
--- a/packages/ui/src/components/shadcn/ui/input.tsx
+++ b/packages/ui/src/components/shadcn/ui/input.tsx
@@ -11,9 +11,9 @@ export interface InputProps
export const InputVariants = cva(
cn(
- 'flex h-10 w-full rounded-md border border-control read-only:border-button bg-foreground/[.026] px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-muted read-only:text-foreground-light',
- 'focus:border-control focus-ring disabled:cursor-not-allowed disabled:text-foreground-muted',
- 'aria-[] aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive'
+ 'flex h-10 w-full rounded-md border border-control hover:border-control-hover read-only:border-button bg-field px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-muted read-only:text-foreground-light',
+ 'focus:border-control-hover focus-ring disabled:cursor-not-allowed disabled:text-foreground-muted transition-colors duration-200',
+ 'aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:hover:border-destructive aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive'
),
{
variants: {
diff --git a/packages/ui/src/components/shadcn/ui/radio-group.tsx b/packages/ui/src/components/shadcn/ui/radio-group.tsx
index 2aa4fac0e00..e7f7ed2b952 100644
--- a/packages/ui/src/components/shadcn/ui/radio-group.tsx
+++ b/packages/ui/src/components/shadcn/ui/radio-group.tsx
@@ -1,7 +1,7 @@
'use client'
-import { RadioGroup as RadioGroupPrimitive } from 'radix-ui'
import { Circle } from 'lucide-react'
+import { RadioGroup as RadioGroupPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
@@ -56,10 +56,8 @@ const RadioGroupLargeItem = React.forwardRef<
'rounded-md border border-strong',
'p-2',
'shadow-xs',
- 'hover:border-stronger hover:bg-surface-300',
- 'data-[state=checked]:border-primary',
- 'data-[state=checked]:ring-1 data-[state=checked]:ring-border',
- 'data-[state=checked]:bg-selection data-[state=checked]:border-foreground',
+ 'hover:border-control-hover focus-visible:border-control-hover hover:bg-surface-300',
+ 'data-[state=checked]:bg-selection data-[state=checked]:border-control-hover',
'transition-colors',
'group',
props.className
@@ -87,8 +85,9 @@ const RadioGroupLargeItem = React.forwardRef<
'w-3 h-3',
'border border-stronger',
'rounded-full',
- 'group-hover:border-foreground-light',
- 'group-data-[state=checked]:border-foreground',
+ 'group-hover:border-control-hover',
+ 'group-focus-visible:border-control-hover',
+ 'group-data-[state=checked]:border-control-hover',
'transition-colors'
)}
></div>
diff --git a/packages/ui/src/components/shadcn/ui/select.tsx b/packages/ui/src/components/shadcn/ui/select.tsx
index d2cdd3087c2..9bacd99420f 100644
--- a/packages/ui/src/components/shadcn/ui/select.tsx
+++ b/packages/ui/src/components/shadcn/ui/select.tsx
@@ -47,8 +47,8 @@ const SelectTrigger = React.forwardRef<
<SelectPrimitive.Trigger
ref={ref}
className={cn(
- 'flex w-full items-center justify-between rounded-md border border-strong hover:border-stronger bg-background dark:bg-card hover:bg-popover text-xs data-[placeholder]:text-foreground-lighter ring-border-control focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200',
- 'data-[state=open]:bg-popover data-[state=open]:border-stronger',
+ 'flex w-full items-center justify-between rounded-md border border-strong hover:border-control-hover bg-control-raised text-xs data-[placeholder]:text-foreground-lighter ring-border-control focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200',
+ 'data-[state=open]:border-control-hover',
'gap-2',
'[&>span]:truncate text-left', // [kemal] This is to prevent double lines rendering when a string is particularly long.
SelectTriggerVariants({ size }),
diff --git a/packages/ui/src/components/shadcn/ui/text-area.tsx b/packages/ui/src/components/shadcn/ui/text-area.tsx
index f54a9a50d91..7c07af022da 100644
--- a/packages/ui/src/components/shadcn/ui/text-area.tsx
+++ b/packages/ui/src/components/shadcn/ui/text-area.tsx
@@ -4,16 +4,18 @@ import { cn } from '../../../lib/utils/cn'
export interface TextAreaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-const customClasses = ['bg-control']
-
+/**
+ * Legacy TextArea. Prefer `Textarea` from `./textarea` for new work.
+ * Kept in sync with the shadcn Textarea control surface (field well + control-hover).
+ */
const TextArea = React.forwardRef<HTMLTextAreaElement, TextAreaProps>(
({ className, ...props }, ref) => {
return (
<textarea
className={cn(
- 'flex min-h-10 w-full rounded-md border border-control focus:border-control bg-control px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-muted',
- 'focus-ring disabled:cursor-not-allowed disabled:opacity-50',
- ...customClasses,
+ 'flex min-h-10 w-full rounded-md border border-control hover:border-control-hover bg-field px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-muted',
+ 'focus:border-control-hover focus-visible:border-control-hover focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200',
+ 'aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:hover:border-destructive aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive',
className
)}
ref={ref}
diff --git a/packages/ui/src/components/shadcn/ui/textarea.tsx b/packages/ui/src/components/shadcn/ui/textarea.tsx
index 288e57abb7d..8c668ebd861 100644
--- a/packages/ui/src/components/shadcn/ui/textarea.tsx
+++ b/packages/ui/src/components/shadcn/ui/textarea.tsx
@@ -9,7 +9,8 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
return (
<textarea
className={cn(
- 'flex min-h-[80px] w-full rounded-md border border-control bg-foreground/[.026] px-3 py-2 text-base md:text-sm placeholder:text-foreground-muted focus:border-control focus-visible:border-control focus-ring disabled:cursor-not-allowed disabled:opacity-50',
+ 'flex min-h-[80px] w-full rounded-md border border-control hover:border-control-hover bg-field px-3 py-2 text-base md:text-sm placeholder:text-foreground-muted focus:border-control-hover focus-visible:border-control-hover focus-ring disabled:cursor-not-allowed disabled:opacity-50 transition-colors duration-200',
+ 'aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:hover:border-destructive aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive',
className
)}
ref={ref}