Skip to content

Commit

Permalink
Merge branch 'master' into swipe-ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova committed Jan 17, 2023
2 parents 6445cd4 + b9423b6 commit 20877e1
Show file tree
Hide file tree
Showing 327 changed files with 5,688 additions and 4,171 deletions.
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ jobs:
<<: *defaults
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -397,7 +397,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -412,7 +412,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -439,7 +439,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -493,7 +493,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -517,7 +517,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -541,7 +541,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -565,7 +565,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -589,7 +589,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -613,7 +613,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -641,7 +641,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -743,7 +743,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.1-focal
- image: mcr.microsoft.com/playwright:v1.29.2-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@4b3fd9198891cf782111537728021ffc6ae722ba # v1.1.37
uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/support-stackoverflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contents: read
issues: write
steps:
- uses: dessant/support-requests@876a4de3922dd57434a451e58ad679f986c5da97 # v2.1.2
- uses: dessant/support-requests@b1303caf4438e66dea1130aa4c30189dc28e690d # v3.0.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Label used to mark issues as support requests
Expand Down
85 changes: 85 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,90 @@
# [Versions](https://mui.com/versions/)

## 5.11.4

<!-- generated comparing v5.11.3..master -->

_Jan 9, 2023_

A big thanks to the 14 contributors who made this release possible.
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.

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

- [Autocomplete] Add index to renderOption's AutocompleteRenderOptionState (#35578) @CowDotDev
- [Autocomplete] Fix grammar in console.error in `useAutocomplete` (#35723) @hamirmahal
- [Modal] Fix can't override Backdrop Props using new Slots API (#35140) @ZeeshanTamboli
- [Select] Revert "Update `renderValue` prop's TypeScript type (#34177)" (#35733) @michaldudak
- [Tabs] Throw error only if individual `Tab` is hidden, not the whole `Tabs` (#34026) @Ryczko
- [TextField] Improve WCAG 2.4.7 with error={true} (#35687) @oliviertassinari
- [Tooltip] Remove `data-foo` attribute (#35736) @koolskateguy89

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

- [Autocomplete][joy] Specify `type` attribute for popup indicator (#35648) @hbjORbj
- [Joy] Miscellaneous improvements (#35769) @siriwatknp
- [Joy] Improve `onKeyDown` event handler for demo (#35642) @hbjORbj

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

- [Portal][base] Convert code to TypeScript (#35657) @sai6855

### Docs

- [docs] Revise and expand Joy UI Button doc (#35737) @samuelsycamore
- [docs] Document the workaround for crashing a translated page (#35720) @michaldudak
- [docs] Fix API page for `MenuItem` to list all valid props (#35561) @mnajdova
- [docs] Fix ad exception in Joy UI (#35685) @oliviertassinari
- [docs] Fix content wider than screen regression @oliviertassinari
- [examples] Add `Vite.js with TypeScript` example (#35683) @miha53cevic

### Core

- [core] Close 2022 developer survey @oliviertassinari
- [core] Fix the product license reference name (#35703) @oliviertassinari
- [core] Use TypeScript AST instead of TTP for component doc building (#35379) @flaviendelangle
- [test] Always use & for nesting styles (#35702) @oliviertassinari
- [website] Improve Lead Designer role description (#35684) @oliviertassinari

All contributors of this release in alphabetical order: @CowDotDev, @flaviendelangle, @hamirmahal, @hbjORbj, @koolskateguy89, @michaldudak, @miha53cevic, @mnajdova, @oliviertassinari, @Ryczko, @sai6855, @samuelsycamore, @siriwatknp, @ZeeshanTamboli

## 5.11.3

<!-- generated comparing v5.11.2..master -->

_Jan 2, 2023_

A big thanks to the 6 contributors who made this release possible.
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.

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

- &#8203;<!-- 02 -->[Select] Update `renderValue` prop's TypeScript type (#34177) @ZeeshanTamboli

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

- &#8203;<!-- 14 -->[Autocomplete][joy] Export component (#35647) @mbranch

### Docs

- &#8203;<!-- 13 -->[blog] Fix handling of markdown links (#35628) @oliviertassinari
- &#8203;<!-- 09 -->[docs] Fix demo code selection through copy shortcut key on Firefox browser (#35670) @ZeeshanTamboli
- &#8203;<!-- 08 -->[docs] Fix layout shift when streaming the page (#35627) @oliviertassinari
- &#8203;<!-- 07 -->[docs] Fix switch name to reflect the color (#35052) @rjhcnf
- &#8203;<!-- 06 -->[docs] Fix anchor link in the card's docs and fix a typo (#35634) @ZeeshanTamboli
- &#8203;<!-- 05 -->[docs] Fix layout shift with modal (#35591) @oliviertassinari
- &#8203;<!-- 04 -->[Joy][docs] Add documentation for `Input` component (#35482) @hbjORbj
- &#8203;<!-- 03 -->[docs][joy] Improved readability on theme tokens page (#35639) @badalsaibo

### Core

- &#8203;<!-- 12 -->[core] Disable prefetch of footer links @oliviertassinari
- &#8203;<!-- 11 -->[core] A few SEO fixes (#35672) @oliviertassinari
- &#8203;<!-- 10 -->[core] Remove need for scopePathnames (#35584) @oliviertassinari
- &#8203;<!-- 01 -->[test] Fix Algolia noisy lvl1 anchor (#35686) @oliviertassinari

All contributors of this release in alphabetical order: @badalsaibo, @hbjORbj, @mbranch, @oliviertassinari, @rjhcnf, @ZeeshanTamboli

## 5.11.2

<!-- generated comparing v5.11.1..master -->
Expand Down
8 changes: 4 additions & 4 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"server:system": "cd ../ && cross-env NODE_ENV=production BABEL_ENV=benchmark babel-node benchmark/server/scenarios/system.js --inspect=0.0.0.0:9229 --extensions \".tsx,.ts,.js\""
},
"dependencies": {
"@chakra-ui/system": "^2.3.5",
"@chakra-ui/system": "^2.3.8",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mdx-js/react": "^2.2.1",
"@mui/material": "^5.11.2",
"@mui/material": "^5.11.4",
"@mui/styles": "^5.11.2",
"@mui/system": "^5.11.2",
"@mui/system": "^5.11.4",
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"playwright": "^1.29.1",
"playwright": "^1.29.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions docs/data/base/components/button/button.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/button/

<p class="description">Buttons let users take actions and make choices with a single tap.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}

## Introduction

The Unstyled Button component replaces the native HTML `<button>` element, and offers expanded options for styling and accessibility.

{{"demo": "UnstyledButtonIntroduction.tsx", "defaultCodeOpen": false, "bg": "gradient"}}

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}

## Component

### Usage
Expand Down
16 changes: 5 additions & 11 deletions docs/data/joy/components/aspect-ratio/BasicRatio.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import * as React from 'react';
import AspectRatio from '@mui/joy/AspectRatio';
import Sheet from '@mui/joy/Sheet';
import Typography from '@mui/joy/Typography';

export default function BasicRatio() {
return (
<Sheet
variant="outlined"
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
>
<AspectRatio>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
</Sheet>
<AspectRatio sx={{ width: 300 }}>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
);
}
16 changes: 5 additions & 11 deletions docs/data/joy/components/aspect-ratio/BasicRatio.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import * as React from 'react';
import AspectRatio from '@mui/joy/AspectRatio';
import Sheet from '@mui/joy/Sheet';
import Typography from '@mui/joy/Typography';

export default function BasicRatio() {
return (
<Sheet
variant="outlined"
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
>
<AspectRatio>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
</Sheet>
<AspectRatio sx={{ width: 300 }}>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
);
}
15 changes: 5 additions & 10 deletions docs/data/joy/components/aspect-ratio/BasicRatio.tsx.preview
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<Sheet
variant="outlined"
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
>
<AspectRatio>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
</Sheet>
<AspectRatio sx={{ width: 300 }}>
<Typography level="h2" component="div">
16/9
</Typography>
</AspectRatio>
20 changes: 11 additions & 9 deletions docs/data/joy/components/aspect-ratio/CustomRatio.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import * as React from 'react';
import AspectRatio from '@mui/joy/AspectRatio';
import Sheet from '@mui/joy/Sheet';
import Typography from '@mui/joy/Typography';

export default function CustomRatio() {
return (
<Sheet
<AspectRatio
variant="outlined"
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
ratio="4/3"
sx={{
width: 300,
bgcolor: 'background.level2',
borderRadius: 'md',
}}
>
<AspectRatio ratio="4/3">
<Typography level="h2" component="div">
4/3
</Typography>
</AspectRatio>
</Sheet>
<Typography level="h2" component="div">
4/3
</Typography>
</AspectRatio>
);
}
20 changes: 11 additions & 9 deletions docs/data/joy/components/aspect-ratio/CustomRatio.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import * as React from 'react';
import AspectRatio from '@mui/joy/AspectRatio';
import Sheet from '@mui/joy/Sheet';
import Typography from '@mui/joy/Typography';

export default function CustomRatio() {
return (
<Sheet
<AspectRatio
variant="outlined"
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
ratio="4/3"
sx={{
width: 300,
bgcolor: 'background.level2',
borderRadius: 'md',
}}
>
<AspectRatio ratio="4/3">
<Typography level="h2" component="div">
4/3
</Typography>
</AspectRatio>
</Sheet>
<Typography level="h2" component="div">
4/3
</Typography>
</AspectRatio>
);
}
Loading

0 comments on commit 20877e1

Please sign in to comment.