monadical/opencode
14
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: resolve Select children type conflict with ButtonProps

Browse Source
This commit is contained in:
David Hill
2026-01-20 21:08:26 +00:00
parent ecd28fd520
commit de87694867
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/app/src/components/settings-general.tsx
View File

@@ -113,7 +113,6 @@ export const SettingsGeneral: Component = () => {
size="small" size="small"
triggerStyle={{ "font-family": monoFontFamily(settings.appearance.font()), "min-width": "180px" }} triggerStyle={{ "font-family": monoFontFamily(settings.appearance.font()), "min-width": "180px" }}
> >
{/* @ts-expect-error */}
{(option) => <span style={{ "font-family": monoFontFamily(option?.value) }}>{option?.label}</span>} {(option) => <span style={{ "font-family": monoFontFamily(option?.value) }}>{option?.label}</span>}
</Select> </Select>
</SettingsRow> </SettingsRow>

2
packages/ui/src/components/select.tsx
View File

@@ -20,7 +20,7 @@ export type SelectProps<T> = Omit<ComponentProps<typeof Kobalte<T>>, "value" | "
triggerVariant?: "default" | "button" 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, [ const [local, others] = splitProps(props, [
"class", "class",
"classList", "classList",