Skip to content

Commit

Permalink
Merge pull request #167 from gregnb/bugfix/toolbar-styles
Browse files Browse the repository at this point in the history
remove Datastyles. upgrade enzyme. add toolbar styles support
  • Loading branch information
gregnb committed Aug 26, 2018
2 parents 34e9c88 + a5c8123 commit 4f0c05f
Show file tree
Hide file tree
Showing 8 changed files with 289 additions and 266 deletions.
144 changes: 98 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"chai": "^4.1.2",
"coveralls": "^3.0.0",
"cross-env": "^5.1.1",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"enzyme": "^3.5.0",
"enzyme-adapter-react-16": "^1.3.0",
"eslint": "^4.14.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-filenames": "^1.2.0",
Expand Down
71 changes: 0 additions & 71 deletions src/DataStyles.js

This file was deleted.

3 changes: 2 additions & 1 deletion src/MUIDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ class MUIDataTable extends React.Component {
},
() => {
if (this.options.onRowsSelect) {
this.options.onRowsSelect(this.state.curSelectedRows.data, this.state.selectedRows.data);
console.log(this.state.curSelectedRows);
this.options.onRowsSelect(this.state.curSelectedRows.data[0], this.state.selectedRows.data);
}
},
);
Expand Down
Loading

0 comments on commit 4f0c05f

Please sign in to comment.