published version 2.0.0-beta-18

gregnb · Jul 29, 2018 · 31db541 · 31db541
1 parent a22e943
commit 31db541
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 38 deletions.
diff --git a/docs/pages/index.js b/docs/pages/index.js
@@ -33,11 +33,10 @@ class Homepage extends React.Component {
       <Layout>
         <div>
           <p>
-            MUI-Datatables is a data tables component built on{" "}
-            <a href="https://www.material-ui.com">Material-UI V1</a>. It comes with features like filtering,
-            view/hide columns, search, export to CSV download, printing, selectable rows, pagination, and sorting. On
-            top of the ability to customize styling on most views, there are two responsive modes "stacked" and "scroll"
-            for mobile/tablet devices.
+            MUI-Datatables is a data tables component built on <a href="https://www.material-ui.com">Material-UI V1</a>.
+            It comes with features like filtering, view/hide columns, search, export to CSV download, printing,
+            selectable rows, pagination, and sorting. On top of the ability to customize styling on most views, there
+            are two responsive modes "stacked" and "scroll" for mobile/tablet devices.
           </p>
           <img src="/static/mui-datatables-main.jpg" className={classes.mainImage} border="0" />
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mui-datatables",
-  "version": "2.0.0-beta-17",
+  "version": "2.0.0-beta-18",
   "description": "Datatables for React using Material-UI",
   "main": "dist/index.js",
   "files": [

diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js
@@ -56,7 +56,7 @@ class MUIDataTable extends React.Component {
             filter: PropTypes.bool,
             sort: PropTypes.bool,
             customHeadRender: PropTypes.func,
-            customBodyRender: PropTypes.func
+            customBodyRender: PropTypes.func,
           }),
         }),
       ]),
@@ -735,21 +735,19 @@ class MUIDataTable extends React.Component {
           </Table>
         </div>
         <Table>
-          {this.options.customFooter ? (
-            this.options.customFooter(rowCount, page, rowsPerPage, this.changeRowsPerPage, this.changePage)
-          ) : (            
-            this.options.pagination && (
-              <MUIDataTablePagination
-                count={rowCount}
-                page={page}
-                rowsPerPage={rowsPerPage}
-                changeRowsPerPage={this.changeRowsPerPage}
-                changePage={this.changePage}
-                component={"div"}
-                options={this.options}
-              />
-            )
-          )}
+          {this.options.customFooter
+            ? this.options.customFooter(rowCount, page, rowsPerPage, this.changeRowsPerPage, this.changePage)
+            : this.options.pagination && (
+                <MUIDataTablePagination
+                  count={rowCount}
+                  page={page}
+                  rowsPerPage={rowsPerPage}
+                  changeRowsPerPage={this.changeRowsPerPage}
+                  changePage={this.changePage}
+                  component={"div"}
+                  options={this.options}
+                />
+              )}
         </Table>
         <div className={classes.liveAnnounce} aria-live={"polite"} ref={el => (this.announceRef = el)}>
           {announceText}

diff --git a/src/MUIDataTableHead.js b/src/MUIDataTableHead.js
@@ -55,22 +55,21 @@ class MUIDataTableHead extends React.Component {
           )}
           {columns.map(
             (column, index) =>
-              column.display && (
-                column.customHeadRender ? (
-                  column.customHeadRender({ index, ...column }, this.handleToggleColumn)
-                ) : (
-                  <MUIDataTableHeadCell
-                    key={index}
-                    index={index}
-                    type={"cell"}
-                    sort={column.sort}
-                    sortDirection={column.sortDirection}
-                    toggleSort={this.handleToggleColumn}
-                    options={options}>
-                    {column.name}
-                  </MUIDataTableHeadCell>
-                )
-              ),
+              column.display &&
+              (column.customHeadRender ? (
+                column.customHeadRender({ index, ...column }, this.handleToggleColumn)
+              ) : (
+                <MUIDataTableHeadCell
+                  key={index}
+                  index={index}
+                  type={"cell"}
+                  sort={column.sort}
+                  sortDirection={column.sortDirection}
+                  toggleSort={this.handleToggleColumn}
+                  options={options}>
+                  {column.name}
+                </MUIDataTableHeadCell>
+              )),
           )}
         </MUIDataTableHeadRow>
       </TableHead>