diff --git a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
index a3995c8..75e6df6 100644
--- a/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
+++ b/packages/react-bootstrap-table2-example/.storybook/webpack.config.js
@@ -9,6 +9,7 @@ const sourceStylePath = path.join(__dirname, '../../react-bootstrap-table2/style
const paginationStylePath = path.join(__dirname, '../../react-bootstrap-table2-paginator/style');
const filterStylePath = path.join(__dirname, '../../react-bootstrap-table2-filter/style');
const toolkitSourcePath = path.join(__dirname, '../../react-bootstrap-table2-toolkit/index.js');
+const toolkitStylePath = path.join(__dirname, '../../react-bootstrap-table2-toolkit/style');
const storyPath = path.join(__dirname, '../stories');
const examplesPath = path.join(__dirname, '../examples');
const srcPath = path.join(__dirname, '../src');
@@ -43,7 +44,13 @@ const loaders = [{
}, {
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
- include: [storyPath, sourceStylePath, paginationStylePath, filterStylePath],
+ include: [
+ storyPath,
+ sourceStylePath,
+ paginationStylePath,
+ filterStylePath,
+ toolkitStylePath
+ ],
}, {
test: /\.(jpg|png|woff|woff2|eot|ttf|svg)$/,
loader: 'url-loader?limit=100000',
diff --git a/packages/react-bootstrap-table2-example/stories/index.js b/packages/react-bootstrap-table2-example/stories/index.js
index 9fc20d1..d35cbcb 100644
--- a/packages/react-bootstrap-table2-example/stories/index.js
+++ b/packages/react-bootstrap-table2-example/stories/index.js
@@ -229,6 +229,7 @@ import 'stories/stylesheet/storybook.scss';
import '../../react-bootstrap-table2/style/react-bootstrap-table2.scss';
import '../../react-bootstrap-table2-paginator/style/react-bootstrap-table2-paginator.scss';
import '../../react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss';
+import '../../react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss';
// import bootstrap style by given version
import bootstrapStyle, { BOOTSTRAP_VERSION } from './bootstrap-style';
diff --git a/packages/react-bootstrap-table2-filter/src/components/date.js b/packages/react-bootstrap-table2-filter/src/components/date.js
index 45717ae..578f558 100644
--- a/packages/react-bootstrap-table2-filter/src/components/date.js
+++ b/packages/react-bootstrap-table2-filter/src/components/date.js
@@ -132,24 +132,35 @@ class DateFilter extends Component {
className={ `filter date-filter ${className}` }
style={ style }
>
-
- this.inputDate = n }
- className={ `filter date-filter-input form-control ${dateClassName}` }
- style={ dateStyle }
- type="date"
- onChange={ this.onChangeDate }
- placeholder={ placeholder || `Enter ${text}...` }
- defaultValue={ this.getDefaultDate() }
- />
+ Filter comparator
+
+
+
);
}
diff --git a/packages/react-bootstrap-table2-filter/src/components/multiselect.js b/packages/react-bootstrap-table2-filter/src/components/multiselect.js
index 5f4623b..2de86f9 100644
--- a/packages/react-bootstrap-table2-filter/src/components/multiselect.js
+++ b/packages/react-bootstrap-table2-filter/src/components/multiselect.js
@@ -111,18 +111,25 @@ class MultiSelectFilter extends Component {
`filter select-filter form-control ${className} ${this.state.isSelected ? '' : 'placeholder-selected'}`;
return (
-
+ Filter by {column.text}
+
+
);
}
}
diff --git a/packages/react-bootstrap-table2-filter/src/components/number.js b/packages/react-bootstrap-table2-filter/src/components/number.js
index 447eed2..29e0370 100644
--- a/packages/react-bootstrap-table2-filter/src/components/number.js
+++ b/packages/react-bootstrap-table2-filter/src/components/number.js
@@ -173,35 +173,53 @@ class NumberFilter extends Component {
className={ `filter number-filter ${className}` }
style={ style }
>
-
+ Filter comparator
+
+
{
options ?
- :
- this.numberFilter = n }
- type="number"
- style={ numberStyle }
- className={ `number-filter-input form-control ${numberClassName}` }
- placeholder={ placeholder || `Enter ${column.text}...` }
- onChange={ this.onChangeNumber }
- defaultValue={ defaultValue ? defaultValue.number : '' }
- />
+ {`Select ${column.text}`}
+
+ :
+
}
);
diff --git a/packages/react-bootstrap-table2-filter/src/components/select.js b/packages/react-bootstrap-table2-filter/src/components/select.js
index 973bdb3..3f7471b 100644
--- a/packages/react-bootstrap-table2-filter/src/components/select.js
+++ b/packages/react-bootstrap-table2-filter/src/components/select.js
@@ -136,17 +136,24 @@ class SelectFilter extends Component {
`filter select-filter form-control ${className} ${this.state.isSelected ? '' : 'placeholder-selected'}`;
return (
-
+ Filter by { column.text }
+
+
);
}
}
diff --git a/packages/react-bootstrap-table2-filter/src/components/text.js b/packages/react-bootstrap-table2-filter/src/components/text.js
index a17c3ea..1995ebe 100644
--- a/packages/react-bootstrap-table2-filter/src/components/text.js
+++ b/packages/react-bootstrap-table2-filter/src/components/text.js
@@ -94,17 +94,24 @@ class TextFilter extends Component {
// stopPropagation for onClick event is try to prevent sort was triggered.
return (
- this.input = n }
- type="text"
- className={ `filter text-filter form-control ${className}` }
- style={ style }
- onChange={ this.filter }
- onClick={ this.handleClick }
- placeholder={ placeholder || `Enter ${text}...` }
- value={ this.state.value }
- />
+
);
}
}
diff --git a/packages/react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss b/packages/react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss
index e2304b6..445579e 100644
--- a/packages/react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss
+++ b/packages/react-bootstrap-table2-filter/style/react-bootstrap-table2-filter.scss
@@ -1,3 +1,7 @@
+.react-bootstrap-table > table > thead > tr > th .filter-label {
+ display: block !important;
+}
+
.react-bootstrap-table > table > thead > tr > th .filter {
font-weight: normal;
}
diff --git a/packages/react-bootstrap-table2-toolkit/src/search/SearchBar.js b/packages/react-bootstrap-table2-toolkit/src/search/SearchBar.js
index f51f09c..64e148f 100644
--- a/packages/react-bootstrap-table2-toolkit/src/search/SearchBar.js
+++ b/packages/react-bootstrap-table2-toolkit/src/search/SearchBar.js
@@ -54,20 +54,28 @@ class SearchBar extends React.Component {
const {
className,
style,
- placeholder
+ placeholder,
+ tableId
} = this.props;
return (
- this.input = n }
- type="text"
- style={ style }
- onKeyUp={ () => this.onKeyup() }
- onChange={ this.onChangeValue }
- className={ `form-control ${className}` }
- value={ this.state.value }
- placeholder={ placeholder || SearchBar.defaultProps.placeholder }
- />
+
);
}
}
@@ -78,7 +86,8 @@ SearchBar.propTypes = {
placeholder: PropTypes.string,
style: PropTypes.object,
delay: PropTypes.number,
- searchText: PropTypes.string
+ searchText: PropTypes.string,
+ tableId: PropTypes.string
};
SearchBar.defaultProps = {
@@ -86,7 +95,8 @@ SearchBar.defaultProps = {
style: {},
placeholder: 'Search',
delay: 250,
- searchText: ''
+ searchText: '',
+ tableId: 0
};
export default SearchBar;
diff --git a/packages/react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss b/packages/react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss
index e69de29..c840023 100644
--- a/packages/react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss
+++ b/packages/react-bootstrap-table2-toolkit/style/react-bootstrap-table2-toolkit.scss
@@ -0,0 +1,3 @@
+.search-label {
+ display: block !important;
+}
\ No newline at end of file