Merge branch 'master' into mention-toolpad

mui · Nov 12, 2024 · 98e4930 · 98e4930
2 parents 5e09e01 + e84fc98
commit 98e4930
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 94 deletions.
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/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/pnpm-lock.yaml b/pnpm-lock.yaml