Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gregnb/mui-datatables
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.4.1
Choose a base ref
...
head repository: gregnb/mui-datatables
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
39 contributors
Loading
Showing with 27,918 additions and 13,763 deletions.
  1. +43 −11 .babelrc
  2. +17 −7 .eslintrc
  3. +68 −36 README.md
  4. +1 −1 docs/icons/GitHub.js
  5. +7 −7 docs/pages/index.js
  6. +3 −3 docs/utils/CodeSnippet.js
  7. +6 −6 docs/utils/Menu.js
  8. +4 −4 docs/utils/getPageContext.js
  9. +8 −8 docs/utils/layout.js
  10. +4 −4 docs/utils/withRoot.js
  11. +4 −4 examples/Router/ExamplesGrid.js
  12. +55 −42 examples/Router/index.js
  13. +108 −95 examples/array-value-columns/index.js
  14. +1 −1 examples/column-sort/index.js
  15. +3 −3 examples/component/cities.js
  16. +5 −3 examples/component/index.js
  17. +1 −1 examples/csv-export/index.js
  18. +40 −43 examples/custom-components/TableViewCol.js
  19. +7 −7 examples/custom-components/index.js
  20. +1 −1 examples/customize-filter/index.js
  21. +6 −6 examples/customize-footer/CustomFooter.js
  22. +10 −9 examples/customize-footer/index.js
  23. +6 −6 examples/customize-search-render/CustomSearchRender.js
  24. +43 −26 examples/customize-styling/index.js
  25. +74 −0 examples/customize-toolbar-icons/index.js
  26. +5 −6 examples/customize-toolbar/CustomToolbar.js
  27. +7 −7 examples/customize-toolbarselect/CustomToolbarSelect.js
  28. +5 −5 examples/customize-toolbarselect/index.js
  29. +6 −6 examples/draggable-columns/index.js
  30. +2 −0 examples/examples.js
  31. +64 −63 examples/expandable-rows/index.js
  32. +5 −5 examples/infinite-scrolling/index.js
  33. +3 −3 examples/large-data-set/index.js
  34. +5 −5 examples/resizable-columns/index.js
  35. +3 −3 examples/selectable-rows/index.js
  36. +1 −1 examples/serverside-filters/index.js
  37. +70 −73 examples/serverside-pagination/index.js
  38. +3 −3 examples/serverside-sorting/cities.js
  39. +1 −1 examples/serverside-sorting/index.js
  40. +80 −8 examples/simple/index.js
  41. +4 −0 examples/text-localization/index.js
  42. +85 −85 examples/themes/index.js
  43. +26,004 −12,352 package-lock.json
  44. +31 −20 package.json
  45. +1 −1 prettier.config.js
  46. +3 −20 rollup.config.js
  47. +138 −94 src/MUIDataTable.js
  48. +27 −17 src/components/ExpandButton.js
  49. +37 −36 src/components/JumpToPage.js
  50. +5 −5 src/components/Popover.js
  51. +8 −8 src/components/TableBody.js
  52. +66 −69 src/components/TableBodyCell.js
  53. +5 −5 src/components/TableBodyRow.js
  54. +53 −37 src/components/TableFilter.js
  55. +13 −16 src/components/TableFilterList.js
  56. +1 −1 src/components/TableFilterListItem.js
  57. +9 −12 src/components/TableFooter.js
  58. +17 −19 src/components/TableHead.js
  59. +86 −81 src/components/TableHeadCell.js
  60. +6 −9 src/components/TableHeadRow.js
  61. +30 −31 src/components/TablePagination.js
  62. +4 −3 src/components/TableResize.js
  63. +29 −29 src/components/TableSearch.js
  64. +114 −123 src/components/TableSelectCell.js
  65. +67 −45 src/components/TableToolbar.js
  66. +7 −7 src/components/TableToolbarSelect.js
  67. +37 −40 src/components/TableViewCol.js
  68. +2 −0 src/localStorage/index.js
  69. +10 −0 src/localStorage/load.js
  70. +5 −0 src/localStorage/save.js
  71. +13 −10 src/plug-ins/DebounceSearchRender.js
  72. +11 −10 test/MUIDataTable.test.js
  73. +26 −13 test/MUIDataTableBody.test.js
  74. +1 −1 test/MUIDataTableCustomComponents.test.js
  75. +4 −4 test/MUIDataTableFilter.test.js
  76. +5 −5 test/MUIDataTableFilterList.test.js
  77. +1 −1 test/MUIDataTableFooter.test.js
  78. +2 −2 test/MUIDataTableHead.test.js
  79. +4 −4 test/MUIDataTableHeadCell.test.js
  80. +1 −1 test/MUIDataTablePagination.test.js
  81. +1 −1 test/MUIDataTableSearch.test.js
  82. +1 −1 test/MUIDataTableSelectCell.test.js
  83. +53 −6 test/MUIDataTableToolbar.test.js
  84. +93 −0 test/MUIDataTableToolbarCustomIcons.test.js
  85. +1 −1 test/MUIDataTableToolbarSelect.test.js
  86. +2 −2 test/MUIDataTableViewCol.test.js
  87. +10 −13 webpack.config.js
54 changes: 43 additions & 11 deletions .babelrc
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,53 @@
{
"env": {
"test": {
"plugins": ["istanbul"]
"plugins": [
"istanbul"
]
}
},
"presets": [
"@babel/react",
["@babel/env", {
"targets": {
"browsers": ["> 1%", "iOS >= 8", "Android >= 4"],
"node": "6.10"
},
"debug": false
}]
[
"@babel/preset-env",
{
"targets": {
"browsers": [
"ie >= 11",
"> 1%",
"iOS >= 8",
"Android >= 4"
],
"node": "6.10"
},
"useBuiltIns": "entry",
"debug": false,
"modules": false,
"corejs": {
"version": 3,
"proposals": true
}
}
],
[
"@babel/preset-react"
]
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-object-rest-spread"
[
"@babel/plugin-proposal-class-properties"
],
[
"@babel/plugin-proposal-object-rest-spread"
],
[
"@babel/plugin-transform-async-to-generator"
],
[
"@babel/plugin-transform-runtime",
{
"corejs": 3,
"regenerator": true
}
]
]
}
24 changes: 17 additions & 7 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
{
"parser": "babel-eslint",
"settings": {
"import/extensions": [".js"],
"react": {
"version": "latest"
},
"import/extensions": [
".js"
],
"import/parser": "babel-eslint",
"import/resolver": {
"node": {
"extensions": [".js"]
"extensions": [
".js"
]
},
"webpack": {
"config": "webpack.config.js"
@@ -19,7 +26,7 @@
"ecmaFeatures": {
"jsx": true,
"experimentalObjectRestSpread": true
},
}
},
"env": {
"es6": true,
@@ -28,7 +35,7 @@
"node": true
},
"extends": [
"plugin:jsx-a11y/recommended"
"plugin:jsx-a11y/recommended"
],
"rules": {
"no-console": "off",
@@ -41,9 +48,12 @@
"react/jsx-no-duplicate-props": "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"jsx-a11y/no-autofocus": [ 2, {
"ignoreNonDOM": true
}]
"jsx-a11y/no-autofocus": [
2,
{
"ignoreNonDOM": true
}
]
},
"plugins": [
"import",
Loading