From 59b84773c9657ccc66a5eb30b110d30bee597a5f Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Thu, 31 Aug 2017 10:58:16 +0200 Subject: [PATCH] [core] Fix some issues after the latest release (#7973) --- docs/src/pages/customization/themes.md | 3 +-- src/Dialog/withResponsiveFullScreen.d.ts | 2 +- src/Drawer/Drawer.d.ts | 2 +- src/Grid/Grid.d.ts | 2 +- src/Hidden/Hidden.d.ts | 2 +- src/Hidden/HiddenJs.d.ts | 2 +- src/Typography/Typography.d.ts | 2 +- src/transitions/Collapse.d.ts | 2 +- src/transitions/Fade.d.ts | 2 +- src/transitions/Grow.d.ts | 2 +- src/transitions/Slide.d.ts | 2 +- src/utils/withWidth.d.ts | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/src/pages/customization/themes.md b/docs/src/pages/customization/themes.md index 1e0532ebfadaa3..f870091abd8468 100644 --- a/docs/src/pages/customization/themes.md +++ b/docs/src/pages/customization/themes.md @@ -110,8 +110,7 @@ This component should preferably be used at **the root of your component tree**. ```jsx import React from 'react'; import { render } from 'react-dom'; -import createMuiTheme from 'material-ui/styles/theme'; -import { MuiThemeProvider } from 'material-ui/styles'; +import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles'; import Root from './Root'; const theme = createMuiTheme(); diff --git a/src/Dialog/withResponsiveFullScreen.d.ts b/src/Dialog/withResponsiveFullScreen.d.ts index 008af9a5b63526..c027c7d15146cf 100644 --- a/src/Dialog/withResponsiveFullScreen.d.ts +++ b/src/Dialog/withResponsiveFullScreen.d.ts @@ -1,4 +1,4 @@ -import { Breakpoint } from '../styles/breakpoints'; +import { Breakpoint } from '../styles/createBreakpoints'; import { WithWidthProps } from '../utils/withWidth'; export interface WithResponsiveFullScreenOptions { diff --git a/src/Drawer/Drawer.d.ts b/src/Drawer/Drawer.d.ts index 1d26f5d5554ec1..be7233a9af4783 100644 --- a/src/Drawer/Drawer.d.ts +++ b/src/Drawer/Drawer.d.ts @@ -2,7 +2,7 @@ import * as React from 'react'; import { StyledComponent } from '..'; import { ModalProps } from '../internal/Modal'; import { SlideProps } from '../transitions/Slide'; -import { Theme } from '../styles/theme'; +import { Theme } from '../styles/createMuiTheme'; export interface DrawerProps extends ModalProps { anchor?: 'left' | 'top' | 'right' | 'bottom'; diff --git a/src/Grid/Grid.d.ts b/src/Grid/Grid.d.ts index 13e627bf2cb1ef..fe41557be6d1e9 100644 --- a/src/Grid/Grid.d.ts +++ b/src/Grid/Grid.d.ts @@ -1,7 +1,7 @@ import * as React from 'react'; import { StyledComponent } from '..'; import { HiddenProps } from '../Hidden/Hidden'; -import { Breakpoint } from '../styles/breakpoints'; +import { Breakpoint } from '../styles/createBreakpoints'; export type GridAlignment = 'flex-start' | 'center' | 'flex-end' | 'stretch'; diff --git a/src/Hidden/Hidden.d.ts b/src/Hidden/Hidden.d.ts index 4e32333fc0fe7f..9b3f62d7d14110 100644 --- a/src/Hidden/Hidden.d.ts +++ b/src/Hidden/Hidden.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Breakpoint } from '../styles/breakpoints'; +import { Breakpoint } from '../styles/createBreakpoints'; export interface HiddenProps { only?: Breakpoint | Array; diff --git a/src/Hidden/HiddenJs.d.ts b/src/Hidden/HiddenJs.d.ts index 6555319b734723..156194bed97cfe 100644 --- a/src/Hidden/HiddenJs.d.ts +++ b/src/Hidden/HiddenJs.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Breakpoint } from '../styles/breakpoints'; +import { Breakpoint } from '../styles/createBreakpoints'; export interface HiddenJsProps { only?: Breakpoint | Array; diff --git a/src/Typography/Typography.d.ts b/src/Typography/Typography.d.ts index 0480d00781b6d4..2d010c25f5d355 100644 --- a/src/Typography/Typography.d.ts +++ b/src/Typography/Typography.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent, PropTypes } from '..'; -import { Style, TextStyle } from '../styles/typography'; +import { Style, TextStyle } from '../styles/createTypography'; export interface TypographyProps extends React.HTMLAttributes { align?: PropTypes.Alignment; diff --git a/src/transitions/Collapse.d.ts b/src/transitions/Collapse.d.ts index f91d06469fb6b9..70058de26ec336 100644 --- a/src/transitions/Collapse.d.ts +++ b/src/transitions/Collapse.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Theme } from '../styles/theme'; +import { Theme } from '../styles/createMuiTheme'; import { TransitionProps } from '../internal/Transition'; export interface CollapseProps extends TransitionProps { diff --git a/src/transitions/Fade.d.ts b/src/transitions/Fade.d.ts index 9f9db5e4b76b6d..a9f001f1727086 100644 --- a/src/transitions/Fade.d.ts +++ b/src/transitions/Fade.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Theme } from '../styles/theme'; +import { Theme } from '../styles/createMuiTheme'; import { TransitionProps } from '../internal/Transition'; export interface FadeProps extends TransitionProps { diff --git a/src/transitions/Grow.d.ts b/src/transitions/Grow.d.ts index 08d20c49c3b52f..eefe04f7f8299f 100644 --- a/src/transitions/Grow.d.ts +++ b/src/transitions/Grow.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Theme } from '../styles/theme'; +import { Theme } from '../styles/createMuiTheme'; import { TransitionProps } from '../internal/Transition'; export interface GrowProps extends TransitionProps { diff --git a/src/transitions/Slide.d.ts b/src/transitions/Slide.d.ts index 73d756ee9c6afc..4fe8a3d20650d9 100644 --- a/src/transitions/Slide.d.ts +++ b/src/transitions/Slide.d.ts @@ -1,6 +1,6 @@ import * as React from 'react'; import { StyledComponent } from '..'; -import { Theme } from '../styles/theme'; +import { Theme } from '../styles/createMuiTheme'; import { TransitionProps } from '../internal/Transition'; export interface SlideProps extends TransitionProps { diff --git a/src/utils/withWidth.d.ts b/src/utils/withWidth.d.ts index 6d4722232734c1..0e2223068f86b1 100644 --- a/src/utils/withWidth.d.ts +++ b/src/utils/withWidth.d.ts @@ -1,4 +1,4 @@ -import { Breakpoint } from '../styles/breakpoints'; +import { Breakpoint } from '../styles/createBreakpoints'; export interface WithWidthOptions { resizeInterval: number; }