styled-components 6.0.0-beta.1 → 6.0.0-beta.10

package/dist/base.d.ts

@@ -5,7 +5,7 @@ import keyframes from './constructors/keyframes';
 import withTheme from './hoc/withTheme';
 import useTheme from './hooks/useTheme';
 import ServerStyleSheet from './models/ServerStyleSheet';
-import StyleSheetManager, { StyleSheetConsumer, StyleSheetContext } from './models/StyleSheetManager';
+import { IStyleSheetContext, IStyleSheetManager, IStylisContext, StyleSheetConsumer, StyleSheetContext, StyleSheetManager } from './models/StyleSheetManager';
 import ThemeProvider, { ThemeConsumer, ThemeContext } from './models/ThemeProvider';
 import isStyledComponent from './utils/isStyledComponent';
 declare global {
@@ -14,5 +14,5 @@ declare global {
     }
 }
 export * from './secretInternals';
-export { Attrs, DefaultTheme, ShouldForwardProp } from './types';
-export { createGlobalStyle, css, isStyledComponent, keyframes, ServerStyleSheet, StyleSheetConsumer, StyleSheetContext, StyleSheetManager, ThemeConsumer, ThemeContext, ThemeProvider, useTheme, SC_VERSION as version, withTheme, };
+export { AttrsArg as Attrs, DefaultTheme, ShouldForwardProp } from './types';
+export { createGlobalStyle, css, isStyledComponent, IStyleSheetManager, IStyleSheetContext, IStylisContext, keyframes, ServerStyleSheet, StyleSheetConsumer, StyleSheetContext, StyleSheetManager, ThemeConsumer, ThemeContext, ThemeProvider, useTheme, SC_VERSION as version, withTheme, };

package/dist/constructors/constructWithOptions.d.ts

@@ -1,32 +1,25 @@
-/// <reference types="react" />
-import { Attrs, ExecutionContext, Interpolation, IStyledComponent, IStyledComponentFactory, IStyledNativeComponent, IStyledNativeComponentFactory, KnownTarget, NativeTarget, StyledNativeOptions, StyledOptions, StyledTarget, Styles, WebTarget } from '../types';
-export interface NativeStyled<Target extends NativeTarget, DerivedProps = Target extends KnownTarget ? React.ComponentProps<Target> : unknown, OuterProps = unknown, OuterStatics = unknown> {
-    <Props = unknown, Statics = unknown>(initialStyles: Styles<DerivedProps & OuterProps & Props>, ...interpolations: Exclude<Interpolation<ExecutionContext & DerivedProps & OuterProps & Props>, IStyledComponent<any>>[]): IStyledNativeComponent<Target, DerivedProps & OuterProps & Props> & OuterStatics & Statics;
-    attrs(attrs: Attrs<ExecutionContext & DerivedProps & OuterProps>): NativeStyled<Target, DerivedProps, OuterProps, OuterStatics>;
-    withConfig(config: StyledNativeOptions<DerivedProps & OuterProps>): NativeStyled<Target, DerivedProps, OuterProps, OuterStatics>;
-}
-export interface WebStyled<Target extends WebTarget, DerivedProps = Target extends KnownTarget ? React.ComponentProps<Target> : unknown, OuterProps = unknown, OuterStatics = unknown> {
-    <Props = unknown, Statics = unknown>(initialStyles: Styles<DerivedProps & OuterProps & Props>, ...interpolations: Interpolation<ExecutionContext & DerivedProps & OuterProps & Props>[]): IStyledComponent<Target, DerivedProps & OuterProps & Props> & OuterStatics & Statics;
-    attrs(attrs: Attrs<ExecutionContext & DerivedProps & OuterProps>): WebStyled<Target, DerivedProps, OuterProps, OuterStatics>;
-    withConfig(config: StyledOptions<DerivedProps & OuterProps>): WebStyled<Target, DerivedProps, OuterProps, OuterStatics>;
-}
-export default function constructWithOptions<Environment extends 'web' | 'native', Target extends StyledTarget, DerivedProps = Target extends KnownTarget ? React.ComponentProps<Target> : unknown, OuterProps = unknown, // used for styled<{}>().attrs() so attrs() gets the generic prop context
-OuterStatics = unknown>(componentConstructor: Environment extends 'web' ? IStyledComponentFactory<any, any, any> : IStyledNativeComponentFactory<any, any, any>, tag: Target, options?: Environment extends 'web' ? StyledOptions<DerivedProps & OuterProps> : StyledNativeOptions<DerivedProps & OuterProps>): {
-    <Props = unknown, Statics = unknown>(initialStyles: Styles<DerivedProps & OuterProps & Props>, ...interpolations: Interpolation<ExecutionContext & DerivedProps & OuterProps & Props>[]): ReturnType<Environment extends "web" ? IStyledComponentFactory<Target, DerivedProps & OuterProps & Props, OuterStatics & Statics> : IStyledNativeComponentFactory<Target, DerivedProps & OuterProps & Props, OuterStatics & Statics>>;
-    attrs(attrs: Attrs<ExecutionContext & DerivedProps & OuterProps>): {
-        <Props_1 = unknown, Statics_1 = unknown>(initialStyles: Styles<DerivedProps & OuterProps & OuterStatics & Props_1>, ...interpolations: Interpolation<ExecutionContext & DerivedProps & OuterProps & OuterStatics & Props_1>[]): ReturnType<Environment extends "web" ? IStyledComponentFactory<Target, DerivedProps & OuterProps & OuterStatics & Props_1, Statics_1> : IStyledNativeComponentFactory<Target, DerivedProps & OuterProps & OuterStatics & Props_1, Statics_1>>;
-        attrs(attrs: Attrs<ExecutionContext & DerivedProps & OuterProps & OuterStatics>): {
-            <Props_2 = unknown, Statics_2 = unknown>(initialStyles: Styles<DerivedProps & OuterProps & OuterStatics & Props_2>, ...interpolations: Interpolation<ExecutionContext & DerivedProps & OuterProps & OuterStatics & Props_2>[]): ReturnType<Environment extends "web" ? IStyledComponentFactory<Target, DerivedProps & OuterProps & OuterStatics & Props_2, Statics_2> : IStyledNativeComponentFactory<Target, DerivedProps & OuterProps & OuterStatics & Props_2, Statics_2>>;
-            attrs(attrs: Attrs<ExecutionContext & DerivedProps & OuterProps & OuterStatics>): any;
-            /**
-             * If config methods are called, wrap up a new template function and merge options */
-            withConfig(config: Environment extends "web" ? StyledOptions<DerivedProps & OuterProps & OuterStatics> : StyledNativeOptions<DerivedProps & OuterProps & OuterStatics>): any;
-        };
-        /**
-         * If config methods are called, wrap up a new template function and merge options */
-        withConfig(config: Environment extends "web" ? StyledOptions<DerivedProps & OuterProps & OuterStatics> : StyledNativeOptions<DerivedProps & OuterProps & OuterStatics>): any;
-    };
-    /**
-     * If config methods are called, wrap up a new template function and merge options */
-    withConfig(config: Environment extends 'web' ? StyledOptions<DerivedProps & OuterProps> : StyledNativeOptions<DerivedProps & OuterProps>): any;
+import React from 'react';
+import { Attrs, AttrsArg, ExecutionProps, Interpolation, IStyledComponent, IStyledComponentFactory, KnownTarget, Runtime, StyledOptions, StyledTarget, Styles } from '../types';
+/**
+ * for types a and b, if b shares a field with a, mark a's field as optional
+ */
+declare type OptionalIntersection<A, B> = {
+    [K in Extract<keyof A, keyof B>]?: A[K];
 };
+declare type AttrsResult<T extends Attrs> = T extends (...args: any) => infer P ? P : T;
+declare type ExtractAttrsTarget<R extends Runtime, P extends ExecutionProps, DefaultTarget extends StyledTarget<R>> = P['as'] extends KnownTarget ? P['as'] : DefaultTarget;
+/**
+ * If attrs type is a function (no type provided, inferring from usage), extract the return value
+ * and merge it with the existing type to hole-punch any required fields that are satisfied as
+ * a result of running attrs. Otherwise if we have a definite type then union the base props
+ * with the passed attr type to capture any intended overrides.
+ */
+declare type PropsSatisfiedByAttrs<T extends Attrs, Props extends object, Result extends ExecutionProps = AttrsResult<T>> = Omit<Props, keyof Result> & OptionalIntersection<Props, Result> & Partial<Omit<Result, keyof Props | 'as'>>;
+export interface Styled<R extends Runtime, Target extends StyledTarget<R>, OuterProps extends object = object, OuterStatics extends object = object, RuntimeInjectedProps extends ExecutionProps = object> {
+    <Props extends object = object, Statics extends object = object>(initialStyles: Styles<OuterProps & RuntimeInjectedProps & Props>, ...interpolations: Interpolation<OuterProps & RuntimeInjectedProps & Props>[]): // @ts-expect-error KnownTarget is a subset of StyledTarget<R>
+    IStyledComponent<R, ExtractAttrsTarget<R, RuntimeInjectedProps, Target>, OuterProps & Props> & OuterStatics & Statics;
+    attrs: <T extends Attrs, TResult extends ExecutionProps = AttrsResult<T>, TTarget extends StyledTarget<R> = ExtractAttrsTarget<R, TResult, Target>>(attrs: AttrsArg<T extends (...args: any) => infer P ? OuterProps & P : OuterProps & T>) => Styled<R, TTarget, PropsSatisfiedByAttrs<T, OuterProps>, OuterStatics, Omit<RuntimeInjectedProps, keyof TResult> & TResult>;
+    withConfig: (config: StyledOptions<R, OuterProps>) => Styled<R, Target, OuterProps, OuterStatics>;
+}
+export default function constructWithOptions<R extends Runtime, Target extends StyledTarget<R>, OuterProps extends object = Target extends KnownTarget ? React.ComponentPropsWithRef<Target> : object, OuterStatics extends object = object>(componentConstructor: IStyledComponentFactory<R, Target, OuterProps, OuterStatics>, tag: Target, options?: StyledOptions<R, OuterProps>): Styled<R, Target, OuterProps, OuterStatics>;
+export {};

package/dist/constructors/createGlobalStyle.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-import { ExtensibleObject, Interpolation, Styles } from '../types';
-export default function createGlobalStyle<Props = unknown>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): React.NamedExoticComponent<ExtensibleObject>;
+import { ExecutionProps, Interpolation, Styles } from '../types';
+export default function createGlobalStyle<Props extends object>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): React.NamedExoticComponent<ExecutionProps & Props>;

package/dist/constructors/css.d.ts

@@ -1,4 +1,4 @@
-import { Interpolation, StyledObject, StyleFunction, Styles } from '../types';
-export default function css<Props>(styles: Styles<Props>, ...interpolations: Interpolation<Props>[]): string | number | import("../types").Keyframes | TemplateStringsArray | import("../types").IStyledComponent<any, any> | StyledObject<Props> | StyleFunction<Props> | (Interpolation<Props>[] & {
-    isCss?: boolean | undefined;
-});
+import { Interpolation, 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>;
+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 = unknown>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): Keyframes;
+export default function keyframes<Props extends object = object>(strings: Styles<Props>, ...interpolations: Array<Interpolation<Props>>): Keyframes;