Skip to content

Commit

Permalink
fix: remove paper styling for filter pane
Browse files Browse the repository at this point in the history
  • Loading branch information
gmaclennan committed Oct 2, 2019
1 parent e8e2aa0 commit fd25320
Showing 1 changed file with 33 additions and 46 deletions.
79 changes: 33 additions & 46 deletions src/FilterPanel/FilterPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import React, { useMemo, useEffect } from 'react'
import { makeStyles } from '@material-ui/core/styles'
import List from '@material-ui/core/List'
import Paper from '@material-ui/core/Paper'
import { defineMessages, useIntl } from 'react-intl'
import isEqual from 'lodash/isEqual'
import omit from 'lodash/omit'
Expand Down Expand Up @@ -169,41 +168,39 @@ const FilterPanel = ({

return (
<MuiPickersUtilsProvider utils={DateFnsUtils}>
<Paper className={cx.root} elevation={1} square>
<List className={cx.list}>
{Object.keys(filterFields)
.map(id => {
const field = filterFields[id]
if (!field) return
const fieldId = JSON.stringify(field.key)
switch (field.type) {
case 'select_one':
return (
<DiscreteFilter
fieldKey={field.key}
label={<FormattedFieldname field={field} />}
filter={filterByField[fieldId]}
options={field.options}
onChangeFilter={handleChangeFilter(fieldId)}
/>
)
case 'date':
case 'datetime':
return (
<DateFilter
fieldKey={field.key}
label={<FormattedFieldname field={field} />}
filter={filterByField[fieldId]}
min={field.min_value || '2001-01-01'}
max={field.max_value || new Date().toISOString()}
onChangeFilter={handleChangeFilter(fieldId)}
/>
)
}
})
.filter(Boolean)}
</List>
</Paper>
<List className={cx.list}>
{Object.keys(filterFields)
.map(id => {
const field = filterFields[id]
if (!field) return
const fieldId = JSON.stringify(field.key)
switch (field.type) {
case 'select_one':
return (
<DiscreteFilter
fieldKey={field.key}
label={<FormattedFieldname field={field} />}
filter={filterByField[fieldId]}
options={field.options}
onChangeFilter={handleChangeFilter(fieldId)}
/>
)
case 'date':
case 'datetime':
return (
<DateFilter
fieldKey={field.key}
label={<FormattedFieldname field={field} />}
filter={filterByField[fieldId]}
min={field.min_value || '2001-01-01'}
max={field.max_value || new Date().toISOString()}
onChangeFilter={handleChangeFilter(fieldId)}
/>
)
}
})
.filter(Boolean)}
</List>
</MuiPickersUtilsProvider>
)
}
Expand Down Expand Up @@ -300,16 +297,6 @@ function combineOptionsWithStats(
}

const useStyles = makeStyles(theme => ({
root: {
minWidth: 300,
flex: 1,
overflowY: 'auto',
zIndex: 20,
// backgroundColor: 'white',
'@media print': {
display: 'none'
}
},
list: {
paddingTop: 0
},
Expand Down

0 comments on commit fd25320

Please sign in to comment.