Skip to content

Commit

Permalink
Merge branch 'master' into docs/base-select-tailwind-plain-css-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova committed Jun 28, 2023
2 parents 130419c + 50521a1 commit 475672b
Show file tree
Hide file tree
Showing 338 changed files with 1,115 additions and 715 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module.exports = {
'eslint-plugin-material-ui',
'eslint-plugin-react-hooks',
'@typescript-eslint/eslint-plugin',
'filenames',
],
settings: {
'import/resolver': {
Expand Down Expand Up @@ -297,6 +298,18 @@ module.exports = {
'no-console': 'off',
},
},
{
files: ['docs/data/**/*.tsx'],
excludedFiles: [
'docs/data/joy/getting-started/templates/**/*.tsx',
'docs/data/**/css/*.tsx',
'docs/data/**/system/*.tsx',
'docs/data/**/tailwind/*.tsx',
],
rules: {
'filenames/match-exported': ['error'],
},
},
{
files: ['*.d.ts'],
rules: {
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/priority-support-validation-prompt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- name: Find Comment
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
uses: peter-evans/find-comment@a54c31d7fa095754bfef525c0c8e5e5674c4b4b1 # v2
id: findComment
with:
issue-number: ${{ github.event.pull_request.number }}
issue-number: ${{ github.event.issue.number }}
comment-author: 'github-actions[bot]'
body-includes: You have created a priority support request

Expand All @@ -44,3 +44,4 @@ jobs:
comment-id: ${{ steps.findComment.outputs.comment-id }}
body: |
Thank you for verifying your support key 🔑, your SLA starts now.
edit-mode: replace
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
with:
results_file: results.sarif
results_format: sarif
Expand Down
89 changes: 85 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,86 @@
# [Versions](https://mui.com/versions/)

## 5.13.6

_Jun 21, 2023_

A big thanks to the 25 contributors who made this release possible. Here are some highlights ✨:

- 💫 Added [Slider](https://mui.com/material-ui/react-slider/#material-you-version) component using the new Material You design language (#37520) @DiegoAndai.
- 📚 Added [examples](https://github.com/mui/material-ui/tree/master/examples/material-next-app-router-ts) showcasing how you can use Material UI with next.js's app directory (#37315) @smo043

### `@mui/[email protected]`

- &#8203;<!-- 45 -->[Autocomplete] Fixed autocomplete's existing option selection (#37012) @bencevoros
- &#8203;<!-- 44 -->[Autocomplete] Add hint demos to Material UI and Joy UI docs (#37496) @sai6855
- &#8203;<!-- 13 -->[Masonry] Fix ResizeObserver loop limit exceeded error (#37208) @hbjORbj
- &#8203;<!-- 11 -->[Tooltip][material] Improve warning when Tooltip receives string child (#37530) @DiegoAndai
- &#8203;<!-- 10 -->[Modal] Add missing members to ModalOwnProps (#37568) @ivp-dev
- &#8203;<!-- 09 -->[Slider] Arrow keys control does not work with float numbers (#37071) @gitstart
- &#8203;<!-- 08 -->[SvgIcon] allow `svg` as a child (#37231) @siriwatknp
- &#8203;<!-- 07 -->[Timeline] Add alternate reverse position (#37311) @abhinavkmrru
- &#8203;<!-- 06 -->[Tooltip] Fix type of sx prop in `slotProps` (#37550) @SuperKXT
- &#8203;<!-- 05 -->[TouchRipple] perf: avoid calling `clearTimeout()` (#37512) @romgrk

### `@mui/[email protected]`

- &#8203;<!-- 12 -->[Material You] Add Slider component with Material You design (#37520) @DiegoAndai

### `@mui/[email protected]`

- &#8203;<!-- 37 -->[ButtonGroup][joy] Missing border when spacing is more than zero (#37577) @siriwatknp
- &#8203;<!-- 36 -->[CardActions][joy] Add `CardActions` component (#37441) @siriwatknp
- &#8203;<!-- 14 -->[Menu][joy] Fix closing of `Menu` in demos (#36917) @sai6855

### `@mui/[email protected]`

- &#8203;<!-- 39 -->[Menu][base] Add the resetHighlight action (#37392) @michaldudak
- &#8203;<!-- 38 -->[Select][base] Expose the `areOptionsEqual` prop (#37615) @michaldudak

### `@mui/[email protected]`

- &#8203;<!-- 04 -->[utils] Allow nested imports in @mui/utils to speed up build (#37586) @flaviendelangle

### Docs

- &#8203;<!-- 43 -->[docs][base] Improve Base UI all components images (#37590) @danilo-leal
- &#8203;<!-- 42 -->[docs][base] Add pages for coming soon components (#37575) @danilo-leal
- &#8203;<!-- 41 -->[docs][base] Add a Snackbar introduction demo (#37602) @danilo-leal
- &#8203;<!-- 40 -->[docs][base] Add page for all Base UI components (#37536) @danilo-leal
- &#8203;<!-- 33 -->[docs] Fix scrollbar on snackbar page (#37657) @oliviertassinari
- &#8203;<!-- 32 -->[docs] Switch order of snackbar buttons in demos (#37389) @Primajin
- &#8203;<!-- 31 -->[docs] Add support for Tailwind CSS and plain CSS demos (#37319) @mnajdova
- &#8203;<!-- 30 -->[docs] Tree view color fix for dark mode in Gmail example (#37051) @PunitSoniME
- &#8203;<!-- 29 -->[docs] Inline the Base UI demo (#37603) @oliviertassinari
- &#8203;<!-- 28 -->[docs] Fix typo in themed components page (#37598) @vinayr
- &#8203;<!-- 27 -->[docs] Fix render inline code in CSS description generation (#37448) @alexfauquette
- &#8203;<!-- 26 -->[docs] Add styles to styled argument list (#37558) @DiegoAndai
- &#8203;<!-- 25 -->[docs] Improve awkward wording in READMEs of example projects (#37110) @DIWAKARKASHYAP
- &#8203;<!-- 24 -->[docs] Fix small base -> base-ui migration issue (#37594) @oliviertassinari
- &#8203;<!-- 23 -->[docs] Fix GitHub typo (#37578) @oliviertassinari
- &#8203;<!-- 22 -->[docs] Improve release guide (#37547) @DiegoAndai
- &#8203;<!-- 21 -->[docs] Review fixes to the Material UI's "Example projects" page (#37444) @danilo-leal
- &#8203;<!-- 17 -->[docs][joy] Add a messages template (#37546) @sernstberger
- &#8203;<!-- 16 -->[docs][joy] Add pages for coming soon Joy UI components (#36920) @danilo-leal
- &#8203;<!-- 15 -->[docs][joy] Add design and consistency tweaks to the Playground (#37580) @danilo-leal
- &#8203;<!-- 37 -->[docs] Add and revise Base UI + Create React App examples (#36825) @samuelsycamore
- &#8203;<!-- 20 -->[docs-infra] Fix demos border radius (#37658) @oliviertassinari
- &#8203;<!-- 19 -->[docs-infra] Add analyticsTags to Algolia (#37600) @Janpot
- &#8203;<!-- 18 -->[docs-infra] Simplify product id handling (#37593) @oliviertassinari
- &#8203;<!-- 35 -->[CHANGELOG] Add missing release date for v5.13.5 @oliviertassinari
- &#8203;<!-- 16 -->[examples] Shell command fix in the readme file of material-next-app-router-ts example (#37675) @bablukpik
- &#8203;<!-- 15 -->[examples] Next.js v13 app router with Material UI (#37315) @smo043

### Core

- &#8203;<!-- 34 -->[core] Update to Node.js v18 for `test-dev` CI (#37604) @ZeeshanTamboli
- &#8203;<!-- 39 -->[core] Add priority support issue template (#37671) @DanailH
- &#8203;<!-- 03 -->[website] Update roadmap page (#37587) @cherniavskii
- &#8203;<!-- 02 -->[website] Add CSP to limit iframes to self @oliviertassinari
- &#8203;<!-- 01 -->[website] Link mui-x Stack Overflow in footer link (#37509) @richbustos

All contributors of this release in alphabetical order: @abhinavkmrru, @alexfauquette, @bencevoros, @cherniavskii, @danilo-leal, @DiegoAndai, @DIWAKARKASHYAP, @flaviendelangle, @gitstart, @hbjORbj, @ivp-dev, @Janpot, @michaldudak, @mnajdova, @oliviertassinari, @Primajin, @PunitSoniME, @richbustos, @romgrk, @sai6855, @sernstberger, @siriwatknp, @SuperKXT, @vinayr, @ZeeshanTamboli

## 5.13.5

_Jun 12, 2023_
Expand Down Expand Up @@ -9777,7 +9858,7 @@ A big thanks to the 34 contributors who made this release possible. Here are som

While the source code is currently hosted in the [main repository](https://github.com/mui/material-ui), we might move it to the [x repository](https://github.com/mui/mui-x) in the future, depending on what is easier for the commercial date range picker. The date picker will stay open source no matter what.

- 📚 Revamp the documentation for [the system](https://mui.com/system/getting-started/overview/). The System contains CSS utilities. The documentation now promotes the use of the `sx` prop. It's ideal for adding one-off styles, e.g. padding, but when pushed to its limits, it can be used to implement quickly a complete page.
- 📚 Revamp the documentation for [the system](https://mui.com/system/getting-started/). The System contains CSS utilities. The documentation now promotes the use of the `sx` prop. It's ideal for adding one-off styles, e.g. padding, but when pushed to its limits, it can be used to implement quickly a complete page.
- 👩‍🎨 Upgrade emotion to v11 (#23007) @mnajdova.
- And many more 🐛 bug fixes and 📚 improvements.

Expand Down Expand Up @@ -10179,7 +10260,7 @@ Here are some highlights ✨:
If you target IE11, you need to use the new bundle (`legacy`). We are treating IE11 as a second class-citizen, which is a continuation of the direction taken in #22873.

- 🚀 Improve the internal benchmark suite (#22923, #23058) @mnajdova.
This was a prerequisite step to improve the [system](https://mui.com/system/getting-started/overview/). We needed to be able to measure performance. After #22945, we have measured that the `Box` component is x3 faster in v5-alpha compared to v4.
This was a prerequisite step to improve the [system](https://mui.com/system/getting-started/). We needed to be able to measure performance. After #22945, we have measured that the `Box` component is x3 faster in v5-alpha compared to v4.
- ✏️ A new blog post: [Q3 2020 Update](https://mui.com/blog/2020-q3-update/) (#23055) @oliviertassinari.
- 🐙 Migrate more tests to react-testing-library @deiga, @Morteza-Jenabzadeh, @nicholas-l.
- And many more 🐛 bug fixes and 📚 improvements.
Expand Down Expand Up @@ -10520,7 +10601,7 @@ Here are some highlights ✨:

The new styling solution saves 2kB gzipped in the bundle compared to JSS, and about 14 kB gzipped if you were already using emotion or styled-components.

Last but not least, the change allows us to take advantage dynamic style props. We will use them for dynamic color props, variant props, and new style props (an improved [system](https://mui.com/system/getting-started/overview/)).
Last but not least, the change allows us to take advantage dynamic style props. We will use them for dynamic color props, variant props, and new style props (an improved [system](https://mui.com/system/getting-started/)).

This change has been in our roadmap for more than a year.
We announced it in the [v4 release blog post](https://mui.com/blog/material-ui-v4-is-out/) as a direction v5 would take.
Expand Down Expand Up @@ -11773,7 +11854,7 @@ A big thanks to the 33 contributors who made this release possible. Here are som
/>
```

- [Typography] Replace the `srOnly` prop so as to not duplicate the capabilities of [System](https://mui.com/system/getting-started/overview/) (#21413) @mnajdova.
- [Typography] Replace the `srOnly` prop so as to not duplicate the capabilities of [System](https://mui.com/system/getting-started/) (#21413) @mnajdova.

```diff
-import Typography from '@material-ui/core/Typography';
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

**MUI Core** contains foundational React UI component libraries for shipping new features faster.

- [_Material UI_](https://mui.com/material-ui/getting-started/overview/) is a comprehensive library of components that features our implementation of Google's [Material Design](https://m2.material.io/design/introduction/) system.
- [_Material UI_](https://mui.com/material-ui/getting-started/) is a comprehensive library of components that features our implementation of Google's [Material Design](https://m2.material.io/design/introduction/) system.

- [_Joy UI_](https://mui.com/joy-ui/getting-started/overview/) is a beautifully designed library of React UI components.
- [_Joy UI_](https://mui.com/joy-ui/getting-started/) is a beautifully designed library of React UI components.

- [_Base UI_](https://mui.com/base-ui/getting-started/overview/) is our library of "unstyled" components and low-level hooks. With Base, you gain complete control over your app's CSS and accessibility features.
- [_Base UI_](https://mui.com/base-ui/getting-started/) is our library of "unstyled" components and low-level hooks. With Base, you gain complete control over your app's CSS and accessibility features.

- [_MUI System_](https://mui.com/system/getting-started/overview/) is a collection of CSS utilities to help you rapidly lay out custom designs.
- [_MUI System_](https://mui.com/system/getting-started/) is a collection of CSS utilities to help you rapidly lay out custom designs.

<div align="center">

Expand Down Expand Up @@ -177,10 +177,10 @@ Our documentation features [a collection of example projects using Material UI](

## Documentation

- [Material UI](https://mui.com/material-ui/getting-started/overview/)
- [Joy UI](https://mui.com/joy-ui/getting-started/overview/)
- [Base UI](https://mui.com/base-ui/getting-started/overview/)
- [MUI System](https://mui.com/system/getting-started/overview/)
- [Material UI](https://mui.com/material-ui/getting-started/)
- [Joy UI](https://mui.com/joy-ui/getting-started/)
- [Base UI](https://mui.com/base-ui/getting-started/)
- [MUI System](https://mui.com/system/getting-started/)

## Premium themes

Expand Down
8 changes: 4 additions & 4 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mdx-js/react": "^2.3.0",
"@mui/material": "^5.13.5",
"@mui/material": "^5.13.6",
"@mui/styles": "^5.13.2",
"@mui/system": "^5.13.5",
"@mui/system": "^5.13.6",
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"playwright": "^1.35.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-jss": "^10.10.0",
"react-redux": "^8.1.0",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"serve-handler": "^6.1.5",
"styled-components": "^5.3.11",
"theme-ui": "^0.16.0",
"webpack": "^5.85.0",
"webpack": "^5.88.0",
"webpack-cli": "^4.10.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const CustomAutocomplete = React.forwardRef(function CustomAutocomplete(props, r
);
});

export default function UseAutocomplete() {
export default function UseAutocompletePopper() {
const [value, setValue] = React.useState(null);

const handleChange = (event, newValue) => setValue(newValue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const CustomAutocomplete = React.forwardRef(function CustomAutocomplete(
);
});

export default function UseAutocomplete() {
export default function UseAutocompletePopper() {
const [value, setValue] = React.useState<(typeof top100Films)[number] | null>(
null,
);
Expand Down
8 changes: 7 additions & 1 deletion docs/data/base/components/input/InputAdornments.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ export default function InputAdornments() {
};

return (
<Box sx={{ display: 'flex', '& > * + *': { ml: 1 } }}>
<Box
sx={{
display: 'flex',
flexDirection: { xs: 'column', sm: 'row' },
gap: 2,
}}
>
<CustomInput
id="outlined-start-adornment"
startAdornment={<InputAdornment>kg</InputAdornment>}
Expand Down
8 changes: 7 additions & 1 deletion docs/data/base/components/input/InputAdornments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ export default function InputAdornments() {
};

return (
<Box sx={{ display: 'flex', '& > * + *': { ml: 1 } }}>
<Box
sx={{
display: 'flex',
flexDirection: { xs: 'column', sm: 'row' },
gap: 2,
}}
>
<CustomInput
id="outlined-start-adornment"
startAdornment={<InputAdornment>kg</InputAdornment>}
Expand Down
85 changes: 85 additions & 0 deletions docs/data/base/components/input/UnstyledInputBasic/css/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import * as React from 'react';
import Input from '@mui/base/Input';
import { useTheme } from '@mui/system';

export default function UnstyledInputBasic() {
return (
<React.Fragment>
<Input
slotProps={{ input: { className: 'CustomInput' } }}
aria-label="Demo input"
placeholder="Type something…"
/>
<Styles />
</React.Fragment>
);
}

const cyan = {
50: '#E9F8FC',
100: '#BDEBF4',
200: '#99D8E5',
300: '#66BACC',
400: '#1F94AD',
500: '#0D5463',
600: '#094855',
700: '#063C47',
800: '#043039',
900: '#022127',
};

const grey = {
50: '#F3F6F9',
100: '#E7EBF0',
200: '#E0E3E7',
300: '#CDD2D7',
400: '#B2BAC2',
500: '#A0AAB4',
600: '#6F7E8C',
700: '#3E5060',
800: '#2D3843',
900: '#1A2027',
};

function useIsDarkMode() {
const theme = useTheme();
return theme.palette.mode === 'dark';
}

function Styles() {
// Replace this with your app logic for determining dark mode
const isDarkMode = useIsDarkMode();

return (
<style>
{`
.CustomInput {
width: 320px;
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
font-weight: 400;
line-height: 1.5;
padding: 12px;
border-radius: 12px;
color: ${isDarkMode ? grey[300] : grey[900]};
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 2px ${isDarkMode ? grey[900] : grey[50]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[500] : cyan[200]};
}
&:focus-visible {
outline: 0;
}
}
`}
</style>
);
}
Loading

0 comments on commit 475672b

Please sign in to comment.