Skip to content

Commit

Permalink
Merge pull request #1333 from gregnb/v3_0_1
Browse files Browse the repository at this point in the history
Minor 3.0.1 adjustments
  • Loading branch information
patorjk authored Jun 15, 2020
2 parents 88227f3 + 1b4f4db commit f3e5076
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions examples/customize-filter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class Example extends React.Component {
filterOptions: {
renderValue: v => v ? v.replace(/^(\w).* (.*)$/, '$1. $2') : ''
},
display: 'excluded',
filterType: 'textField'
//display: 'excluded',
filterType: 'dropdown'
},
},
{
Expand All @@ -53,7 +53,7 @@ class Example extends React.Component {
render: v => v.map(l => l.toUpperCase())
},
filterOptions: {
logic: (location, filters) => {
logic: (location, filters, row) => {
if (filters.length) return !filters.includes(location);
return false;
},
Expand Down
1 change: 1 addition & 0 deletions src/components/Popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const Popover = ({ className, trigger, refExit, hide, content, ...providedProps
};

const closeIconClass = providedProps.classes.closeIcon;
delete providedProps.classes.closeIcon; // remove non-standard class from being passed to the popover component

const transformOriginSpecs = {
vertical: 'top',
Expand Down
2 changes: 1 addition & 1 deletion src/components/TableFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class TableFilter extends React.Component {
const { classes } = this.props;
const { filterList } = this.state;
if (column.filterOptions && column.filterOptions.renderValue) {
console.error('Custom renderItem not supported for textField filters');
console.warn('Custom renderValue not supported for textField filters');
}

return (
Expand Down

0 comments on commit f3e5076

Please sign in to comment.