Revert "feat: export Theme type from root (#3125)"

This reverts commit 0531faa.
kiwicom · Oct 21, 2021 · c0754d9 · c0754d9
1 parent 322c87e
commit c0754d9
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/packages/orbit-components/src/ThemeProvider/index.d.ts b/packages/orbit-components/src/ThemeProvider/index.d.ts
@@ -4,10 +4,10 @@
 import * as React from "react";
 
 import { Translations } from "../Dictionary";
-import { Theme } from "../defaultTheme";
+import { ThemeShape } from "../defaultTheme";
 
 interface Props {
-  readonly theme: Theme;
+  readonly theme: ThemeShape;
   readonly dictionary?: Translations;
   readonly children: React.ReactNode;
 }

diff --git a/packages/orbit-components/src/defaultTheme.d.ts b/packages/orbit-components/src/defaultTheme.d.ts
@@ -3,16 +3,16 @@
 
 import { Tokens } from "@kiwicom/orbit-design-tokens";
 
-export interface Theme {
+export interface ThemeShape {
   readonly orbit: Tokens;
   readonly transitions?: boolean;
   readonly lockScrolling?: boolean;
   readonly rtl?: boolean;
 }
 
-export interface ThemeProps {
-  theme: Theme;
-}
+export type ThemeType = {
+  theme: ThemeShape;
+};
 
-declare const defaultTheme: Theme;
-export default defaultTheme;
+declare const Theme: ThemeShape;
+export default Theme;
diff --git a/packages/orbit-components/src/hooks/useTheme/index.d.ts b/packages/orbit-components/src/hooks/useTheme/index.d.ts
@@ -1,5 +1,5 @@
-import { Theme } from "../../defaultTheme";
+import { ThemeShape } from "../../defaultTheme";
 
-declare const useTheme: () => Theme;
+declare const useTheme: () => ThemeShape;
 
 export { useTheme, useTheme as default };
diff --git a/packages/orbit-components/src/index.d.ts b/packages/orbit-components/src/index.d.ts
@@ -24,7 +24,7 @@ export { ChoiceGroup } from "./ChoiceGroup";
 export { CountryFlag } from "./CountryFlag";
 export { Collapse } from "./Collapse";
 export { CarrierLogo } from "./CarrierLogo";
-export { default as defaultTheme, Theme } from "./defaultTheme";
+export { default as defaultTheme } from "./defaultTheme";
 export { Desktop } from "./Desktop";
 export { Dialog } from "./Dialog";
 export { FeatureIcon } from "./FeatureIcon";

diff --git a/packages/orbit-components/src/index.js.flow b/packages/orbit-components/src/index.js.flow
@@ -245,7 +245,6 @@ declare export var ThemeProvider: ThemeProviderType;
 declare export var Translate: TranslateType;
 
 declare export var defaultTheme: Theme;
-export type { Theme };
 declare export var getTokens: GetTokens;
 declare export var fromPlainObject: FromPlainObject;
 

diff --git a/packages/orbit-components/src/utils/mediaQuery/index.d.ts b/packages/orbit-components/src/utils/mediaQuery/index.d.ts
@@ -2,12 +2,12 @@
 // Project: http://github.com/kiwicom/orbit
 import type { Interpolation } from "styled-components";
 
-import { Theme } from "../../defaultTheme";
+import { ThemeShape } from "../../defaultTheme";
 import { Devices } from "./consts";
 
 type QueryFunction = (style: Interpolation<any>) => Interpolation<any>;
 
 declare const MediaQuery: { [key in Devices]: QueryFunction };
-declare const getBreakpointWidth: (name: string, theme: Theme, pure?: boolean) => string;
+declare const getBreakpointWidth: (name: string, theme: ThemeShape, pure?: boolean) => string;
 
 export { MediaQuery, MediaQuery as default, getBreakpointWidth };
diff --git a/packages/orbit-components/src/utils/rtl/index.d.ts b/packages/orbit-components/src/utils/rtl/index.d.ts
@@ -1,14 +1,14 @@
-import { ThemeProps } from "../../defaultTheme";
+import { ThemeType } from "../../defaultTheme";
 
-export type LeftToRight = <T1, T2>(left: T1, right: T2) => (options: ThemeProps) => T1 | T2;
+export type LeftToRight = <T1, T2>(left: T1, right: T2) => (theme: ThemeType) => T1 | T2;
 
-export type RtlSpacing = (value: string) => (options: ThemeProps) => string;
+export type RtlSpacing = (value: string) => (theme: ThemeType) => string;
 
-export type BorderRadius = (value: string) => (options: ThemeProps) => string;
+export type BorderRadius = (value: string) => (theme: ThemeType) => string;
 
-export type TextAlign = (value: "left" | "right") => (options: ThemeProps) => string | LeftToRight;
+export type TextAlign = (value: "left" | "right") => (theme: ThemeType) => string | LeftToRight;
 
-export type Translate3d = (value: string) => (options: ThemeProps) => string;
+export type Translate3d = (value: string) => (themeProps: ThemeType) => string;
 
 export declare const rtlSpacing: RtlSpacing;
 

diff --git a/packages/orbit-components/src/utils/transition/index.d.ts b/packages/orbit-components/src/utils/transition/index.d.ts
@@ -1,11 +1,11 @@
-import { ThemeProps } from "../../defaultTheme";
+import { ThemeType } from "../../defaultTheme";
 
 export type TransitionDuration = "slow" | "normal" | "fast";
 
-export declare const transition: (
+export declare const Transition: (
   properties: string[],
   duration: TransitionDuration,
   timingFunction: string,
-) => (options: ThemeProps) => string | null;
+) => (theme: ThemeType) => string | null;
 
-export default transition;
+export default Transition;