Updates to remove warnings for mui v4 users (#836)

gregnb · Aug 29, 2019 · a5f30b6 · a5f30b6
1 parent 6396aa1
commit a5f30b6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/components/TableToolbar.js b/src/components/TableToolbar.js
@@ -248,11 +248,16 @@ class TableToolbar extends React.Component {
             <span>
               <ReactToPrint
                 trigger={() => (
-                  <Tooltip title={print}>
-                    <IconButton data-testid={print + '-iconButton'} aria-label={print} classes={{ root: classes.icon }}>
-                      <PrintIcon />
-                    </IconButton>
-                  </Tooltip>
+                  <span>
+                    <Tooltip title={print}>
+                      <IconButton
+                        data-testid={print + '-iconButton'}
+                        aria-label={print}
+                        classes={{ root: classes.icon }}>
+                        <PrintIcon />
+                      </IconButton>
+                    </Tooltip>
+                  </span>
                 )}
                 content={() => this.props.tableRef()}
               />

diff --git a/src/components/TableToolbarSelect.js b/src/components/TableToolbarSelect.js
@@ -16,8 +16,8 @@ const defaultToolbarSelectStyles = theme => ({
     zIndex: 120,
     justifyContent: 'space-between',
     alignItems: 'center',
-    paddingTop: theme.spacing.unit,
-    paddingBottom: theme.spacing.unit,
+    paddingTop: typeof theme.spacing === 'function' ? theme.spacing(1) : theme.spacing.unit,
+    paddingBottom: typeof theme.spacing === 'function' ? theme.spacing(1) : theme.spacing.unit,
   },
   title: {
     paddingLeft: '26px',