styled-components 6.0.0-rc.6 → 6.0.0

package/dist/types.d.ts

@@ -1,9 +1,9 @@
-import { Properties } from 'csstype';
+import type * as CSS from 'csstype';
 import React from 'react';
 import ComponentStyle from './models/ComponentStyle';
 import { DefaultTheme } from './models/ThemeProvider';
 import createWarnTooManyClasses from './utils/createWarnTooManyClasses';
-export { DefaultTheme };
+export { CSS, DefaultTheme };
 interface ExoticComponentWithDisplayName<P = any> extends React.ExoticComponent<P> {
     defaultProps?: Partial<P>;
     displayName?: string;
@@ -60,7 +60,7 @@ export interface ExecutionContext extends ExecutionProps {
     theme: DefaultTheme;
 }
 export interface StyleFunction<Props extends object> {
-    (executionContext: ExecutionContext & Props): Interpolation<Props>;
+    (executionContext: ExecutionContext & Props): Interpolation<object>;
 }
 export type Interpolation<Props extends object> = StyleFunction<Props> | StyledObject<Props> | TemplateStringsArray | string | number | false | undefined | null | Keyframes | StyledComponentBrand | RuleSet<object> | Interpolation<Props>[];
 export type Attrs<Props extends object = BaseObject> = (ExecutionProps & Partial<Props>) | ((props: ExecutionContext & Props) => ExecutionProps & Partial<Props>);
@@ -78,7 +78,6 @@ export interface Keyframes {
 export interface Flattener<Props extends object> {
     (chunks: Interpolation<Props>[], executionContext: object | null | undefined, styleSheet: StyleSheet | null | undefined): Interpolation<Props>[];
 }
-export type FlattenerResult<Props extends object> = RuleSet<Props> | number | string | string[] | StyledComponentBrand | Keyframes;
 export interface Stringifier {
     (css: string, selector?: string, prefix?: string, componentId?: string): string[];
     hash: string;
@@ -128,9 +127,9 @@ export interface IInlineStyleConstructor<Props extends object> {
 }
 export interface IInlineStyle<Props extends object> {
     rules: RuleSet<Props>;
-    generateStyleObject(executionContext: Object): Object;
+    generateStyleObject(executionContext: ExecutionContext & Props): object;
 }
-export type StyledObject<Props extends object> = Properties & Props & {
+export type StyledObject<Props extends object> = Substitute<Props, CSS.Properties> & {
     [key: string]: string | number | StyleFunction<Props> | StyledObject<Props> | RuleSet<any> | undefined;
 };
 /**

package/dist/utils/flatten.d.ts

@@ -1,4 +1,4 @@
 import StyleSheet from '../sheet';
 import { Dict, ExecutionContext, Interpolation, RuleSet, Stringifier } from '../types';
 export declare const objToCssArray: (obj: Dict<any>) => string[];
-export default function flatten<Props extends object>(chunk: Interpolation<Props>, executionContext?: ExecutionContext & Props, styleSheet?: StyleSheet, stylisInstance?: Stringifier): RuleSet<Props>;
+export default function flatten<Props extends object>(chunk: Interpolation<object>, executionContext?: ExecutionContext & Props, styleSheet?: StyleSheet, stylisInstance?: Stringifier): RuleSet<Props>;

package/native/dist/constructors/constructWithOptions.d.ts

@@ -9,7 +9,7 @@ type AttrsResult<T extends Attrs<any>> = T extends (...args: any) => infer P ? P
 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> {
+export interface Styled<R extends Runtime, Target extends StyledTarget<R>, OuterProps extends object, 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>;