Skip to content

Commit 7d7e127

Browse files
committed
fix(web): restore compact panel controls and touch targets
1 parent 738e246 commit 7d7e127

2 files changed

Lines changed: 19 additions & 7 deletions

File tree

‎apps/web/src/components/ui/menu.tsx‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ function MenuPopup({
4747
collisionAvoidance?: MenuPrimitive.Positioner.Props["collisionAvoidance"];
4848
anchor?: MenuPrimitive.Positioner.Props["anchor"];
4949
keepMounted?: boolean;
50-
width?: "default" | "content";
50+
width?: "default" | "content" | "wide";
5151
variant?: "default" | "scope";
52-
spacing?: "default" | "relaxed";
52+
spacing?: "default" | "relaxed" | "compact";
5353
}) {
5454
return (
5555
<MenuPrimitive.Portal keepMounted={keepMounted}>
@@ -68,19 +68,30 @@ function MenuPopup({
6868
className={cn(
6969
"surface-popover kbd-in-popover relative flex origin-(--transform-origin) rounded-card outline-none focus:outline-none",
7070
variant === "scope" &&
71-
"rounded-pane [&_[data-slot=menu-radio-item]:not([data-checked]):not([data-highlighted])]:text-muted-foreground [&_[data-slot=menu-radio-item-indicator]>svg]:size-3",
71+
"rounded-pane [&_[data-slot=menu-radio-item]]:min-h-7 [&_[data-slot=menu-sub-trigger]]:min-h-7 [&_[data-slot=menu-radio-item]:not([data-checked]):not([data-highlighted])]:text-muted-foreground [&_[data-slot=menu-radio-item-indicator]>svg]:size-3",
7272
spacing === "relaxed" && RELAXED_PICKER_CLASS,
73+
spacing === "compact" &&
74+
"[&_[data-slot=menu-radio-item]]:min-h-7.5 [&_[data-slot=menu-radio-item]]:rounded-item [&_[data-slot=menu-radio-item]]:px-2 [&_[data-slot=menu-radio-item]]:py-1.5",
7375
// Electron drag hit-testing ignores z-index; opt portaled menus out to keep overlapping rows
7476
// hoverable.
7577
"[-webkit-app-region:no-drag]",
7678
"max-w-[calc(100vw-2rem)]",
77-
width === "content" ? "w-max min-w-0" : "min-w-[min(10rem,calc(100vw-2rem))]",
79+
width === "content"
80+
? "w-max min-w-0"
81+
: width === "wide"
82+
? "w-60"
83+
: "min-w-[min(10rem,calc(100vw-2rem))]",
7884
className,
7985
)}
8086
data-slot="menu-popup"
8187
{...props}
8288
>
83-
<div className="max-h-(--available-height) flex w-full flex-col gap-px overflow-y-auto p-1.5">
89+
<div
90+
className={cn(
91+
"max-h-(--available-height) flex w-full flex-col gap-px overflow-y-auto",
92+
variant === "scope" || spacing === "compact" ? "p-1" : "p-1.5",
93+
)}
94+
>
8495
{children}
8596
</div>
8697
</MenuPrimitive.Popup>
@@ -374,6 +385,7 @@ function MenuSubPopup({
374385
align = "start",
375386
...props
376387
}: MenuPrimitive.Popup.Props & {
388+
variant?: "default" | "scope";
377389
align?: MenuPrimitive.Positioner.Props["align"];
378390
sideOffset?: MenuPrimitive.Positioner.Props["sideOffset"];
379391
alignOffset?: MenuPrimitive.Positioner.Props["alignOffset"];

‎apps/web/src/components/ui/select.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { cn } from "~/lib/utils";
1010
const Select = SelectPrimitive.Root;
1111

1212
const selectTriggerVariants = cva(
13-
"relative inline-flex cursor-pointer select-none items-center justify-between gap-2 border rounded-[var(--control-radius)] text-left text-label outline-none transition-[color,box-shadow,background-color] data-disabled:pointer-events-none data-disabled:opacity-64 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4",
13+
"relative pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 inline-flex cursor-pointer select-none items-center justify-between gap-2 border rounded-[var(--control-radius)] text-left text-label outline-none transition-[color,box-shadow,background-color] data-disabled:pointer-events-none data-disabled:opacity-64 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4",
1414
{
1515
defaultVariants: {
1616
size: "default",
@@ -20,7 +20,7 @@ const selectTriggerVariants = cva(
2020
variant: {
2121
// The raised recipe; open and focused trade the rim for the ring stroke.
2222
default:
23-
"w-full min-w-36 surface-raised text-foreground pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 [:hover,[data-pressed]]:not-data-popup-open:surface-raised-hover focus-visible:not-data-disabled:surface-focus data-popup-open:not-data-disabled:surface-focus aria-invalid:not-data-disabled:surface-invalid focus-visible:aria-invalid:not-data-disabled:surface-invalid-focus data-popup-open:aria-invalid:not-data-disabled:surface-invalid [&_svg:not([class*='text-'])]:text-muted-foreground",
23+
"w-full min-w-36 surface-raised text-foreground [:hover,[data-pressed]]:not-data-popup-open:surface-raised-hover focus-visible:not-data-disabled:surface-focus data-popup-open:not-data-disabled:surface-focus aria-invalid:not-data-disabled:surface-invalid focus-visible:aria-invalid:not-data-disabled:surface-invalid-focus data-popup-open:aria-invalid:not-data-disabled:surface-invalid [&_svg:not([class*='text-'])]:text-muted-foreground",
2424
ghost:
2525
"border-transparent text-secondary-label focus-visible:outline-solid focus-visible:outline-2 focus-visible:outline-ring [:hover,[data-pressed],[data-popup-open]]:surface-ghost-hover [:hover,[data-pressed],[data-popup-open]]:text-foreground [&_svg:not([class*='text-'])]:text-muted-foreground",
2626
},

0 commit comments

Comments
 (0)