Skip to content

Commit 367077f

Browse files
committed
fix(web): multi-select options draw the checkbox without a nested input
1 parent b8a829f commit 367077f

2 files changed

Lines changed: 36 additions & 8 deletions

File tree

‎apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
derivePendingUserInputProgress,
77
type PendingUserInputDraftAnswer,
88
} from "../../pendingUserInput";
9-
import { Checkbox } from "../ui/checkbox";
9+
import { CheckboxMark } from "../ui/checkbox";
1010
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
1111
import { Kbd } from "../ui/kbd";
1212
import { cn } from "~/lib/utils";
@@ -263,7 +263,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
263263
<>
264264
<span className="pointer-events-none flex h-5 shrink-0 items-center">
265265
{activeQuestion.multiSelect ? (
266-
<Checkbox checked={isSelected} tabIndex={-1} aria-hidden />
266+
<CheckboxMark checked={isSelected} />
267267
) : (
268268
<OptionRadio checked={isSelected} />
269269
)}

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

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@ import { Checkbox as CheckboxPrimitive } from "@base-ui/react/checkbox";
22

33
import { cn } from "~/lib/utils";
44

5+
const rootClassName =
6+
"relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[3px] not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-2 focus-visible:outline-ring aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:outline-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:focus-visible:aria-invalid:outline-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none";
7+
8+
const indicatorClassName =
9+
"-inset-px absolute flex items-center justify-center rounded-[.25rem] text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground in-[[data-slot=checkbox]:focus-visible]:inset-shadow-[0_0_0_3px_var(--background)] in-[[data-slot=checkbox]:focus-visible]:outline-2 in-[[data-slot=checkbox]:focus-visible]:outline-solid in-[[data-slot=checkbox]:focus-visible]:-outline-offset-2 in-[[data-slot=checkbox]:focus-visible]:outline-inherit";
10+
511
function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
612
return (
713
<CheckboxPrimitive.Root
8-
className={cn(
9-
"relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[3px] not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:outline-2 focus-visible:outline-solid focus-visible:-outline-offset-2 focus-visible:outline-ring aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:outline-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:focus-visible:aria-invalid:outline-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none",
10-
className,
11-
)}
14+
className={cn(rootClassName, className)}
1215
data-slot="checkbox"
1316
{...props}
1417
>
1518
{/* Leave a contrasting inner gap inside the 2px focus outline. The glyphs name their color so
1619
rows that mute stray icons, such as list items, leave the indicator's color alone. */}
1720
<CheckboxPrimitive.Indicator
18-
className="-inset-px absolute flex items-center justify-center rounded-[.25rem] text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground in-[[data-slot=checkbox]:focus-visible]:inset-shadow-[0_0_0_3px_var(--background)] in-[[data-slot=checkbox]:focus-visible]:outline-2 in-[[data-slot=checkbox]:focus-visible]:outline-solid in-[[data-slot=checkbox]:focus-visible]:-outline-offset-2 in-[[data-slot=checkbox]:focus-visible]:outline-inherit"
21+
className={indicatorClassName}
1922
data-slot="checkbox-indicator"
2023
render={(props, state) => (
2124
<span {...props}>
@@ -57,4 +60,29 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
5760
);
5861
}
5962

60-
export { Checkbox };
63+
// Checkbox's look without its hidden input, for a row that is itself the button.
64+
function CheckboxMark({ checked }: { checked: boolean }) {
65+
const state = checked ? { "data-checked": "" } : { "data-unchecked": "" };
66+
return (
67+
<span aria-hidden className={rootClassName} data-slot="checkbox" {...state}>
68+
<span className={indicatorClassName} data-slot="checkbox-indicator" {...state}>
69+
<svg
70+
className="size-3.5 text-current sm:size-3"
71+
fill="none"
72+
height="24"
73+
stroke="currentColor"
74+
strokeLinecap="round"
75+
strokeLinejoin="round"
76+
strokeWidth="3"
77+
viewBox="0 0 24 24"
78+
width="24"
79+
xmlns="http://www.w3.org/2000/svg"
80+
>
81+
<path d="M5.252 12.7 10.2 18.63 18.748 5.37" />
82+
</svg>
83+
</span>
84+
</span>
85+
);
86+
}
87+
88+
export { Checkbox, CheckboxMark };

0 commit comments

Comments
 (0)