Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding custom filters for paginated table component #538

Merged
merged 2 commits into from
Mar 30, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
"node-sass": "^4.12.0",
"object-path": ">=0.11.5",
"prop-types": "^15.6.1",
"react": "^17.0.0",
"react": "^17.0.1",
"react-docgen-typescript-loader": "^3.1.0",
"react-docgen-typescript-webpack-plugin": "^1.1.0",
"react-dom": "^17.0.0",
"react-dom": "^17.0.1",
"sass-lint": "^1.13.1",
"sass-loader": "^7.3.1",
"style-loader": "^0.23.1",
Expand All @@ -91,6 +91,7 @@
"lodash": "^4.17.15"
},
"peerDependencies": {
"react": "^17.0.0"
"react": "^17.0.1",
"react-dom": "^17.0.1"
bradcypert marked this conversation as resolved.
Show resolved Hide resolved
}
}
6 changes: 3 additions & 3 deletions src/js/components/Table/Paginated/PaginatedTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ const PaginatedTable: React.FunctionComponent<Props> = ({

return (
<div className="Grid">
<div className="Grid Grid-cell Grid--fit Grid--withGutter">
<div className="Grid Grid-cell">
{bulkActions?.length > 0 ? (
<div className="Grid-cell u-spaceTopSm u-md-spaceTopNone u-flex u-size1of1 u-md-size1of12 u-flexJustifyStart">
<Select inputProps={{
Expand All @@ -209,7 +209,7 @@ const PaginatedTable: React.FunctionComponent<Props> = ({
]} />
</div>
) : null}
<div className="Grid-cell u-spaceTopSm u-md-spaceTopNone u-size1of1 u-md-size1of4 u-flex u-flexJustifyStart">
<div className="Grid-cell u-sizeFill u-spaceTopSm u-md-size1of4">
{customSearchFilter || includeBasicSearch ? (
customSearchFilter ? (
customSearchFilter
Expand All @@ -221,7 +221,7 @@ const PaginatedTable: React.FunctionComponent<Props> = ({
)
) : null}
</div>
<div className="Grid-cell u-spaceTopSm u-md-spaceTopNone u-size1of1 u-md-size2of4 u-flex u-flexJustifyEnd">
<div className="Grid-cell u-sizeFit u-spaceTopSm u-sizeFit u-md-size2of4 u-flex u-flexJustifyEnd">
<div className="u-spaceAuto u-spaceRightSm">
<PaginationCurrentSubsetDisplay
itemsPerPage={itemsPerPage}
Expand Down