Skip to content

Commit

Permalink
upgrade material-ui to v1.3.1 and fix error and warning in ListItemTe…
Browse files Browse the repository at this point in the history
…xt and Typography

mui/material-ui#11834
  • Loading branch information
zlargon committed Jul 8, 2018
1 parent 6c73e01 commit 8307298
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": "http://zlargon.github.io/mbta",
"dependencies": {
"@material-ui/core": "^1.2.1",
"@material-ui/core": "^1.3.1",
"@material-ui/icons": "^1.1.0",
"co": "^4.6.0",
"react": "^16.4.0",
Expand Down
19 changes: 8 additions & 11 deletions src/components/Search.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
import Collapse from '@material-ui/core/Collapse';
import Typography from '@material-ui/core/Typography';
import Checkbox from '@material-ui/core/Checkbox';
import Divider from '@material-ui/core/Divider';
import ListSubheader from '@material-ui/core/ListSubheader';
Expand Down Expand Up @@ -150,16 +149,14 @@ class Search extends React.Component {
<img alt='' src={logo} style={{ height: '30px', width: '30px' }}/>
</ListItemIcon>
<ListItemText inset
primary={
<Typography variant="subheading" style={{ color: '#' + route.text_color }}>
{this.lang(route.name)}
</Typography>
}
secondary={
<Typography style={{ color: '#' + route.text_color }}>
{`${route.direction[0]} / ${route.direction[1]}`}
</Typography>
}/>
primary={this.lang(route.name)}
primaryTypographyProps={{
style: { color: '#' + route.text_color }
}}
secondary={`${route.direction[0]} / ${route.direction[1]}`}
secondaryTypographyProps={{
style: { color: '#' + route.text_color }
}}/>
{this.state.collapse[route.id] ? <ExpandLessIcon /> : <ExpandMoreIcon />}
</ListItem>
);
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
core-js "^2.5.6"
regenerator-runtime "^0.11.1"

"@material-ui/core@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-1.2.1.tgz#f8c73da10b875762b37be7167ec2ac79b027499f"
"@material-ui/core@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-1.3.1.tgz#8b4e6db9ed4536e8ccbea0eeff3da0d524e6af2c"
dependencies:
"@babel/runtime" "^7.0.0-beta.42"
"@types/jss" "^9.5.3"
Expand All @@ -37,7 +37,7 @@
react-jss "^8.1.0"
react-popper "^0.10.0"
react-transition-group "^2.2.1"
recompose "^0.26.0 || ^0.27.0"
recompose "^0.27.0"
scroll "^2.0.3"
warning "^4.0.1"

Expand Down Expand Up @@ -5675,7 +5675,7 @@ readdirp@^2.0.0:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"

"recompose@^0.26.0 || ^0.27.0":
"recompose@^0.26.0 || ^0.27.0", recompose@^0.27.0:
version "0.27.1"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.1.tgz#1a49e931f183634516633bbb4f4edbfd3f38a7ba"
dependencies:
Expand Down

0 comments on commit 8307298

Please sign in to comment.