Skip to content

Commit d502aa4

Browse files
Update filtered list
1 parent 0c67f0f commit d502aa4

2 files changed

Lines changed: 34 additions & 3 deletions

File tree

lib/FilteredList/FilteredList.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ var FilteredList = function (_React$Component) {
118118
container = _props3.container,
119119
onDisplay = _props3.onDisplay,
120120
onNumOfListChange = _props3.onNumOfListChange,
121-
onListDidMount = _props3.onListDidMount;
121+
onListDidMount = _props3.onListDidMount,
122+
noWrapper = _props3.noWrapper;
122123
var currentPage = this.state.currentPage;
123124

124125
var filteredData = this.applySearch(this.generateFilteredArticles(data));
@@ -128,6 +129,19 @@ var FilteredList = function (_React$Component) {
128129

129130
var paginatorObject = this.generatePaginatorObject();
130131

132+
if (noWrapper && !paginatorDisplay) {
133+
return _react2.default.createElement(_List2.default, {
134+
data: filteredData,
135+
itemDisplay: itemDisplay,
136+
pageSize: pageSize,
137+
container: container,
138+
currentPage: currentPage,
139+
onDisplay: onDisplay,
140+
onNumOfListChange: onNumOfListChange,
141+
onListDidMount: onListDidMount
142+
});
143+
}
144+
131145
return _react2.default.createElement(
132146
'div',
133147
{ className: (0, _classnames2.default)(className, 'wfui-filtered-list') },
@@ -165,7 +179,8 @@ FilteredList.propTypes = {
165179
simpleSearch: _react2.default.PropTypes.bool,
166180
searchKeys: _react2.default.PropTypes.arrayOf(_react2.default.PropTypes.string),
167181
wholeWord: _react2.default.PropTypes.bool,
168-
searchLogic: _react2.default.PropTypes.oneOf(['and', 'or'])
182+
searchLogic: _react2.default.PropTypes.oneOf(['and', 'or']),
183+
noWrapper: _react2.default.PropTypes.bool
169184
};
170185

171186
FilteredList.defaultProps = {

src/FilteredList/FilteredList.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,29 @@ class FilteredList extends React.Component {
6060
}
6161

6262
render() {
63-
const { className, itemDisplay, paginatorDisplay, data, pageSize, sortFunction, container, onDisplay, onNumOfListChange, onListDidMount } = this.props;
63+
const { className, itemDisplay, paginatorDisplay, data, pageSize, sortFunction, container, onDisplay, onNumOfListChange, onListDidMount, noWrapper } = this.props;
6464
const { currentPage } = this.state;
6565
const filteredData = this.applySearch(this.generateFilteredArticles(data));
6666
if (sortFunction) {
6767
filteredData.sort(sortFunction);
6868
}
6969

7070
const paginatorObject = this.generatePaginatorObject();
71+
72+
if (noWrapper && !paginatorDisplay) {
73+
return (
74+
<List
75+
data={filteredData}
76+
itemDisplay={itemDisplay}
77+
pageSize={pageSize}
78+
container={container}
79+
currentPage={currentPage}
80+
onDisplay={onDisplay}
81+
onNumOfListChange={onNumOfListChange}
82+
onListDidMount={onListDidMount}
83+
/>
84+
);
85+
}
7186

7287
return (
7388
<div className={classNames(className, 'wfui-filtered-list')}>
@@ -104,6 +119,7 @@ FilteredList.propTypes = {
104119
searchKeys: React.PropTypes.arrayOf(React.PropTypes.string),
105120
wholeWord: React.PropTypes.bool,
106121
searchLogic: React.PropTypes.oneOf(['and', 'or']),
122+
noWrapper: React.PropTypes.bool,
107123
};
108124

109125
FilteredList.defaultProps = {

0 commit comments

Comments
 (0)