From ca5ac1450792c3c6c68bb2d26c6e0f05678c33f6 Mon Sep 17 00:00:00 2001 From: Flavien DELANGLE Date: Wed, 6 Sep 2023 11:01:57 +0200 Subject: [PATCH 1/3] [lab] Fix `@mui/x-tree-view` dependency (#38822) --- packages/mui-lab/package.json | 2 +- yarn.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/mui-lab/package.json b/packages/mui-lab/package.json index c1de61d817782e..a2f0e60280efc2 100644 --- a/packages/mui-lab/package.json +++ b/packages/mui-lab/package.json @@ -65,7 +65,7 @@ "@mui/system": "^5.14.8", "@mui/types": "^7.2.4", "@mui/utils": "^5.14.8", - "@mui/x-tree-view": "https://pkg.csb.dev/mui/mui-x/commit/1f23b33d/@mui/x-tree-view", + "@mui/x-tree-view": "6.0.0-alpha.1", "clsx": "^2.0.0", "prop-types": "^15.8.1", "react-is": "^18.2.0" diff --git a/yarn.lock b/yarn.lock index 6ee2e13b24b426..85ec0d67095778 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2372,14 +2372,15 @@ "@babel/runtime" "^7.22.6" "@mui/utils" "^5.13.7" -"@mui/x-tree-view@https://pkg.csb.dev/mui/mui-x/commit/1f23b33d/@mui/x-tree-view": - version "6.0.0-alpha.0" - resolved "https://pkg.csb.dev/mui/mui-x/commit/1f23b33d/@mui/x-tree-view#93cbc61c818ed2d6c40554cdbada969f7dcbaab1" +"@mui/x-tree-view@6.0.0-alpha.1": + version "6.0.0-alpha.1" + resolved "https://registry.yarnpkg.com/@mui/x-tree-view/-/x-tree-view-6.0.0-alpha.1.tgz#fe499f8c43c01d28aca95cfb17491746ffcc3080" + integrity sha512-JUG3HmBrmGEALbCFg1b+i7h726e1dWYZs4db3syO1j+Q++E3nbvE4Lehp5yGTFm+8esH0Tny50tuJaa4WX6VSA== dependencies: "@babel/runtime" "^7.22.6" - "@mui/utils" "^5.13.7" + "@mui/utils" "^5.14.3" "@types/react-transition-group" "^4.4.6" - clsx "^1.2.1" + clsx "^2.0.0" prop-types "^15.8.1" react-transition-group "^4.4.5" @@ -6010,7 +6011,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -clsx@^1.1.0, clsx@^1.1.1, clsx@^1.2.1: +clsx@^1.1.0, clsx@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== From 42005c6fdcee28357e1b47a7f6d71e23553afd59 Mon Sep 17 00:00:00 2001 From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Date: Wed, 6 Sep 2023 07:35:29 -0300 Subject: [PATCH 2/3] [material-ui][Button] Update the file upload demo (#38823) --- .../components/buttons/InputFileUpload.js | 31 ++++++++----------- .../components/buttons/InputFileUpload.tsx | 31 ++++++++----------- .../buttons/InputFileUpload.tsx.preview | 9 ++---- 3 files changed, 28 insertions(+), 43 deletions(-) diff --git a/docs/data/material/components/buttons/InputFileUpload.js b/docs/data/material/components/buttons/InputFileUpload.js index f053ce2dd2c511..27e8b252fc94da 100644 --- a/docs/data/material/components/buttons/InputFileUpload.js +++ b/docs/data/material/components/buttons/InputFileUpload.js @@ -3,27 +3,22 @@ import { styled } from '@mui/material/styles'; import Button from '@mui/material/Button'; import CloudUploadIcon from '@mui/icons-material/CloudUpload'; -const VisuallyHiddenInput = styled('input')` - clip: rect(0 0 0 0); - clip-path: inset(50%); - height: 1px; - overflow: hidden; - position: absolute; - bottom: 0; - left: 0; - white-space: nowrap; - width: 1px; -`; +const VisuallyHiddenInput = styled('input')({ + clip: 'rect(0 0 0 0)', + clipPath: 'inset(50%)', + height: 1, + overflow: 'hidden', + position: 'absolute', + bottom: 0, + left: 0, + whiteSpace: 'nowrap', + width: 1, +}); export default function InputFileUpload() { return ( - ); diff --git a/docs/data/material/components/buttons/InputFileUpload.tsx b/docs/data/material/components/buttons/InputFileUpload.tsx index f053ce2dd2c511..27e8b252fc94da 100644 --- a/docs/data/material/components/buttons/InputFileUpload.tsx +++ b/docs/data/material/components/buttons/InputFileUpload.tsx @@ -3,27 +3,22 @@ import { styled } from '@mui/material/styles'; import Button from '@mui/material/Button'; import CloudUploadIcon from '@mui/icons-material/CloudUpload'; -const VisuallyHiddenInput = styled('input')` - clip: rect(0 0 0 0); - clip-path: inset(50%); - height: 1px; - overflow: hidden; - position: absolute; - bottom: 0; - left: 0; - white-space: nowrap; - width: 1px; -`; +const VisuallyHiddenInput = styled('input')({ + clip: 'rect(0 0 0 0)', + clipPath: 'inset(50%)', + height: 1, + overflow: 'hidden', + position: 'absolute', + bottom: 0, + left: 0, + whiteSpace: 'nowrap', + width: 1, +}); export default function InputFileUpload() { return ( - ); diff --git a/docs/data/material/components/buttons/InputFileUpload.tsx.preview b/docs/data/material/components/buttons/InputFileUpload.tsx.preview index 7763b53206c8ad..9cdb1581fda0ad 100644 --- a/docs/data/material/components/buttons/InputFileUpload.tsx.preview +++ b/docs/data/material/components/buttons/InputFileUpload.tsx.preview @@ -1,9 +1,4 @@ - \ No newline at end of file From 1a47213c443239860bbee373e198c95dac1f69b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Wed, 6 Sep 2023 12:38:24 +0200 Subject: [PATCH 3/3] [docs] Fix a11y issues in tables demos (#38829) --- .../components/table-pagination/TableCustomized/css/index.js | 2 +- .../components/table-pagination/TableCustomized/css/index.tsx | 2 +- .../components/table-pagination/TableCustomized/system/index.js | 2 +- .../table-pagination/TableCustomized/system/index.tsx | 2 +- .../table-pagination/TableCustomized/tailwind/index.js | 1 + .../table-pagination/TableCustomized/tailwind/index.tsx | 1 + docs/data/base/components/table-pagination/TableUnstyled.js | 2 +- docs/data/base/components/table-pagination/TableUnstyled.tsx | 2 +- docs/data/joy/components/table/TableSortAndSelection.js | 2 +- docs/data/joy/components/table/TableSortAndSelection.tsx | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/data/base/components/table-pagination/TableCustomized/css/index.js b/docs/data/base/components/table-pagination/TableCustomized/css/index.js index 9c4d968a0688d6..994b5903883f8b 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/css/index.js +++ b/docs/data/base/components/table-pagination/TableCustomized/css/index.js @@ -51,7 +51,7 @@ export default function TableCustomized() { {emptyRows > 0 && ( - + )} diff --git a/docs/data/base/components/table-pagination/TableCustomized/css/index.tsx b/docs/data/base/components/table-pagination/TableCustomized/css/index.tsx index c924d1d72ffb2a..1f0889da8ea348 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/css/index.tsx +++ b/docs/data/base/components/table-pagination/TableCustomized/css/index.tsx @@ -56,7 +56,7 @@ export default function TableCustomized() { {emptyRows > 0 && ( - + )} diff --git a/docs/data/base/components/table-pagination/TableCustomized/system/index.js b/docs/data/base/components/table-pagination/TableCustomized/system/index.js index 28b28ed7c35e12..4eeca35e3a1cf8 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/system/index.js +++ b/docs/data/base/components/table-pagination/TableCustomized/system/index.js @@ -50,7 +50,7 @@ export default function TableCustomized() { {emptyRows > 0 && ( - + )} diff --git a/docs/data/base/components/table-pagination/TableCustomized/system/index.tsx b/docs/data/base/components/table-pagination/TableCustomized/system/index.tsx index 79ab5c877c8bd7..4f68884c57548a 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/system/index.tsx +++ b/docs/data/base/components/table-pagination/TableCustomized/system/index.tsx @@ -55,7 +55,7 @@ export default function TableCustomized() { {emptyRows > 0 && ( - + )} diff --git a/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.js b/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.js index fcf06917283581..63c12894c85d6c 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.js +++ b/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.js @@ -82,6 +82,7 @@ export default function TableCustomized() { )} diff --git a/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.tsx b/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.tsx index 598013069e048b..64cacc74fff3a7 100644 --- a/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.tsx +++ b/docs/data/base/components/table-pagination/TableCustomized/tailwind/index.tsx @@ -86,6 +86,7 @@ export default function TableCustomized() { )} diff --git a/docs/data/base/components/table-pagination/TableUnstyled.js b/docs/data/base/components/table-pagination/TableUnstyled.js index d912e9c1e5f700..f633e5ee23abac 100644 --- a/docs/data/base/components/table-pagination/TableUnstyled.js +++ b/docs/data/base/components/table-pagination/TableUnstyled.js @@ -49,7 +49,7 @@ export default function TableUnstyled() { ))} {emptyRows > 0 && ( - + )} diff --git a/docs/data/base/components/table-pagination/TableUnstyled.tsx b/docs/data/base/components/table-pagination/TableUnstyled.tsx index 0ee21b0a43fb31..7bbd97be29b9fb 100644 --- a/docs/data/base/components/table-pagination/TableUnstyled.tsx +++ b/docs/data/base/components/table-pagination/TableUnstyled.tsx @@ -54,7 +54,7 @@ export default function TableUnstyled() { ))} {emptyRows > 0 && ( - + )} diff --git a/docs/data/joy/components/table/TableSortAndSelection.js b/docs/data/joy/components/table/TableSortAndSelection.js index fe5184e8430df3..2455a21333b4cf 100644 --- a/docs/data/joy/components/table/TableSortAndSelection.js +++ b/docs/data/joy/components/table/TableSortAndSelection.js @@ -401,7 +401,7 @@ export default function TableSortAndSelection() { '--TableRow-hoverBackground': 'transparent', }} > - + )} diff --git a/docs/data/joy/components/table/TableSortAndSelection.tsx b/docs/data/joy/components/table/TableSortAndSelection.tsx index af9c7ddc93376c..f063700890b412 100644 --- a/docs/data/joy/components/table/TableSortAndSelection.tsx +++ b/docs/data/joy/components/table/TableSortAndSelection.tsx @@ -445,7 +445,7 @@ export default function TableSortAndSelection() { } as React.CSSProperties } > - + )}