Skip to content
This repository was archived by the owner on Aug 4, 2025. It is now read-only.

Commit 3d2b33c

Browse files
Merge pull request #100 from uptick/export-filters-only
export and accept version where only filters are applied
2 parents 43927b2 + 0020108 commit 3d2b33c

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-object-list",
3-
"version": "0.2.9",
3+
"version": "0.2.10",
44
"description": "React component to display an array of object data in a filterable view",
55
"repository": {
66
"url": "https://github.com/uptick/react-object-list",

src/actions-filters/ActionsFiltersContainer.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ class ActionsFilterContainer extends Component {
7171
icons: PropTypes.object,
7272
/** Object of custom react-select styles */
7373
selectStyles: PropTypes.object,
74+
/** Show item count if we are using data **/
75+
showItemCount: PropTypes.bool,
7476
}
7577

7678
static defaultProps = {
@@ -81,6 +83,7 @@ class ActionsFilterContainer extends Component {
8183
columns: [],
8284
status: STATUS_CHOICES.done,
8385
selectStyles: {},
86+
showItemCount: true,
8487
}
8588

8689
state = {
@@ -110,7 +113,7 @@ class ActionsFilterContainer extends Component {
110113
filters, updateFilter, removeFilter, status,
111114
updateColumns, loadFavourite, handleAddFavourite,
112115
selectedFavouriteName, handleDeleteFavourite, favourites,
113-
selectStyles,
116+
selectStyles, showItemCount,
114117
} = this.props
115118
const loading = status === STATUS_CHOICES.loading
116119
let search
@@ -141,7 +144,7 @@ class ActionsFilterContainer extends Component {
141144
<SelectFilters
142145
filters={filters.filter(f =>
143146
(!search || f.filterKey !== searchKey) && // remove search filter
144-
((f.permanent !== undefined && !f.permanent) || (f.permanent === undefined && !f.Renderer.defaultProps.permanent)) // remove filters to display permanently
147+
((f.permanent !== undefined && !f.permanent) || (f.permanent === undefined && (!f.Renderer || !f.Renderer.defaultProps.permanent))) // remove filters to display permanently
145148
)}
146149
addFilter={this.props.addFilter}
147150
selectStyles={selectStyles}
@@ -170,11 +173,13 @@ class ActionsFilterContainer extends Component {
170173
{/* TODO: render children below filters */}
171174
<div className="objectlist-row objectlist-row__actions">
172175
<div className="objectlist-column">
173-
<span className="objectlist-results-text">
174-
{loading ? `Loading ${itemPluralName}...` : (
175-
`${totalCount ? totalCount.toLocaleString() : 'No'} ${totalCount === 1 ? itemSingleName : itemPluralName} found`
176-
)}
177-
</span>
176+
{showItemCount && (
177+
<span className="objectlist-results-text">
178+
{loading ? `Loading ${itemPluralName}...` : (
179+
`${totalCount ? totalCount.toLocaleString() : 'No'} ${totalCount === 1 ? itemSingleName : itemPluralName} found`
180+
)}
181+
</span>
182+
)}
178183
{customActions[0] && customActions[0]({
179184
selection,
180185
itemCount,

src/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
import ObjectList from './ObjectList'
2-
export {COLUMN_TYPE} from './ObjectList'
2+
import ActionsFilterContainer from './actions-filters/ActionsFiltersContainer'
3+
export { COLUMN_TYPE } from './ObjectList'
4+
export { FILTER_BASE_TYPE, META_TYPE, STATUS_TYPE, STATUS_CHOICES, SELECTION_TYPE } from './utils/proptypes'
35
export default ObjectList
6+
7+
const FilterContainer = ActionsFilterContainer
8+
export { FilterContainer }

0 commit comments

Comments
 (0)