From de87694867e21456c5cf80f7f841f875db91647d Mon Sep 17 00:00:00 2001
From: David Hill <iamdavidhill@gmail.com>
Date: Tue, 20 Jan 2026 21:08:26 +0000
Subject: [PATCH] fix: resolve Select children type conflict with ButtonProps

---
 packages/app/src/components/settings-general.tsx | 1 -
 packages/ui/src/components/select.tsx            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/app/src/components/settings-general.tsx b/packages/app/src/components/settings-general.tsx
index 6221b253f..4e0fa765f 100644
--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -113,7 +113,6 @@ export const SettingsGeneral: Component = () => {
                 size="small"
                 triggerStyle={{ "font-family": monoFontFamily(settings.appearance.font()), "min-width": "180px" }}
               >
-                {/* @ts-expect-error */}
                 {(option) => <span style={{ "font-family": monoFontFamily(option?.value) }}>{option?.label}</span>}
               </Select>
             </SettingsRow>
diff --git a/packages/ui/src/components/select.tsx b/packages/ui/src/components/select.tsx
index f7d212848..e334ede42 100644
--- a/packages/ui/src/components/select.tsx
+++ b/packages/ui/src/components/select.tsx
@@ -20,7 +20,7 @@ export type SelectProps<T> = Omit<ComponentProps<typeof Kobalte<T>>, "value" | "
   triggerVariant?: "default" | "button"
 }
 
-export function Select<T>(props: SelectProps<T> & ButtonProps) {
+export function Select<T>(props: SelectProps<T> & Omit<ButtonProps, "children">) {
   const [local, others] = splitProps(props, [
     "class",
     "classList",