Merge 6a6e144 into abfe1b4

eddyson-de · Nov 24, 2017 · c63d3f7 · c63d3f7
2 parents abfe1b4 + 6a6e144
commit c63d3f7
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 16 deletions.
diff --git a/lib/Column.js b/lib/Column.js
@@ -14,10 +14,10 @@ class Column extends Component {
         this.setState({component, content});
     }
 
-    updateFilterConfig(filterFunction, filterComponent){
+    updateFilterConfig(filterFunction, filterComponent, hide){
         const { name } = this.props;
         const { updateFilterConfig } = this.context;
-        updateFilterConfig(filterFunction, filterComponent, name);
+        updateFilterConfig(filterFunction, filterComponent, name, hide);
     }
 
     getChildContext(){
@@ -85,7 +85,15 @@ if (process.env.NODE_ENV !== 'production'){
         name: PropTypes.string.isRequired,
         sortable: PropTypes.bool,
         label: PropTypes.node,
-        children: PropTypes.node
+        children: PropTypes.node,
+        hideTools: (props, propName, componentName, location, propFullName)=>{
+            if (props[propName]){
+                return new Error(
+                    'Invalid prop `' + propFullName + '` supplied to' +
+                  ' `' + componentName + '`. Please use <Filter hide />.'
+                );
+            }
+        }
     };
 }
 

diff --git a/lib/Filter.js b/lib/Filter.js
@@ -7,17 +7,17 @@ class Filter extends Component {
     }
 
     updateFilterConfig(){
-        const { match, component } = this.props;
+        const { match, component, hide } = this.props;
         const { updateFilterConfig } = this.context;
-        updateFilterConfig(match, component);
+        updateFilterConfig(match, component, hide);
     }
 
     componentWillMount(){
         this.updateFilterConfig();
     }
 
     componentDidUpdate(prevProps){
-        if (prevProps.match !== this.props.match || prevProps.component !== this.props.component){
+        if (prevProps.match !== this.props.match || prevProps.component !== this.props.component || prevProps.hide !== this.props.hide){
             this.updateFilterConfig();
         }
     }
@@ -34,7 +34,8 @@ Filter.contextTypes = {
 if (process.env.NODE_ENV !== 'production'){
     Filter.propTypes = {
         match: PropTypes.func,
-        component: PropTypes.func
+        component: PropTypes.func,
+        hide: PropTypes.bool
     };
 }
 

diff --git a/lib/FilterHandler.js b/lib/FilterHandler.js
@@ -46,7 +46,8 @@ const  withFilterHandler = ComponentToWrap => {
                 filterComponents: {},
                 filterFunctions : {},
                 defaultFilterFunction: defaultFilterFunction,
-                defaultFilterComponent: TextFilter
+                defaultFilterComponent: TextFilter,
+                columnsWithHiddenFilters: []
             };
         }
 
@@ -58,7 +59,8 @@ const  withFilterHandler = ComponentToWrap => {
                 filterComponents: this.state.filterComponents,
                 defaultFilterComponent: this.state.defaultFilterComponent,
                 updateFilter: this.updateFilter,
-                filter: this.state.filter
+                filter: this.state.filter,
+                columnsWithHiddenFilters: this.state.columnsWithHiddenFilters
             };
         }
 
@@ -86,7 +88,7 @@ const  withFilterHandler = ComponentToWrap => {
             });
         }
 
-        updateFilterConfig(filterFunction, filterComponent, columnName){
+        updateFilterConfig(filterFunction, filterComponent, columnName, hide){
             if (columnName !== undefined){
                 this.setState((prevState) => {
                     let newState = {};
@@ -98,6 +100,12 @@ const  withFilterHandler = ComponentToWrap => {
                         newState.filterComponents = Object.assign({}, prevState.filterComponents);
                         newState.filterComponents[columnName] = filterComponent;
                     }
+                    if (hide && prevState.columnsWithHiddenFilters.indexOf(columnName) === -1){
+                        newState.columnsWithHiddenFilters = prevState.columnsWithHiddenFilters.slice(0).concat(columnName);
+                    }
+                    else if (!hide && prevState.columnsWithHiddenFilters.indexOf(columnName) !== -1){
+                        newState.columnsWithHiddenFilters = prevState.columnsWithHiddenFilters.filter(col => col !== columnName);
+                    }
                     return newState;
                 });
 
@@ -173,7 +181,8 @@ const  withFilterHandler = ComponentToWrap => {
         updateFilterConfig: PropTypes.func,
         filter: PropTypes.array,
         filterComponents: PropTypes.objectOf(PropTypes.func),
-        defaultFilterComponent : PropTypes.func
+        defaultFilterComponent : PropTypes.func,
+        columnsWithHiddenFilters: PropTypes.arrayOf(PropTypes.string)
     };
 
     if (process.env.NODE_ENV !== 'production'){

diff --git a/lib/FilterRow.js b/lib/FilterRow.js
@@ -64,12 +64,12 @@ class FilterRow extends Component {
 
     render() {
         const {component, children} = this.props;
-        const { columnConfigs, filter, filterComponents, defaultFilterComponent} = this.context;
+        const { columnConfigs, filter, filterComponents, defaultFilterComponent, columnsWithHiddenFilters } = this.context;
         const { FilterCell } = this.state;
         const childrenAsArray = React.Children.toArray(children);
         const activeColumnKeys = activeColumnKeysFunction(columnConfigs);
         const FilterRowComponent = component ? component : DefaultFilterRowComponent ;
-        const activeFilters = activeColumnKeys.filter(columnKey => !columnConfigs.find(c => c.name === columnKey).hideTools );
+        const activeFilters = activeColumnKeys.filter(columnKey => columnsWithHiddenFilters.indexOf(columnKey) === -1);
         const filterCells = activeColumnKeys.map(columnKey => {
             if (activeFilters.indexOf(columnKey) !== -1){
                 const FilterComponent = filterComponents[columnKey] || defaultFilterComponent;
@@ -96,7 +96,8 @@ FilterRow.contextTypes = {
     filter: PropTypes.array,
     updateFilter: PropTypes.func.isRequired,
     filterComponents: PropTypes.objectOf(PropTypes.func).isRequired,
-    defaultFilterComponent: PropTypes.func.isRequired
+    defaultFilterComponent: PropTypes.func.isRequired,
+    columnsWithHiddenFilters: PropTypes.arrayOf(PropTypes.string).isRequired
 };
 
 FilterRow.childContextTypes = {

diff --git a/lib/proptypes.js b/lib/proptypes.js
@@ -26,7 +26,6 @@ const columnsConfig = PropTypes.objectOf(PropTypes.shape({
     id: PropTypes.bool,
     label: PropTypes.string,
     order: PropTypes.number,
-    hideTools: PropTypes.bool,
     sortable: PropTypes.bool,
     sortValueGetter: PropTypes.func,
     filterFunction: PropTypes.func,

diff --git a/test/GridTest.js b/test/GridTest.js
@@ -7,6 +7,7 @@ import  Cell from '../lib/Cell';
 import  Row  from '../lib/Row';
 import  Body  from '../lib/Body';
 import  HeaderRow  from '../lib/HeaderRow';
+import  Filter  from '../lib/Filter';
 import { buildGridWithTemplate } from '../lib/GridBuilder';
 import PagingHandler from "../lib/PagingHandler";
 import chai, { expect } from 'chai'
@@ -579,7 +580,9 @@ describe('Grid render tests', function(){
   it('Should be possible to hide the tools for a column', ()=>{
     let grid = mount(
         <Grid objects={[{a: "foo", b: "bar"}]}>
-            <Column name="b" hideTools={true}/>
+            <Column name="b">
+              <Filter hide />
+            </Column>
             <Column name="id" hide/>
         </Grid>);
      expect(grid.find("th input").length).be.equal(1);