Export InterpolationValue type and clean up

arvindarvee · Jan 20, 2017 · 9e7016c · 9e7016c
1 parent e19415c
commit 9e7016c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/native/index.d.ts b/native/index.d.ts
@@ -6,6 +6,7 @@ export {
   ThemeProps,
   ThemeProvider,
   Interpolation,
+  InterpolationValue,
   InterpolationFunction,
   OuterStyledProps,
   StyledFunction,

diff --git a/typings/styled-components.d.ts b/typings/styled-components.d.ts
@@ -1,23 +1,24 @@
 import * as React from "react";
 import { StatelessComponent, ComponentClass } from "react";
 
+type Component<P> = ComponentClass<P> | StatelessComponent<P>;
+
 export interface ThemeProps {
   theme: any;
 }
 
-type Component<P> = ComponentClass<P> | StatelessComponent<P>;
 export type StyledProps<P> = P & ThemeProps;
-export interface InterpolationFunction<P> {
-  (props: StyledProps<P>): InterpolationValue<P> | ReadonlyArray<Interpolation<P>>;
-}
-type InterpolationValue<P> = string | number;
-export type Interpolation<P> = InterpolationFunction<P> | InterpolationValue<P> | ReadonlyArray<InterpolationValue<P> | InterpolationFunction<P>>;
-
 export type OuterStyledProps<P> = P & {
   theme?: Object;
   innerRef?: (instance: any) => void;
 };
 
+export type Interpolation<P> = InterpolationValue | InterpolationFunction<P> | ReadonlyArray<InterpolationValue | InterpolationFunction<P>>;
+export type InterpolationValue = string | number;
+export interface InterpolationFunction<P> {
+  (props: StyledProps<P>): InterpolationValue | ReadonlyArray<Interpolation<P>>;
+}
+
 export interface StyledFunction<P> {
   (strings: TemplateStringsArray, ...interpolations: Interpolation<StyledProps<P>>[]): ComponentClass<OuterStyledProps<P>>;
   <U>(strings: TemplateStringsArray, ...interpolations: Interpolation<StyledProps<P & U>>[]): ComponentClass<OuterStyledProps<P & U>>;