Skip to content

Commit cc53e00

Browse files
sai6855sai6855
authored
Merge branch 'master' into step-icon
2 parents 923297e + 7ad8893 commit cc53e00

File tree

674 files changed

+1889
-2997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

674 files changed

+1889
-2997
lines changed

‎.github/ISSUE_TEMPLATE/1.bug.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ body:
2828
2929
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. See our [documentation](https://mui.com/material-ui/getting-started/support/#bug-reproductions) on how to build a reproduction case.
3030
value: |
31-
Link to live example: (required)
32-
3331
Steps:
34-
1.
32+
1. Open this link to live example: (required)
3533
2.
3634
3.
3735
- type: textarea

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
22+
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
33+
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
46+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
4747
with:
4848
sarif_file: results.sarif

‎CHANGELOG.md

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,60 @@
11
# [Versions](https://mui.com/versions/)
22

3-
## 6.1.6
3+
## v6.1.7
4+
5+
<!-- generated comparing v6.1.6..master -->
6+
7+
_Nov 13, 2024_
8+
9+
A big thanks to the 13 contributors who made this release possible.
10+
This release includes fixes as well as documentation improvements.
11+
12+
### `@mui/[email protected]`
13+
14+
- Fix default props theme scoping (#44340) @siriwatknp
15+
- Support theme scoping in `useMediaQuery` (#44339) @siriwatknp
16+
- [Grid] Fix regression spacing prop with string value (#44376) @siriwatknp
17+
18+
### `@mui/[email protected]`
19+
20+
- Fix missing `@types/hoist-non-react-statics` causing `styled` returns any (#44397) @megos
21+
22+
### Docs
23+
24+
- Replace 'Experimental APIs - Toolpad' with 'Toolpad (Beta)' (#44388) @prakhargupta1
25+
- Fix Pigment CSS install (#44353) @oliviertassinari
26+
- Fix dashboard menu warning (#44317) @siriwatknp
27+
- Add runtime theme section for Material Pigment CSS (#44137) @siriwatknp
28+
- Add hash to `key` to remove noise from console (#44289) @sai6855
29+
- Revise Example Projects and Related Projects pages (#44191) @samuelsycamore
30+
- [material-ui] Fix typo in typography theme set up for templates (#44338) @navedqb
31+
- [material-ui] Add StackBlitz/CodeSandbox buttons to template cards (#44253) @zanivan
32+
- [material-ui] Fix Sign-in/Sign-up templates layout (#44281) @zanivan
33+
- [material-ui] Remove noise in template (#44260) @oliviertassinari
34+
- [material-ui][Rating] Add uncontrolled example to Basic Rating demo (#44386) @sai6855
35+
- [material-ui][TextField] Replace InputProps with slotProps.input in demo (#44288) @sai6855
36+
37+
### Core
38+
39+
- [blog] Follow media asset guidelines (#44374) @oliviertassinari
40+
- [code-infra] Changes for test util to work in `vitest` (#43625) @JCQuintas
41+
- Remove old marked JS options (#44375) @ZeeshanTamboli
42+
- Fix webpack capitalization (#44352) @oliviertassinari
43+
- Fix Next.js link 404 (710cd95) @oliviertassinari
44+
- Update Gold sponsoring backlinks (#44316) @oliviertassinari
45+
- Fix tools-public.mui.com redirection (9196fa5) @oliviertassinari
46+
- Remove blank AlertTitle test file (#44282) @ZeeshanTamboli
47+
- [docs-infra] Fix ad in RTL (#44345) @oliviertassinari
48+
- [docs-infra] Enforce punctuation on descriptions (#44292) @oliviertassinari
49+
- [docs-infra] Add CodeSandbox and StackBlitz to vale vocab (6db477a) @oliviertassinari
50+
- [docs-infra] Fix correct spelling of VS Code (#44277) @oliviertassinari
51+
- [docs-infra] Add a `rawDescriptions` option (#44390) @vladmoroz
52+
- [examples] Add missing `clsx` dependency (#43526) @Janpot
53+
- [infra] Fix @renovate[bot] appearing in changelog (#44275) @mnajdova
54+
55+
All contributors of this release in alphabetical order: @Janpot, @JCQuintas, @megos, @mnajdova, @navedqb, @oliviertassinari, @prakhargupta1, @sai6855, @samuelsycamore, @siriwatknp, @vladmoroz, @zanivan, @ZeeshanTamboli
56+
57+
## v6.1.6
458

559
<!-- generated comparing v6.1.5..master -->
660

@@ -52,7 +106,7 @@ A big thanks to the 13 contributors who made this release possible.
52106

53107
All contributors of this release in alphabetical order: @aarongarciah, @blackcow1987, @DiegoAndai, @jimmycallin, @joshkel, @mnajdova, @navedqb, @nphmuller, @o-alexandrov, @oliviertassinari, @prakhargupta1, @sai6855, @siriwatknp
54108

55-
## 6.1.5
109+
## v6.1.5
56110

57111
<!-- generated comparing v6.1.4..master -->
58112

‎apps/pigment-css-next-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-dom": "^18.3.1"
2424
},
2525
"devDependencies": {
26-
"@pigment-css/nextjs-plugin": "0.0.25",
26+
"@pigment-css/nextjs-plugin": "0.0.26",
2727
"@types/node": "^20.17.6",
2828
"@types/react": "^18.3.12",
2929
"@types/react-dom": "^18.3.1",

‎apps/pigment-css-vite-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"react": "^18.3.1",
2222
"react-dom": "^18.3.1",
2323
"react-error-boundary": "^4.1.2",
24-
"react-router-dom": "^6.27.0",
24+
"react-router-dom": "^6.28.0",
2525
"webfontloader": "^1.6.28"
2626
},
2727
"devDependencies": {
2828
"@babel/preset-react": "^7.25.9",
2929
"@babel/preset-typescript": "^7.26.0",
30-
"@pigment-css/vite-plugin": "0.0.25",
30+
"@pigment-css/vite-plugin": "0.0.26",
3131
"@types/react": "^18.3.12",
3232
"@types/react-dom": "^18.3.1",
3333
"@types/webfontloader": "^1.6.38",

‎docs/data/material/components/button-group/LoadingButtonGroup.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import * as React from 'react';
22
import ButtonGroup from '@mui/material/ButtonGroup';
33
import Button from '@mui/material/Button';
4-
import LoadingButton from '@mui/lab/LoadingButton';
54
import SaveIcon from '@mui/icons-material/Save';
65

76
export default function LoadingButtonGroup() {
87
return (
98
<ButtonGroup variant="outlined" aria-label="Loading button group">
109
<Button>Submit</Button>
11-
<LoadingButton>Fetch data</LoadingButton>
12-
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
10+
<Button>Fetch data</Button>
11+
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
1312
Save
14-
</LoadingButton>
13+
</Button>
1514
</ButtonGroup>
1615
);
1716
}

‎docs/data/material/components/button-group/LoadingButtonGroup.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import * as React from 'react';
22
import ButtonGroup from '@mui/material/ButtonGroup';
33
import Button from '@mui/material/Button';
4-
import LoadingButton from '@mui/lab/LoadingButton';
54
import SaveIcon from '@mui/icons-material/Save';
65

76
export default function LoadingButtonGroup() {
87
return (
98
<ButtonGroup variant="outlined" aria-label="Loading button group">
109
<Button>Submit</Button>
11-
<LoadingButton>Fetch data</LoadingButton>
12-
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
10+
<Button>Fetch data</Button>
11+
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
1312
Save
14-
</LoadingButton>
13+
</Button>
1514
</ButtonGroup>
1615
);
1716
}

‎docs/data/material/components/button-group/LoadingButtonGroup.tsx.preview

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ButtonGroup variant="outlined" aria-label="Loading button group">
22
<Button>Submit</Button>
3-
<LoadingButton>Fetch data</LoadingButton>
4-
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
3+
<Button>Fetch data</Button>
4+
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
55
Save
6-
</LoadingButton>
6+
</Button>
77
</ButtonGroup>

‎docs/data/material/components/button-group/button-group.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
productId: material-ui
33
title: React Button Group component
4-
components: Button, ButtonGroup, LoadingButton
4+
components: Button, ButtonGroup
55
githubLabel: 'component: ButtonGroup'
66
githubSource: packages/mui-material/src/ButtonGroup
77
---
@@ -49,10 +49,8 @@ You can remove the elevation with the `disableElevation` prop.
4949

5050
{{"demo": "DisableElevation.js"}}
5151

52-
## Experimental APIs
52+
## Loading
5353

54-
### Loading button
55-
56-
You can use the [`<LoadingButton />`](/material-ui/react-button/#loading-button) from [`@mui/lab`](/material-ui/about-the-lab/) in the button group.
54+
Use the `loading` prop from `Button` to set buttons in a loading state and disable interactions.
5755

5856
{{"demo": "LoadingButtonGroup.js"}}

0 commit comments

Comments
 (0)