@jasperoosthoek/react-toolbox 0.6.8 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/change-log.md +7 -1
  2. package/dist/components/tables/DataTable.d.ts +1 -1
  3. package/dist/index.js +2 -2
  4. package/package.json +1 -1
  5. package/src/components/tables/DataTable.tsx +19 -11
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jasperoosthoek/react-toolbox",
3
- "version": "0.6.8",
3
+ "version": "0.7.0",
4
4
  "author": "jasperoosthoek",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/tables/DataTable.tsx CHANGED
@@ -78,7 +78,7 @@ export type DataTableProps<D extends any[]> = {
78
78
  columns: DataTableColumn<D[number]>[];
79
79
  rowsPerPage?: number | null;
80
80
  rowsPerPageOptions?: RowsPerPageOptions;
81
- filterColumn?: ((row: D[number]) => string) | string;
81
+ filterColumn?: (keyof D) | ((row: D[number]) => string) | ((keyof D) | ((row: D[number]) => string))[];
82
82
  orderByDefault?: ((row: D[number]) => number) | string | null;
83
83
  orderByDefaultDirection?: OrderByDirection;
84
84
  onMove?: OnMove<D[number]>;
@@ -126,16 +126,24 @@ export const DataTable = <D extends any[]>({
126
126
  const [rowsPerPage, setRowsPerPage] = useState(rowsPerPageDefault);
127
127
  const [page, setPage] = useState(0);
128
128
  let data = allData && (
129
- Object.values(allData)
130
- .filter(
131
- row => filterColumn && filterText
132
- ? (
133
- typeof filterColumn === 'function'
134
- ? filterColumn(row)
135
- : row[filterColumn]
136
- ).match(new RegExp(`${filterText}`, 'i'))
137
- : true
138
- )
129
+ Object.values(allData).filter(row =>
130
+ filterColumn && filterText
131
+ ? (
132
+ typeof filterColumn === 'function'
133
+ ? filterColumn(row)
134
+ : Array.isArray(filterColumn)
135
+ ? filterColumn.reduce((acc, col) => {
136
+ if (typeof col === 'function') {
137
+ return acc + ' ' + col(row);
138
+ } else if (typeof row[col] !== 'undefined') {
139
+ return acc + ' ' + row[col];
140
+ }
141
+ return acc;
142
+ }, '')
143
+ : row[filterColumn]
144
+ ).toString().match(new RegExp(`${filterText}`, 'i'))
145
+ : true
146
+ )
139
147
  );
140
148
 
141
149
  const pagesCount = (data && rowsPerPage && Math.ceil(data.length / rowsPerPage));