Skip to content

Commit 30b7934

Browse files
committed
fix: solid adapter types
1 parent 0f8be02 commit 30b7934

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

packages/solid/src/index.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ type IntrinsicProps<TComponent> = TComponent extends keyof JSX.IntrinsicElements
1212
type StyledComponent<
1313
TProps = {},
1414
Variants extends VariantGroups = {}
15-
> = ParentComponent<
16-
TProps & VariantSelection<Variants> & { class?: string }
17-
> & {
15+
> = ParentComponent<TProps & { class?: string }> & {
1816
variants: Array<keyof Variants>;
1917
selector: (variants: VariantSelection<Variants>) => string;
2018
};
@@ -26,15 +24,15 @@ export function styled<
2624
>(
2725
component: TComponent,
2826
options: PatternOptions<Variants>
29-
): StyledComponent<IntrinsicProps<TComponent>, Variants>;
27+
): StyledComponent<
28+
IntrinsicProps<TComponent> & VariantSelection<Variants>,
29+
Variants
30+
>;
3031

31-
export function styled<
32-
TProps extends { class?: string },
33-
Variants extends VariantGroups = {}
34-
>(
32+
export function styled<TProps, Variants extends VariantGroups = {}>(
3533
component: Component<TProps>,
3634
options: PatternOptions<Variants>
37-
): StyledComponent<TProps, Variants>;
35+
): StyledComponent<TProps & VariantSelection<Variants>, Variants>;
3836

3937
export function styled(component: any, options: any): (props: any) => any {
4038
// the following doesn't work because vanilla-extract's function serializer

0 commit comments

Comments
 (0)