From 059f8215840fb4b35fd1462085f3880162d4ed63 Mon Sep 17 00:00:00 2001
From: MyPrototypeWhat <daoquqiexing@gmail.com>
Date: Thu, 6 Nov 2025 18:20:43 +0800
Subject: [PATCH] refactor(button & combobox): update size properties and
 improve styling

- Changed button size properties to use min-height for better layout consistency.
- Simplified combobox size properties by removing height specifications.
- Enhanced combobox option rendering with improved class management for better styling.
- Updated comments in ComboboxProps to English for clarity.
---
 .../ui/src/components/primitives/button.tsx   |  6 +-
 .../ui/src/components/primitives/combobox.tsx | 59 ++++++-------------
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/packages/ui/src/components/primitives/button.tsx b/packages/ui/src/components/primitives/button.tsx
index 698b4781f4..e5c9cfd0f1 100644
--- a/packages/ui/src/components/primitives/button.tsx
+++ b/packages/ui/src/components/primitives/button.tsx
@@ -19,9 +19,9 @@ const buttonVariants = cva(
         link: 'text-primary underline-offset-4 hover:underline'
       },
       size: {
-        default: 'h-9 px-4 py-2 has-[>svg]:px-3',
-        sm: 'h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5',
-        lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
+        default: 'min-h-9 px-4 py-2 has-[>svg]:px-3',
+        sm: 'min-h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5',
+        lg: 'min-h-10 rounded-md px-6 has-[>svg]:px-4',
         icon: 'size-9',
         'icon-sm': 'size-8',
         'icon-lg': 'size-10'
diff --git a/packages/ui/src/components/primitives/combobox.tsx b/packages/ui/src/components/primitives/combobox.tsx
index daef43c11d..9bdc77911f 100644
--- a/packages/ui/src/components/primitives/combobox.tsx
+++ b/packages/ui/src/components/primitives/combobox.tsx
@@ -29,9 +29,9 @@ const comboboxTriggerVariants = cva(
         disabled: 'opacity-50 cursor-not-allowed pointer-events-none'
       },
       size: {
-        sm: 'h-8 px-2 text-xs gap-1',
-        default: 'h-9 px-3 gap-2',
-        lg: 'h-10 px-4 gap-2'
+        sm: 'px-2 text-xs gap-1',
+        default: 'px-3 gap-2',
+        lg: 'px-4 gap-2'
       }
     },
     defaultVariants: {
@@ -69,38 +69,38 @@ export interface ComboboxOption {
 }
 
 export interface ComboboxProps extends Omit<VariantProps<typeof comboboxTriggerVariants>, 'state'> {
-  // 数据源
+  // Data source
   options: ComboboxOption[]
   value?: string | string[]
   defaultValue?: string | string[]
   onChange?: (value: string | string[]) => void
 
-  // 模式
+  // Mode
   multiple?: boolean
 
-  // 自定义渲染
+  // Custom rendering
   renderOption?: (option: ComboboxOption) => React.ReactNode
   renderValue?: (value: string | string[], options: ComboboxOption[]) => React.ReactNode
 
-  // 搜索
+  // Search
   searchable?: boolean
   searchPlaceholder?: string
   emptyText?: string
   onSearch?: (search: string) => void
 
-  // 状态
+  // State
   error?: boolean
   disabled?: boolean
   open?: boolean
   onOpenChange?: (open: boolean) => void
 
-  // 样式
+  // Styling
   placeholder?: string
   className?: string
   popoverClassName?: string
   width?: string | number
 
-  // 其他
+  // Other
   name?: string
 }
 
@@ -194,7 +194,13 @@ export function Combobox({
           {selectedOptions.map((option) => (
             <span
               key={option.value}
-              className="inline-flex items-center gap-1 px-2 py-0.5 rounded bg-success/10 text-success-foreground text-xs">
+              className={cn(
+                'bg-success/10',
+                'gap-1 px-2 py-0.5',
+                'inline-flex items-center rounded',
+                'text-success-foreground text-xs',
+                'text-primary background-primary/10'
+              )}>
               {option.label}
               <X
                 className="size-3 cursor-pointer hover:text-success"
@@ -280,34 +286,3 @@ export function Combobox({
     </Popover>
   )
 }
-
-// ==================== Demo (for testing) ====================
-
-const frameworks = [
-  {
-    value: 'next.js',
-    label: 'Next.js'
-  },
-  {
-    value: 'sveltekit',
-    label: 'SvelteKit'
-  },
-  {
-    value: 'nuxt.js',
-    label: 'Nuxt.js'
-  },
-  {
-    value: 'remix',
-    label: 'Remix'
-  },
-  {
-    value: 'astro',
-    label: 'Astro'
-  }
-]
-
-export function ComboboxDemo() {
-  const [value, setValue] = React.useState('')
-
-  return <Combobox options={frameworks} value={value} onChange={(val) => setValue(val as string)} width={200} />
-}