[core] Batch small fixes (mui#28381)

dnyall · Sep 16, 2021 · 3dd914c · 3dd914c
1 parent 84eab8c
commit 3dd914c
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -579,9 +579,9 @@ _Jul 14, 2021_
 A big thanks to the 17 contributors who made this release possible. Here are some highlights ✨:
 
 - ✨ We have introduced a new unstyled component: the Switch (#26688) @michaldudak
-  You can find two new versions of the Switch. A component without any styles: [`SwitchUnstyled`](https://mui.com/components/switches/#unstyled-switches), and a hook: [`useSwitch`](https://mui.com/components/switches/#useswitch-hook).
+  You can find two new versions of the Switch. A component without any styles: [`SwitchUnstyled`](https://mui.com/components/switches/#unstyled), and a hook: [`useSwitch`](https://mui.com/components/switches/#useswitch-hook).
 
-  <a href="https://mui.com/components/switches/#unstyled-switches"><img width="832" alt="switch" src="https://user-images.githubusercontent.com/3165635/125192249-236f8a80-e247-11eb-9df9-17d476379a32.png"></a>
+  <a href="https://mui.com/components/switches/#unstyled"><img width="832" alt="switch" src="https://user-images.githubusercontent.com/3165635/125192249-236f8a80-e247-11eb-9df9-17d476379a32.png"></a>
 
   You can follow our progress at https://github.com/mui-org/material-ui/issues/27170.
 

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies within all project spaces, and it also applies when
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at conduct@mui.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@mui.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/docs/pages/about.tsx b/docs/pages/about.tsx
@@ -707,7 +707,7 @@ export default function About() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI: About us"
+        title="About us - MUI"
         description="MUI (formerly Material-UI) started back in 2014 to unify React and Material Design. Today, MUI has grown to become one of the world's most popular React libraries – used by a vibrant community of more than 2M developers in over 180 countries."
       />
       <AppHeader />

diff --git a/docs/pages/blog/2021-q2-update.md b/docs/pages/blog/2021-q2-update.md
@@ -215,7 +215,7 @@ We have the following objectives:
   We want to make the upgrade feel painless.
 - ⚛️ Support [React 18](https://reactjs.org/blog/2021/06/08/the-plan-for-react-18.html). [Sebastian](https://github.com/eps1lon) is part of the React [Working Group](https://github.com/reactwg/react-18/discussions), focusing on making us ready ahead of time.
   We want our most demanding users to feel empowered by MUI, not slowed down by a third-party.
-- 🦴 Migrate more components to `@mui/core`. [Michał](https://github.com/michaldudak) has recently added support for the [Switch](https://mui.com/components/switches/#unstyled-switches).
+- 🦴 Migrate more components to `@mui/core`. [Michał](https://github.com/michaldudak) has recently added support for the [Switch](https://mui.com/components/switches/#unstyled).
   You can follow our progress in the [umbrella issue](https://github.com/mui-org/material-ui/issues/27170).
 - 🌈 Do a proof of concept on supporting a second design system.
   Some of our users (and potential users) dislike Material Design. We will try to make the second design system one that they love!

diff --git a/docs/pages/blog/may-2019-update.md b/docs/pages/blog/may-2019-update.md
@@ -33,6 +33,6 @@ _(We'll do our best, no guarantee!)_
   - A dedicated communication channel giving priority access to MUI engineers.
   - Architecture Reviews. Sit down with a MUI engineer and walk through all aspects of your MUI project and current tech stack or architecture, to identify issues and opportunities for improvement.
 
-You can contact us at advisory@mui.com.
+You can contact us at contact@mui.com.
 
 - ❓ Please upvote our [GitHub issues](https://github.com/mui-org/material-ui/issues) if you want something specific. The number of 👍 helps us to prioritize.
diff --git a/docs/pages/blog/mui-core-v5.md b/docs/pages/blog/mui-core-v5.md
@@ -335,7 +335,7 @@ So far it features:
 - [Modal](/components/modal/#unstyled)
 - [Pagination](/components/pagination/#usepagination)
 - [Slider](/components/slider/#unstyled)
-- [Switch](/components/switches/#unstyled-switches)
+- [Switch](/components/switches/#unstyled)
 
 ```jsx
 const CustomButton = React.forwardRef(function CustomButton(

diff --git a/docs/pages/core.tsx b/docs/pages/core.tsx
@@ -15,7 +15,7 @@ export default function Home() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI: Ready to use components, free forever"
+        title="MUI Core: Ready to use components, free forever"
         description="Get a growing list of components, ready to use, free forever and with accessibility always in mind. We've built the foundational UI blocks for your design system so you don't have to."
         card="/static/social-previews/core-preview.jpg"
       />

diff --git a/docs/pages/design-kits.tsx b/docs/pages/design-kits.tsx
@@ -15,7 +15,7 @@ export default function DesignKits() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI in your favorite design tool."
+        title="MUI in your favorite design tool"
         description="Pick your favorite design tool to enjoy and use MUI components. Boost consistency and facilitate communication when working with developers."
         card="/static/social-previews/designkits-preview.jpg"
       />

diff --git a/docs/pages/pricing.tsx b/docs/pages/pricing.tsx
@@ -18,7 +18,7 @@ export default function Pricing() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI: Pricing"
+        title="Pricing - MUI"
         description="The community edition lets you get going right away. Switch to a commercial plan for more components & premium support."
       />
       <AppHeader />

diff --git a/docs/pages/templates.tsx b/docs/pages/templates.tsx
@@ -14,7 +14,7 @@ export default function Templates() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI: Fully built templates for your app."
+        title="Fully built templates for your app - MUI"
         description="A collection of 4.5 average rating templates, selected and curated by MUI's team of maintainers to get your projects up and running today."
         card="/static/social-previews/templates-preview.jpg"
       />

diff --git a/docs/pages/x.tsx b/docs/pages/x.tsx
@@ -15,7 +15,7 @@ export default function Home() {
   return (
     <BrandingProvider>
       <Head
-        title="MUI: Performant advanced components."
+        title="MUI X: Performant advanced components"
         description="We are kicking it off with the most powerful Data Grid on the market and there's a lot more to come. Build complex applications with our advanced components."
         card="/static/social-previews/x-preview.jpg"
       />

diff --git a/docs/public/_redirects b/docs/public/_redirects
@@ -6,17 +6,14 @@
 
 /size-snapshot https://s3.eu-central-1.amazonaws.com/eps1lon-material-ui/artifacts/master/latest/size-snapshot.json 200
 
-# To add when we finish work on v5
-https://next.material-ui.com/* https://mui.com/:splat 301!
+# To add when we finish work on v6
+# https://next.mui.com/* https://mui.com/:splat 301!
 
 # Support multiple domains
-https://material-ui.dev/* https://mui.com/:splat 301!
-https://v0.material-ui.com/* https://v0.mui.com/:splat 301!
-https://v1.material-ui.com/* https://v1.mui.com/:splat 301!
-https://v3.material-ui.com/* https://v3.mui.com/:splat 301!
-https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
+# TODO add back
+# https://material-ui.com/* https://mui.com/:splat 301!
 
-# Redirect all except the store
+# Redirect all except /store/
 https://material-ui.com https://mui.com 301!
 https://material-ui.com/api-docs/* https://mui.com/api-docs/:splat 301!
 https://material-ui.com/api/* https://mui.com/api/:splat 301!
@@ -167,6 +164,11 @@ https://v3-9-0.mui.com/* https://v3.mui.com/:splat 301!
 /components/slider-styled/ /components/slider/ 301
 /customization/styled/ /system/styled/ 301
 /api/data-grid/x-grid/ /api/data-grid/data-grid-pro/ 301
+https://next.material-ui.com/* https://mui.com/:splat 301!
+https://v0.material-ui.com/* https://v0.mui.com/:splat 301!
+https://v1.material-ui.com/* https://v1.mui.com/:splat 301!
+https://v3.material-ui.com/* https://v3.mui.com/:splat 301!
+https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
 
 # Proxies
 

diff --git a/docs/public/static/manifest.json b/docs/public/static/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MUI",
   "short_name": "MUI",
-  "display": "MUI",
+  "display": "minimal-ui",
   "start_url": "/",
   "theme_color": "#007FFF",
   "background_color": "#ffffff",

diff --git a/docs/src/layouts/AppFooter.tsx b/docs/src/layouts/AppFooter.tsx
@@ -25,7 +25,7 @@ export default function AppFooter() {
           gridAutoColumns: '1fr',
           alignItems: 'center',
           justifyContent: 'space-between',
-          gap: (theme) => theme.spacing(4),
+          gap: 4,
           gridTemplateColumns: { xs: '1fr', sm: '1fr', md: '1fr 1.75fr', lg: '1fr 1fr' },
           gridTemplateRows: 'auto',
           '& a:not(.MuiIconButton-root)': {

diff --git a/docs/src/modules/components/AppNavDrawerItem.js b/docs/src/modules/components/AppNavDrawerItem.js
@@ -124,12 +124,12 @@ const ItemButton = styled(Item, {
         if (theme.palette.mode === 'dark') {
           return alpha(theme.palette.grey[500], 0.5);
         }
-        return theme.palette.grey[500];
+        return theme.palette.grey[600];
       }
       return theme.palette.text.primary;
     })(),
     fontSize: theme.typography.pxToRem(depth === 0 ? 14.5 : 12),
-    fontWeight: depth === 0 ? 600 : 700,
+    fontWeight: depth === 0 ? 500 : 700,
     margin: depth === 0 ? theme.spacing(0.5, 0) : '8px 0 4px',
     '&:hover': {
       backgroundColor: depth === 0 ? '' : alpha(theme.palette.primary.main, 0),
@@ -140,7 +140,7 @@ const ItemButton = styled(Item, {
         if (theme.palette.mode === 'dark') {
           return alpha(theme.palette.grey[500], 0.5);
         }
-        return theme.palette.grey[500];
+        return theme.palette.grey[600];
       })(),
       cursor: depth === 0 ? '' : 'text',
     },

diff --git a/docs/src/pages/components/switches/switches.md b/docs/src/pages/components/switches/switches.md
@@ -57,7 +57,7 @@ You can learn more about this in the [overrides documentation page](/customizati
 
 🎨 If you are looking for inspiration, you can check [MUI Treasury's customization examples](https://mui-treasury.com/styles/switch).
 
-## Unstyled switches
+## Unstyled
 
 The switch also comes with an unstyled version. It's ideal for doing heavy customizations and minimizing bundle size.
 

diff --git a/docs/src/pages/discover-more/roadmap/roadmap.md b/docs/src/pages/discover-more/roadmap/roadmap.md
@@ -29,49 +29,50 @@ Here are the top priorities:
 
 Our GitHub project's roadmap is where you can learn about what features we're working on, what stage they're at, and when we expect to bring them to you:
 
-- [MUI community](https://github.com/mui-org/material-ui/projects/25). This repository focuses on empowering the creation of great design systems with React, as well as providing two ready-to-use themes (Material Design so far, another one coming in the near future).
-- [MUI X](https://github.com/mui-org/material-ui-x/projects/1). This repository focuses on providing advanced React components.
+- [MUI Core](https://github.com/mui-org/material-ui/projects/25).
+  This repository focuses on empowering the creation of great design systems with React, as well as providing two ready to use themes (Material Design so far, another one coming in the near future).
+- [MUI X](https://github.com/mui-org/material-ui-x/projects/1).
+  This repository focuses on providing advanced React components.
+  Some of the features are MIT licensed, others are available under a commercial license.
 
 ## New components
 
-Here are the components we will work on being supported in the MUI ecosystem, no matter if they are part of the [community edition](https://github.com/mui-org/material-ui) (MIT license) or [MUI X](https://github.com/mui-org/material-ui-x), a paid extension for enterprises:
+Here are the components we will work on being supported in the MUI ecosystem:
 
 - 🧪 Close to becoming stable, already released as unstable
 - 🛠 Work in progress, will be or already released as unstable
 - ⏳ Planning to build
-- ⭐️ We will make some of the features available in [MUI X](https://github.com/mui-org/material-ui-x) (parts won't be MIT)
 
-| Name                                                                              | Status |
-| :-------------------------------------------------------------------------------- | ------ |
-| Timeline                                                                          | 🧪     |
-| Tree View                                                                         | 🧪     |
-| Tree View - Multiselect                                                           | 🧪     |
-| Data Grid                                                                         | 🧪     |
-| [Data Grid (Advanced)](/components/data-grid/getting-started/#feature-comparison) | 🧪⭐   |
-| Date Picker                                                                       | 🧪     |
-| Date Range Picker                                                                 | 🧪⭐   |
-| Advanced layout                                                                   | ⏳⭐️  |
-| Carousel                                                                          | ⏳     |
-| Charts                                                                            | ⏳⭐️  |
-| Dropdown                                                                          | ⏳     |
-| Dropzone                                                                          | ⏳     |
-| File Upload                                                                       | ⏳     |
-| Gantt Chart                                                                       | ⏳⭐️  |
-| Gauge                                                                             | ⏳⭐️  |
-| Image                                                                             | ⏳     |
-| Masonry                                                                           | ⏳     |
-| Navbar                                                                            | ⏳     |
-| NProgress                                                                         | ⏳     |
-| Nested Menu                                                                       | ⏳     |
-| Numeric Input                                                                     | ⏳     |
-| Rich Text Editor                                                                  | ⏳⭐️  |
-| Scheduler                                                                         | ⏳⭐️  |
-| Scrollspy                                                                         | ⏳     |
-| Sparkline                                                                         | ⏳⭐️  |
-| Window Splitter                                                                   | ⏳⭐️  |
-| Tree Select                                                                       | ⏳⭐️  |
-| Tree View - Checkbox                                                              | ⏳⭐️  |
-| Tree View - Drag & Drop                                                           | ⏳⭐️  |
-| Tree View - Virtualization                                                        | ⏳⭐️  |
+| Name                       | Product  | Status |
+| :------------------------- | -------- | ------ |
+| Advanced layout            | MUI X    | ⏳     |
+| Carousel                   | MUI X    | ⏳     |
+| Charts                     | MUI X    | ⏳     |
+| Data Grid                  | MUI X    | 🧪     |
+| Date Picker                | MUI X    | 🧪     |
+| Date Range Picker          | MUI X    | 🧪     |
+| Dropdown                   | MUI Core | ⏳     |
+| Dropzone                   | MUI X    | ⏳     |
+| File Upload                | MUI X    | ⏳     |
+| Gantt Chart                | MUI X    | ⏳     |
+| Gauge                      | MUI X    | ⏳     |
+| Image                      | MUI Core | ⏳     |
+| Masonry                    | MUI Core | 🧪     |
+| Navbar                     | MUI Core | ⏳     |
+| Nested Menu                | MUI X    | ⏳     |
+| NProgress                  | MUI Core | ⏳     |
+| Numeric Input              | MUI Core | ⏳     |
+| Rich Text Editor           | MUI X    | ⏳     |
+| Scheduler                  | MUI X    | ⏳     |
+| Scrollspy                  | MUI Core | ⏳     |
+| Sparkline                  | MUI X    | ⏳     |
+| Timeline                   | MUI Core | 🧪     |
+| Tree Select                | MUI X    | ⏳     |
+| Tree View                  | MUI X    | 🧪     |
+| Tree View - Checkbox       | MUI X    | ⏳     |
+| Tree View - Drag & Drop    | MUI X    | ⏳     |
+| Tree View - Multiselect    | MUI X    | 🧪     |
+| Tree View - Virtualization | MUI X    | ⏳     |
+| Window Splitter            | MUI X    | ⏳     |
 
 > ⚠️ **Disclaimer**: We operate in a dynamic environment, and things are subject to change. The information provided is intended to outline the general framework direction, for informational purposes only. We may decide to add or remove new items at any time, depending on our capability to deliver while meeting our quality standards. The development, releases, and timing of any features or functionality remains at the sole discretion of MUI. The roadmap does not represent a commitment, obligation, or promise to deliver at any time.
diff --git a/docs/src/pages/system/the-sx-prop/Example.js b/docs/src/pages/system/the-sx-prop/Example.js
@@ -17,8 +17,7 @@ export default function Example() {
       <Box sx={{ color: 'text.primary', fontSize: 34, fontWeight: 'medium' }}>
         98.3 K
       </Box>
-      <Box
-        component={TrendingUpIcon}
+      <TrendingUpIcon
         sx={{ color: 'success.dark', fontSize: 16, verticalAlign: 'sub' }}
       />
       <Box

diff --git a/docs/src/pages/system/the-sx-prop/Example.tsx b/docs/src/pages/system/the-sx-prop/Example.tsx
@@ -17,8 +17,7 @@ export default function Example() {
       <Box sx={{ color: 'text.primary', fontSize: 34, fontWeight: 'medium' }}>
         98.3 K
       </Box>
-      <Box
-        component={TrendingUpIcon}
+      <TrendingUpIcon
         sx={{ color: 'success.dark', fontSize: 16, verticalAlign: 'sub' }}
       />
       <Box