Merge branch 'master' into remove-ownerState-propogation-accordion-transition-slot

ZeeshanTamboli · ZeeshanTamboli · commit 30184287a072 · 2024-11-13T13:10:38.000+05:30
diff --git a/.github/ISSUE_TEMPLATE/1.bug.yml b/.github/ISSUE_TEMPLATE/1.bug.yml
@@ -28,10 +28,8 @@ body:
 
         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.
       value: |
-        Link to live example: (required)
-
         Steps:
-        1.
+        1. Open this link to live example: (required)
         2.
         3.
   - type: textarea
diff --git a/docs/data/material/components/rating/BasicRating.js b/docs/data/material/components/rating/BasicRating.js
@@ -16,6 +16,14 @@ export default function BasicRating() {
           setValue(newValue);
         }}
       />
+      <Typography component="legend">Uncontrolled</Typography>
+      <Rating
+        name="simple-uncontrolled"
+        onChange={(event, newValue) => {
+          console.log(newValue);
+        }}
+        defaultValue={2}
+      />
       <Typography component="legend">Read only</Typography>
       <Rating name="read-only" value={value} readOnly />
       <Typography component="legend">Disabled</Typography>
diff --git a/docs/data/material/components/rating/BasicRating.tsx b/docs/data/material/components/rating/BasicRating.tsx
@@ -16,6 +16,14 @@ export default function BasicRating() {
           setValue(newValue);
         }}
       />
+      <Typography component="legend">Uncontrolled</Typography>
+      <Rating
+        name="simple-uncontrolled"
+        onChange={(event, newValue) => {
+          console.log(newValue);
+        }}
+        defaultValue={2}
+      />
       <Typography component="legend">Read only</Typography>
       <Rating name="read-only" value={value} readOnly />
       <Typography component="legend">Disabled</Typography>
diff --git a/docs/data/material/components/rating/BasicRating.tsx.preview b/docs/data/material/components/rating/BasicRating.tsx.preview
diff --git a/docs/data/material/components/snackbars/snackbars.md b/docs/data/material/components/snackbars/snackbars.md
@@ -141,7 +141,7 @@ The Snackbar component is composed of a root `<div>` that houses interior elemen
 </div>
 ```
 
-## Experimental APIs - Toolpad
+## Toolpad (Beta)
 
 ### useNotifications
 
diff --git a/docs/data/material/experimental-api/pigment-css/pigment-css.md b/docs/data/material/experimental-api/pigment-css/pigment-css.md
@@ -48,8 +48,8 @@ npm install --save-dev @pigment-css/nextjs-plugin
 ```
 
 ```bash Vite
-npm install @pigment-css/react@next
-npm install --save-dev @pigment-css/vite-plugin@next
+npm install @pigment-css/react
+npm install --save-dev @pigment-css/vite-plugin
 ```
 
 </codeblock>
diff --git a/docs/package.json b/docs/package.json
@@ -54,7 +54,7 @@
     "@mui/x-tree-view": "7.22.1",
     "@popperjs/core": "^2.11.8",
     "@react-spring/web": "^9.7.5",
-    "@toolpad/core": "^0.8.1",
+    "@toolpad/core": "^0.9.0",
     "autoprefixer": "^10.4.20",
     "autosuggest-highlight": "^3.3.4",
     "babel-plugin-module-resolver": "^5.0.2",
diff --git a/docs/scripts/reportBrokenLinks.js b/docs/scripts/reportBrokenLinks.js
@@ -15,7 +15,7 @@ function getPageLinks(markdown) {
       hrefs.push(href);
     }
   };
-  marked(markdown, { mangle: false, headerIds: false, renderer });
+  marked(markdown, { renderer });
   return hrefs;
 }
 
diff --git a/packages/markdown/parseMarkdown.js b/packages/markdown/parseMarkdown.js
@@ -7,15 +7,8 @@ const prism = require('./prism');
  */
 const markedOptions = {
   gfm: true,
-  tables: true,
   breaks: false,
   pedantic: false,
-  sanitize: false,
-  smartLists: true,
-  smartypants: false,
-  headerPrefix: false,
-  headerIds: false,
-  mangle: false,
 };
 
 const headerRegExp = /---[\r\n]([\s\S]*)[\r\n]---/;
diff --git a/packages/mui-docs/src/Ad/ad.styles.ts b/packages/mui-docs/src/Ad/ad.styles.ts
@@ -7,9 +7,11 @@ export const adBodyImageStyles = (theme: Theme) => ({
     border: '1px dashed',
     borderColor: theme.palette.divider,
     borderRadius: theme.shape.borderRadius,
-    padding: '8px 8px 8px calc(8px + 130px)',
+    padding: 8,
+    paddingLeft: 8 + 130,
     [theme.breakpoints.up('sm')]: {
-      padding: '12px 12px 12px calc(12px + 130px)',
+      padding: 12,
+      paddingLeft: 12 + 130,
     },
   },
   imgWrapper: {
diff --git a/packages/mui-material/src/Grid/Grid.js b/packages/mui-material/src/Grid/Grid.js
@@ -170,7 +170,7 @@ export function generateRowGap({ theme, ownerState }) {
 
       if (themeSpacing !== '0px') {
         return {
-          marginTop: theme.spacing(-propValue),
+          marginTop: `-${themeSpacing}`,
           [`& > .${gridClasses.item}`]: {
             paddingTop: themeSpacing,
           },
@@ -214,7 +214,7 @@ export function generateColumnGap({ theme, ownerState }) {
     styles = handleBreakpoints({ theme }, columnSpacingValues, (propValue, breakpoint) => {
       const themeSpacing = theme.spacing(propValue);
       if (themeSpacing !== '0px') {
-        const negativeValue = theme.spacing(-propValue);
+        const negativeValue = `-${themeSpacing}`;
         return {
           width: `calc(100% + ${themeSpacing})`,
           marginLeft: negativeValue,
diff --git a/packages/mui-material/src/Grid/Grid.test.js b/packages/mui-material/src/Grid/Grid.test.js
@@ -746,7 +746,7 @@ describe('Material UI <Grid />', () => {
         generateRowGap({
           ownerState: {
             container: true,
-            rowSpacing: { xs: 1, sm: 2 },
+            rowSpacing: { xs: 1, sm: 2, md: '16px' },
           },
           theme,
         }),
@@ -763,13 +763,19 @@ describe('Material UI <Grid />', () => {
           },
           marginTop: '-16px',
         },
+        [`@media (min-width:${defaultTheme.breakpoints.values.md}px)`]: {
+          '& > .MuiGrid-item': {
+            paddingTop: '16px',
+          },
+          marginTop: '-16px',
+        },
       });
 
       expect(
         generateColumnGap({
           ownerState: {
             container: true,
-            columnSpacing: { xs: 1, sm: 2 },
+            columnSpacing: { xs: 1, sm: 2, md: '16px' },
           },
           theme,
         }),
@@ -788,6 +794,13 @@ describe('Material UI <Grid />', () => {
           marginLeft: '-16px',
           width: 'calc(100% + 16px)',
         },
+        [`@media (min-width:${defaultTheme.breakpoints.values.md}px)`]: {
+          '& > .MuiGrid-item': {
+            paddingLeft: '16px',
+          },
+          marginLeft: '-16px',
+          width: 'calc(100% + 16px)',
+        },
       });
     });
 
diff --git a/packages/mui-system/src/createTheme/createSpacing.test.ts b/packages/mui-system/src/createTheme/createSpacing.test.ts
@@ -51,6 +51,12 @@ describe('createSpacing', () => {
     expect(spacing(1, 'auto', 2, 3)).to.equal('0.25rem auto 0.5rem 0.75rem');
   });
 
+  it('should support valid CSS unit', () => {
+    const spacing = createSpacing();
+    expect(spacing('16px')).to.equal('16px');
+    expect(spacing('1rem')).to.equal('1rem');
+  });
+
   describe('warnings', () => {
     it('should warn for wrong input', () => {
       expect(() => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function getPageLinks(markdown) {`
`15`	`15`	`hrefs.push(href);`
`16`	`16`	`}`
`17`	`17`	`};`
`18`		`- marked(markdown, { mangle: false, headerIds: false, renderer });`
	`18`	`+ marked(markdown, { renderer });`
`19`	`19`	`return hrefs;`
`20`	`20`	`}`
`21`	`21`