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

fix(react-grid): correct 'All' page size text rendering in MUI #242

Merged
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
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var gulp = require('gulp'),
var distPath = 'site/';

var versionTagIndex = process.argv.indexOf('--versionTag');
var versionTag = process.argv[versionTagIndex + 1];
var versionTag = versionTagIndex > -1 ? process.argv[versionTagIndex + 1] : undefined;

var splitNameToPath = function(path) {
// dx-react-grid-bs3\... ==> react\grid\bs3\...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class VirtualBox extends React.Component {
>
{children}
</div>
);*/
); */
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ class DropDownMenuBase extends React.PureComponent {
}

render() {
const { items, classes, className, itemTemplate } = this.props;
const { items, classes, className, titleClassName, itemTemplate } = this.props;
const { anchorEl, open, selectedIndex, title } = this.state;
const titleClasses = classNames({
[classes.title]: true,
[titleClassName]: true,
[classes.selected]: selectedIndex > -1,
});
return (
Expand Down Expand Up @@ -136,10 +137,12 @@ DropDownMenuBase.propTypes = {
onItemClick: PropTypes.func.isRequired,
itemTemplate: PropTypes.func,
className: PropTypes.string,
titleClassName: PropTypes.string,
};

DropDownMenuBase.defaultProps = {
className: null,
titleClassName: null,
selectedItem: undefined,
defaultTitle: undefined,
itemTemplate: undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ const styleSheet = createStyleSheet('PageSizeSelector', theme => ({
},
pageSizes: {
display: 'inline-block',
minWidth: theme.spacing.unit * 5,
},
pageSizeTitle: {
width: 'auto',
marginRight: theme.spacing.unit / 2,
},
'@media (max-width: 768px)': {
label: {
Expand Down Expand Up @@ -47,6 +50,7 @@ const PageSizeSelectorBase = ({
onPageSizeChange(item);
}}
className={classes.pageSizes}
titleClassName={classes.pageSizeTitle}
/>
</div>
);
Expand Down