Unparameterize Theme type (mui#9295)

pelotom · Nov 27, 2017 · be0d4fd · be0d4fd
1 parent 6159f5c
commit be0d4fd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/styles/MuiThemeProvider.d.ts b/src/styles/MuiThemeProvider.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Theme } from './createMuiTheme';
 
 export interface MuiThemeProviderProps {
-  theme?: Theme<any>;
+  theme?: Theme;
   sheetsManager?: Object;
   children: React.ReactNode;
 }

diff --git a/src/styles/createMuiTheme.d.ts b/src/styles/createMuiTheme.d.ts
@@ -20,7 +20,7 @@ export interface ThemeOptions {
   overrides?: { [name: string]: StyleRules };
 }
 
-export type Theme<T = {}> = {
+export type Theme = {
   direction: 'ltr' | 'rtl';
   palette: Palette;
   typography: Typography;
@@ -31,8 +31,8 @@ export type Theme<T = {}> = {
   spacing: Spacing;
   zIndex: ZIndex;
   overrides?: { [name: string]: StyleRules; };
-} & T;
+};
 
-export default function createMuiTheme<T = {}>(
-  options?: ThemeOptions & T
-): Theme<T>;
+export default function createMuiTheme(
+  options?: ThemeOptions
+): Theme;
diff --git a/src/styles/withTheme.d.ts b/src/styles/withTheme.d.ts
@@ -1,5 +1,7 @@
 import { Theme } from './createMuiTheme';
 
-export default function withTheme<P = {}, T extends Theme = Theme>():
-  (component: React.ComponentType<P & { theme: T }>
-  ) => React.ComponentClass<P>;
+declare const withTheme: <P = {}>() => (
+  component: React.ComponentType<P & { theme: Theme }>
+) => React.ComponentClass<P>;
+
+export default withTheme