Merge remote-tracking branch 'upstream/master' into pnpm

mui · Sep 6, 2023 · 7a882ac · 7a882ac
2 parents b667663 + 1a47213
commit 7a882ac
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 76 deletions.
diff --git 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 (
-    <Button
-      component="label"
-      variant="contained"
-      startIcon={<CloudUploadIcon />}
-      href="#file-upload"
-    >
-      Upload a file
+    <Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
+      Upload file
       <VisuallyHiddenInput type="file" />
     </Button>
   );

diff --git 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 (
-    <Button
-      component="label"
-      variant="contained"
-      startIcon={<CloudUploadIcon />}
-      href="#file-upload"
-    >
-      Upload a file
+    <Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
+      Upload file
       <VisuallyHiddenInput type="file" />
     </Button>
   );

diff --git a/docs/data/material/components/buttons/InputFileUpload.tsx.preview b/docs/data/material/components/buttons/InputFileUpload.tsx.preview
@@ -1,9 +1,4 @@
-<Button
-  component="label"
-  variant="contained"
-  startIcon={<CloudUploadIcon />}
-  href="#file-upload"
->
-  Upload a file
+<Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
+  Upload file
   <VisuallyHiddenInput type="file" />
 </Button>
diff --git a/packages/mui-lab/package.json b/packages/mui-lab/package.json
@@ -46,7 +46,7 @@
     "@mui/system": "workspace:^",
     "@mui/types": "workspace:^",
     "@mui/utils": "workspace:^",
-    "@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"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml