From acfd8bec6b4908aba6135daccf63b1db8c5cb0c8 Mon Sep 17 00:00:00 2001 From: Sergey Alexeev Date: Fri, 4 Aug 2017 10:21:28 +0300 Subject: [PATCH 1/3] Fix version tag calculation on windows --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index f363feeda5..884efa0a80 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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\... From 3b8053167ff4ec35796e51541e7b5ae39611bab6 Mon Sep 17 00:00:00 2001 From: Sergey Alexeev Date: Fri, 4 Aug 2017 11:53:33 +0300 Subject: [PATCH 2/3] Specific css class for page size selector --- .../src/templates/drop-down-menu.jsx | 5 ++++- .../src/templates/page-size-selector.jsx | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/dx-react-grid-material-ui/src/templates/drop-down-menu.jsx b/packages/dx-react-grid-material-ui/src/templates/drop-down-menu.jsx index d2a55b634d..59bd2d122b 100644 --- a/packages/dx-react-grid-material-ui/src/templates/drop-down-menu.jsx +++ b/packages/dx-react-grid-material-ui/src/templates/drop-down-menu.jsx @@ -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 ( @@ -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, diff --git a/packages/dx-react-grid-material-ui/src/templates/page-size-selector.jsx b/packages/dx-react-grid-material-ui/src/templates/page-size-selector.jsx index d4a72da601..cb7f52cde6 100644 --- a/packages/dx-react-grid-material-ui/src/templates/page-size-selector.jsx +++ b/packages/dx-react-grid-material-ui/src/templates/page-size-selector.jsx @@ -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: { @@ -47,6 +50,7 @@ const PageSizeSelectorBase = ({ onPageSizeChange(item); }} className={classes.pageSizes} + titleClassName={classes.pageSizeTitle} /> ); From 9d0525bc48fe9665671454818574b58028796fc7 Mon Sep 17 00:00:00 2001 From: Sergey Alexeev Date: Fri, 4 Aug 2017 11:55:53 +0300 Subject: [PATCH 3/3] Fix lint --- .../src/templates/virtual-table/virtual-box.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dx-react-grid-bootstrap3/src/templates/virtual-table/virtual-box.jsx b/packages/dx-react-grid-bootstrap3/src/templates/virtual-table/virtual-box.jsx index 90c6d716e5..ca81d8ee79 100644 --- a/packages/dx-react-grid-bootstrap3/src/templates/virtual-table/virtual-box.jsx +++ b/packages/dx-react-grid-bootstrap3/src/templates/virtual-table/virtual-box.jsx @@ -125,7 +125,7 @@ export class VirtualBox extends React.Component { > {children} - );*/ + ); */ } }