Merge branch 'v2' of github.com:CherryHQ/cherry-studio into v2

2025-11-06 19:53:20 +08:00
parent a50da9fc80 7d5d9964d7
commit dae10cf673
2 changed files with 12 additions and 13 deletions
@@ -22,8 +22,7 @@ const comboboxTriggerVariants = cva(
  {
    variants: {
      state: {
-        default:
-          'border-input bg-background aria-expanded:border-success aria-expanded:ring-2 aria-expanded:ring-success/20',
+        default: 'border-input aria-expanded:border-success aria-expanded:ring-2 aria-expanded:ring-success/20',
        error:
          'border-destructive ring-2 ring-destructive/20 aria-expanded:border-destructive aria-expanded:ring-destructive/20',
        disabled: 'opacity-50 cursor-not-allowed pointer-events-none'
@@ -255,7 +254,7 @@ export function Combobox({
          size={size}
          disabled={disabled}
          style={{ width: triggerWidth }}
-          className={cn(comboboxTriggerVariants({ state, size }), className)}
+          className={cn(comboboxTriggerVariants({ state, size }), 'bg-white', className)}
          aria-expanded={open}
          aria-invalid={error}>
          {renderTriggerContent()}