@brightlocal/ui-components 0.1.1 → 0.1.3

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