Merge remote-tracking branch 'Dashlane/fix/material-ui-themedecorator' into material-ui-v014. Pull request #6792.

material-ui/material-ui-tests.tsx

@@ -34,6 +34,7 @@ import IconMenu from "material-ui/lib/menus/icon-menu";
 import Menu from 'material-ui/lib/menus/menu';
 import MenuItem from 'material-ui/lib/menus/menu-item';
 import Divider from 'material-ui/lib/divider';
+import ThemeDecorator from 'material-ui/lib/styles/theme-decorator';
 import ThemeManager from 'material-ui/lib/styles/theme-manager';
 import GridList from 'material-ui/lib/grid-list/grid-list';
 import GridTile from 'material-ui/lib/grid-list/grid-tile';
@@ -57,6 +58,17 @@ interface MaterialUiTestsState {
     value: number;
 }
 
+// "http://material-ui.com/#/customization/themes"
+let muiTheme: MuiTheme = ThemeManager.getMuiTheme({
+    palette: {
+        accent1Color: Colors.cyan100
+    },
+    spacing: {
+
+    }
+});
+
+@ThemeDecorator(muiTheme)
 class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements React.LinkedStateMixin {
 
     // injected with mixin
@@ -75,16 +87,6 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen
 
     render() {
 
-        // "http://material-ui.com/#/customization/themes"
-        let muiTheme: MuiTheme = ThemeManager.getMuiTheme({
-            palette: {
-                accent1Color: Colors.cyan100
-            },
-            spacing: {
-
-            }
-        });
-
         // "http://material-ui.com/#/customization/inline-styles"
         let element: React.ReactElement<any>;
         element = <Checkbox

material-ui/material-ui-tests.tsx.tscparams

@@ -0,0 +1 @@
+--experimentalDecorators

material-ui/material-ui.d.ts

@@ -351,7 +351,7 @@ declare namespace __MaterialUI {
             palette: ThemePalette;
         }
 
-        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <T>(Component: T) => T;
+        export function ThemeDecorator(muiTheme: Styles.MuiTheme): <TFunction extends Function>(Component: TFunction) => TFunction;
 
         interface ThemeManager {
             getMuiTheme(rawTheme: RawTheme): MuiTheme;