Просмотр исходного кода

fix: resolve Select children type conflict with ButtonProps

David Hill 1 месяц назад
Родитель
Сommit
de87694867

+ 0 - 1
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>

+ 1 - 1
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",