@brightlocal/ui-components 0.1.2 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (281) hide show
  1. package/dist/accordion.cjs +1 -1
  2. package/dist/accordion.d.ts +74 -4
  3. package/dist/accordion.d.ts.map +1 -1
  4. package/dist/accordion.js +100 -105
  5. package/dist/alert-dialog.cjs +1 -1
  6. package/dist/alert-dialog.d.ts +30 -10
  7. package/dist/alert-dialog.d.ts.map +1 -1
  8. package/dist/alert-dialog.js +129 -132
  9. package/dist/alert.cjs +1 -1
  10. package/dist/alert.d.ts +22 -1
  11. package/dist/alert.d.ts.map +1 -1
  12. package/dist/alert.js +1 -1
  13. package/dist/aspect-ratio.cjs +1 -1
  14. package/dist/aspect-ratio.d.ts +11 -1
  15. package/dist/aspect-ratio.d.ts.map +1 -1
  16. package/dist/aspect-ratio.js +16 -20
  17. package/dist/avatar.cjs +1 -1
  18. package/dist/avatar.d.ts +43 -3
  19. package/dist/avatar.d.ts.map +1 -1
  20. package/dist/avatar.js +18 -16
  21. package/dist/badge.cjs +1 -1
  22. package/dist/badge.d.ts +24 -9
  23. package/dist/badge.d.ts.map +1 -1
  24. package/dist/badge.js +34 -32
  25. package/dist/blocks/data-table.cjs +1 -1
  26. package/dist/blocks/data-table.d.ts.map +1 -1
  27. package/dist/blocks/data-table.js +177 -170
  28. package/dist/blocks/sidebar.cjs +1 -1
  29. package/dist/blocks/sidebar.d.ts +38 -307
  30. package/dist/blocks/sidebar.d.ts.map +1 -1
  31. package/dist/blocks/sidebar.js +411 -508
  32. package/dist/breadcrumb.cjs +1 -1
  33. package/dist/breadcrumb.d.ts +63 -8
  34. package/dist/breadcrumb.d.ts.map +1 -1
  35. package/dist/breadcrumb.js +97 -93
  36. package/dist/button.cjs +1 -1
  37. package/dist/button.d.ts +17 -45
  38. package/dist/button.d.ts.map +1 -1
  39. package/dist/button.js +49 -50
  40. package/dist/calendar.cjs +1 -1
  41. package/dist/calendar.d.ts +16 -1
  42. package/dist/calendar.d.ts.map +1 -1
  43. package/dist/calendar.js +31 -29
  44. package/dist/card.cjs +1 -1
  45. package/dist/card.d.ts +58 -18
  46. package/dist/card.d.ts.map +1 -1
  47. package/dist/card.js +60 -51
  48. package/dist/carousel.cjs +1 -1
  49. package/dist/carousel.d.ts +99 -9
  50. package/dist/carousel.d.ts.map +1 -1
  51. package/dist/carousel.js +142 -128
  52. package/dist/centred-layout.cjs +1 -1
  53. package/dist/centred-layout.d.ts +18 -15
  54. package/dist/centred-layout.d.ts.map +1 -1
  55. package/dist/centred-layout.js +44 -33
  56. package/dist/chart.cjs +4 -4
  57. package/dist/chart.d.ts +70 -7
  58. package/dist/chart.d.ts.map +1 -1
  59. package/dist/chart.js +71 -66
  60. package/dist/checkbox.cjs +1 -1
  61. package/dist/checkbox.d.ts +9 -5
  62. package/dist/checkbox.d.ts.map +1 -1
  63. package/dist/checkbox.js +61 -82
  64. package/dist/collapsible.cjs +1 -1
  65. package/dist/collapsible.d.ts +65 -8
  66. package/dist/collapsible.d.ts.map +1 -1
  67. package/dist/collapsible.js +41 -55
  68. package/dist/combobox.cjs +1 -1
  69. package/dist/combobox.d.ts +28 -18
  70. package/dist/combobox.d.ts.map +1 -1
  71. package/dist/combobox.js +191 -160
  72. package/dist/command.cjs +1 -1
  73. package/dist/command.d.ts +115 -9
  74. package/dist/command.d.ts.map +1 -1
  75. package/dist/command.js +176 -152
  76. package/dist/context-menu.cjs +1 -1
  77. package/dist/context-menu.d.ts +188 -20
  78. package/dist/context-menu.d.ts.map +1 -1
  79. package/dist/context-menu.js +120 -122
  80. package/dist/date-picker.cjs +1 -1
  81. package/dist/date-picker.d.ts +75 -9
  82. package/dist/date-picker.d.ts.map +1 -1
  83. package/dist/date-picker.js +221 -82
  84. package/dist/description.cjs +1 -0
  85. package/dist/description.d.ts +37 -0
  86. package/dist/description.d.ts.map +1 -0
  87. package/dist/description.js +25 -0
  88. package/dist/dialog.cjs +1 -1
  89. package/dist/dialog.d.ts +73 -9
  90. package/dist/dialog.d.ts.map +1 -1
  91. package/dist/dialog.js +103 -112
  92. package/dist/drawer.cjs +1 -1
  93. package/dist/drawer.d.ts +92 -0
  94. package/dist/drawer.d.ts.map +1 -1
  95. package/dist/drawer.js +67 -52
  96. package/dist/dropdown-menu.cjs +1 -1
  97. package/dist/dropdown-menu.d.ts +95 -11
  98. package/dist/dropdown-menu.d.ts.map +1 -1
  99. package/dist/dropdown-menu.js +146 -106
  100. package/dist/field.cjs +1 -1
  101. package/dist/field.d.ts +26 -6
  102. package/dist/field.d.ts.map +1 -1
  103. package/dist/field.js +55 -53
  104. package/dist/global-layout.cjs +1 -1
  105. package/dist/global-layout.d.ts +27 -17
  106. package/dist/global-layout.d.ts.map +1 -1
  107. package/dist/global-layout.js +86 -79
  108. package/dist/hover-card.cjs +1 -1
  109. package/dist/hover-card.d.ts +36 -6
  110. package/dist/hover-card.d.ts.map +1 -1
  111. package/dist/hover-card.js +44 -42
  112. package/dist/index.cjs +1 -1
  113. package/dist/index.d.ts +1 -1
  114. package/dist/index.d.ts.map +1 -1
  115. package/dist/index.js +367 -386
  116. package/dist/input-group.cjs +1 -1
  117. package/dist/input-group.d.ts +21 -2
  118. package/dist/input-group.d.ts.map +1 -1
  119. package/dist/input-group.js +51 -41
  120. package/dist/input-otp.cjs +1 -1
  121. package/dist/input-otp.js +1 -1
  122. package/dist/input-password.cjs +1 -1
  123. package/dist/input-password.d.ts.map +1 -1
  124. package/dist/input-password.js +25 -26
  125. package/dist/input.cjs +1 -1
  126. package/dist/input.d.ts +38 -24
  127. package/dist/input.d.ts.map +1 -1
  128. package/dist/input.js +68 -136
  129. package/dist/label.cjs +1 -1
  130. package/dist/label.d.ts +20 -1
  131. package/dist/label.d.ts.map +1 -1
  132. package/dist/label.js +31 -18
  133. package/dist/link.cjs +1 -1
  134. package/dist/link.js +1 -1
  135. package/dist/logo.cjs +1 -1
  136. package/dist/logo.d.ts +9 -4
  137. package/dist/logo.d.ts.map +1 -1
  138. package/dist/logo.js +20 -21
  139. package/dist/menubar.cjs +1 -1
  140. package/dist/menubar.d.ts +43 -6
  141. package/dist/menubar.d.ts.map +1 -1
  142. package/dist/menubar.js +100 -78
  143. package/dist/navigation-menu.cjs +1 -1
  144. package/dist/navigation-menu.d.ts +6 -54
  145. package/dist/navigation-menu.d.ts.map +1 -1
  146. package/dist/navigation-menu.js +73 -84
  147. package/dist/pagination.cjs +1 -1
  148. package/dist/pagination.d.ts +8 -10
  149. package/dist/pagination.d.ts.map +1 -1
  150. package/dist/pagination.js +78 -86
  151. package/dist/popover.cjs +1 -1
  152. package/dist/popover.d.ts +59 -4
  153. package/dist/popover.d.ts.map +1 -1
  154. package/dist/popover.js +42 -34
  155. package/dist/progress.cjs +1 -1
  156. package/dist/progress.d.ts +9 -2
  157. package/dist/progress.d.ts.map +1 -1
  158. package/dist/progress.js +71 -59
  159. package/dist/radio-group.cjs +1 -1
  160. package/dist/radio-group.d.ts +33 -10
  161. package/dist/radio-group.d.ts.map +1 -1
  162. package/dist/radio-group.js +56 -66
  163. package/dist/rating.d.ts +4 -0
  164. package/dist/rating.d.ts.map +1 -1
  165. package/dist/resizable.cjs +1 -1
  166. package/dist/resizable.d.ts +58 -6
  167. package/dist/resizable.d.ts.map +1 -1
  168. package/dist/resizable.js +38 -37
  169. package/dist/scroll-area.cjs +1 -1
  170. package/dist/scroll-area.d.ts +46 -5
  171. package/dist/scroll-area.d.ts.map +1 -1
  172. package/dist/scroll-area.js +42 -38
  173. package/dist/select.cjs +1 -1
  174. package/dist/select.d.ts +30 -0
  175. package/dist/select.d.ts.map +1 -1
  176. package/dist/select.js +64 -54
  177. package/dist/separator.cjs +1 -1
  178. package/dist/separator.d.ts +52 -5
  179. package/dist/separator.d.ts.map +1 -1
  180. package/dist/separator.js +45 -35
  181. package/dist/sheet.cjs +1 -1
  182. package/dist/sheet.d.ts +85 -19
  183. package/dist/sheet.d.ts.map +1 -1
  184. package/dist/sheet.js +117 -115
  185. package/dist/skeleton.cjs +1 -1
  186. package/dist/skeleton.d.ts +24 -2
  187. package/dist/skeleton.d.ts.map +1 -1
  188. package/dist/skeleton.js +15 -9
  189. package/dist/slider.cjs +1 -1
  190. package/dist/slider.d.ts +18 -4
  191. package/dist/slider.d.ts.map +1 -1
  192. package/dist/slider.js +72 -66
  193. package/dist/sonner.cjs +1 -1
  194. package/dist/sonner.d.ts +21 -22
  195. package/dist/sonner.d.ts.map +1 -1
  196. package/dist/sonner.js +46 -48
  197. package/dist/split-layout.d.ts +4 -1
  198. package/dist/split-layout.d.ts.map +1 -1
  199. package/dist/switch.cjs +1 -1
  200. package/dist/switch.d.ts +2 -12
  201. package/dist/switch.d.ts.map +1 -1
  202. package/dist/switch.js +37 -41
  203. package/dist/table.cjs +1 -1
  204. package/dist/table.d.ts +16 -12
  205. package/dist/table.d.ts.map +1 -1
  206. package/dist/table.js +56 -58
  207. package/dist/tabs.d.ts +27 -3
  208. package/dist/tabs.d.ts.map +1 -1
  209. package/dist/toggle-group.cjs +1 -1
  210. package/dist/toggle-group.d.ts +57 -7
  211. package/dist/toggle-group.d.ts.map +1 -1
  212. package/dist/toggle-group.js +60 -67
  213. package/dist/toggle.cjs +1 -1
  214. package/dist/toggle.d.ts +12 -26
  215. package/dist/toggle.d.ts.map +1 -1
  216. package/dist/toggle.js +16 -20
  217. package/package.json +9 -3
  218. package/src/blocks/data-table.tsx +43 -33
  219. package/src/blocks/sidebar.tsx +158 -541
  220. package/src/components/accordion.tsx +164 -78
  221. package/src/components/alert-dialog.tsx +156 -111
  222. package/src/components/alert.tsx +27 -14
  223. package/src/components/aspect-ratio.tsx +25 -16
  224. package/src/components/avatar.tsx +56 -8
  225. package/src/components/badge.tsx +65 -42
  226. package/src/components/breadcrumb.tsx +159 -83
  227. package/src/components/button.tsx +42 -63
  228. package/src/components/calendar.tsx +22 -6
  229. package/src/components/card.tsx +92 -40
  230. package/src/components/carousel.tsx +240 -115
  231. package/src/components/centred-layout.tsx +68 -49
  232. package/src/components/chart.tsx +118 -47
  233. package/src/components/checkbox.tsx +43 -79
  234. package/src/components/collapsible.tsx +95 -26
  235. package/src/components/combobox.tsx +243 -153
  236. package/src/components/command.tsx +295 -121
  237. package/src/components/context-menu.tsx +279 -82
  238. package/src/components/date-picker.tsx +282 -31
  239. package/src/components/description.tsx +60 -0
  240. package/src/components/dialog.tsx +163 -87
  241. package/src/components/drawer.tsx +76 -2
  242. package/src/components/dropdown-menu.tsx +143 -37
  243. package/src/components/field.tsx +38 -11
  244. package/src/components/global-layout.tsx +116 -77
  245. package/src/components/hover-card.tsx +54 -14
  246. package/src/components/input-group.tsx +56 -18
  247. package/src/components/input-otp.tsx +1 -1
  248. package/src/components/input-password.tsx +4 -5
  249. package/src/components/input.tsx +93 -186
  250. package/src/components/label.tsx +56 -15
  251. package/src/components/link.tsx +1 -1
  252. package/src/components/logo.tsx +12 -7
  253. package/src/components/menubar.tsx +61 -5
  254. package/src/components/navigation-menu.tsx +37 -99
  255. package/src/components/pagination.tsx +13 -19
  256. package/src/components/popover.tsx +103 -20
  257. package/src/components/progress.tsx +82 -60
  258. package/src/components/radio-group.tsx +44 -25
  259. package/src/components/rating.tsx +4 -0
  260. package/src/components/resizable.tsx +88 -38
  261. package/src/components/scroll-area.tsx +123 -56
  262. package/src/components/select.tsx +22 -2
  263. package/src/components/separator.tsx +101 -24
  264. package/src/components/sheet.tsx +186 -90
  265. package/src/components/skeleton.tsx +40 -10
  266. package/src/components/slider.tsx +83 -57
  267. package/src/components/sonner.tsx +34 -34
  268. package/src/components/split-layout.tsx +4 -1
  269. package/src/components/switch.figma.tsx +7 -11
  270. package/src/components/switch.tsx +9 -19
  271. package/src/components/table.tsx +23 -18
  272. package/src/components/tabs.tsx +27 -3
  273. package/src/components/toggle-group.tsx +115 -86
  274. package/src/components/toggle.figma.tsx +13 -19
  275. package/src/components/toggle.tsx +20 -34
  276. package/src/index.ts +1 -1
  277. package/dist/input-base.cjs +0 -1
  278. package/dist/input-base.d.ts +0 -28
  279. package/dist/input-base.d.ts.map +0 -1
  280. package/dist/input-base.js +0 -56
  281. package/src/components/input-base.tsx +0 -86
@@ -1,7 +1,13 @@
1
1
  "use client";
2
2
 
3
3
  import * as React from "react";
4
- import { CheckIcon, ChevronsUpDownIcon, ChevronDownIcon } from "lucide-react";
4
+ import {
5
+ ChevronsUpDownIcon,
6
+ ChevronDownIcon,
7
+ CheckIcon,
8
+ type LucideIcon,
9
+ } from "@brightlocal/icons";
10
+ import { Checkbox } from "@brightlocal/ui-components/checkbox";
5
11
  import { cva, type VariantProps } from "class-variance-authority";
6
12
 
7
13
  import { cn } from "@brightlocal/ui-components/lib/utils";
@@ -21,23 +27,19 @@ import {
21
27
 
22
28
  /**
23
29
  * Visual style variants for Combobox
30
+ * - `default`: Default variant with standard combobox styling
31
+ * - `withGroupLabel`: Variant with group label showing category above selection
24
32
  */
25
- export enum ComboboxVariant {
26
- /** Default variant with standard combobox styling */
27
- DEFAULT = "default",
28
- /** Variant with group label showing category above selection */
29
- WITH_GROUP_LABEL = "withGroupLabel",
30
- }
33
+ export type ComboboxVariant = "default" | "withGroupLabel";
31
34
 
32
35
  /**
33
- * Size variants for Combobox
36
+ * Menu item type variants for Combobox dropdown items
37
+ * - `simple`: Simple text-only menu item
38
+ * - `checkbox`: Menu item with checkbox
39
+ * - `icon`: Menu item with icon
40
+ * - `avatar`: Menu item with avatar
34
41
  */
35
- export enum ComboboxSize {
36
- /** Standard size (36px height) */
37
- DEFAULT = "default",
38
- /** Large size (48px height) */
39
- LG = "lg",
40
- }
42
+ export type ComboboxMenuItemType = "simple" | "checkbox" | "icon" | "avatar";
41
43
 
42
44
  export interface ComboboxItem {
43
45
  /** Unique value for the item */
@@ -46,24 +48,43 @@ export interface ComboboxItem {
46
48
  label: string;
47
49
  /** Optional group/category for the item */
48
50
  group?: string;
51
+ /** Icon component for icon menu item type */
52
+ icon?: LucideIcon;
53
+ /** Avatar image source URL for avatar menu item type */
54
+ avatarSrc?: string;
55
+ /** Avatar fallback text/initials for avatar menu item type */
56
+ avatarFallback?: string;
49
57
  }
50
58
 
59
+ // Shared class name for menu item labels (moved outside component to avoid recreation)
60
+ const MENU_ITEM_LABEL_CLASS =
61
+ "font-sans text-sm leading-normal font-normal text-foreground";
62
+
63
+ // Avatar container styles (shared between trigger and menu items)
64
+ const AVATAR_CONTAINER_CLASS =
65
+ "bg-accent flex size-5 shrink-0 items-center justify-center rounded-full text-xs font-medium";
66
+
67
+ const AVATAR_IMAGE_CLASS = "size-5 rounded-full object-cover";
68
+
51
69
  const comboboxTriggerVariants = cva(
52
70
  [
53
71
  // Base layout
54
- "relative flex w-full items-center justify-between gap-2",
55
- "px-3 py-2",
72
+ "relative flex w-full items-center justify-start gap-2",
73
+ "px-4 py-2",
56
74
 
57
75
  // Base appearance
58
- "border border-border rounded-lg outline-none transition-all",
59
- "bg-neutral-50 border-neutral-300",
76
+ "border border-input rounded-md outline-none",
77
+ "bg-neutral-50 shadow-xs",
60
78
  "dark:bg-white/5 dark:border-white/15",
61
79
 
62
80
  // Typography
63
81
  "text-sm font-normal font-sans text-foreground",
64
82
 
65
83
  // Placeholder state
66
- "data-[placeholder]:text-muted-foreground",
84
+ "data-[placeholder=true]:text-muted-foreground",
85
+
86
+ // Hover state
87
+ "hover:bg-accent",
67
88
 
68
89
  // Focus state (keyboard navigation only - not on click)
69
90
  "focus-visible:outline-none focus-visible:border-ring dark:focus-visible:border-neutral-500 focus-visible:bg-background",
@@ -74,6 +95,10 @@ const comboboxTriggerVariants = cva(
74
95
 
75
96
  // Disabled state
76
97
  "disabled:cursor-not-allowed disabled:opacity-50",
98
+ "disabled:hover:bg-neutral-50",
99
+
100
+ // Transitions - following AGENTS.md guidelines (0.2s-0.3s, ease-out for entering)
101
+ "transition-[background-color,border-color,box-shadow] duration-200 ease-out",
77
102
 
78
103
  // Icon styles
79
104
  "[&_svg]:pointer-events-none [&_svg]:shrink-0",
@@ -83,29 +108,22 @@ const comboboxTriggerVariants = cva(
83
108
  {
84
109
  variants: {
85
110
  variant: {
86
- default: ["h-9", "py-2"],
87
- withGroupLabel: ["h-12", "py-2", "flex-col", "items-start"],
88
- },
89
- size: {
90
- default: [],
91
- lg: [],
111
+ default: ["h-9"],
112
+ withGroupLabel: [
113
+ // Only variant-specific styles (removed duplicates from base)
114
+ "self-stretch",
115
+ ],
92
116
  },
93
117
  },
94
- compoundVariants: [
95
- {
96
- variant: "withGroupLabel",
97
- size: "lg",
98
- className: "h-12",
99
- },
100
- ],
101
118
  defaultVariants: {
102
119
  variant: "default",
103
- size: "default",
104
120
  },
105
121
  }
106
122
  );
107
123
 
108
124
  interface ComboboxProps extends VariantProps<typeof comboboxTriggerVariants> {
125
+ /** Optional id for the combobox trigger, used with FieldLabel htmlFor */
126
+ id?: string;
109
127
  /** Data hook for automated testing (REQUIRED) */
110
128
  dataHook: string;
111
129
  /** Tracking element identifier for analytics */
@@ -122,25 +140,56 @@ interface ComboboxProps extends VariantProps<typeof comboboxTriggerVariants> {
122
140
  placeholder?: string;
123
141
  /** Group label text (only for withGroupLabel variant) */
124
142
  groupLabel?: string;
125
- /** Label text displayed above the combobox */
126
- label?: string;
127
- /** Description text displayed below the combobox */
128
- description?: string;
129
143
  /** Disabled state */
130
144
  disabled?: boolean;
131
145
  /** Empty state message when no results found */
132
146
  emptyMessage?: string;
133
147
  /** Search placeholder text */
134
148
  searchPlaceholder?: string;
149
+ /** Whether to show the avatar */
150
+ showAvatar?: boolean;
151
+ /** Avatar image source URL */
152
+ avatarSrc?: string;
153
+ /** Avatar fallback text/initials */
154
+ avatarFallback?: string;
135
155
  /** Custom className for the trigger button */
136
156
  className?: string;
157
+ /** Menu item type for dropdown items */
158
+ menuItemType?: ComboboxMenuItemType;
159
+ /** Accessible label for the combobox (used when no visible label is provided) */
160
+ "aria-label"?: string;
161
+ }
162
+
163
+ /**
164
+ * Internal avatar component for consistent rendering
165
+ */
166
+ function ComboboxAvatar({
167
+ src,
168
+ fallback,
169
+ alt,
170
+ dataSlot,
171
+ }: {
172
+ src?: string;
173
+ fallback?: string;
174
+ alt?: string;
175
+ dataSlot?: string;
176
+ }) {
177
+ return (
178
+ <span className={AVATAR_CONTAINER_CLASS} data-slot={dataSlot}>
179
+ {src ? (
180
+ <img alt={alt || ""} className={AVATAR_IMAGE_CLASS} src={src} />
181
+ ) : (
182
+ fallback || "?"
183
+ )}
184
+ </span>
185
+ );
137
186
  }
138
187
 
139
188
  const Combobox = React.forwardRef<HTMLButtonElement, ComboboxProps>(
140
189
  (
141
190
  {
142
- variant = ComboboxVariant.DEFAULT,
143
- size = ComboboxSize.DEFAULT,
191
+ id,
192
+ variant = "default",
144
193
  dataHook,
145
194
  trackingEl,
146
195
  trackingLabel,
@@ -149,22 +198,27 @@ const Combobox = React.forwardRef<HTMLButtonElement, ComboboxProps>(
149
198
  onValueChange,
150
199
  placeholder = "Select an option...",
151
200
  groupLabel,
152
- label,
153
- description,
154
201
  disabled,
155
202
  emptyMessage = "No results found.",
156
- searchPlaceholder = "Search...",
203
+ searchPlaceholder = "Search",
204
+ showAvatar = false,
205
+ avatarSrc,
206
+ avatarFallback,
157
207
  className,
208
+ menuItemType = "simple",
209
+ "aria-label": ariaLabel,
158
210
  },
159
211
  ref
160
212
  ) => {
161
213
  const [open, setOpen] = React.useState(false);
214
+ const listboxId = React.useId();
162
215
 
163
216
  const selectedItem = items.find((item) => item.value === value);
217
+ const isPlaceholder = !selectedItem;
164
218
 
165
219
  // Group items by their group property for withGroupLabel variant
166
220
  const groupedItems = React.useMemo(() => {
167
- if (variant !== ComboboxVariant.WITH_GROUP_LABEL) {
221
+ if (variant !== "withGroupLabel") {
168
222
  return { "": items };
169
223
  }
170
224
 
@@ -187,131 +241,167 @@ const Combobox = React.forwardRef<HTMLButtonElement, ComboboxProps>(
187
241
  setOpen(false);
188
242
  };
189
243
 
190
- return (
191
- <div
192
- className="flex w-full flex-col gap-2"
193
- data-slot="combobox-container"
194
- >
195
- {label && (
196
- <label
197
- className="text-foreground text-sm leading-none font-medium"
198
- data-slot="combobox-label"
199
- >
200
- {label}
201
- </label>
202
- )}
244
+ const renderMenuItem = (item: ComboboxItem, isSelected: boolean) => {
245
+ const ItemIcon = item.icon;
246
+ const checkIcon = isSelected ? (
247
+ <CheckIcon className="text-muted-foreground ml-auto size-4 shrink-0" />
248
+ ) : null;
203
249
 
204
- <Popover open={open} onOpenChange={setOpen}>
205
- <PopoverTrigger asChild>
206
- <button
207
- ref={ref}
208
- aria-expanded={open}
209
- aria-haspopup="listbox"
210
- aria-label={label || placeholder}
211
- className={cn(
212
- comboboxTriggerVariants({
213
- variant:
214
- selectedItem && variant === ComboboxVariant.WITH_GROUP_LABEL
215
- ? ComboboxVariant.WITH_GROUP_LABEL
216
- : ComboboxVariant.DEFAULT,
217
- size,
218
- }),
219
- className
250
+ switch (menuItemType) {
251
+ case "checkbox":
252
+ return (
253
+ <>
254
+ <Checkbox
255
+ checked={isSelected}
256
+ className="pointer-events-none self-center"
257
+ dataHook={`${dataHook}-checkbox-${item.value}`}
258
+ />
259
+ <span className={MENU_ITEM_LABEL_CLASS}>{item.label}</span>
260
+ </>
261
+ );
262
+ case "icon":
263
+ return (
264
+ <>
265
+ {ItemIcon && (
266
+ <ItemIcon className="text-muted-foreground size-4 shrink-0" />
220
267
  )}
221
- data-hook={dataHook}
222
- data-slot="combobox-trigger"
223
- data-tracking-el={trackingEl || `combobox-${variant}`}
224
- data-tracking-label={trackingLabel}
225
- disabled={disabled}
226
- type="button"
227
- >
228
- {variant === ComboboxVariant.WITH_GROUP_LABEL && selectedItem ? (
229
- <>
230
- <div className="flex w-full flex-col items-start gap-0.5">
231
- {groupLabel && (
232
- <span className="text-muted-foreground text-xs leading-none font-normal">
233
- {groupLabel}
234
- </span>
235
- )}
236
- <span className="text-foreground overflow-hidden text-sm leading-5 font-medium text-ellipsis whitespace-nowrap">
237
- {selectedItem.label}
268
+ <span className={MENU_ITEM_LABEL_CLASS}>{item.label}</span>
269
+ {checkIcon}
270
+ </>
271
+ );
272
+ case "avatar":
273
+ return (
274
+ <>
275
+ <ComboboxAvatar
276
+ alt={item.label}
277
+ dataSlot="menu-item-avatar"
278
+ fallback={item.avatarFallback}
279
+ src={item.avatarSrc}
280
+ />
281
+ <span className={MENU_ITEM_LABEL_CLASS}>{item.label}</span>
282
+ {checkIcon}
283
+ </>
284
+ );
285
+ case "simple":
286
+ default:
287
+ return (
288
+ <>
289
+ <span className={MENU_ITEM_LABEL_CLASS}>{item.label}</span>
290
+ {checkIcon}
291
+ </>
292
+ );
293
+ }
294
+ };
295
+
296
+ return (
297
+ <Popover open={open} onOpenChange={setOpen}>
298
+ <PopoverTrigger asChild>
299
+ <button
300
+ ref={ref}
301
+ aria-controls={open ? listboxId : undefined}
302
+ aria-expanded={open}
303
+ aria-haspopup="listbox"
304
+ aria-label={ariaLabel}
305
+ className={cn(
306
+ comboboxTriggerVariants({
307
+ variant,
308
+ }),
309
+ className
310
+ )}
311
+ data-hook={dataHook}
312
+ data-placeholder={isPlaceholder}
313
+ data-slot="combobox-trigger"
314
+ data-tracking-el={trackingEl || `combobox-${variant}`}
315
+ data-tracking-label={trackingLabel}
316
+ disabled={disabled}
317
+ id={id}
318
+ role="combobox"
319
+ type="button"
320
+ >
321
+ {variant === "withGroupLabel" ? (
322
+ <>
323
+ <div className="flex w-full flex-col items-start pr-6">
324
+ {groupLabel && (
325
+ <span className="text-muted-foreground overflow-hidden font-sans text-xs leading-4 font-normal text-ellipsis">
326
+ {groupLabel}
238
327
  </span>
239
- </div>
240
- <ChevronDownIcon className="size-4 shrink-0 opacity-50" />
241
- </>
242
- ) : (
243
- <>
244
- <span className="text-foreground overflow-hidden text-ellipsis whitespace-nowrap">
328
+ )}
329
+ <span className="text-foreground overflow-hidden font-sans text-sm leading-5 font-medium text-ellipsis whitespace-nowrap">
245
330
  {selectedItem ? selectedItem.label : placeholder}
246
331
  </span>
247
- <ChevronsUpDownIcon className="size-4 shrink-0 opacity-50" />
248
- </>
249
- )}
250
- </button>
251
- </PopoverTrigger>
332
+ </div>
333
+ <ChevronDownIcon className="text-muted-foreground absolute top-1/2 right-4 size-4 shrink-0 -translate-y-1/2" />
334
+ </>
335
+ ) : (
336
+ <>
337
+ {showAvatar && (
338
+ <ComboboxAvatar
339
+ alt={selectedItem?.label}
340
+ dataSlot="combobox-avatar"
341
+ fallback={avatarFallback}
342
+ src={avatarSrc}
343
+ />
344
+ )}
345
+ <span className="text-foreground overflow-hidden text-sm leading-normal font-medium text-ellipsis whitespace-nowrap">
346
+ {selectedItem ? selectedItem.label : placeholder}
347
+ </span>
348
+ <ChevronsUpDownIcon className="text-muted-foreground ml-auto size-4 shrink-0" />
349
+ </>
350
+ )}
351
+ </button>
352
+ </PopoverTrigger>
252
353
 
253
- <PopoverContent
254
- align="start"
255
- className="w-[var(--radix-popover-trigger-width)] p-0"
354
+ <PopoverContent
355
+ align="start"
356
+ className="w-[var(--radix-popover-trigger-width)] p-0"
357
+ data-slot="combobox-popover"
358
+ >
359
+ <Command
360
+ className="border-0 shadow-none"
361
+ data-slot="combobox-command"
362
+ dataHook={`${dataHook}-command`}
363
+ id={listboxId}
256
364
  >
257
- <Command data-slot="combobox-command">
258
- <CommandInput placeholder={searchPlaceholder} />
259
- <CommandList>
260
- <CommandEmpty>{emptyMessage}</CommandEmpty>
261
- {variant === ComboboxVariant.WITH_GROUP_LABEL &&
262
- Object.keys(groupedItems).length > 1 ? (
263
- Object.entries(groupedItems).map(([group, groupItems]) => (
264
- <CommandGroup key={group} heading={group}>
265
- {groupItems.map((item) => (
266
- <CommandItem
267
- key={item.value}
268
- value={item.value}
269
- onSelect={handleSelect}
270
- >
271
- <CheckIcon
272
- className={cn(
273
- "mr-2 size-4",
274
- value === item.value ? "opacity-100" : "opacity-0"
275
- )}
276
- />
277
- {item.label}
278
- </CommandItem>
279
- ))}
280
- </CommandGroup>
281
- ))
282
- ) : (
283
- <CommandGroup>
284
- {items.map((item) => (
365
+ <CommandInput
366
+ dataHook={`${dataHook}-search`}
367
+ placeholder={searchPlaceholder}
368
+ />
369
+ <CommandList>
370
+ <CommandEmpty>{emptyMessage}</CommandEmpty>
371
+ {variant === "withGroupLabel" &&
372
+ Object.keys(groupedItems).length > 1 ? (
373
+ Object.entries(groupedItems).map(([group, groupItems]) => (
374
+ <CommandGroup key={group} heading={group}>
375
+ {groupItems.map((item) => (
285
376
  <CommandItem
286
377
  key={item.value}
378
+ dataHook={`${dataHook}-item-${item.value}`}
287
379
  value={item.value}
288
380
  onSelect={handleSelect}
289
381
  >
290
- <CheckIcon
291
- className={cn(
292
- "mr-2 size-4",
293
- value === item.value ? "opacity-100" : "opacity-0"
294
- )}
295
- />
296
- {item.label}
382
+ {renderMenuItem(item, value === item.value)}
297
383
  </CommandItem>
298
384
  ))}
299
385
  </CommandGroup>
300
- )}
301
- </CommandList>
302
- </Command>
303
- </PopoverContent>
304
- </Popover>
305
-
306
- {description && (
307
- <p
308
- className="text-muted-foreground text-sm leading-5 font-normal"
309
- data-slot="combobox-description"
310
- >
311
- {description}
312
- </p>
313
- )}
314
- </div>
386
+ ))
387
+ ) : (
388
+ <CommandGroup>
389
+ {items.map((item) => (
390
+ <CommandItem
391
+ key={item.value}
392
+ dataHook={`${dataHook}-item-${item.value}`}
393
+ value={item.value}
394
+ onSelect={handleSelect}
395
+ >
396
+ {renderMenuItem(item, value === item.value)}
397
+ </CommandItem>
398
+ ))}
399
+ </CommandGroup>
400
+ )}
401
+ </CommandList>
402
+ </Command>
403
+ </PopoverContent>
404
+ </Popover>
315
405
  );
316
406
  }
317
407
  );