Skip to content

Commit fe047f6

Browse files
author
spoeck
committed
update material-ui to v3.1.1
1 parent b554f47 commit fe047f6

File tree

7 files changed

+310
-4426
lines changed

7 files changed

+310
-4426
lines changed

package-lock.json

Lines changed: 292 additions & 4403 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,31 @@
33
"version": "0.0.1",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "1.4.1",
7-
"@material-ui/icons": "2.0.0",
8-
"npm": "^5.7.1",
9-
"react": "16.4.0",
10-
"react-dom": "16.4.0",
6+
"@material-ui/core": "3.1.1",
7+
"@material-ui/icons": "3.0.1",
8+
"react": "16.5.2",
9+
"react-dom": "16.5.2",
1110
"react-redux": "^5.0.7",
1211
"react-router": "^4.2.0",
1312
"react-scripts-ts": "latest",
1413
"redux": "^3.7.2",
15-
"redux-logger": "^3.0.6",
14+
"redux-logger": "3.0.6",
1615
"redux-persist": "^5.5.0",
1716
"redux-thunk": "^2.2.0"
1817
},
1918
"devDependencies": {
2019
"@types/history": "^4.6.2",
2120
"@types/jest": "22.1.0",
2221
"@types/node": "9.4.0",
23-
"@types/react": "16.3.16",
24-
"@types/react-dom": "16.0.6",
22+
"@types/react": "16.4.14",
23+
"@types/react-dom": "16.0.7",
2524
"@types/react-redux": "^5.0.19",
2625
"@types/react-router": "^4.0.18",
2726
"@types/redux-logger": "^3.0.5",
2827
"@types/webpack-env": "^1.13.5",
2928
"csstype": "^2.4.2",
3029
"redux-devtools-extension": "^2.13.2",
31-
"typescript": "2.8.3"
30+
"typescript": "3.0.3"
3231
},
3332
"scripts": {
3433
"start": "react-scripts-ts start",

src/App.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { AppBar, Badge, createStyles, Divider, Drawer, Hidden, IconButton, List, ListItem, ListItemIcon, ListItemText, Theme, Toolbar, Typography, WithStyles, withStyles } from '@material-ui/core';
2-
import withWidth, { WithWidthProps } from '@material-ui/core/withWidth';
1+
import { AppBar, Badge, createStyles, Divider, Drawer, Hidden, IconButton, List, ListItem, ListItemIcon, ListItemText, Theme, Toolbar, Typography, WithStyles, withStyles, withWidth } from '@material-ui/core';
2+
import { WithWidth } from '@material-ui/core/withWidth';
33
import TodoIcon from '@material-ui/icons/FormatListNumbered';
44
import HomeIcon from '@material-ui/icons/Home';
55
import MenuIcon from '@material-ui/icons/Menu';
@@ -15,7 +15,7 @@ import { isSmartphone } from './responsive';
1515
import withRoot from './withRoot';
1616

1717
export namespace App {
18-
export interface Props extends RouteComponentProps<void>, WithStyles<typeof styles>, WithWidthProps {
18+
export interface Props extends RouteComponentProps<void>, WithStyles<typeof styles>, WithWidth {
1919
todoList: Todo[];
2020
}
2121

@@ -194,4 +194,4 @@ function mapStateToProps(state: RootState) {
194194
};
195195
}
196196

197-
export default (withRoot(withStyles(styles)<{}>(connect(mapStateToProps)(withWidth()(App)))));
197+
export default withRoot(withStyles(styles)(connect(mapStateToProps)(withWidth()(App))));

src/components/TodoDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ const styles = (theme: Theme) => createStyles({
6868
}
6969
});
7070

71-
export default withStyles(styles)<TodoDialog.Props>(TodoDialog);
71+
export default withStyles(styles)(TodoDialog);

src/components/TodoTable.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ export namespace TodoTable {
1313

1414
class TodoTable extends React.Component<TodoTable.Props> {
1515

16-
constructor(props?: (TodoTable.Props), context?: any) {
17-
super(props as any, context);
18-
}
19-
2016
onRowClick(todo: Todo) {
2117
if (todo.completed) {
2218
this.props.actions.uncompleteTodo(todo.id);
@@ -80,4 +76,4 @@ const styles = (theme: Theme) => createStyles({
8076
},
8177
});
8278

83-
export default withStyles(styles)<TodoTable.Props>(TodoTable);
79+
export default withStyles(styles)(TodoTable);

src/pages/HomePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ function mapStateToProps(state: RootState) {
3939
};
4040
}
4141

42-
export default (withStyles(styles)<{}>(connect(mapStateToProps)(HomePage)));
42+
export default withStyles(styles)(connect(mapStateToProps)(HomePage));

src/pages/TodoPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Button, createStyles, Grid, Theme, Typography, WithStyles, withStyles, withWidth } from '@material-ui/core';
2-
import { WithWidthProps } from '@material-ui/core/withWidth';
2+
import { WithWidth } from '@material-ui/core/withWidth';
33
import * as React from 'react';
44
import { connect } from 'react-redux';
55
import { RouteComponentProps } from 'react-router';
@@ -12,7 +12,7 @@ import { RootState } from '../reducers/index';
1212
import { isSmartphone } from '../responsive';
1313

1414
export namespace TodoPage {
15-
export interface Props extends RouteComponentProps<void>, WithStyles<typeof styles>, WithWidthProps {
15+
export interface Props extends RouteComponentProps<void>, WithStyles<typeof styles>, WithWidth {
1616
todoList: Todo[];
1717
actions: typeof TodoActions;
1818
}
@@ -91,4 +91,4 @@ function mapDispatchToProps(dispatch: any) {
9191
};
9292
}
9393

94-
export default (withStyles(styles)<{}>(connect(mapStateToProps, mapDispatchToProps)(withWidth()(TodoPage))));
94+
export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(withWidth()(TodoPage)));

0 commit comments

Comments
 (0)