Skip to content

Commit

Permalink
Merge pull request #566 from jbetancur/fix/565
Browse files Browse the repository at this point in the history
paginationServerOptions no longer required
  • Loading branch information
jbetancur authored May 1, 2020
2 parents db5fe5c + 616c3ea commit e80d3bc
Show file tree
Hide file tree
Showing 4 changed files with 544 additions and 466 deletions.
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface IDataTableProps<T> {
sortServer?: boolean;
pagination?: boolean;
paginationServer?: boolean;
paginationServerOptions: {
paginationServerOptions?: {
persistSelectedOnSort?: boolean;
persistSelectedOnPageChange?: boolean;
};
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-data-table-component",
"version": "6.9.0",
"version": "6.9.1",
"description": "A declarative react based data table",
"main": "dist/index.cjs.js",
"module": "dist/index.es.js",
Expand Down Expand Up @@ -53,8 +53,8 @@
}
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@babel/core": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/preset-react": "^7.9.4",
"@material-ui/core": "^4.9.12",
"@material-ui/icons": "^4.9.1",
Expand All @@ -65,12 +65,12 @@
"@storybook/addon-options": "^5.3.18",
"@storybook/addon-storysource": "^5.3.18",
"@storybook/react": "^5.3.18",
"@testing-library/react": "^10.0.3",
"@typescript-eslint/eslint-plugin": "^2.29.0",
"@typescript-eslint/parser": "^2.29.0",
"@testing-library/react": "^10.0.4",
"@typescript-eslint/eslint-plugin": "^2.30.0",
"@typescript-eslint/parser": "^2.30.0",
"axios": "^0.19.2",
"babel-eslint": "^10.1.0",
"babel-jest": "^25.4.0",
"babel-jest": "^25.5.1",
"babel-loader": "^8.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-plugin-styled-components": "^1.10.7",
Expand All @@ -86,15 +86,15 @@
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^3.0.0",
"faker": "^4.1.0",
"jest": "^25.4.0",
"jest": "^25.5.3",
"jest-styled-components": "^7.0.2",
"lodash-es": "^4.17.15",
"memoize-one": "^5.1.1",
"moment": "^2.24.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"rimraf": "^3.0.2",
"rollup": "^2.7.2",
"rollup": "^2.7.6",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-copy": "^3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stories/DataTable/Basic/Filtering.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const columns = [
const BasicTable = () => {
const [filterText, setFilterText] = React.useState('');
const [resetPaginationToggle, setResetPaginationToggle] = React.useState(false);
const filteredItems = fakeUsers.filter(item => item.name && item.name.includes(filterText));
const filteredItems = fakeUsers.filter(item => item.name && item.name.toLowerCase().includes(filterText.toLowerCase()));

const subHeaderComponentMemo = React.useMemo(() => {
const handleClear = () => {
Expand Down
Loading

0 comments on commit e80d3bc

Please sign in to comment.