Merge branch 'eitansela-master'

Author: AllenFang

examples/js/column-filter/demo.js

@@ -6,6 +6,7 @@ import ProgrammaticallyTextFilter from './text-filter-programmatically';
 import RegexFilter from './regex-filter';
 import ProgrammaticallyRegexFilter from './regex-filter-programmatically';
 import SelectFilter from './select-filter';
+import SelectFilterWithCustomText from './select-filter-with-select-text';
 import SelectFilterWithDefaultValue from './select-filter-with-default-value';
 import ProgrammaticallySelectFilter from './select-filter-programmatically';
 import SelectFilterWithSort from './select-filter-with-sort';
@@ -79,6 +80,15 @@ class Demo extends React.Component {
                     </div>
                 </div>
             </div>
+            <div className='col-md-offset-1 col-md-8'>
+                <div className='panel panel-default'>
+                    <div className='panel-heading'>Select Filter with Custom Text Example</div>
+                    <div className='panel-body'>
+                        <h5>Source in /examples/js/column-filter/select-filter-with-select-text.js</h5>
+                        <SelectFilterWithCustomText />
+                    </div>
+                </div>
+            </div>
             <div className='col-md-offset-1 col-md-8'>
                 <div className='panel panel-default'>
                     <div className='panel-heading'>Select Filter With Default Value Example</div>

examples/js/column-filter/select-filter-with-select-text.js

@@ -0,0 +1,42 @@
+/* eslint max-len: 0 */
+import React from 'react';
+import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
+
+const products = [];
+
+const qualityType = {
+  0: 'good',
+  1: 'Bad',
+  2: 'unknown'
+};
+
+function addProducts(quantity) {
+  const startId = products.length;
+  for (let i = 0; i < quantity; i++) {
+    const id = startId + i;
+    products.push({
+      id: id,
+      name: 'Item name ' + id,
+      quality: i % 3
+    });
+  }
+}
+
+addProducts(5);
+
+function enumFormatter(cell, row, enumObject) {
+  return enumObject[cell];
+}
+
+export default class SelectFilter extends React.Component {
+  render() {
+    return (
+      <BootstrapTable data={ products }>
+        <TableHeaderColumn dataField='id' isKey={ true }>Product ID</TableHeaderColumn>
+        <TableHeaderColumn dataField='name'>Product Name</TableHeaderColumn>
+        <TableHeaderColumn dataField='quality' filterFormatted dataFormat={ enumFormatter } formatExtraData={ qualityType }
+          filter={ { type: 'SelectFilter', options: qualityType, selectText: 'Choose' } }>Product Quality</TableHeaderColumn>
+      </BootstrapTable>
+    );
+  }
+}

src/filters/Select.js

@@ -34,9 +34,10 @@ class SelectFilter extends Component {
 
   getOptions() {
     const optionTags = [];
-    const { options, placeholder, columnName } = this.props;
+    const { options, placeholder, columnName, selectText } = this.props;
+    const selectTextValue = (selectText !== undefined) ? selectText : 'Select';
     optionTags.push((
-      <option key='-1' value=''>{ placeholder || `Select ${columnName}...` }</option>
+      <option key='-1' value=''>{ placeholder || `${selectTextValue} ${columnName}...` }</option>
     ));
     Object.keys(options).map(key => {
       optionTags.push(<option key={ key } value={ key }>{ options[key] + '' }</option>);