Skip to content

Commit 4bf8810

Browse files
authored
fix(react-grid-material-ui): update material-ui version to 1.0.0-beta.33 (#750)
1 parent 8cfcd56 commit 4bf8810

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

packages/dx-react-demos/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@devexpress/dx-react-grid-bootstrap3": "1.0.0",
3636
"@devexpress/dx-react-grid-material-ui": "1.0.0",
3737
"core-js": "^2.5.3",
38-
"material-ui": "1.0.0-beta.31",
38+
"material-ui": "1.0.0-beta.33",
3939
"material-ui-icons": "1.0.0-beta.17",
4040
"prismjs": "^1.10.0",
4141
"prop-types": "^15.6.0",

packages/dx-react-grid-material-ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"jss": "^9.6.0",
7474
"jss-preset-default": "^4.1.0",
7575
"jss-theme-reactor": "^0.11.1",
76-
"material-ui": "1.0.0-beta.31",
76+
"material-ui": "1.0.0-beta.33",
7777
"material-ui-icons": "1.0.0-beta.17",
7878
"react": "^16.2.0",
7979
"react-dom": "^16.2.0",
@@ -91,7 +91,7 @@
9191
"@devexpress/dx-grid-core": "1.0.0",
9292
"@devexpress/dx-react-core": "1.0.0",
9393
"@devexpress/dx-react-grid": "1.0.0",
94-
"material-ui": "1.0.0-beta.31",
94+
"material-ui": "1.0.0-beta.33",
9595
"material-ui-icons": "1.0.0-beta.17",
9696
"react": "^16.2.0"
9797
}

packages/dx-react-grid-material-ui/src/templates/drag-drop.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const ColumnBase = ({
6969
}) => (
7070
<Typography
7171
className={classNames(classes.column, className)}
72-
type="body1"
72+
variant="body1"
7373
component="p"
7474
{...restProps}
7575
>

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5532,9 +5532,9 @@ material-ui-icons@1.0.0-beta.17:
55325532
dependencies:
55335533
recompose "^0.26.0"
55345534

5535-
material-ui@1.0.0-beta.31:
5536-
version "1.0.0-beta.31"
5537-
resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.31.tgz#5d832d0c4d9eceea2cbf1647dc7f57a4031f0243"
5535+
material-ui@1.0.0-beta.33:
5536+
version "1.0.0-beta.33"
5537+
resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.33.tgz#9b2e9664a9a085951e6dde4594fa3a9bf2c62cd1"
55385538
dependencies:
55395539
"@types/jss" "^9.3.0"
55405540
"@types/react-transition-group" "^2.0.6"

0 commit comments

Comments
 (0)