diff options
| author | Determinant <ted.sybil@gmail.com> | 2019-02-14 23:59:16 -0500 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2019-02-14 23:59:16 -0500 |
| commit | 495e0d4518871e950afcd38d7d3afeb5477076dc (patch) | |
| tree | fd2bc9f49340a1c7f4f530e6aaa6607d4a4efacf /src/PatternTable.tsx | |
| parent | 6738cb883c37f2e388f1c86c84bd4c34a98699bd (diff) | |
finish migration
Diffstat (limited to 'src/PatternTable.tsx')
| -rw-r--r-- | src/PatternTable.tsx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/PatternTable.tsx b/src/PatternTable.tsx index 60acd3c..2b05287 100644 --- a/src/PatternTable.tsx +++ b/src/PatternTable.tsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Theme, withStyles, withTheme } from '@material-ui/core/styles'; +import { Theme, withStyles, withTheme, StyleRules } from '@material-ui/core/styles'; import TextField from '@material-ui/core/TextField'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; @@ -16,7 +16,7 @@ import { theme, defaultChartColor } from './theme'; import { PatternEntry, PatternEntryColor } from './pattern'; import { GCalendarMeta } from './gapi'; -const styles = (theme: Theme) => ({ +const styles = (theme: Theme): StyleRules => ({ deleteButton: { width: 0, position: 'absolute', @@ -74,8 +74,8 @@ function NameField(props: { const patternHead = [ {label: "Name", elem: withStyles(nameFieldstyles)(NameField)}, - {label: "Calendar", elem: withTheme(theme)(CalendarField)}, - {label: "Event", elem: withTheme(theme)(EventField)}] as {label: string, elem: any}[]; + {label: "Calendar", elem: withTheme()(CalendarField)}, + {label: "Event", elem: withTheme()(EventField)}] as {label: string, elem: any}[]; class PatternTable extends React.Component<{ classes: { @@ -178,15 +178,15 @@ class PatternTable extends React.Component<{ }}> <MaterialColorPicker initColor={this.state.colorPickerDefault} - onSelect={(event: any) => { + onSelect={(event: { target: { value: any }}) => { console.log("select"); this.chosenColor = event.target.value; }} onSubmit={this.handleColorPickerClose} onReset={() => {}} style={{width: 400, backgroundColor: '#c7c7c7'}} - submitLabel='Apply' - resetLabel='Undo' + submitLabel='Ok' + resetLabel='Reset' /> </Popover> <div className={classes.patternTableWrapper}> |