Skip to content

Commit

Permalink
[typescript] Adjust typings to refactoring in styles. (mui#7975)
Browse files Browse the repository at this point in the history
  • Loading branch information
sebald authored Aug 31, 2017
1 parent 59b8477 commit f669320
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/styles/MuiThemeProvider.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Theme } from './theme';
import { Theme } from './createMuiTheme';

export interface MuiThemeProviderProps {
theme?: Theme<any>;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/createMixins.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Breakpoints } from './breakpoints';
import { Breakpoints } from './createBreakpoints';
import { Spacing } from './spacing';

export interface Mixins {
Expand Down
8 changes: 4 additions & 4 deletions src/styles/createMuiTheme.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Breakpoints } from './breakpoints';
import { Mixins } from './mixins';
import { Palette } from './palette';
import { Breakpoints } from './createBreakpoints';
import { Mixins } from './createMixins';
import { Palette } from './createPalette';
import { Shadows } from './shadows';
import { Spacing } from './spacing';
import { Transitions } from './transitions';
import { Typography } from './typography';
import { Typography } from './createTypography';
import { ZIndex } from './zIndex';

export interface ThemeOptions {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/createTypography.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Palette } from './palette';
import { Palette } from './createPalette';

export type TextStyle =
| 'display1'
Expand Down
8 changes: 4 additions & 4 deletions src/styles/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export { default as MuiThemeProvider } from './MuiThemeProvider';
export { default as createBreakpoints } from './breakpoints';
export { default as createMuiTheme } from './theme';
export { default as createPalette } from './palette';
export { default as createTypography } from './typography';
export { default as createBreakpoints } from './createBreakpoints';
export { default as createMuiTheme, Theme } from './createMuiTheme';
export { default as createPalette } from './createPalette';
export { default as createTypography } from './createTypography';
export { default as withStyles } from './withStyles';
export { StyleRules, StyleRulesCallback } from './withStyles';
export { default as withTheme } from './withTheme';
2 changes: 1 addition & 1 deletion src/styles/withStyles.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { StyledComponentProps } from '..';
import { Theme } from './theme';
import { Theme } from './createMuiTheme';

/**
* This is basically the API of JSS. It defines a Map<string, CSS>,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/withTheme.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Theme } from './theme';
import { Theme } from './createMuiTheme';

interface withTheme<P = {}, T extends Theme = Theme> {
(component: React.ComponentType<P & { theme: T }>): React.ComponentClass<P>;
Expand Down
2 changes: 1 addition & 1 deletion test/typescript/styles.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
StyleRules,
createMuiTheme,
MuiThemeProvider,
Theme,
} from '../../src/styles';
import { Theme } from '../../src/styles/theme';
import Button from '../../src/Button/Button';

const styles = ({ palette, spacing }) => ({
Expand Down

0 comments on commit f669320

Please sign in to comment.