Skip to content

Commit

Permalink
Merge branch 'master' into fix-text-wrap-arrow-interference
Browse files Browse the repository at this point in the history
  • Loading branch information
rileyjshaw authored Dec 12, 2024
2 parents f5f7524 + a491dc2 commit 4d8aac7
Show file tree
Hide file tree
Showing 241 changed files with 3,715 additions and 2,434 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ module.exports = /** @type {Config} */ ({
variables: true,
},
],
'@typescript-eslint/no-unused-vars': [
'error',
{ vars: 'all', args: 'after-used', ignoreRestSiblings: true, argsIgnorePattern: '^_' },
],
'no-use-before-define': 'off',

// disabled type-aware linting due to performance considerations
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# 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
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
with:
sarif_file: results.sarif
82 changes: 82 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,87 @@
# [Versions](https://mui.com/versions/)

## 6.2.0

<!-- generated comparing v6.1.10..master -->

_Dec 10, 2024_

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

- Material UI is now compatible with React 19 (#44672) @DiegoAndai
- Fixed incorrect `aria-orientation` for vertical sliders. <kbd>ArrowRight</kbd> now increases the value and <kbd>ArrowLeft</kbd> decreases the value in vertical sliders; they were reversed in prior versions. (#44537) @mj12albert

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

- [Box] Add missing `component` to `BoxProps` type (#44643) @DiegoAndai
- [Grid] Fix spacing when using css variables (#44663) @DiegoAndai
- [ListItemText] Add `slots` and `slotProps` (#44571) @sai6855

### Docs

- Add Toolpad Core template link (#44415) @bharatkashyap

### Core

- [docs-infra] Allow custom annotations (#44707) @vladmoroz
- [Box] Fix `component` prop test (#44651) @DiegoAndai
- React 19 useRef cleanup (#44704) @DiegoAndai
- Remove obselete lerna options (#44676) @ZeeshanTamboli
- Fix Regular Expression Denial of Service (ReDoS) vulnerabilities (#44627) @SuperMaxine
- Fix number of contributors (#44650) @aarongarciah
- [docs-infra] Add support for data attributes in the API generation (#44709) @mnajdova
- [docs-infra] Fix RTL dark mode (#41803) @alexfauquette
- [Grid] Remove deeply nested imports (#43605) @Janpot

All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @bharatkashyap, @DiegoAndai, @Janpot, @mj12albert, @mnajdova, @sai6855, @SuperMaxine, @vladmoroz, @ZeeshanTamboli

## 6.1.10

<!-- generated comparing v6.1.9..master -->

_Dec 3, 2024_

A big thanks to the 11 contributors who made this release possible.

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

- [Avatar] Fix `slotProps.img` not spread to hook (#44536) @siriwatknp
- [FilledInput] Use `slotProps` instead of `componentsProps` (#44552) @siriwatknp
- [Grid2] Fix theme scoping error (#44599) @siriwatknp
- [Grid2] Add container styles from styleOverrides (#44598) @sai6855
- Skip `tonalOffset` from setting color channel (#44585) @siriwatknp
- Remove few more React.ReactElement<any> types (#44290) @sai6855
- [Tabs] Fix `ScrollbarSize` ref being overriden (#44593) @DiegoAndai
- [Select][TextField] Fix screen reader from saying `&ZeroWidthSpace` (#44631) @arishoham

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

- [ThemeProvider] Optimize `theme` changes when enabling CSS theme variables (#44588) @siriwatknp

### Docs

- Notification for the MUI X v8 alpha zero announcement blog post (#44629) @joserodolfofreitas
- Bump React Router to ^7.0.1 (#44531) @oliviertassinari
- [material-ui] Replace testid with id in migration guide (#44636) @sai6855
- [material-ui][TextField] Update usage of `InputLabelProps` in docs (#44634) @sai6855
- [material-ui][ListItem] Add missing diffs in migration guide (#44638) @sai6855
- [examples] Use Next.js 14 on examples (#44486) @DiegoAndai
- Update links and sidebar nav for Base UI components in Material UI (#44581) @samuelsycamore

### Core

- Remove `getSlotOwnerState` from `useSlot` util (#44403) @ZeeshanTamboli
- Extract useRippleHandler outside of ButtonBase (#44591) @albarv340
- Update eslint config (#44586) @MBilalShafi
- [core-infra] Remove useless fragments (#44516) @oliviertassinari
- [docs-infra] Fix Banner CLS (#44632) @oliviertassinari
- [docs-infra] Change CSS vars generation to be extracted from Enum (#44587) @mnajdova
- [docs-infra] Automatically hide Black Friday banner (#44630) @oliviertassinari
- [docs-infra] Fix TOC RTL padding regression (#44535) @oliviertassinari
- [test-utils] Remove leftover React.ReactElement<any> from describeConformance.tsx (#44639) @sai6855

All contributors of this release in alphabetical order: @albarv340, @arishoham, @DiegoAndai, @joserodolfofreitas, @MBilalShafi, @mnajdova, @oliviertassinari, @sai6855, @samuelsycamore, @siriwatknp, @ZeeshanTamboli

## 6.1.9

<!-- generated comparing v6.1.8..master -->
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,17 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
<p>
<a href="https://tidelift.com/subscription/pkg/npm-material-ui?utm_source=npm-material-ui&utm_medium=referral&utm_campaign=homepage" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://avatars.githubusercontent.com/u/30204434?s=288" alt="tidelift.com" title="Tidelift: Enterprise-ready open-source software." loading="lazy" /></a>
&nbsp;
<a href="https://open.spotify.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://avatars.githubusercontent.com/u/251374?s=288" alt="Spotify" title="Spotify: Music service for accessing millions of songs." loading="lazy" /></a>
&nbsp;
<a href="https://icons8.com?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/icons8/7fa1641/logo/288.png" alt="Icons8" title="Icons8: API for icons, photos, illustrations, and music." loading="lazy"></a>
&nbsp;
<a href="https://rxdb.info/?utm_source=sponsor&utm_medium=opencollective&utm_campaign=opencollective-mui" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://rxdb.info/files/logo/logo_text.svg" alt="RxDB" title="RxDB: Local-first JavaScript database." loading="lazy" /></a>
&nbsp;
<a href="https://www.text-em-all.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img src="https://avatars.githubusercontent.com/u/1262264?s=288" alt="text-em-all.com" title="Text-em-all: Mass text messaging and automated calling." height="96" width="96" loading="lazy"></a>
&nbsp;
<a href="https://www.dialmycalls.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/dialmycalls/f5ae9ab/avatar/288.png" alt="dialmycalls.com" title="DialMyCalls: Send text messages, calls, and emails." loading="lazy" /></a>
&nbsp;
<a href="https://copycopter.ai/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/copycopterai/e167216/logo/288.png" alt="copycopter.ai" title="CopyCopter: Turn prompts into videos at ultra speed." loading="lazy" /></a>
&nbsp;
<a href="https://route4me.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/route4me/71fb6fa/avatar/288.png" alt="Route4Me" title="Route4Me: Trusted last mile route planning and route optimization." loading="lazy" /></a>
&nbsp;
</p>

<p>
<a href="https://megafamous.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://mui.com/static/sponsors/megafamous.png" alt="megafamous.com" title="MegaFamous: Buy Instagram followers and likes." loading="lazy" />MegaFamous</a>
&nbsp;
<a href="https://goread.io/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="23" src="https://images.opencollective.com/goread_io/eb6337d/logo/78.png" alt="goread.io" title="Goread.io: Instagram followers, likes, views, and comments." loading="lazy" />Goread.io</a>
&nbsp;
<a href="https://buzzoid.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://images.opencollective.com/buzzoidz/d23d9bb/logo/78.png" alt="buzzoid.com" title="Buzzoid: Instant delivery Instagram followers." loading="lazy" />Buzzoid</a>
Expand Down
18 changes: 9 additions & 9 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
"clean": "rimraf .next"
},
"dependencies": {
"@mui/material-pigment-css": "workspace:^",
"@mui/utils": "workspace:^",
"@emotion/cache": "latest",
"@mui/base": "workspace:^",
"@mui/icons-material": "workspace:^",
"@mui/lab": "workspace:^",
"@mui/material": "workspace:^",
"@mui/material-nextjs": "workspace:^",
"@mui/material-pigment-css": "workspace:^",
"@mui/system": "workspace:^",
"@emotion/cache": "latest",
"@mui/utils": "workspace:^",
"next": "latest",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "0.0.27",
"@types/node": "^20.17.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@pigment-css/nextjs-plugin": "0.0.28",
"@types/node": "^20.17.9",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8.57.1",
"typescript": "^5.7.2"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import RangeSlider from '../../../../../../docs/data/material/components/slider/
import SliderSizes from '../../../../../../docs/data/material/components/slider/SliderSizes';
import TrackFalseSlider from '../../../../../../docs/data/material/components/slider/TrackFalseSlider';
import TrackInvertedSlider from '../../../../../../docs/data/material/components/slider/TrackInvertedSlider';
import VerticalAccessibleSlider from '../../../../../../docs/data/material/components/slider/VerticalAccessibleSlider';
import VerticalSlider from '../../../../../../docs/data/material/components/slider/VerticalSlider';

export default function Slider() {
Expand Down Expand Up @@ -125,12 +124,6 @@ export default function Slider() {
<TrackInvertedSlider />
</div>
</section>
<section>
<h2> Vertical Accessible Slider</h2>
<div className="demo-container">
<VerticalAccessibleSlider />
</div>
</section>
<section>
<h2> Vertical Slider</h2>
<div className="demo-container">
Expand Down
14 changes: 7 additions & 7 deletions apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@
"@mui/utils": "workspace:^",
"clsx": "^2.1.1",
"playwright": "^1.48.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^4.1.2",
"react-router-dom": "^6.28.0",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/preset-react": "^7.25.9",
"@babel/preset-typescript": "^7.26.0",
"@pigment-css/vite-plugin": "0.0.27",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@pigment-css/vite-plugin": "0.0.28",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@types/webfontloader": "^1.6.38",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"postcss": "^8.4.49",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.4.11",
"vite-plugin-node-polyfills": "0.22.0",
"vite-plugin-pages": "^0.32.3"
"vite-plugin-pages": "^0.32.4"
},
"nx": {
"targets": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import RangeSlider from '../../../../../docs/data/material/components/slider/Ran
import SliderSizes from '../../../../../docs/data/material/components/slider/SliderSizes.tsx';
import TrackFalseSlider from '../../../../../docs/data/material/components/slider/TrackFalseSlider.tsx';
import TrackInvertedSlider from '../../../../../docs/data/material/components/slider/TrackInvertedSlider.tsx';
import VerticalAccessibleSlider from '../../../../../docs/data/material/components/slider/VerticalAccessibleSlider.tsx';
import VerticalSlider from '../../../../../docs/data/material/components/slider/VerticalSlider.tsx';

export default function Slider() {
Expand Down Expand Up @@ -126,12 +125,6 @@ export default function Slider() {
<TrackInvertedSlider />
</div>
</section>
<section>
<h2> Vertical Accessible Slider</h2>
<div className="demo-container">
<VerticalAccessibleSlider />
</div>
</section>
<section>
<h2> Vertical Slider</h2>
<div className="demo-container">
Expand Down
8 changes: 4 additions & 4 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"docs": "workspace:^",
"express": "^4.21.1",
"express": "^4.21.2",
"fs-extra": "^11.2.0",
"jss": "^10.10.0",
"playwright": "^1.48.2",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-is": "^19.0.0",
"react-jss": "^10.10.0",
"react-redux": "^9.1.2",
"redux": "^5.0.1",
Expand Down
Loading

0 comments on commit 4d8aac7

Please sign in to comment.