Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for 676 and 595 #836

Merged
merged 1 commit into from
Aug 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/components/TableToolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,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()}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/TableToolbarSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down