Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mui/material-ui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a1e30390da62019e5769e398f4cbc9f8892d8f9a
Choose a base ref
...
head repository: mui/material-ui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e9d8fa07e1ff979bcaf92837b131cd9e292f0161
Choose a head ref

Commits on Dec 20, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bc25110 View commit details
  2. [Modal] Convert code to typescript (#34793)

    Co-authored-by: Levent Deniz <levent.deniz@check24.de>
    Co-authored-by: Michał Dudak <michal@dudak.me>
    3 people authored Dec 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    48fb870 View commit details
  3. [FocusTrap] Convert focus trap to typescript (#35005)

    Signed-off-by: Trizotti <gootrizotti@gmail.com>
    Co-authored-by: Michał Dudak <michal.dudak@gmail.com>
    trizotti and michaldudak authored Dec 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8f0d81d View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ba0ba65 View commit details
  5. [Popper] Convert code to typescript (#34771)

    Co-authored-by: Michał Dudak <michal@dudak.me>
    danhuynhdev and michaldudak authored Dec 20, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5b2583a View commit details

Commits on Dec 21, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e0e0d69 View commit details
  2. [docs] Fix typo in Progress docs (#35553)

    Signed-off-by: Jason Sturges <jason@jasonsturges.com>
    jasonsturges authored Dec 21, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    44c0f5d View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fa62bf3 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1c4cf6b View commit details

Commits on Dec 22, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b8c0d39 View commit details
  2. [SelectInput] Update menu to use select wrapper as anchor (#34229)

    Co-authored-by: Michał Dudak <michal@dudak.me>
    EduardoSCosta and michaldudak authored Dec 22, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    94f8c9f View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a04f578 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    defd28e View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5b423bd View commit details
  6. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3352b2c View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    727e06e View commit details
  8. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bcb6d57 View commit details

Commits on Dec 23, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    68ef353 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    648e121 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b533db2 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c166d8b View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e33b2f6 View commit details
  6. [TableCell] Fix scope prop to be not set when a data cell is render…

    …ed within a table head (#35559)
    sai6855 authored Dec 23, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f4cb745 View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0aca7e5 View commit details
  8. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e984fc1 View commit details
  9. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7710cdd View commit details
  10. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    94bc99f View commit details

Commits on Dec 25, 2022

  1. Verified

    This commit was signed with the committer’s verified signature.
    oliviertassinari Olivier Tassinari
    Copy the full SHA
    2093d62 View commit details

Commits on Dec 26, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5344adb View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9c67e77 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b9266a7 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    568471f View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d365cf0 View commit details
  6. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0c0072d View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e225d43 View commit details
  8. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    504f1cc View commit details
  9. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b082015 View commit details
  10. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ace9a1f View commit details
  11. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    88f7870 View commit details
  12. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e7faa07 View commit details
  13. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fdbdcbc View commit details
  14. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4464791 View commit details
  15. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a79e3c View commit details
  16. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a09cc9e View commit details
  17. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b1396f1 View commit details
  18. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    740c278 View commit details
  19. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    779a524 View commit details
  20. Bump babel (#35609)

    renovate[bot] authored Dec 26, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    622cc96 View commit details
  21. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a2436fc View commit details
  22. [release] v5.11.2 (#35633)

    mnajdova authored Dec 26, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e9d8fa0 View commit details
Showing 382 changed files with 7,295 additions and 2,032 deletions.
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -348,7 +348,7 @@ jobs:
<<: *defaults
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -378,7 +378,7 @@ jobs:
test_e2e:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -397,7 +397,7 @@ jobs:
test_e2e_website:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -412,7 +412,7 @@ jobs:
test_profile:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -439,7 +439,7 @@ jobs:
test_regressions:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -493,7 +493,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -517,7 +517,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -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.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -565,7 +565,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -589,7 +589,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -613,7 +613,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -641,7 +641,7 @@ jobs:
<<: *defaults
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
@@ -743,7 +743,7 @@ jobs:
test_benchmark:
<<: *defaults
docker:
- image: mcr.microsoft.com/playwright:v1.29.0-focal
- image: mcr.microsoft.com/playwright:v1.29.1-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
2 changes: 1 addition & 1 deletion .github/workflows/ci-check.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow is a workaround for ci.yml to bypass the github checks
#
# Ref: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
name: CI
name: CI Check

on:
push:
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@937ffa90d79c7d720498178154ad4c7ba1e4ad8c # v2.1.0
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
with:
results_file: results.sarif
results_format: sarif
71 changes: 71 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,76 @@
# [Versions](https://mui.com/versions/)

## 5.11.2

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

_Dec 26, 2022_

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

- ⚙️ Several MUI Base components were converted to TypeScript by @trizotti, @leventdeniz and @danhuynhdev (#35005, #34793, #34771)
- Many other 🐛 bug fixes abd 📚 documentation improvements.

### `@mui/material@5.11.2`

- &#8203;<!-- 10 -->[l10n] Add displayed rows label to `faIR` locale (#35587) @hootan-rocky
- &#8203;<!-- 09 -->[l10n] Add Kurdish (Kurmanji) locale (#32508) @JagarYousef
- &#8203;<!-- 06 -->[Select] Accept non-component children (#33530) @boutahlilsoufiane
- &#8203;<!-- 05 -->[SelectInput] Update menu to use select wrapper as anchor (#34229) @EduardoSCosta
- &#8203;<!-- 03 -->[TableCell] Fix `scope` prop to be not set when a data cell is rendered within a table head (#35559) @sai6855

### `@mui/utils@5.11.2`

- &#8203;<!-- 02 -->[utils] `mergedeep` deeply clones source key if it's an object (#35364) @sldk-yuri

### `@mui/base@5.0.0-alpha.112`

- &#8203;<!-- 16 -->[FocusTrap][base] Convert code to TypeScript (#35005) @trizotti
- &#8203;<!-- 08 -->[Modal][base] Convert code to TypeScript (#34793) @leventdeniz
- &#8203;<!-- 07 -->[Popper][base] Convert code to TypeScript (#34771) @danhuynhdev
- &#8203;<!-- 04 -->[Slider] Exclude `isRtl` from Material UI's Slider props (#35564) @michaldudak

### `@mui/joy@5.0.0-alpha.60`

- &#8203;<!-- 15 -->[Joy] Fix radius adjustment (#35629) @siriwatknp
- &#8203;<!-- 14 -->[Joy] Apply color inversion to components (#34602) @siriwatknp
- &#8203;<!-- 13 -->[Joy] Improve cursor pointer and add fallback for outlined variant (#35573) @siriwatknp
- &#8203;<!-- 12 -->[Joy] Miscellaneous fixes (#35552) @siriwatknp
- &#8203;<!-- 11 -->[Radio][joy] Use precise dimensions for radio icon (#35548) @hbjORbj

### `@mui/material-next@6.0.0-alpha.68`

- &#8203;<!-- 36 -->[Material You] Update Button test & add active class name (#35497) @mnajdova

### Docs

- &#8203;<!-- 35 -->[docs] Fix GoogleMaps demo (#35545) @hbjORbj
- &#8203;<!-- 25 -->[docs] Remove flow, its legacy (#35624) @oliviertassinari
- &#8203;<!-- 24 -->[docs] Add a guide on using icon libraries with Joy UI (#35377) @siriwatknp
- &#8203;<!-- 23 -->[docs] Clarify comment about `sortStability()` use case (#35570) @frontendlane
- &#8203;<!-- 22 -->[docs] Improve the experimental API demos on the button page (#35560) @mnajdova
- &#8203;<!-- 21 -->[docs] Force `light` theme mode when `activePage` is null (#35575) @LukasTy
- &#8203;<!-- 20 -->[docs] Fix ListItem button deprecated use (#33970) @MickaelAustoni
- &#8203;<!-- 19 -->[docs] Fix typo in `Progress` docs (#35553) @jasonsturges
- &#8203;<!-- 18 -->[docs] Remove empty tags on the TransferList demos (#33127) @ekusiadadus
- &#8203;<!-- 17 -->[docs][joy] Add documentation for `Stack` component (#35373) @hbjORbj
- &#8203;<!-- 35 -->[docs][joy] Add documentation for `Grid` component (#35374) @hbjORbj
- &#8203;<!-- 01 -->[website] Update sponsor grid (#35452) @danilo-leal

### Core

- &#8203;<!-- 34 -->[core] Shorthand notation to remove outline (#35623) @oliviertassinari
- &#8203;<!-- 33 -->[core] Fix header link layout shift and clash (#35626) @oliviertassinari
- &#8203;<!-- 32 -->[core] Hide keyboard shortcut if no hover feature (#35625) @oliviertassinari
- &#8203;<!-- 31 -->[core] Fix confusing duplicated name in the log @oliviertassinari
- &#8203;<!-- 30 -->[core] Fix API demos callout spacing (#35579) @oliviertassinari
- &#8203;<!-- 29 -->[core] Fix a few title case (#35547) @oliviertassinari
- &#8203;<!-- 28 -->[core] Cleanup mention of test-utils (#35577) @oliviertassinari
- &#8203;<!-- 27 -->[core] Remove oudated pickers prop-type logic (#35571) @oliviertassinari
- &#8203;<!-- 26 -->[core] Exclude documentation of Base props not used in styled libraries (#35562) @michaldudak

All contributors of this release in alphabetical order: @boutahlilsoufiane, @danhuynhdev, @danilo-leal, @EduardoSCosta, @ekusiadadus, @frontendlane, @hbjORbj, @hootan-rocky, @JagarYousef, @jasonsturges, @leventdeniz, @LukasTy, @michaldudak, @MickaelAustoni, @mnajdova, @oliviertassinari, @sai6855, @siriwatknp, @sldk-yuri, @trizotti

## 5.11.1

<!-- generated comparing v5.11.0..master -->
10 changes: 5 additions & 5 deletions benchmark/package.json
Original file line number Diff line number Diff line change
@@ -15,17 +15,17 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mdx-js/react": "^2.2.1",
"@mui/material": "^5.11.1",
"@mui/styles": "^5.11.1",
"@mui/system": "^5.11.1",
"@mui/material": "^5.11.2",
"@mui/styles": "^5.11.2",
"@mui/system": "^5.11.2",
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"playwright": "^1.29.0",
"playwright": "^1.29.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-jss": "^10.9.2",
"react-redux": "^7.2.9",
"react-redux": "^8.0.5",
"redux": "^4.2.0",
"serve-handler": "^6.1.5",
"styled-components": "^5.3.6",
4 changes: 2 additions & 2 deletions docs/data/base/components/modal/ServerModal.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import Modal from '@mui/base/ModalUnstyled';
import ModalUnstyled from '@mui/base/ModalUnstyled';
import { Box, styled } from '@mui/system';

const StyledModal = styled(Modal)`
const StyledModal = styled(ModalUnstyled)`
position: fixed;
z-index: 1300;
right: 0;
4 changes: 2 additions & 2 deletions docs/data/base/components/modal/ServerModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import Modal from '@mui/base/ModalUnstyled';
import ModalUnstyled from '@mui/base/ModalUnstyled';
import { Box, styled } from '@mui/system';

const StyledModal = styled(Modal)`
const StyledModal = styled(ModalUnstyled)`
position: fixed;
z-index: 1300;
right: 0;
2 changes: 1 addition & 1 deletion docs/data/base/pages.ts
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ const pages = [
},
{
pathname: '/base/guides',
title: 'How To Guides',
title: 'How-to guides',
icon: 'VisibilityIcon',
children: [
{
5 changes: 1 addition & 4 deletions docs/data/joy/components/aspect-ratio/CarouselRatio.js
Original file line number Diff line number Diff line change
@@ -48,10 +48,7 @@ export default function CarouselRatio() {
'--Card-padding': (theme) => theme.spacing(2),
}}
>
<AspectRatio
ratio="1"
sx={{ minWidth: 60, borderRadius: 'sm', overflow: 'auto' }}
>
<AspectRatio ratio="1" sx={{ minWidth: 60 }}>
<img
src={`${item.src}?h=120&fit=crop&auto=format`}
srcSet={`${item.src}?h=120&fit=crop&auto=format&dpr=2 2x`}
5 changes: 1 addition & 4 deletions docs/data/joy/components/aspect-ratio/CarouselRatio.tsx
Original file line number Diff line number Diff line change
@@ -48,10 +48,7 @@ export default function CarouselRatio() {
'--Card-padding': (theme) => theme.spacing(2),
}}
>
<AspectRatio
ratio="1"
sx={{ minWidth: 60, borderRadius: 'sm', overflow: 'auto' }}
>
<AspectRatio ratio="1" sx={{ minWidth: 60 }}>
<img
src={`${item.src}?h=120&fit=crop&auto=format`}
srcSet={`${item.src}?h=120&fit=crop&auto=format&dpr=2 2x`}
2 changes: 1 addition & 1 deletion docs/data/joy/components/css-baseline/css-baseline.md
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ The CSS [`color-scheme`](https://web.dev/color-scheme/) is applied by default to

- No base font-size is declared on the `<html>`, but 16px is assumed (the browser default).
You can learn more about the implications of changing the `<html>` default font size in [the theme documentation](/material-ui/customization/typography/#html-font-size) page.
- Set the `theme.typography.body1` style on the `<body>` element.
- Set the default `Typography`'s level (`body1`) style on the `<body>` element. The style comes from `theme.typography.{default typography level prop}`.
- Set the font-weight to `bold` for the `<b>` and `<strong>` elements.
- Custom font-smoothing is enabled for better display of the default font.

27 changes: 27 additions & 0 deletions docs/data/joy/components/grid/AutoGrid.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import { styled } from '@mui/joy/styles';
import Sheet from '@mui/joy/Sheet';
import Grid from '@mui/joy/Grid';

const Item = styled(Sheet)(({ theme }) => ({
...theme.typography.body2,
padding: theme.spacing(1),
textAlign: 'center',
color: theme.vars.palette.text.tertiary,
}));

export default function AutoGrid() {
return (
<Grid container spacing={3} sx={{ flexGrow: 1 }}>
<Grid xs>
<Item>xs</Item>
</Grid>
<Grid xs={6}>
<Item>xs=6</Item>
</Grid>
<Grid xs>
<Item>xs</Item>
</Grid>
</Grid>
);
}
27 changes: 27 additions & 0 deletions docs/data/joy/components/grid/AutoGrid.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import { styled } from '@mui/joy/styles';
import Sheet from '@mui/joy/Sheet';
import Grid from '@mui/joy/Grid';

const Item = styled(Sheet)(({ theme }) => ({
...theme.typography.body2,
padding: theme.spacing(1),
textAlign: 'center',
color: theme.vars.palette.text.tertiary,
}));

export default function AutoGrid() {
return (
<Grid container spacing={3} sx={{ flexGrow: 1 }}>
<Grid xs>
<Item>xs</Item>
</Grid>
<Grid xs={6}>
<Item>xs=6</Item>
</Grid>
<Grid xs>
<Item>xs</Item>
</Grid>
</Grid>
);
}
11 changes: 11 additions & 0 deletions docs/data/joy/components/grid/AutoGrid.tsx.preview
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Grid container spacing={3} sx={{ flexGrow: 1 }}>
<Grid xs>
<Item>xs</Item>
</Grid>
<Grid xs={6}>
<Item>xs=6</Item>
</Grid>
<Grid xs>
<Item>xs</Item>
</Grid>
</Grid>
30 changes: 30 additions & 0 deletions docs/data/joy/components/grid/BasicGrid.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import * as React from 'react';
import { styled } from '@mui/joy/styles';
import Sheet from '@mui/joy/Sheet';
import Grid from '@mui/joy/Grid';

const Item = styled(Sheet)(({ theme }) => ({
...theme.typography.body2,
padding: theme.spacing(1),
textAlign: 'center',
color: theme.vars.palette.text.tertiary,
}));

export default function BasicGrid() {
return (
<Grid container spacing={2} sx={{ flexGrow: 1 }}>
<Grid xs={8}>
<Item>xs=8</Item>
</Grid>
<Grid xs={4}>
<Item>xs=4</Item>
</Grid>
<Grid xs={4}>
<Item>xs=4</Item>
</Grid>
<Grid xs={8}>
<Item>xs=8</Item>
</Grid>
</Grid>
);
}
Loading