Update MaterialUI

This commit is contained in:
Thomas Nordquist
2019-06-14 11:25:32 +02:00
parent 3935b1d614
commit 6176859c7c
14 changed files with 370 additions and 356 deletions

View File

@@ -2,7 +2,7 @@ import * as q from '../../../../backend/src/Model'
import * as React from 'react'
import { AppState } from '../../reducers'
import { connect } from 'react-redux'
import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
import { StyleRulesCallback, withStyles, Theme } from '@material-ui/core/styles'
import { TopicViewModel } from '../../model/TopicViewModel'
import { Typography } from '@material-ui/core'
import { Base64Message } from '../../../../backend/src/Model/Base64Message'
@@ -15,7 +15,7 @@ interface Stats {
title: string
}
const styles: StyleRulesCallback = theme => ({
const styles = (theme: Theme) => ({
flex: {
display: 'flex',
width: '100%',

View File

@@ -2,12 +2,13 @@ import * as React from 'react'
import BooleanSwitch from './BooleanSwitch'
import BrokerStatistics from './BrokerStatistics'
import ChevronRight from '@material-ui/icons/ChevronRight'
import TimeLocale from './TimeLocale'
import { AppState } from '../../reducers'
import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
import { globalActions, settingsActions } from '../../actions'
import { shell } from 'electron'
import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
import { Theme, withStyles } from '@material-ui/core/styles'
import { TopicOrder } from '../../reducers/Settings'
import {
@@ -21,7 +22,6 @@ import {
Typography,
Tooltip,
} from '@material-ui/core'
import TimeLocale from './TimeLocale';
export const autoExpandLimitSet = [{
limit: 0,
@@ -43,7 +43,7 @@ export const autoExpandLimitSet = [{
name: 'All',
}]
const styles: StyleRulesCallback = theme => ({
const styles = (theme: Theme) => ({
drawer: {
backgroundColor: theme.palette.background.default,
flexShrink: 0,

View File

@@ -8,7 +8,8 @@ import {
InputLabel,
MenuItem,
Select,
StyleRulesCallback
StyleRulesCallback,
Theme
} from '@material-ui/core'
import { settingsActions } from '../../actions'
import { withStyles } from '@material-ui/styles'
@@ -69,16 +70,16 @@ const mapDispatchToProps = (dispatch: any) => {
}
}
const styles: StyleRulesCallback = theme => ({
const styles = (theme: Theme) => ({
input: {
minWidth: '150px',
margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
},
selected: {
'& div': {
display: 'none'
}
}
display: 'none',
},
},
})
export default withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(TimeLocaleSettings))