diff --git a/docs/package.json b/docs/package.json index e6169eff3777a..b540f4b1706ab 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "docs", - "version": "4.0.0-alpha.6", + "version": "5.0.0-alpha.1", "private": true, "author": "Material-UI Team", "license": "MIT", @@ -24,11 +24,11 @@ "@date-io/core": "^1.3.9", "@emotion/core": "^10.0.27", "@emotion/styled": "^10.0.27", - "@material-ui/core": "^4.9.12", - "@material-ui/docs": "^4.0.0-beta.3", - "@material-ui/icons": "^4.9.1", - "@material-ui/lab": "^4.0.0-alpha.56", - "@material-ui/monorepo": "https://github.com/mui-org/material-ui.git#master", + "@material-ui/core": "next", + "@material-ui/docs": "next", + "@material-ui/icons": "next", + "@material-ui/lab": "next", + "@material-ui/monorepo": "https://github.com/mui-org/material-ui.git#next", "@trendmicro/react-interpolate": "^0.5.5", "@types/autosuggest-highlight": "^3.1.0", "@types/css-mediaquery": "^0.1.0", diff --git a/docs/src/pages/components/data-grid/rendering/AntDesignGrid.js b/docs/src/pages/components/data-grid/rendering/AntDesignGrid.js index c5f3f3eb122d1..c9cb82f59a751 100644 --- a/docs/src/pages/components/data-grid/rendering/AntDesignGrid.js +++ b/docs/src/pages/components/data-grid/rendering/AntDesignGrid.js @@ -13,7 +13,7 @@ function customCheckbox(theme) { height: 16, backgroundColor: 'transparent', border: `1px solid ${ - theme.palette.type === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)' + theme.palette.mode === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)' }`, borderRadius: 2, }, @@ -54,7 +54,7 @@ const useStyles = makeStyles((theme) => ({ root: { border: 0, color: - theme.palette.type === 'light' + theme.palette.mode === 'light' ? 'rgba(0,0,0,.85)' : 'rgba(255,255,255,0.85)', fontFamily: [ @@ -72,24 +72,24 @@ const useStyles = makeStyles((theme) => ({ WebkitFontSmoothing: 'auto', letterSpacing: 'normal', '& .MuiDataGrid-columnsContainer': { - backgroundColor: theme.palette.type === 'light' ? '#fafafa' : '#1d1d1d', + backgroundColor: theme.palette.mode === 'light' ? '#fafafa' : '#1d1d1d', }, '& .MuiDataGrid-iconSeparator': { display: 'none', }, '& .MuiDataGrid-colCell, .MuiDataGrid-cell': { borderRight: `1px solid ${ - theme.palette.type === 'light' ? '#f0f0f0' : '#303030' + theme.palette.mode === 'light' ? '#f0f0f0' : '#303030' }`, }, '& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell': { borderBottom: `1px solid ${ - theme.palette.type === 'light' ? '#f0f0f0' : '#303030' + theme.palette.mode === 'light' ? '#f0f0f0' : '#303030' }`, }, '& .MuiDataGrid-cell': { color: - theme.palette.type === 'light' + theme.palette.mode === 'light' ? 'rgba(0,0,0,.85)' : 'rgba(255,255,255,0.65)', }, diff --git a/docs/src/pages/components/data-grid/rendering/AntDesignGrid.tsx b/docs/src/pages/components/data-grid/rendering/AntDesignGrid.tsx index 12ae6f50614be..e2dd6e3dcb9ee 100644 --- a/docs/src/pages/components/data-grid/rendering/AntDesignGrid.tsx +++ b/docs/src/pages/components/data-grid/rendering/AntDesignGrid.tsx @@ -12,7 +12,7 @@ function customCheckbox(theme) { height: 16, backgroundColor: 'transparent', border: `1px solid ${ - theme.palette.type === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)' + theme.palette.mode === 'light' ? '#d9d9d9' : 'rgb(67, 67, 67)' }`, borderRadius: 2, }, @@ -54,7 +54,7 @@ const useStyles = makeStyles((theme: Theme) => root: { border: 0, color: - theme.palette.type === 'light' + theme.palette.mode === 'light' ? 'rgba(0,0,0,.85)' : 'rgba(255,255,255,0.85)', fontFamily: [ @@ -72,24 +72,24 @@ const useStyles = makeStyles((theme: Theme) => WebkitFontSmoothing: 'auto', letterSpacing: 'normal', '& .MuiDataGrid-columnsContainer': { - backgroundColor: theme.palette.type === 'light' ? '#fafafa' : '#1d1d1d', + backgroundColor: theme.palette.mode === 'light' ? '#fafafa' : '#1d1d1d', }, '& .MuiDataGrid-iconSeparator': { display: 'none', }, '& .MuiDataGrid-colCell, .MuiDataGrid-cell': { borderRight: `1px solid ${ - theme.palette.type === 'light' ? '#f0f0f0' : '#303030' + theme.palette.mode === 'light' ? '#f0f0f0' : '#303030' }`, }, '& .MuiDataGrid-columnsContainer, .MuiDataGrid-cell': { borderBottom: `1px solid ${ - theme.palette.type === 'light' ? '#f0f0f0' : '#303030' + theme.palette.mode === 'light' ? '#f0f0f0' : '#303030' }`, }, '& .MuiDataGrid-cell': { color: - theme.palette.type === 'light' + theme.palette.mode === 'light' ? 'rgba(0,0,0,.85)' : 'rgba(255,255,255,0.65)', }, diff --git a/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.js b/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.js index a5fadf74e2161..a3cd7b37fea29 100644 --- a/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.js +++ b/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.js @@ -7,20 +7,20 @@ const useStyles = makeStyles((theme) => ({ root: { flexDirection: 'column', '& .ant-empty-img-1': { - fill: theme.palette.type === 'light' ? '#aeb8c2' : '#262626', + fill: theme.palette.mode === 'light' ? '#aeb8c2' : '#262626', }, '& .ant-empty-img-2': { - fill: theme.palette.type === 'light' ? '#f5f5f7' : '#595959', + fill: theme.palette.mode === 'light' ? '#f5f5f7' : '#595959', }, '& .ant-empty-img-3': { - fill: theme.palette.type === 'light' ? '#dce0e6' : '#434343', + fill: theme.palette.mode === 'light' ? '#dce0e6' : '#434343', }, '& .ant-empty-img-4': { - fill: theme.palette.type === 'light' ? '#fff' : '#1c1c1c', + fill: theme.palette.mode === 'light' ? '#fff' : '#1c1c1c', }, '& .ant-empty-img-5': { - fillOpacity: theme.palette.type === 'light' ? '0.8' : '0.08', - fill: theme.palette.type === 'light' ? '#f5f5f5' : '#fff', + fillOpacity: theme.palette.mode === 'light' ? '0.8' : '0.08', + fill: theme.palette.mode === 'light' ? '#f5f5f5' : '#fff', }, }, label: { diff --git a/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.tsx b/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.tsx index 6337b0979279e..bce97d9a9e7b9 100644 --- a/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.tsx +++ b/docs/src/pages/components/data-grid/rendering/CustomEmptyOverlayGrid.tsx @@ -8,20 +8,20 @@ const useStyles = makeStyles((theme: Theme) => root: { flexDirection: 'column', '& .ant-empty-img-1': { - fill: theme.palette.type === 'light' ? '#aeb8c2' : '#262626', + fill: theme.palette.mode === 'light' ? '#aeb8c2' : '#262626', }, '& .ant-empty-img-2': { - fill: theme.palette.type === 'light' ? '#f5f5f7' : '#595959', + fill: theme.palette.mode === 'light' ? '#f5f5f7' : '#595959', }, '& .ant-empty-img-3': { - fill: theme.palette.type === 'light' ? '#dce0e6' : '#434343', + fill: theme.palette.mode === 'light' ? '#dce0e6' : '#434343', }, '& .ant-empty-img-4': { - fill: theme.palette.type === 'light' ? '#fff' : '#1c1c1c', + fill: theme.palette.mode === 'light' ? '#fff' : '#1c1c1c', }, '& .ant-empty-img-5': { - fillOpacity: theme.palette.type === 'light' ? '0.8' : '0.08', - fill: theme.palette.type === 'light' ? '#f5f5f5' : '#fff', + fillOpacity: theme.palette.mode === 'light' ? '0.8' : '0.08', + fill: theme.palette.mode === 'light' ? '#f5f5f5' : '#fff', }, }, label: { diff --git a/yarn.lock b/yarn.lock index 6b65471d4a712..8258495399077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2811,13 +2811,32 @@ react-is "^16.8.0" react-transition-group "^4.4.0" -"@material-ui/docs@^4.0.0-beta.3": - version "4.0.0-beta.3" - resolved "https://registry.yarnpkg.com/@material-ui/docs/-/docs-4.0.0-beta.3.tgz#8c37863a58b175e03d565a8c8a9ea25c64ba30f8" - integrity sha512-RLgfN41V+gnstWYrBsFfluH4qX8We9coMOhAe/vlJLsZ5pQxP2HEJFE/FGa2ImszezwCsG7DuCZigHRXoHTy9w== +"@material-ui/core@next": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-5.0.0-alpha.11.tgz#a31d0ea7cebf97ba190db0767f07891ab9a13b75" + integrity sha512-NIZNIswI4gBgpcOiYxtkaKmRZdJy2+e51p7OFAyXIfWB+CtNtXattPdz4MioCL3yaOwf7wZoJWyXbV0mjsDPVg== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.9.6" + "@material-ui/styled-engine" "^5.0.0-alpha.11" + "@material-ui/styles" "^5.0.0-alpha.11" + "@material-ui/system" "^5.0.0-alpha.11" + "@material-ui/types" "^5.1.0" + "@material-ui/utils" "^5.0.0-alpha.8" + "@types/react-transition-group" "^4.2.0" + clsx "^1.0.4" + hoist-non-react-statics "^3.3.2" + popper.js "1.16.1-lts" + prop-types "^15.7.2" + react-is "^16.8.0" + react-transition-group "^4.4.0" + +"@material-ui/docs@next": + version "5.0.0-alpha.1" + resolved "https://registry.yarnpkg.com/@material-ui/docs/-/docs-5.0.0-alpha.1.tgz#878e18e177e09324992345d1ef91dd5dbbd4d4aa" + integrity sha512-bSncXpossMxnzc+Jx4I2T0FBNK/NgIRFsqEXltYreRdd8hkFtT8e+QNSq+SxtsO2CRCkhDQ9wbt043Vqe3BAww== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^5.0.0-alpha.1" nprogress "^0.2.0" "@material-ui/icons@^4.9.1": @@ -2827,7 +2846,14 @@ dependencies: "@babel/runtime" "^7.4.4" -"@material-ui/lab@^4.0.0-alpha.54", "@material-ui/lab@^4.0.0-alpha.56": +"@material-ui/icons@next": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-5.0.0-alpha.11.tgz#ffefac5b4ba3e7895a57e29ff7f67eba4d9e4d0b" + integrity sha512-rQA599j0g1LHd88/zAx5YBSGR0iktSOwTRRaP2CXrxqoh5KvNqted2Kc3FPpe0rbeEIT1sCge5PDEKvov8fLUw== + dependencies: + "@babel/runtime" "^7.4.4" + +"@material-ui/lab@^4.0.0-alpha.54": version "4.0.0-alpha.56" resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.56.tgz#ff63080949b55b40625e056bbda05e130d216d34" integrity sha512-xPlkK+z/6y/24ka4gVJgwPfoCF4RCh8dXb1BNE7MtF9bXEBLN/lBxNTK8VAa0qm3V2oinA6xtUIdcRh0aeRtVw== @@ -2838,14 +2864,27 @@ prop-types "^15.7.2" react-is "^16.8.0" -"@material-ui/monorepo@https://github.com/mui-org/material-ui.git#master": - version "4.11.0" - resolved "https://github.com/mui-org/material-ui.git#4502b9bbe18e15c532940e3ef83b513721298b24" +"@material-ui/lab@next": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-5.0.0-alpha.11.tgz#6c0f7063351aa328369ee9ab0a6f78e14e10aab3" + integrity sha512-HBJ6A0WIMssejjj9eSjFdtZA/OfyVHOV/wq3lpSFMSZpkk8QI+Tk9XtE6CaprGmTKPbOdPNKIWqbVvZq8oCtDQ== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/system" "^5.0.0-alpha.6" + "@material-ui/utils" "^5.0.0-alpha.8" + clsx "^1.0.4" + prop-types "^15.7.2" + react-is "^16.8.0" "@material-ui/monorepo@https://github.com/mui-org/material-ui.git#next": version "5.0.0-alpha.5" resolved "https://github.com/mui-org/material-ui.git#f43417718baa7b25dd28ad32dc83f89bc19bef62" +"@material-ui/styled-engine@^5.0.0-alpha.11": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/styled-engine/-/styled-engine-5.0.0-alpha.11.tgz#a0a78935dd47fc1d0e76d7dbd7ced80978f453d4" + integrity sha512-BmA1YvtRa5W0jg3QAZMDa+6LZYQ2bQh87W3v1ZgmCq4hzsEDWPbP/EpKq+eSItG4NytUBJPW72ynNemZuzEdnQ== + "@material-ui/styles@^4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071" @@ -2868,6 +2907,28 @@ jss-plugin-vendor-prefixer "^10.0.3" prop-types "^15.7.2" +"@material-ui/styles@^5.0.0-alpha.11": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-5.0.0-alpha.11.tgz#23d45af3392d579c3ae2e6c47de4de7c3d0c6902" + integrity sha512-O2typCPhgdF8vrBdT5PZE/DdssVdZd+ObvFo7fzQ9uLjYCP8JHf5URTzbRb26LP3IM1eIjaaMOpiuhMyY2nQTA== + dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "^5.1.0" + "@material-ui/utils" "^5.0.0-alpha.8" + clsx "^1.0.4" + csstype "^3.0.2" + hoist-non-react-statics "^3.3.2" + jss "^10.0.3" + jss-plugin-camel-case "^10.0.3" + jss-plugin-default-unit "^10.0.3" + jss-plugin-global "^10.0.3" + jss-plugin-nested "^10.0.3" + jss-plugin-props-sort "^10.0.3" + jss-plugin-rule-value-function "^10.0.3" + jss-plugin-vendor-prefixer "^10.0.3" + prop-types "^15.7.2" + "@material-ui/system@^4.9.14": version "4.9.14" resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f" @@ -2878,6 +2939,15 @@ csstype "^2.5.2" prop-types "^15.7.2" +"@material-ui/system@^5.0.0-alpha.11", "@material-ui/system@^5.0.0-alpha.6": + version "5.0.0-alpha.11" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-5.0.0-alpha.11.tgz#3ee5aaa5c8a4f621275e124ba3ea4344481d2a29" + integrity sha512-ChMZKY4ZW+4nAL5/vMb8jnCdCvjD7JXUCUbesKQoKMuA02qFM0aQZjfuQ7j2Q7oQUkIaSoqCsNjwQ8YvZz78Mg== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^5.0.0-alpha.8" + prop-types "^15.7.2" + "@material-ui/types@^4.0.0": version "4.1.1" resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz#b65e002d926089970a3271213a3ad7a21b17f02b" @@ -2899,6 +2969,17 @@ prop-types "^15.7.2" react-is "^16.8.0" +"@material-ui/utils@^5.0.0-alpha.1", "@material-ui/utils@^5.0.0-alpha.8": + version "5.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-5.0.0-alpha.8.tgz#521e143041805441c1e5fd15baaa0ece38e27bf6" + integrity sha512-g1uWRBLQtPUJ/C+tLx5XQ7Gn2u4/xysPWezy8/65G4iXt3pCPrbAmrb6qWbLUHNdGkwJ2/+wyaXKe5gs4fHNAg== + dependencies: + "@babel/runtime" "^7.4.4" + "@types/prop-types" "^15.7.3" + "@types/react-is" "^16.7.1" + prop-types "^15.7.2" + react-is "^16.8.0" + "@mdx-js/loader@^1.5.1": version "1.6.6" resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.6.tgz#de7438f3b18b097d66380f8698123a91c587a2f9" @@ -5104,7 +5185,7 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d" integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ== -"@types/prop-types@*": +"@types/prop-types@*", "@types/prop-types@^15.7.3": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== @@ -5149,6 +5230,13 @@ dependencies: "@types/react" "*" +"@types/react-is@^16.7.1": + version "16.7.1" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539" + integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ== + dependencies: + "@types/react" "*" + "@types/react-native@*": version "0.62.17" resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.17.tgz#78e630692557ae82a106dab7682560a8b541c49a"