fix: update @material-ui/core to 3.7.0 (#1718)

DevExpress · Dec 21, 2018 · ce5d4fe · ce5d4fe
1 parent d7f345c
commit ce5d4fe
Show file tree

Hide file tree

Showing 9 changed files with 832 additions and 671 deletions.
diff --git a/packages/dx-react-chart-demos/package.json b/packages/dx-react-chart-demos/package.json
@@ -29,7 +29,7 @@
     "@devexpress/dx-react-chart": "1.9.1",
     "@devexpress/dx-react-chart-bootstrap4": "1.9.1",
     "@devexpress/dx-react-chart-material-ui": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "@types/react": "^16.7.7",
     "@types/react-dom": "^16.0.10",

diff --git a/packages/dx-react-chart-material-ui/package.json b/packages/dx-react-chart-material-ui/package.json
@@ -49,7 +49,7 @@
     "@babel/preset-react": "^7.0.0",
     "@devexpress/dx-react-core": "1.9.1",
     "@devexpress/dx-testing": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^23.6.0",

diff --git a/packages/dx-react-grid-demos/package.json b/packages/dx-react-grid-demos/package.json
@@ -34,7 +34,7 @@
     "@devexpress/dx-react-grid-bootstrap3": "1.9.1",
     "@devexpress/dx-react-grid-bootstrap4": "1.9.1",
     "@devexpress/dx-react-grid-material-ui": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "@types/react": "^16.7.7",
     "@types/react-dom": "^16.0.10",

diff --git a/packages/dx-react-grid-material-ui/package.json b/packages/dx-react-grid-material-ui/package.json
@@ -51,7 +51,7 @@
     "@devexpress/dx-react-core": "1.9.1",
     "@devexpress/dx-react-grid": "1.9.1",
     "@devexpress/dx-testing": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^23.6.0",

diff --git a/packages/dx-react-grid-material-ui/src/templates/table-header-cell.jsx b/packages/dx-react-grid-material-ui/src/templates/table-header-cell.jsx
@@ -76,6 +76,7 @@ const styles = theme => ({
   cellRight: {
     paddingLeft: theme.spacing.unit,
     paddingRight: theme.spacing.unit,
+    textAlign: 'right',
   },
   cellCenter: {
     textAlign: 'center',
@@ -137,7 +138,6 @@ class TableHeaderCellBase extends React.PureComponent {
       <TableCell
         style={style}
         className={tableCellClasses}
-        numeric={align === 'right'}
         {...restProps}
       >
         <div className={classes.container}>

diff --git a/packages/dx-react-scheduler-demos/package.json b/packages/dx-react-scheduler-demos/package.json
@@ -27,7 +27,7 @@
     "@devexpress/dx-react-core": "1.9.1",
     "@devexpress/dx-react-scheduler": "1.9.1",
     "@devexpress/dx-react-scheduler-material-ui": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "@types/react": "^16.7.7",
     "@types/react-dom": "^16.0.10",

diff --git a/packages/dx-react-scheduler-material-ui/package.json b/packages/dx-react-scheduler-material-ui/package.json
@@ -49,7 +49,7 @@
     "@devexpress/dx-react-scheduler": "1.9.1",
     "@devexpress/dx-scheduler-core": "1.9.1",
     "@devexpress/dx-testing": "1.9.1",
-    "@material-ui/core": "^3.6.0",
+    "@material-ui/core": "^3.7.0",
     "@material-ui/icons": "^3.0.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^23.6.0",

diff --git a/packages/dx-react-scheduler-material-ui/src/templates/views/vertical/time-scale/cell.jsx b/packages/dx-react-scheduler-material-ui/src/templates/views/vertical/time-scale/cell.jsx
@@ -12,6 +12,7 @@ const styles = theme => ({
     paddingLeft: theme.spacing.unit / 4,
     overflow: 'hidden',
     textOverflow: 'ellipsis',
+    textAlign: 'right',
     '&:last-child': {
       padding: theme.spacing.unit,
       paddingLeft: theme.spacing.unit / 4,
@@ -33,7 +34,6 @@ const CellBase = ({
   const currentTime = moment(endDate);
   return (
     <TableCell
-      numeric
       className={classNames(classes.cell, className)}
       {...restProps}
     >