From 796861163aca29548aec58ce0944520907395a2b Mon Sep 17 00:00:00 2001
From: sai chand <60743144+sai6855@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:56:34 +0530
Subject: [PATCH 01/11] [material-ui][Select] Add missing root class (#44928)
---
packages/mui-material/src/Select/Select.js | 10 +++++++++-
packages/mui-material/src/Select/Select.test.js | 15 +++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js
index d32ac5cf7eca0b..d6af420e277874 100644
--- a/packages/mui-material/src/Select/Select.js
+++ b/packages/mui-material/src/Select/Select.js
@@ -3,6 +3,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import deepmerge from '@mui/utils/deepmerge';
+import composeClasses from '@mui/utils/composeClasses';
import getReactElementRef from '@mui/utils/getReactElementRef';
import SelectInput from './SelectInput';
import formControlState from '../FormControl/formControlState';
@@ -16,11 +17,18 @@ import { useDefaultProps } from '../DefaultPropsProvider';
import useForkRef from '../utils/useForkRef';
import { styled } from '../zero-styled';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
+import { getSelectUtilityClasses } from './selectClasses';
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
- return classes;
+ const slots = {
+ root: ['root'],
+ };
+
+ const composedClasses = composeClasses(slots, getSelectUtilityClasses, classes);
+
+ return { ...classes, ...composedClasses };
};
const styledRootConfig = {
diff --git a/packages/mui-material/src/Select/Select.test.js b/packages/mui-material/src/Select/Select.test.js
index 50e2a07eab3667..3dc42c37d9473c 100644
--- a/packages/mui-material/src/Select/Select.test.js
+++ b/packages/mui-material/src/Select/Select.test.js
@@ -1757,6 +1757,21 @@ describe('', () => {
expect(selectRef).to.deep.equal({ current: { refToInput: true } });
});
+ it('should have root class', () => {
+ const { container } = render(
+ ,
+ );
+
+ expect(container.querySelector(`.${classes.root}`)).not.to.equal(null);
+ });
+
it('should merge the class names', () => {
const { getByTestId } = render(
` tag:
```html
From 20be6c435088f9de74a88046a50c0ca86cfd0b5c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:01:15 +0100
Subject: [PATCH 03/11] Bump styled-components to ^6.1.14 (#44944)
---
benchmark/package.json | 2 +-
docs/package.json | 2 +-
packages/mui-styled-engine-sc/package.json | 2 +-
packages/mui-system/package.json | 2 +-
pnpm-lock.yaml | 151 ++++++++++++---------
test/package.json | 2 +-
6 files changed, 90 insertions(+), 71 deletions(-)
diff --git a/benchmark/package.json b/benchmark/package.json
index e3ae4b5bc74a24..03904efbbf2e4a 100644
--- a/benchmark/package.json
+++ b/benchmark/package.json
@@ -34,7 +34,7 @@
"react-redux": "^9.2.0",
"redux": "^5.0.1",
"serve-handler": "^6.1.6",
- "styled-components": "^6.1.13",
+ "styled-components": "^6.1.14",
"styled-system": "^5.1.5",
"theme-ui": "^0.17.1",
"webpack": "^5.97.1"
diff --git a/docs/package.json b/docs/package.json
index 760d1e58cffdff..8d223a215add12 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -105,7 +105,7 @@
"react-virtuoso": "^4.12.3",
"react-window": "^1.8.11",
"rimraf": "^6.0.1",
- "styled-components": "^6.1.13",
+ "styled-components": "^6.1.14",
"stylis": "4.2.0",
"stylis-plugin-rtl": "^2.1.1",
"use-count-up": "^3.0.1",
diff --git a/packages/mui-styled-engine-sc/package.json b/packages/mui-styled-engine-sc/package.json
index 7d462cf4eb9709..998deebbad2ce8 100644
--- a/packages/mui-styled-engine-sc/package.json
+++ b/packages/mui-styled-engine-sc/package.json
@@ -49,7 +49,7 @@
"@types/react": "^19.0.2",
"chai": "^4.5.0",
"react": "^19.0.0",
- "styled-components": "^6.1.13"
+ "styled-components": "^6.1.14"
},
"peerDependencies": {
"styled-components": "^6.0.0"
diff --git a/packages/mui-system/package.json b/packages/mui-system/package.json
index bcb7dbaa726b53..75becd171b39d5 100644
--- a/packages/mui-system/package.json
+++ b/packages/mui-system/package.json
@@ -62,7 +62,7 @@
"lodash": "^4.17.21",
"react": "^19.0.0",
"sinon": "^19.0.2",
- "styled-components": "^6.1.13"
+ "styled-components": "^6.1.14"
},
"peerDependencies": {
"@emotion/react": "^11.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ddeeab0d623847..dc7f66513d1424 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -540,8 +540,8 @@ importers:
specifier: ^6.1.6
version: 6.1.6
styled-components:
- specifier: ^6.1.13
- version: 6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ specifier: ^6.1.14
+ version: 6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
styled-system:
specifier: ^5.1.5
version: 5.1.5
@@ -661,7 +661,7 @@ importers:
version: 9.7.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@toolpad/core':
specifier: ^0.11.0
- version: 0.11.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.8.0)(@playwright/test@1.48.2)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react-router-dom@6.28.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(vite@5.4.11(@types/node@20.17.10)(terser@5.37.0))
+ version: 0.11.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material-pigment-css@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.8.0)(@playwright/test@1.48.2)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react-router-dom@6.28.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(vite@5.4.11(@types/node@20.17.10)(terser@5.37.0))
autoprefixer:
specifier: ^10.4.20
version: 10.4.20(postcss@8.4.49)
@@ -813,8 +813,8 @@ importers:
specifier: ^6.0.1
version: 6.0.1
styled-components:
- specifier: ^6.1.13
- version: 6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ specifier: ^6.1.14
+ version: 6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
stylis:
specifier: 4.2.0
version: 4.2.0
@@ -1417,7 +1417,7 @@ importers:
version: link:../markdown
'@mui/system':
specifier: ^5.0.0 || ^6.0.0
- version: 6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
+ version: 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
chai:
specifier: ^4.4.1
version: 4.5.0
@@ -1967,8 +1967,8 @@ importers:
specifier: ^19.0.0
version: 19.0.0
styled-components:
- specifier: ^6.1.13
- version: 6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ specifier: ^6.1.14
+ version: 6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
publishDirectory: build
packages/mui-styles:
@@ -2124,8 +2124,8 @@ importers:
specifier: ^19.0.2
version: 19.0.2
styled-components:
- specifier: ^6.1.13
- version: 6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ specifier: ^6.1.14
+ version: 6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
publishDirectory: build
packages/mui-types:
@@ -2354,8 +2354,8 @@ importers:
specifier: ^19.0.2
version: 19.0.2
styled-components:
- specifier: ^6.1.13
- version: 6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ specifier: ^6.1.14
+ version: 6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
stylis:
specifier: 4.2.0
version: 4.2.0
@@ -4017,6 +4017,12 @@ packages:
'@types/react':
optional: true
+ '@mui/material-pigment-css@6.3.1':
+ resolution: {integrity: sha512-3+muzktBCPqYDZ8PeSpPVx312z9HhXu3WJcQ/+PxLsEXAOOzGUm/TZ8kCYszkzWRnLxMPIIdjN+ps2PnJReALQ==}
+ engines: {node: '>=14.0.0'}
+ peerDependencies:
+ '@pigment-css/react': 0.0.29
+
'@mui/material@5.15.4':
resolution: {integrity: sha512-T/LGRAC+M0c+D3+y67eHwIN5bSje0TxbcJCWR0esNvU11T0QwrX3jedXItPNBwMupF2F5VWCDHBVLlFnN3+ABA==}
engines: {node: '>=12.0.0'}
@@ -4044,8 +4050,8 @@ packages:
'@types/react':
optional: true
- '@mui/private-theming@6.3.0':
- resolution: {integrity: sha512-tdS8jvqMokltNTXg6ioRCCbVdDmZUJZa/T9VtTnX2Lwww3FTgCakst9tWLZSxm1fEE9Xp0m7onZJmgeUmWQYVw==}
+ '@mui/private-theming@6.3.1':
+ resolution: {integrity: sha512-g0u7hIUkmXmmrmmf5gdDYv9zdAig0KoxhIQn1JN8IVqApzf/AyRhH3uDGx5mSvs8+a1zb4+0W6LC260SyTTtdQ==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -4067,8 +4073,8 @@ packages:
'@emotion/styled':
optional: true
- '@mui/styled-engine@6.3.0':
- resolution: {integrity: sha512-iWA6eyiPkO07AlHxRUvI7dwVRSc+84zV54kLmjUms67GJeOWVuXlu8ZO+UhCnwJxHacghxnabsMEqet5PYQmHg==}
+ '@mui/styled-engine@6.3.1':
+ resolution: {integrity: sha512-/7CC0d2fIeiUxN5kCCwYu4AWUDd9cCTxWCyo0v/Rnv6s8uk6hWgJC3VLZBoDENBHf/KjqDZuYJ2CR+7hD6QYww==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.4.1
@@ -4096,8 +4102,8 @@ packages:
'@types/react':
optional: true
- '@mui/system@6.3.0':
- resolution: {integrity: sha512-L+8hUHMNlfReKSqcnVslFrVhoNfz/jw7Fe9NfDE85R3KarvZ4O3MU9daF/lZeqEAvnYxEilkkTfDwQ7qCgJdFg==}
+ '@mui/system@6.3.1':
+ resolution: {integrity: sha512-AwqQ3EAIT2np85ki+N15fF0lFXX1iFPqenCzVOSl3QXKy2eifZeGd9dGtt7pGMoFw5dzW4dRGGzRpLAq9rkl7A==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -4112,8 +4118,8 @@ packages:
'@types/react':
optional: true
- '@mui/types@7.2.20':
- resolution: {integrity: sha512-straFHD7L8v05l/N5vcWk+y7eL9JF0C2mtph/y4BPm3gn2Eh61dDwDB65pa8DLss3WJfDXYC7Kx5yjP0EmXpgw==}
+ '@mui/types@7.2.21':
+ resolution: {integrity: sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww==}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
@@ -4140,8 +4146,8 @@ packages:
'@types/react':
optional: true
- '@mui/utils@6.3.0':
- resolution: {integrity: sha512-MkDBF08OPVwXhAjedyMykRojgvmf0y/jxkBWjystpfI/pasyTYrfdv4jic6s7j3y2+a+SJzS9qrD6X8ZYj/8AQ==}
+ '@mui/utils@6.3.1':
+ resolution: {integrity: sha512-sjGjXAngoio6lniQZKJ5zGfjm+LD2wvLwco7FbKe1fu8A7VIFmz2SwkLb+MDPLNX1lE7IscvNNyh1pobtZg2tw==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -12095,8 +12101,8 @@ packages:
engines: {node: '>=4'}
hasBin: true
- styled-components@6.1.13:
- resolution: {integrity: sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==}
+ styled-components@6.1.14:
+ resolution: {integrity: sha512-KtfwhU5jw7UoxdM0g6XU9VZQFV4do+KrM8idiVCH5h4v49W+3p3yMe0icYwJgZQZepa5DbH04Qv8P0/RdcLcgg==}
engines: {node: '>= 16'}
peerDependencies:
react: '>= 16.8.0'
@@ -15038,7 +15044,7 @@ snapshots:
dependencies:
'@babel/runtime': 7.26.0
'@floating-ui/react-dom': 2.1.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@mui/utils': 5.16.6(@types/react@19.0.2)(react@19.0.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
@@ -15052,7 +15058,7 @@ snapshots:
dependencies:
'@babel/runtime': 7.26.0
'@floating-ui/react-dom': 2.1.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@mui/utils': 5.16.6(@types/react@19.0.2)(react@19.0.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
@@ -15066,8 +15072,8 @@ snapshots:
dependencies:
'@babel/runtime': 7.26.0
'@floating-ui/react-dom': 2.1.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
prop-types: 15.8.1
@@ -15080,8 +15086,8 @@ snapshots:
dependencies:
'@babel/runtime': 7.26.0
'@floating-ui/react-dom': 2.1.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
prop-types: 15.8.1
@@ -15098,7 +15104,7 @@ snapshots:
'@mui/base': 5.0.0-beta.31(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/core-downloads-tracker': 5.15.14
'@mui/system': 5.16.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@mui/utils': 5.16.6(@types/react@19.0.2)(react@19.0.0)
clsx: 2.1.1
prop-types: 15.8.1
@@ -15109,14 +15115,14 @@ snapshots:
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
'@types/react': 19.0.2
- '@mui/lab@6.0.0-beta.19(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)':
+ '@mui/lab@6.0.0-beta.19(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material-pigment-css@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
'@mui/base': 5.0.0-beta.66(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/material': link:packages/mui-material/build
- '@mui/system': 6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/system': 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
clsx: 2.1.1
prop-types: 15.8.1
react: 19.0.0
@@ -15124,15 +15130,28 @@ snapshots:
optionalDependencies:
'@emotion/react': 11.13.5(@types/react@19.0.2)(react@19.0.0)
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
+ '@mui/material-pigment-css': 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
'@types/react': 19.0.2
+ '@mui/material-pigment-css@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)':
+ dependencies:
+ '@babel/runtime': 7.26.0
+ '@mui/system': 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
+ '@pigment-css/react': 0.0.29(@types/react@19.0.2)(react@19.0.0)
+ transitivePeerDependencies:
+ - '@emotion/react'
+ - '@emotion/styled'
+ - '@types/react'
+ - react
+ optional: true
+
'@mui/material@5.15.4(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
'@mui/base': 5.0.0-beta.31(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/core-downloads-tracker': 5.15.14
'@mui/system': 5.16.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@mui/utils': 5.16.6(@types/react@19.0.2)(react@19.0.0)
'@types/react-transition-group': 4.4.12(@types/react@19.0.2)
clsx: 2.1.1
@@ -15156,10 +15175,10 @@ snapshots:
optionalDependencies:
'@types/react': 19.0.2
- '@mui/private-theming@6.3.0(@types/react@19.0.2)(react@19.0.0)':
+ '@mui/private-theming@6.3.1(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
prop-types: 15.8.1
react: 19.0.0
optionalDependencies:
@@ -15176,7 +15195,7 @@ snapshots:
'@emotion/react': 11.13.5(@types/react@19.0.2)(react@19.0.0)
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/styled-engine@6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(react@19.0.0)':
+ '@mui/styled-engine@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
'@emotion/cache': 11.14.0
@@ -15194,7 +15213,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/private-theming': 5.16.5(@types/react@19.0.2)(react@19.0.0)
'@mui/styled-engine': 5.16.4(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@mui/utils': 5.16.6(@types/react@19.0.2)(react@19.0.0)
clsx: 2.1.1
csstype: 3.1.3
@@ -15205,13 +15224,13 @@ snapshots:
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
'@types/react': 19.0.2
- '@mui/system@6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)':
+ '@mui/system@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/private-theming': 6.3.0(@types/react@19.0.2)(react@19.0.0)
- '@mui/styled-engine': 6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(react@19.0.0)
- '@mui/types': 7.2.20(@types/react@19.0.2)
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/private-theming': 6.3.1(@types/react@19.0.2)(react@19.0.0)
+ '@mui/styled-engine': 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(react@19.0.0)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
clsx: 2.1.1
csstype: 3.1.3
prop-types: 15.8.1
@@ -15221,14 +15240,14 @@ snapshots:
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
'@types/react': 19.0.2
- '@mui/types@7.2.20(@types/react@19.0.2)':
+ '@mui/types@7.2.21(@types/react@19.0.2)':
optionalDependencies:
'@types/react': 19.0.2
'@mui/utils@5.16.6(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@types/prop-types': 15.7.14
clsx: 2.1.1
prop-types: 15.8.1
@@ -15240,7 +15259,7 @@ snapshots:
'@mui/utils@6.2.0(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@types/prop-types': 15.7.14
clsx: 2.1.1
prop-types: 15.8.1
@@ -15249,10 +15268,10 @@ snapshots:
optionalDependencies:
'@types/react': 19.0.2
- '@mui/utils@6.3.0(@types/react@19.0.2)(react@19.0.0)':
+ '@mui/utils@6.3.1(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/types': 7.2.20(@types/react@19.0.2)
+ '@mui/types': 7.2.21(@types/react@19.0.2)
'@types/prop-types': 15.7.14
clsx: 2.1.1
prop-types: 15.8.1
@@ -15284,7 +15303,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-charts-vendor': 7.20.0
'@mui/x-internals': 7.23.0(@types/react@19.0.2)(react@19.0.0)
'@react-spring/rafz': 9.7.5
@@ -15322,7 +15341,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-data-grid': 7.23.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/x-data-grid-pro': 7.23.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/x-internals': 7.23.5(@types/react@19.0.2)(react@19.0.0)
@@ -15345,7 +15364,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-data-grid': 7.23.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/x-internals': 7.23.5(@types/react@19.0.2)(react@19.0.0)
'@mui/x-license': 7.23.5(@types/react@19.0.2)(react@19.0.0)
@@ -15366,7 +15385,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-internals': 7.23.5(@types/react@19.0.2)(react@19.0.0)
clsx: 2.1.1
prop-types: 15.8.1
@@ -15384,7 +15403,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-date-pickers': 7.23.3(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@19.0.2)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/x-internals': 7.23.0(@types/react@19.0.2)(react@19.0.0)
'@mui/x-license': 7.23.2(@types/react@19.0.2)(react@19.0.0)
@@ -15406,7 +15425,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-internals': 7.23.0(@types/react@19.0.2)(react@19.0.0)
'@types/react-transition-group': 4.4.12(@types/react@19.0.2)
clsx: 2.1.1
@@ -15425,7 +15444,7 @@ snapshots:
'@mui/x-internals@7.23.0(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
react: 19.0.0
transitivePeerDependencies:
- '@types/react'
@@ -15433,7 +15452,7 @@ snapshots:
'@mui/x-internals@7.23.5(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
react: 19.0.0
transitivePeerDependencies:
- '@types/react'
@@ -15441,7 +15460,7 @@ snapshots:
'@mui/x-license@7.23.2(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
react: 19.0.0
transitivePeerDependencies:
- '@types/react'
@@ -15449,7 +15468,7 @@ snapshots:
'@mui/x-license@7.23.5(@types/react@19.0.2)(react@19.0.0)':
dependencies:
'@babel/runtime': 7.26.0
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
react: 19.0.0
transitivePeerDependencies:
- '@types/react'
@@ -15459,7 +15478,7 @@ snapshots:
'@babel/runtime': 7.26.0
'@mui/material': link:packages/mui-material/build
'@mui/system': link:packages/mui-system/build
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@mui/x-internals': 7.23.0(@types/react@19.0.2)(react@19.0.0)
'@types/react-transition-group': 4.4.12(@types/react@19.0.2)
clsx: 2.1.1
@@ -16042,8 +16061,8 @@ snapshots:
'@emotion/react': 11.13.5(@types/react@19.0.2)(react@19.0.0)
'@emotion/serialize': 1.3.3
'@emotion/styled': 11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/system': 6.3.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
- '@mui/utils': 6.3.0(@types/react@19.0.2)(react@19.0.0)
+ '@mui/system': 6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0)
+ '@mui/utils': 6.3.1(@types/react@19.0.2)(react@19.0.0)
'@wyw-in-js/processor-utils': 0.5.5
'@wyw-in-js/shared': 0.5.5
'@wyw-in-js/transform': 0.5.5
@@ -16793,11 +16812,11 @@ snapshots:
'@theme-ui/css': 0.17.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))
react: 19.0.0
- '@toolpad/core@0.11.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.8.0)(@playwright/test@1.48.2)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react-router-dom@6.28.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(vite@5.4.11(@types/node@20.17.10)(terser@5.37.0))':
+ '@toolpad/core@0.11.0(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material-pigment-css@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.8.0)(@playwright/test@1.48.2)(babel-plugin-macros@3.1.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react-router-dom@6.28.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(vite@5.4.11(@types/node@20.17.10)(terser@5.37.0))':
dependencies:
'@babel/runtime': 7.26.0
'@mui/icons-material': link:packages/mui-icons-material/build
- '@mui/lab': 6.0.0-beta.19(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ '@mui/lab': 6.0.0-beta.19(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material-pigment-css@6.3.1(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@emotion/styled@11.13.5(@emotion/react@11.13.5(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@pigment-css/react@0.0.29(@types/react@19.0.2)(react@19.0.0))(@types/react@19.0.2)(react@19.0.0))(@mui/material@packages+mui-material+build)(@types/react@19.0.2)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
'@mui/material': link:packages/mui-material/build
'@mui/utils': 6.2.0(@types/react@19.0.2)(react@19.0.0)
'@toolpad/utils': 0.11.0(react@19.0.0)
@@ -25187,7 +25206,7 @@ snapshots:
minimist: 1.2.6
through: 2.3.8
- styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
+ styled-components@6.1.14(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
dependencies:
'@emotion/is-prop-valid': 1.2.2
'@emotion/unitless': 0.8.1
diff --git a/test/package.json b/test/package.json
index caa984b28ddd40..c6d439d6b8b473 100644
--- a/test/package.json
+++ b/test/package.json
@@ -37,7 +37,7 @@
"react-router": "^7.1.1",
"react-window": "^1.8.11",
"sinon": "^19.0.2",
- "styled-components": "^6.1.13",
+ "styled-components": "^6.1.14",
"stylis": "4.2.0",
"stylis-plugin-rtl": "^2.1.1",
"webfontloader": "^1.6.28",
From 93a0466dcb56bc4e0a3ae17fd6e7f9ff2cb16f14 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:01:49 +0100
Subject: [PATCH 04/11] Bump marked to ^15.0.5 (#44943)
---
docs/package.json | 2 +-
packages/markdown/package.json | 2 +-
pnpm-lock.yaml | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/package.json b/docs/package.json
index 8d223a215add12..c1c94f854eb864 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -135,7 +135,7 @@
"chai": "^4.5.0",
"cross-fetch": "^4.1.0",
"gm": "^1.25.0",
- "marked": "^15.0.4",
+ "marked": "^15.0.5",
"playwright": "^1.48.2",
"prettier": "^3.4.2",
"tailwindcss": "^3.4.17",
diff --git a/packages/markdown/package.json b/packages/markdown/package.json
index fc5de97bd705d3..5d3b4de44049b9 100644
--- a/packages/markdown/package.json
+++ b/packages/markdown/package.json
@@ -22,7 +22,7 @@
"dependencies": {
"@babel/runtime": "^7.26.0",
"lodash": "^4.17.21",
- "marked": "^15.0.4",
+ "marked": "^15.0.5",
"prismjs": "^1.29.0"
},
"devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc7f66513d1424..e9aa9ae192a544 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -898,8 +898,8 @@ importers:
specifier: ^1.25.0
version: 1.25.0
marked:
- specifier: ^15.0.4
- version: 15.0.4
+ specifier: ^15.0.5
+ version: 15.0.5
playwright:
specifier: ^1.48.2
version: 1.48.2
@@ -1282,8 +1282,8 @@ importers:
specifier: ^4.17.21
version: 4.17.21
marked:
- specifier: ^15.0.4
- version: 15.0.4
+ specifier: ^15.0.5
+ version: 15.0.5
prismjs:
specifier: ^1.29.0
version: 1.29.0
@@ -9630,8 +9630,8 @@ packages:
resolution: {integrity: sha512-eoQqH0291YCCjd+Pe1PUQ9AmWthlVmS0XWgcionkZ8q34ceZyRI+pYvsWksXJJL8OBkWCPwp1h/pnXxrPFC4oA==}
engines: {node: '>=18'}
- marked@15.0.4:
- resolution: {integrity: sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==}
+ marked@15.0.5:
+ resolution: {integrity: sha512-xN+kSuqHjxWg+Q47yhhZMUP+kO1qHobvXkkm6FX+7N6lDvanLDd8H7AQ0jWDDyq+fDt/cSrJaBGyWYHXy0KQWA==}
engines: {node: '>= 18'}
hasBin: true
@@ -22118,7 +22118,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- marked@15.0.4: {}
+ marked@15.0.5: {}
marky@1.2.5: {}
From fbfa26be3ea16375391f8d900588df5eac21b8d1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:02:26 +0100
Subject: [PATCH 05/11] Bump @types/lodash to ^4.17.14 (#44941)
---
package.json | 2 +-
packages-internal/scripts/package.json | 2 +-
pnpm-lock.yaml | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index 3be4f8bca1ad6f..072668ad1a6d18 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"@playwright/test": "1.48.2",
"@types/babel__core": "^7.20.5",
"@types/fs-extra": "^11.0.4",
- "@types/lodash": "^4.17.13",
+ "@types/lodash": "^4.17.14",
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.10",
"@types/react": "^19.0.2",
diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json
index 03c949afdc5eaf..6c3419ab47b085 100644
--- a/packages-internal/scripts/package.json
+++ b/packages-internal/scripts/package.json
@@ -41,7 +41,7 @@
"@types/babel__core": "^7.20.5",
"@types/chai": "^4.3.20",
"@types/doctrine": "^0.0.9",
- "@types/lodash": "^4.17.13",
+ "@types/lodash": "^4.17.14",
"@types/node": "^20.17.10",
"@types/react": "^19.0.2",
"@types/uuid": "^10.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e9aa9ae192a544..2d84d5e79f6077 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,8 +115,8 @@ importers:
specifier: ^11.0.4
version: 11.0.4
'@types/lodash':
- specifier: ^4.17.13
- version: 4.17.13
+ specifier: ^4.17.14
+ version: 4.17.14
'@types/mocha':
specifier: ^10.0.10
version: 10.0.10
@@ -1000,8 +1000,8 @@ importers:
specifier: ^0.0.9
version: 0.0.9
'@types/lodash':
- specifier: ^4.17.13
- version: 4.17.13
+ specifier: ^4.17.14
+ version: 4.17.14
'@types/node':
specifier: ^20.17.10
version: 20.17.10
@@ -5513,8 +5513,8 @@ packages:
'@types/lodash.mergewith@4.6.7':
resolution: {integrity: sha512-3m+lkO5CLRRYU0fhGRp7zbsGi6+BZj0uTVSwvcKU+nSlhjA9/QRNfuSGnD2mX6hQA7ZbmcCkzk5h4ZYGOtk14A==}
- '@types/lodash@4.17.13':
- resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
+ '@types/lodash@4.17.14':
+ resolution: {integrity: sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==}
'@types/mdast@4.0.4':
resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
@@ -16998,9 +16998,9 @@ snapshots:
'@types/lodash.mergewith@4.6.7':
dependencies:
- '@types/lodash': 4.17.13
+ '@types/lodash': 4.17.14
- '@types/lodash@4.17.13': {}
+ '@types/lodash@4.17.14': {}
'@types/mdast@4.0.4':
dependencies:
From 34b6ca45a13281899069407ab4fe2b9a3866f965 Mon Sep 17 00:00:00 2001
From: Siriwat K
Date: Mon, 6 Jan 2025 20:06:30 +0700
Subject: [PATCH 06/11] [material-ui][Link] Fix error for using custom palette
with underline (#44927)
---
.../src/Link/getTextDecoration.test.js | 20 +++++++++++++++++++
.../src/Link/getTextDecoration.ts | 7 +++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/packages/mui-material/src/Link/getTextDecoration.test.js b/packages/mui-material/src/Link/getTextDecoration.test.js
index 142b16a9499ad0..21035fac0f9ae0 100644
--- a/packages/mui-material/src/Link/getTextDecoration.test.js
+++ b/packages/mui-material/src/Link/getTextDecoration.test.js
@@ -36,6 +36,26 @@ describe('getTextDecoration', () => {
);
expect(() => getTextDecoration({ theme, ownerState: { color: 'yellow' } })).to.throw();
});
+
+ it('work with a custom palette', () => {
+ const customTheme = createTheme({
+ colorSchemes: {
+ light: {
+ palette: {
+ myColor: theme.palette.augmentColor({ color: { main: '#bbbbbb' } }),
+ },
+ },
+ dark: {
+ palette: {
+ myColor: theme.palette.augmentColor({ color: { main: '#aaaaaa' } }),
+ },
+ },
+ },
+ });
+ expect(getTextDecoration({ theme: customTheme, ownerState: { color: 'myColor' } })).to.equal(
+ 'rgba(187, 187, 187, 0.4)',
+ );
+ });
});
describe('CSS variables', () => {
diff --git a/packages/mui-material/src/Link/getTextDecoration.ts b/packages/mui-material/src/Link/getTextDecoration.ts
index 8afec8d8a45927..ca36eb8aa1db02 100644
--- a/packages/mui-material/src/Link/getTextDecoration.ts
+++ b/packages/mui-material/src/Link/getTextDecoration.ts
@@ -10,9 +10,12 @@ const getTextDecoration = ({
ownerState: { color: string };
}) => {
const transformedColor = ownerState.color;
- const color = (getPath(theme, `palette.${transformedColor}`, false) ||
+ // check the `main` color first for a custom palette, then fallback to the color itself
+ const color = (getPath(theme, `palette.${transformedColor}.main`, false) ||
+ getPath(theme, `palette.${transformedColor}`, false) ||
ownerState.color) as string;
- const channelColor = getPath(theme, `palette.${transformedColor}Channel`) as string | null;
+ const channelColor = (getPath(theme, `palette.${transformedColor}.mainChannel`) ||
+ getPath(theme, `palette.${transformedColor}Channel`)) as string | null;
if ('vars' in theme && channelColor) {
return `rgba(${channelColor} / 0.4)`;
}
From 4bcf3cc581e6b2573cc84a069f8d241c06a3e5ae Mon Sep 17 00:00:00 2001
From: Yash Dixit <166094122+yashdev16@users.noreply.github.com>
Date: Mon, 6 Jan 2025 18:37:05 +0530
Subject: [PATCH 07/11] [material-ui][CircularProgress] Improve indeterminate
animation to be symmetric and smooth (#44934)
---
.../mui-material/src/CircularProgress/CircularProgress.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/mui-material/src/CircularProgress/CircularProgress.js b/packages/mui-material/src/CircularProgress/CircularProgress.js
index e0aaae8ba05f0d..7bdeb688282958 100644
--- a/packages/mui-material/src/CircularProgress/CircularProgress.js
+++ b/packages/mui-material/src/CircularProgress/CircularProgress.js
@@ -35,8 +35,8 @@ const circularDashKeyframe = keyframes`
}
100% {
- stroke-dasharray: 100px, 200px;
- stroke-dashoffset: -125px;
+ stroke-dasharray: 1px, 200px;
+ stroke-dashoffset: -126px;
}
`;
From ba35dfcfa205fdb73d90d8d86a539b83e22f0139 Mon Sep 17 00:00:00 2001
From: Siriwat K
Date: Mon, 6 Jan 2025 20:10:28 +0700
Subject: [PATCH 08/11] [material-ui] Add `mergeSlotProps` for extending
components (#44809)
---
.../guides/composition/composition.md | 43 ++++++++
packages/mui-material/src/utils/index.d.ts | 1 +
packages/mui-material/src/utils/index.js | 1 +
.../src/utils/mergeSlotProps.spec.tsx | 64 ++++++++++++
.../src/utils/mergeSlotProps.test.ts | 99 +++++++++++++++++++
.../mui-material/src/utils/mergeSlotProps.ts | 43 ++++++++
6 files changed, 251 insertions(+)
create mode 100644 packages/mui-material/src/utils/mergeSlotProps.spec.tsx
create mode 100644 packages/mui-material/src/utils/mergeSlotProps.test.ts
create mode 100644 packages/mui-material/src/utils/mergeSlotProps.ts
diff --git a/docs/data/material/guides/composition/composition.md b/docs/data/material/guides/composition/composition.md
index 00190c9f867791..cc77b9161e6e53 100644
--- a/docs/data/material/guides/composition/composition.md
+++ b/docs/data/material/guides/composition/composition.md
@@ -22,6 +22,49 @@ WrappedIcon.muiName = Icon.muiName;
{{"demo": "Composition.js"}}
+### Forwarding slot props
+
+Use the `mergeSlotProps` utility function to merge custom props with the slot props.
+If the arguments are functions then they'll be resolved before merging, and the result from the first argument will override the second.
+
+```jsx
+import Tooltip, { TooltipProps } from '@mui/material/Tooltip';
+import { mergeSlotProps } from '@mui/material/utils';
+
+export const CustomTooltip = (props: TooltipProps) => {
+ const { children, title, sx: sxProps } = props;
+
+ return (
+ {title}}
+ slotProps={{
+ ...props.slotProps,
+ popper: mergeSlotProps(props.slotProps?.popper, {
+ className: 'custom-tooltip-popper',
+ disablePortal: true,
+ placement: 'top',
+ }),
+ }}
+ >
+ {children}
+
+ );
+};
+```
+
+:::info
+`className` values are concatenated rather than overriding one another.
+In the snippet above, the `custom-tooltip-popper` class is applied to the Tooltip's popper slot.
+If you added another `className` via the `slotProps` prop on the Custom Tooltip—as shown below—then both would be present on the rendered popper slot:
+
+```js
+
+```
+
+The popper slot in the original example would now have both classes applied to it, in addition to any others that may be present: `"[…] custom-tooltip-popper foo"`.
+:::
+
## Component prop
Material UI allows you to change the root element that will be rendered via a prop called `component`.
diff --git a/packages/mui-material/src/utils/index.d.ts b/packages/mui-material/src/utils/index.d.ts
index ccba6bbec929e1..d5889c9328fc49 100644
--- a/packages/mui-material/src/utils/index.d.ts
+++ b/packages/mui-material/src/utils/index.d.ts
@@ -16,4 +16,5 @@ export { default as unsupportedProp } from './unsupportedProp';
export { default as useControlled } from './useControlled';
export { default as useEventCallback } from './useEventCallback';
export { default as useForkRef } from './useForkRef';
+export { default as mergeSlotProps } from './mergeSlotProps';
export * from './types';
diff --git a/packages/mui-material/src/utils/index.js b/packages/mui-material/src/utils/index.js
index a43e01cd154380..0dde8237b711af 100644
--- a/packages/mui-material/src/utils/index.js
+++ b/packages/mui-material/src/utils/index.js
@@ -18,6 +18,7 @@ export { default as unsupportedProp } from './unsupportedProp';
export { default as useControlled } from './useControlled';
export { default as useEventCallback } from './useEventCallback';
export { default as useForkRef } from './useForkRef';
+export { default as mergeSlotProps } from './mergeSlotProps';
// TODO: remove this export once ClassNameGenerator is stable
// eslint-disable-next-line @typescript-eslint/naming-convention
export const unstable_ClassNameGenerator = {
diff --git a/packages/mui-material/src/utils/mergeSlotProps.spec.tsx b/packages/mui-material/src/utils/mergeSlotProps.spec.tsx
new file mode 100644
index 00000000000000..61801e166311b1
--- /dev/null
+++ b/packages/mui-material/src/utils/mergeSlotProps.spec.tsx
@@ -0,0 +1,64 @@
+import * as React from 'react';
+import { expectType } from '@mui/types';
+import Box from '@mui/material/Box';
+import Tooltip, { TooltipProps } from '@mui/material/Tooltip';
+import { mergeSlotProps, SlotComponentProps } from '@mui/material/utils';
+
+// without explicit type
+const slotProps = mergeSlotProps(undefined, { className: 'foo', 'aria-label': 'bar' });
+expectType, typeof slotProps>(slotProps);
+
+// explicit external slot props type
+const defaultProps = mergeSlotProps<{ foo: string }>(undefined, { foo: 'bar' });
+expectType<{ foo: string }, typeof defaultProps>(defaultProps);
+
+// explicit slot props type with function
+const externalSlotProps = mergeSlotProps<
+ (ownerState: { foo: string }) => { foo: string },
+ { foo: string }
+>(() => ({ foo: 'external' }), { foo: 'default' })({ foo: '' });
+expectType<{ foo: string }, typeof externalSlotProps>(externalSlotProps);
+
+export const CustomTooltip = (props: TooltipProps) => {
+ const { children, title } = props;
+
+ return (
+ {title}}
+ slotProps={{
+ ...props.slotProps,
+ popper: mergeSlotProps(props.slotProps?.popper, {
+ className: 'custom-tooltip',
+ disablePortal: true,
+ placement: 'top',
+ }),
+ }}
+ >
+ {children}
+
+ );
+};
+
+export const CustomTooltip2 = (props: TooltipProps) => {
+ const { children, title } = props;
+
+ // to ensure that the return type of `mergeSlotProps` is correctly inferred
+ const popperProps = mergeSlotProps(props.slotProps?.popper, {
+ className: 'custom-tooltip',
+ disablePortal: true,
+ placement: 'top',
+ });
+ return (
+ {title}}
+ slotProps={{
+ ...props.slotProps,
+ popper: popperProps,
+ }}
+ >
+ {children}
+
+ );
+};
diff --git a/packages/mui-material/src/utils/mergeSlotProps.test.ts b/packages/mui-material/src/utils/mergeSlotProps.test.ts
new file mode 100644
index 00000000000000..b6e93114515ad3
--- /dev/null
+++ b/packages/mui-material/src/utils/mergeSlotProps.test.ts
@@ -0,0 +1,99 @@
+import { expect } from 'chai';
+
+import mergeSlotProps from './mergeSlotProps';
+
+type OwnerState = {
+ className: string;
+ 'aria-label'?: string;
+};
+
+describe('utils/index.js', () => {
+ describe('mergeSlotProps', () => {
+ it('external slot props is undefined', () => {
+ expect(
+ mergeSlotProps(undefined, {
+ className: 'default',
+ 'aria-label': 'foo',
+ }),
+ ).to.deep.equal({
+ className: 'default',
+ 'aria-label': 'foo',
+ });
+ });
+
+ it('external slot props should override', () => {
+ expect(
+ mergeSlotProps(
+ { className: 'external', 'aria-label': 'bar' },
+ { className: 'default', 'aria-label': 'foo' },
+ ),
+ ).to.deep.equal({
+ className: 'default external',
+ 'aria-label': 'bar',
+ });
+ });
+
+ it('external slot props is a function', () => {
+ expect(
+ mergeSlotProps<(ownerState: OwnerState) => OwnerState, OwnerState>(
+ () => ({
+ className: 'external',
+ }),
+ { className: 'default', 'aria-label': 'foo' },
+ )({ className: '' }),
+ ).to.deep.equal({
+ className: 'default external',
+ 'aria-label': 'foo',
+ });
+ });
+
+ it('default slot props is a function', () => {
+ expect(
+ mergeSlotProps OwnerState>(
+ {
+ className: 'external',
+ },
+ () => ({ className: 'default', 'aria-label': 'foo' }),
+ )({ className: 'base' }),
+ ).to.deep.equal({
+ className: 'base default external',
+ 'aria-label': 'foo',
+ });
+ });
+
+ it('both slot props are functions', () => {
+ expect(
+ mergeSlotProps<(ownerState: OwnerState) => OwnerState>(
+ () => ({
+ className: 'external',
+ }),
+ () => ({
+ className: 'default',
+ 'aria-label': 'foo',
+ }),
+ )({ className: 'base' }),
+ ).to.deep.equal({
+ className: 'base default external',
+ 'aria-label': 'foo',
+ });
+ });
+
+ it('external callback should be called with default slot props', () => {
+ expect(
+ mergeSlotProps<(ownerState: OwnerState) => OwnerState>(
+ ({ 'aria-label': ariaLabel }) => ({
+ className: 'external',
+ 'aria-label': ariaLabel === 'foo' ? 'bar' : 'baz',
+ }),
+ () => ({
+ className: 'default',
+ 'aria-label': 'foo',
+ }),
+ )({ className: 'base', 'aria-label': 'unknown' }),
+ ).to.deep.equal({
+ className: 'base default external',
+ 'aria-label': 'bar',
+ });
+ });
+ });
+});
diff --git a/packages/mui-material/src/utils/mergeSlotProps.ts b/packages/mui-material/src/utils/mergeSlotProps.ts
new file mode 100644
index 00000000000000..f458a4c985d8a8
--- /dev/null
+++ b/packages/mui-material/src/utils/mergeSlotProps.ts
@@ -0,0 +1,43 @@
+import { SlotComponentProps } from '@mui/utils';
+import clsx from 'clsx';
+
+export default function mergeSlotProps<
+ T extends SlotComponentProps,
+ K = T,
+ // infer external slot props first to provide autocomplete for default slot props
+ U = T extends Function ? T : K extends Function ? K : T extends undefined ? K : T,
+>(externalSlotProps: T | undefined, defaultSlotProps: K): U {
+ if (!externalSlotProps) {
+ return defaultSlotProps as unknown as U;
+ }
+ if (typeof externalSlotProps === 'function' || typeof defaultSlotProps === 'function') {
+ return ((ownerState: Record) => {
+ const defaultSlotPropsValue =
+ typeof defaultSlotProps === 'function' ? defaultSlotProps(ownerState) : defaultSlotProps;
+ const externalSlotPropsValue =
+ typeof externalSlotProps === 'function'
+ ? externalSlotProps({ ...ownerState, ...defaultSlotPropsValue })
+ : externalSlotProps;
+
+ const className = clsx(
+ ownerState?.className,
+ defaultSlotPropsValue?.className,
+ externalSlotPropsValue?.className,
+ );
+ return {
+ ...defaultSlotPropsValue,
+ ...externalSlotPropsValue,
+ ...(!!className && { className }),
+ };
+ }) as U;
+ }
+ const className = clsx(
+ (defaultSlotProps as Record)?.className,
+ externalSlotProps?.className,
+ );
+ return {
+ ...defaultSlotProps,
+ ...externalSlotProps,
+ ...(!!className && { className }),
+ } as U;
+}
From f37ca96dd713bf8abddbddf63f949f526b606004 Mon Sep 17 00:00:00 2001
From: Sycamore <71297412+samuelsycamore@users.noreply.github.com>
Date: Mon, 6 Jan 2025 09:29:52 -0800
Subject: [PATCH 09/11] [docs] Remove Adobe XD chips, links, and mentions
(#44909)
---
.../design-resources/design-resources.md | 2 +-
.../branding/design-kits/adobexd-logo.svg | 1 -
.../productDesignKit/DesignKitDemo.tsx | 5 --
.../productDesignKit/DesignKitFAQ.tsx | 6 +--
.../components/MaterialUIDesignResources.js | 15 +-----
.../ComponentLinkHeader.tsx | 54 ++++++-------------
6 files changed, 22 insertions(+), 61 deletions(-)
delete mode 100644 docs/public/static/branding/design-kits/adobexd-logo.svg
diff --git a/docs/data/material/getting-started/design-resources/design-resources.md b/docs/data/material/getting-started/design-resources/design-resources.md
index cf974fe5fe0d81..833b23d47b8bda 100644
--- a/docs/data/material/getting-started/design-resources/design-resources.md
+++ b/docs/data/material/getting-started/design-resources/design-resources.md
@@ -4,7 +4,7 @@
## Design Kits
-Material UI component designs are available for Figma, Sketch, and Adobe XD, providing accurate representations using shared terminology for all states, variants, and permutations of each component.
+Material UI component designs are available for Figma and Sketch, providing accurate representations using shared terminology for all states, variants, and permutations of each component.
The design kits are composed of over 1,500 unique elements built to speed up the development process and ease communication for teams of designers and developers using the library.
diff --git a/docs/public/static/branding/design-kits/adobexd-logo.svg b/docs/public/static/branding/design-kits/adobexd-logo.svg
deleted file mode 100644
index 787b8fe968e9c0..00000000000000
--- a/docs/public/static/branding/design-kits/adobexd-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/docs/src/components/productDesignKit/DesignKitDemo.tsx b/docs/src/components/productDesignKit/DesignKitDemo.tsx
index 885c798d8c1515..65d99d7dea44b3 100644
--- a/docs/src/components/productDesignKit/DesignKitDemo.tsx
+++ b/docs/src/components/productDesignKit/DesignKitDemo.tsx
@@ -140,11 +140,6 @@ export function MaterialDesignKitInfo() {
alt="Sketch logo."
loading="lazy"
/>
- 
diff --git a/docs/src/components/productDesignKit/DesignKitFAQ.tsx b/docs/src/components/productDesignKit/DesignKitFAQ.tsx
index e06a413bc3efc5..1b51239d348f2b 100644
--- a/docs/src/components/productDesignKit/DesignKitFAQ.tsx
+++ b/docs/src/components/productDesignKit/DesignKitFAQ.tsx
@@ -68,11 +68,11 @@ const faqData = [
),
},
{
- summary: 'Figma or Sketch or Adobe XD?',
+ summary: 'Figma or Sketch?',
detail: (
- We aim to keep feature parity between the Figma, Sketch, and Adobe XD kits where possible.
- We have a 50% off coupon for past customers who want to switch between them.
+ We aim to keep feature parity between the Figma and Sketch kits where possible. We have a
+ 50% off coupon for past customers who want to switch between them.
),
},
diff --git a/docs/src/modules/components/MaterialUIDesignResources.js b/docs/src/modules/components/MaterialUIDesignResources.js
index e47d0dbf53da8c..9808c86517b66e 100644
--- a/docs/src/modules/components/MaterialUIDesignResources.js
+++ b/docs/src/modules/components/MaterialUIDesignResources.js
@@ -29,26 +29,13 @@ const content = [
/>
),
},
- {
- title: 'Material UI for Adobe XD',
- link: 'https://mui.com/store/items/adobe-xd-react/?utm_source=docs&utm_medium=referral&utm_campaign=installation-adobe-xd',
- svg: (
- 
- ),
- },
];
export default function MaterialUIDesignResources() {
return (
{content.map(({ svg, title, link }) => (
-
+
))}
diff --git a/packages/mui-docs/src/ComponentLinkHeader/ComponentLinkHeader.tsx b/packages/mui-docs/src/ComponentLinkHeader/ComponentLinkHeader.tsx
index aab2e456104af2..17fd57002f03b4 100644
--- a/packages/mui-docs/src/ComponentLinkHeader/ComponentLinkHeader.tsx
+++ b/packages/mui-docs/src/ComponentLinkHeader/ComponentLinkHeader.tsx
@@ -7,7 +7,6 @@ import { styled } from '@mui/material/styles';
import { MarkdownHeaders } from '@mui/internal-markdown';
import SketchIcon from '../svgIcons/SketchIcon';
import FigmaIcon from '../svgIcons/FigmaIcon';
-import AdobeXDIcon from '../svgIcons/AdobeXDIcon';
import BundleSizeIcon from '../svgIcons/BundleSizeIcon';
import W3CIcon from '../svgIcons/W3CIcon';
import MaterialDesignIcon from '../svgIcons/MaterialDesignIcon';
@@ -176,42 +175,23 @@ export function ComponentLinkHeader(props: ComponentLinkHeaderProps) {
/>
{packageName === '@mui/joy' ? null : (
-
-
- }
- data-ga-event-category="ComponentLinkHeader"
- data-ga-event-action="click"
- data-ga-event-label="Adobe XD"
- data-ga-event-split="0.1"
- label="Adobe"
- />
-
-
- }
- data-ga-event-category="ComponentLinkHeader"
- data-ga-event-action="click"
- data-ga-event-label="Sketch"
- data-ga-event-split="0.1"
- label="Sketch"
- />
-
-
+
+ }
+ data-ga-event-category="ComponentLinkHeader"
+ data-ga-event-action="click"
+ data-ga-event-label="Sketch"
+ data-ga-event-split="0.1"
+ label="Sketch"
+ />
+
)}
)}
From 4d1bb85af5019ab1141aa1a1d22f4b036acbce26 Mon Sep 17 00:00:00 2001
From: Sycamore <71297412+samuelsycamore@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:22:08 -0800
Subject: [PATCH 10/11] [docs] Remove more instances of Adobe XD (#44956)
---
docs/src/components/home/DesignKits.tsx | 9 +++------
docs/src/modules/components/AdobeXDIcon.js | 16 ----------------
packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx | 16 ----------------
3 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 docs/src/modules/components/AdobeXDIcon.js
delete mode 100644 packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx
diff --git a/docs/src/components/home/DesignKits.tsx b/docs/src/components/home/DesignKits.tsx
index 348ffb54fc1fef..7c9e8994316c25 100644
--- a/docs/src/components/home/DesignKits.tsx
+++ b/docs/src/components/home/DesignKits.tsx
@@ -66,7 +66,7 @@ const Anchor = styled('a')(({ theme }) => [
const DesignToolLink = React.forwardRef<
HTMLAnchorElement,
- React.PropsWithChildren<{ brand: 'figma' | 'sketch' | 'adobexd' }>
+ React.PropsWithChildren<{ brand: 'figma' | 'sketch' }>
>(function DesignToolLink(props, ref) {
const { brand, ...other } = props;
return (
@@ -79,8 +79,6 @@ const DesignToolLink = React.forwardRef<
'https://mui.com/store/items/figma-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
sketch:
'https://mui.com/store/items/sketch-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
- adobexd:
- 'https://mui.com/store/items/adobe-xd-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
}[brand]
}
target="_blank"
@@ -91,7 +89,7 @@ const DesignToolLink = React.forwardRef<
const DesignToolLogo = React.forwardRef<
HTMLImageElement,
- { brand: 'figma' | 'sketch' | 'adobexd' } & AvatarProps
+ { brand: 'figma' | 'sketch' } & AvatarProps
>(function DesignToolLogo({ brand, ...props }, ref) {
return (
;
}
@@ -229,7 +227,6 @@ export function DesignKitTools({ disableLink, ...props }: { disableLink?: boolea
>
{renderTool('figma')}
{renderTool('sketch')}
- {renderTool('adobexd')}
);
}
diff --git a/docs/src/modules/components/AdobeXDIcon.js b/docs/src/modules/components/AdobeXDIcon.js
deleted file mode 100644
index ca3634838b2ee9..00000000000000
--- a/docs/src/modules/components/AdobeXDIcon.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as React from 'react';
-import { createSvgIcon } from '@mui/material/utils';
-
-export default createSvgIcon(
-
-
-
- ,
- 'AdobeXD',
-);
diff --git a/packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx b/packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx
deleted file mode 100644
index ca3634838b2ee9..00000000000000
--- a/packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as React from 'react';
-import { createSvgIcon } from '@mui/material/utils';
-
-export default createSvgIcon(
-
-
-
- ,
- 'AdobeXD',
-);
From 0221d17856a63d89e832d49f652b1e189ab7b7cf Mon Sep 17 00:00:00 2001
From: siddhantantil39 <54893999+siddhantantil39@users.noreply.github.com>
Date: Tue, 7 Jan 2025 13:04:58 +0530
Subject: [PATCH 11/11] [material-ui][Select] Do not set `aria-controls` when
closed (#44919)
Signed-off-by: siddhantantil39 <54893999+siddhantantil39@users.noreply.github.com>
Co-authored-by: Albert Yu
---
packages/mui-material/src/Select/Select.test.js | 5 +++++
packages/mui-material/src/Select/SelectInput.js | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/packages/mui-material/src/Select/Select.test.js b/packages/mui-material/src/Select/Select.test.js
index 3dc42c37d9473c..100b69b1ca4a9f 100644
--- a/packages/mui-material/src/Select/Select.test.js
+++ b/packages/mui-material/src/Select/Select.test.js
@@ -517,6 +517,11 @@ describe('', () => {
expect(getByRole('combobox', { hidden: true })).to.have.attribute('aria-controls', listboxId);
});
+ it('does not set aria-controls when closed', () => {
+ const { getByRole } = render();
+ expect(getByRole('combobox', { hidden: true })).to.not.have.attribute('aria-controls');
+ });
+
specify('the listbox is focusable', async () => {
const { getByRole } = render();
diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
index fd48bd5d44b08d..a1acee8485330f 100644
--- a/packages/mui-material/src/Select/SelectInput.js
+++ b/packages/mui-material/src/Select/SelectInput.js
@@ -497,7 +497,7 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
ref={handleDisplayRef}
tabIndex={tabIndex}
role="combobox"
- aria-controls={listboxId}
+ aria-controls={open ? listboxId : undefined}
aria-disabled={disabled ? 'true' : undefined}
aria-expanded={open ? 'true' : 'false'}
aria-haspopup="listbox"