Skip to content

Commit

Permalink
This closes #510, Pagination IE problem resolved.
Browse files Browse the repository at this point in the history
  • Loading branch information
mbrn committed May 4, 2019
1 parent eba40b5 commit 4930aec
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 22 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"@babel/preset-react": "7.0.0",
"babel-eslint": "10.0.1",
"babel-loader": "^8.0.4",
"babel-polyfill": "^6.26.0",
"buble": "0.19.3",
"docz": "0.13.7",
"docz-theme-default": "0.13.7",
Expand Down
19 changes: 0 additions & 19 deletions src/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,11 @@ class App extends Component {
title="Demo Title"
options={{
}}
isLoading
/>
</Grid>

</Grid>
<button
onClick={() => {
this.tableRef.current.onQueryChange();
}}
>
ok
</button>

</div>
<MaterialTable
ref={this.tableRef}
columns={this.state.columns}
data={this.state.data}
title="Demo Title"
options={{
}}
/>
</MuiThemeProvider>

</>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/m-table-pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MTablePaginationInner extends React.Component {
</IconButton>
</span>
</Tooltip>
<Typography variant="caption" style={{ flex: 1, textAlign: 'center', lineHeight: 'inherit' }} >
<Typography variant="caption" style={{ flex: 1, textAlign: 'center', alignSelf: 'center', flexBasis: 'inherit' }} >
{localization.labelDisplayedRows.replace('{from}', this.props.page * this.props.rowsPerPage + 1).replace('{to}', Math.min((this.props.page + 1) * this.props.rowsPerPage, this.props.count)).replace('{count}', this.props.count)}
</Typography>
<Tooltip title={localization.nextTooltip}>
Expand Down Expand Up @@ -84,7 +84,7 @@ const actionsStyles = theme => ({
flexShrink: 0,
color: theme.palette.text.secondary,
display: 'flex',
lineHeight: '48px'
// lineHeight: '48px'
}
});

Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const webpack = require('webpack');

module.exports = {
entry: './src/demo.js',
entry: ['babel-polyfill', './src/demo.js'],
module: {
rules: [
{
Expand Down

0 comments on commit 4930aec

Please sign in to comment.