styled-components 6.0.0-rc.3 → 6.0.0-rc.5

package/dist/constructors/constructWithOptions.d.ts

@@ -1,44 +1,18 @@
-import React from 'react';
-import { Interpolation, IStyledComponent, IStyledComponentFactory, NoInfer, Runtime, StyledComponentInnerComponent, StyledComponentProps, StyledOptions, StyledTarget, Styles, SubsetOnly, ThemedProps } from '../types';
-type StyledComponentPropsWithRef<R extends Runtime, Target extends StyledTarget<R>> = Target extends keyof JSX.IntrinsicElements | React.ComponentType<any> ? Target extends {
-    readonly _sc: symbol;
-} ? React.ComponentPropsWithRef<StyledComponentInnerComponent<R, Target>> : React.ComponentPropsWithRef<Target> : {};
-type AttrPropValues<R extends Runtime, Target extends StyledTarget<R>, Props extends object> = Partial<StyledComponentPropsWithRef<R, Target> & Props> & {
-    [key: string]: any;
-};
-type AttrFactoryProps<R extends Runtime, Target extends StyledTarget<R>, Props extends object> = ThemedProps<StyledComponentPropsWithRef<R, Target> & Props>;
-type FactoryAsC<R extends Runtime, Target extends StyledTarget<R>, Factory extends (...args: any[]) => any> = ReturnType<Factory> extends {
-    as: infer AsC;
-} ? AsC extends StyledTarget<R> ? AsC : Target : Target;
-type AttrValueType<T> = T extends (() => any) | ((...args: any[]) => any) ? never : {};
-type StrictAttrFactory<Factory extends (...args: any[]) => any, R extends Runtime, Target extends StyledTarget<R>, Props extends object> = Factory extends (...args: any[]) => infer TResult ? TResult extends object & SubsetOnly<TResult, AttrPropValues<R, Target, Props>> ? (props: AttrFactoryProps<R, Target, Props>) => AttrPropValues<R, Target, Props> : never : never;
-export interface Styled<R extends Runtime, Target extends StyledTarget<R>, OtherProps extends object, AttrProps extends keyof any = never, OtherStatics extends object = {}> {
-    <MoreOtherProps extends object = {}, MoreStatics extends object = {}>(initialStyles: Styles<ThemedProps<StyledComponentPropsWithRef<R, Target> & OtherProps & NoInfer<MoreOtherProps>>>, ...interpolations: Interpolation<ThemedProps<StyledComponentPropsWithRef<R, Target> & OtherProps & NoInfer<MoreOtherProps>>>[]): IStyledComponent<R, Target, OtherProps & NoInfer<MoreOtherProps>, AttrProps> & OtherStatics & MoreStatics;
-    attrs<AsC extends StyledTarget<R> = Target, NewA extends AttrPropValues<R, Target, OtherProps> & {
-        as?: AsC;
-    } = AttrPropValues<R, Target, OtherProps> & {
-        as?: AsC;
-    }>(attrs: NewA & AttrValueType<NewA> & {
-        as?: AsC;
-    }): Styled<R, AsC, OtherProps & Omit<NewA, 'as'>, AttrProps | keyof NewA>;
-    attrs<NewProps extends object = never, AsC extends StyledTarget<R> = Target, NewA extends AttrPropValues<R, Target, OtherProps & NewProps> & {
-        as?: AsC;
-    } = AttrPropValues<R, Target, OtherProps & NewProps> & {
-        as?: AsC;
-    }>(attrs: NewA & AttrValueType<NewA> & {
-        as?: AsC;
-    }): Styled<R, AsC, OtherProps & Omit<NewProps, 'as'>, AttrProps | keyof NewA>;
-    attrs<AsC extends StyledTarget<R>, Factory extends (props: AttrFactoryProps<R, Target, OtherProps>) => AttrPropValues<R, Target, OtherProps & {
-        as?: AsC;
-    }>>(attrFactory: Factory & StrictAttrFactory<Factory, R, Target, OtherProps & {
-        as?: AsC;
-    }>): Styled<R, FactoryAsC<R, Target, Factory>, OtherProps & Omit<ReturnType<Factory>, 'as' | keyof StyledComponentPropsWithRef<R, Target>>, AttrProps | keyof ReturnType<Factory>>;
-    attrs<NewProps extends object = {}, AsC extends StyledTarget<R> = Target, Factory extends (props: AttrFactoryProps<R, Target, OtherProps & NoInfer<NewProps>>) => AttrPropValues<R, Target, OtherProps & NoInfer<NewProps> & {
-        as?: AsC;
-    }> = (props: AttrFactoryProps<R, Target, OtherProps & NoInfer<NewProps>>) => AttrPropValues<R, Target, OtherProps & NoInfer<NewProps> & {
-        as?: AsC;
-    }>>(attrFactory: Factory & StrictAttrFactory<Factory, R, Target, OtherProps & NoInfer<NewProps>>): Styled<R, FactoryAsC<R, Target, Factory>, OtherProps & Omit<NewProps, 'as'>, AttrProps | keyof ReturnType<Factory>>;
-    withConfig: <Props extends OtherProps = OtherProps>(config: StyledOptions<R, StyledComponentPropsWithRef<R, Target> & Props>) => Styled<R, Target, Props, AttrProps>;
+/// <reference types="react" />
+import { Attrs, BaseObject, ExecutionProps, Interpolation, IStyledComponent, IStyledComponentFactory, KnownTarget, NoInfer, Runtime, StyledOptions, StyledTarget, Styles, Substitute } from '../types';
+type AttrsResult<T extends Attrs<any>> = T extends (...args: any) => infer P ? P extends object ? P : never : T extends object ? T : never;
+/**
+ * Based on Attrs being a simple object or function that returns
+ * a prop object, inspect the attrs result and attempt to extract
+ * any "as" prop usage to modify the runtime target.
+ */
+type AttrsTarget<R extends Runtime, T extends Attrs<any>, FallbackTarget extends StyledTarget<R>, Result extends ExecutionProps = AttrsResult<T>> = Result extends {
+    as: infer RuntimeTarget;
+} ? RuntimeTarget extends KnownTarget ? RuntimeTarget : FallbackTarget : FallbackTarget;
+export interface Styled<R extends Runtime, Target extends StyledTarget<R>, OuterProps extends object = Target extends KnownTarget ? React.ComponentPropsWithRef<Target> : BaseObject, OuterStatics extends object = BaseObject> {
+    <Props extends object = BaseObject, Statics extends object = BaseObject>(initialStyles: Styles<Substitute<OuterProps, NoInfer<Props>>>, ...interpolations: Interpolation<Substitute<OuterProps, NoInfer<Props>>>[]): IStyledComponent<R, Substitute<OuterProps, Props>> & OuterStatics & Statics;
+    attrs: <Props extends object = BaseObject, PrivateMergedProps extends object = Substitute<OuterProps, Props>, PrivateAttrsArg extends Attrs<PrivateMergedProps> = Attrs<PrivateMergedProps>, PrivateResolvedTarget extends StyledTarget<R> = AttrsTarget<R, PrivateAttrsArg, Target>>(attrs: PrivateAttrsArg) => Styled<R, PrivateResolvedTarget, PrivateResolvedTarget extends KnownTarget ? Substitute<Substitute<OuterProps, React.ComponentPropsWithRef<PrivateResolvedTarget>>, Props> : PrivateMergedProps, OuterStatics>;
+    withConfig: (config: StyledOptions<R, OuterProps>) => Styled<R, Target, OuterProps, OuterStatics>;
 }
-export default function constructWithOptions<R extends Runtime, Target extends StyledTarget<R>, OtherProps extends object = {}, OtherStatics extends object = {}>(componentConstructor: IStyledComponentFactory<R, Target, OtherProps, never, OtherStatics>, tag: Target, options?: StyledOptions<R, StyledComponentProps<R, Target, OtherProps, never>>): Styled<R, Target, OtherProps, never, OtherStatics>;
+export default function constructWithOptions<R extends Runtime, Target extends StyledTarget<R>, OuterProps extends object = Target extends KnownTarget ? React.ComponentPropsWithRef<Target> : BaseObject, OuterStatics extends object = BaseObject>(componentConstructor: IStyledComponentFactory<R, StyledTarget<R>, object, any>, tag: StyledTarget<R>, options?: StyledOptions<R, OuterProps>): Styled<R, Target, OuterProps, OuterStatics>;
 export {};

package/dist/constructors/css.d.ts

@@ -1,4 +1,4 @@
-import { Interpolation, RuleSet, Styles } from '../types';
+import { Interpolation, NoInfer, RuleSet, Styles } from '../types';
 declare function css(styles: Styles<object>, ...interpolations: Interpolation<object>[]): RuleSet<object>;
-declare function css<Props extends object>(styles: Styles<Props>, ...interpolations: Interpolation<Props>[]): RuleSet<Props>;
+declare function css<Props extends object>(styles: Styles<NoInfer<Props>>, ...interpolations: Interpolation<NoInfer<Props>>[]): RuleSet<NoInfer<Props>>;
 export default css;

package/dist/constructors/keyframes.d.ts

@@ -1,3 +1,3 @@
 import Keyframes from '../models/Keyframes';
 import { Interpolation, Styles } from '../types';
-export default function keyframes<Props extends object = object>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): Keyframes;
+export default function keyframes<Props extends object = {}>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): Keyframes;