Merge branch 'master' into fix-detailPanel-demo

mui · Oct 9, 2024 · 3dc9f0d · 3dc9f0d
2 parents 2792890 + e8991e9
commit 3dc9f0d
Show file tree

Hide file tree

Showing 132 changed files with 2,639 additions and 964 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -39,10 +39,6 @@ const defaultAlias = {
   packages: resolveAliasPath('./packages'),
 };
 
-const productionPlugins = [
-  ['babel-plugin-react-remove-properties', { properties: ['data-mui-test'] }],
-];
-
 /** @type {babel.ConfigFunction} */
 module.exports = function getBabelConfig(api) {
   const useESModules = api.env(['modern', 'stable', 'rollup']);
@@ -129,7 +125,9 @@ module.exports = function getBabelConfig(api) {
   }
 
   if (process.env.NODE_ENV === 'production') {
-    plugins.push(...productionPlugins);
+    if (!process.env.E2E_BUILD) {
+      plugins.push(['babel-plugin-react-remove-properties', { properties: ['data-testid'] }]);
+    }
 
     if (process.env.BABEL_ENV) {
       plugins.push([

diff --git a/docs/data/charts/highlighting/ElementHighlights.js b/docs/data/charts/highlighting/ElementHighlights.js
@@ -7,7 +7,6 @@ import TextField from '@mui/material/TextField';
 import MenuItem from '@mui/material/MenuItem';
 import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
 import ToggleButton from '@mui/material/ToggleButton';
-
 import { BarChart } from '@mui/x-charts/BarChart';
 import { LineChart } from '@mui/x-charts/LineChart';
 import { ScatterChart } from '@mui/x-charts/ScatterChart';
@@ -130,6 +129,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'line' && (
           <LineChart
             {...lineChartsParams}
@@ -143,6 +143,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'scatter' && (
           <ScatterChart
             {...scatterChartsParams}
@@ -155,6 +156,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'pie' && (
           <PieChart
             {...pieChartsParams}

diff --git a/docs/data/charts/highlighting/ElementHighlights.tsx b/docs/data/charts/highlighting/ElementHighlights.tsx
@@ -7,11 +7,11 @@ import TextField from '@mui/material/TextField';
 import MenuItem from '@mui/material/MenuItem';
 import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
 import ToggleButton from '@mui/material/ToggleButton';
-import { HighlightScope } from '@mui/x-charts/context';
 import { BarChart } from '@mui/x-charts/BarChart';
 import { LineChart } from '@mui/x-charts/LineChart';
 import { ScatterChart } from '@mui/x-charts/ScatterChart';
 import { PieChart } from '@mui/x-charts/PieChart';
+import { HighlightScope } from '@mui/x-charts/context';
 
 const barChartsParams = {
   series: [
@@ -130,6 +130,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'line' && (
           <LineChart
             {...lineChartsParams}
@@ -143,6 +144,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'scatter' && (
           <ScatterChart
             {...scatterChartsParams}
@@ -155,6 +157,7 @@ export default function ElementHighlights() {
             }))}
           />
         )}
+
         {chartType === 'pie' && (
           <PieChart
             {...pieChartsParams}

diff --git a/docs/data/date-pickers/custom-components/ActionBarComponent.js b/docs/data/date-pickers/custom-components/ActionBarComponent.js
@@ -27,7 +27,6 @@ function CustomActionBar(props) {
       case 'clear':
         return (
           <MenuItem
-            data-mui-test="clear-action-button"
             onClick={() => {
               onClear();
               setAnchorEl(null);
@@ -67,7 +66,6 @@ function CustomActionBar(props) {
       case 'today':
         return (
           <MenuItem
-            data-mui-test="today-action-button"
             onClick={() => {
               setAnchorEl(null);
               onSetToday();

diff --git a/docs/data/date-pickers/custom-components/ActionBarComponent.tsx b/docs/data/date-pickers/custom-components/ActionBarComponent.tsx
@@ -27,7 +27,6 @@ function CustomActionBar(props: PickersActionBarProps) {
       case 'clear':
         return (
           <MenuItem
-            data-mui-test="clear-action-button"
             onClick={() => {
               onClear();
               setAnchorEl(null);
@@ -64,7 +63,6 @@ function CustomActionBar(props: PickersActionBarProps) {
       case 'today':
         return (
           <MenuItem
-            data-mui-test="today-action-button"
             onClick={() => {
               setAnchorEl(null);
               onSetToday();

diff --git a/docs/data/tree-view/rich-tree-view/customization/LabelSlotProps.js b/docs/data/tree-view/rich-tree-view/customization/LabelSlotProps.js
diff --git a/docs/data/tree-view/rich-tree-view/customization/LabelSlotProps.tsx b/docs/data/tree-view/rich-tree-view/customization/LabelSlotProps.tsx