Merge branch 'next' into remove-legacy-api

mui · Oct 6, 2022 · df0ce38 · df0ce38
2 parents 2e192bc + efa88c6
commit df0ce38
Show file tree

Hide file tree

Showing 187 changed files with 1,407 additions and 977 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -87,7 +87,7 @@ commands:
                   - v5-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
       - run:
           name: Install js dependencies
-          command: yarn install --verbose
+          command: yarn install
           environment:
             PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: <<# parameters.browsers >>0<</ parameters.browsers >><<^ parameters.browsers >>1<</ parameters.browsers >>
       - save_cache:

diff --git a/.github/workflows/vale-action.yml b/.github/workflows/vale-action.yml
@@ -6,7 +6,7 @@ jobs:
     name: runner / vale
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: errata-ai/vale-action@reviewdog
         with:
           reporter: github-pr-review

diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.js b/docs/data/data-grid/aggregation/AggregationColDefAggregable.js
@@ -54,7 +54,6 @@ export default function AggregationColDefAggregable() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx b/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx
@@ -54,7 +54,6 @@ export default function AggregationColDefAggregable() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx.preview b/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx.preview
@@ -9,5 +9,4 @@
       },
     },
   }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationControlled.js b/docs/data/data-grid/aggregation/AggregationControlled.js
@@ -40,7 +40,6 @@ export default function AggregationControlled() {
         columns={COLUMNS}
         aggregationModel={aggregationModel}
         onAggregationModelChange={(newModel) => setAggregationModel(newModel)}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationControlled.tsx b/docs/data/data-grid/aggregation/AggregationControlled.tsx
@@ -45,7 +45,6 @@ export default function AggregationControlled() {
         columns={COLUMNS}
         aggregationModel={aggregationModel}
         onAggregationModelChange={(newModel) => setAggregationModel(newModel)}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationControlled.tsx.preview b/docs/data/data-grid/aggregation/AggregationControlled.tsx.preview
@@ -3,5 +3,4 @@
   columns={COLUMNS}
   aggregationModel={aggregationModel}
   onAggregationModelChange={(newModel) => setAggregationModel(newModel)}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationCustomFunction.js b/docs/data/data-grid/aggregation/AggregationCustomFunction.js
@@ -88,7 +88,6 @@ export default function AggregationCustomFunction() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx b/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx
@@ -91,7 +91,6 @@ export default function AggregationCustomFunction() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx.preview b/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx.preview
@@ -0,0 +1,16 @@
+<DataGridPremium
+  rows={data.rows}
+  columns={COLUMNS}
+  aggregationFunctions={{
+    ...GRID_AGGREGATION_FUNCTIONS,
+    firstAlphabetical: firstAlphabeticalAggregation,
+    lastAlphabetical: lastAlphabeticalAggregation,
+  }}
+  initialState={{
+    aggregation: {
+      model: {
+        director: 'firstAlphabetical',
+      },
+    },
+  }}
+/>
diff --git a/docs/data/data-grid/aggregation/AggregationDisabled.js b/docs/data/data-grid/aggregation/AggregationDisabled.js
@@ -11,7 +11,6 @@ export default function AggregationDisabled() {
         {...data}
         disableAggregation
         initialState={{ aggregation: { model: { gross: 'sum' } } }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationDisabled.tsx b/docs/data/data-grid/aggregation/AggregationDisabled.tsx
@@ -11,7 +11,6 @@ export default function AggregationDisabled() {
         {...data}
         disableAggregation
         initialState={{ aggregation: { model: { gross: 'sum' } } }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationDisabled.tsx.preview b/docs/data/data-grid/aggregation/AggregationDisabled.tsx.preview
@@ -2,5 +2,4 @@
   {...data}
   disableAggregation
   initialState={{ aggregation: { model: { gross: 'sum' } } }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationFiltering.js b/docs/data/data-grid/aggregation/AggregationFiltering.js
@@ -49,9 +49,6 @@ export default function AggregationFiltering() {
           },
         }}
         aggregationRowsScope="all"
-        experimentalFeatures={{
-          aggregation: true,
-        }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationFiltering.tsx b/docs/data/data-grid/aggregation/AggregationFiltering.tsx
@@ -49,9 +49,6 @@ export default function AggregationFiltering() {
           },
         }}
         aggregationRowsScope="all"
-        experimentalFeatures={{
-          aggregation: true,
-        }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.js b/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.js
@@ -69,7 +69,6 @@ export default function AggregationGetAggregationPosition() {
         getAggregationPosition={(groupNode) =>
           groupNode.depth === -1 ? null : 'footer'
         }
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx b/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx
@@ -70,7 +70,6 @@ export default function AggregationGetAggregationPosition() {
         getAggregationPosition={(groupNode) =>
           groupNode.depth === -1 ? null : 'footer'
         }
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx.preview b/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx.preview
@@ -7,5 +7,4 @@
   getAggregationPosition={(groupNode) =>
     groupNode.depth === -1 ? null : 'footer'
   }
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationInitialState.js b/docs/data/data-grid/aggregation/AggregationInitialState.js
@@ -41,7 +41,6 @@ export default function AggregationInitialState() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationInitialState.tsx b/docs/data/data-grid/aggregation/AggregationInitialState.tsx
@@ -41,7 +41,6 @@ export default function AggregationInitialState() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationInitialState.tsx.preview b/docs/data/data-grid/aggregation/AggregationInitialState.tsx.preview
@@ -8,5 +8,4 @@
       },
     },
   }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.js b/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.js
@@ -49,7 +49,6 @@ export default function AggregationRemoveFunctionAllColumns() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.tsx b/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.tsx
@@ -50,7 +50,6 @@ export default function AggregationRemoveFunctionAllColumns() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.tsx.preview b/docs/data/data-grid/aggregation/AggregationRemoveFunctionAllColumns.tsx.preview
@@ -0,0 +1,16 @@
+<DataGridPremium
+  rows={data.rows}
+  columns={COLUMNS}
+  aggregationFunctions={Object.fromEntries(
+    Object.entries(GRID_AGGREGATION_FUNCTIONS).filter(
+      ([name]) => name !== 'sum',
+    ),
+  )}
+  initialState={{
+    aggregation: {
+      model: {
+        gross: 'max',
+      },
+    },
+  }}
+/>
diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.js b/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.js
@@ -48,7 +48,6 @@ export default function AggregationRemoveFunctionOneColumn() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.tsx b/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.tsx
@@ -48,7 +48,6 @@ export default function AggregationRemoveFunctionOneColumn() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.tsx.preview b/docs/data/data-grid/aggregation/AggregationRemoveFunctionOneColumn.tsx.preview
@@ -9,5 +9,4 @@
       },
     },
   }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationRenderCell.js b/docs/data/data-grid/aggregation/AggregationRenderCell.js
@@ -49,7 +49,6 @@ export default function AggregationRenderCell() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRenderCell.tsx b/docs/data/data-grid/aggregation/AggregationRenderCell.tsx
@@ -49,7 +49,6 @@ export default function AggregationRenderCell() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRenderCell.tsx.preview b/docs/data/data-grid/aggregation/AggregationRenderCell.tsx.preview
@@ -8,5 +8,4 @@
       },
     },
   }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationRowGrouping.js b/docs/data/data-grid/aggregation/AggregationRowGrouping.js
@@ -61,7 +61,6 @@ export default function AggregationRowGrouping() {
         columns={COLUMNS}
         disableSelectionOnClick
         initialState={initialState}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRowGrouping.tsx b/docs/data/data-grid/aggregation/AggregationRowGrouping.tsx
@@ -62,7 +62,6 @@ export default function AggregationRowGrouping() {
         columns={COLUMNS}
         disableSelectionOnClick
         initialState={initialState}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationRowGrouping.tsx.preview b/docs/data/data-grid/aggregation/AggregationRowGrouping.tsx.preview
@@ -4,5 +4,4 @@
   columns={COLUMNS}
   disableSelectionOnClick
   initialState={initialState}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationTreeData.js b/docs/data/data-grid/aggregation/AggregationTreeData.js
@@ -145,9 +145,6 @@ export default function AggregationTreeData() {
             },
           },
         }}
-        experimentalFeatures={{
-          aggregation: true,
-        }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationTreeData.tsx b/docs/data/data-grid/aggregation/AggregationTreeData.tsx
@@ -158,9 +158,6 @@ export default function AggregationTreeData() {
             },
           },
         }}
-        experimentalFeatures={{
-          aggregation: true,
-        }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationTreeData.tsx.preview b/docs/data/data-grid/aggregation/AggregationTreeData.tsx.preview
@@ -0,0 +1,16 @@
+<DataGridPremium
+  treeData
+  rows={rows}
+  columns={columns}
+  getTreeDataPath={getTreeDataPath}
+  getRowId={getRowId}
+  groupingColDef={{ headerName: 'Files', width: 350 }}
+  initialState={{
+    aggregation: {
+      model: {
+        size: 'sum',
+        updatedAt: 'max',
+      },
+    },
+  }}
+/>
diff --git a/docs/data/data-grid/aggregation/AggregationValueFormatter.js b/docs/data/data-grid/aggregation/AggregationValueFormatter.js
@@ -68,7 +68,6 @@ export default function AggregationValueFormatter() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationValueFormatter.tsx b/docs/data/data-grid/aggregation/AggregationValueFormatter.tsx
@@ -71,7 +71,6 @@ export default function AggregationValueFormatter() {
             },
           },
         }}
-        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationValueFormatter.tsx.preview b/docs/data/data-grid/aggregation/AggregationValueFormatter.tsx.preview
@@ -12,5 +12,4 @@
       },
     },
   }}
-  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/aggregation.md b/docs/data/data-grid/aggregation/aggregation.md
@@ -10,16 +10,6 @@ You can aggregate rows through the grid interface by opening the column menu and
 
 The aggregated values are rendered in a footer row at the bottom of the grid.
 
-:::warning
-This feature is experimental.
-To activate it, use the `aggregation` experimental feature flag:
-
-```tsx
-<DataGridPremium experimentalFeatures={{ aggregation: true }} {...otherProps} />
-```
-
-:::
-
 {{"demo": "AggregationInitialState.js", "bg": "inline", "defaultCodeOpen": false}}
 
 ## Pass aggregation to the Data Grid

diff --git a/docs/data/date-pickers/custom-components/ArrowSwitcherComponent.tsx b/docs/data/date-pickers/custom-components/ArrowSwitcherComponent.tsx
@@ -15,7 +15,7 @@ import { StaticTimePicker } from '@mui/x-date-pickers/StaticTimePicker';
 import { StaticDateRangePicker } from '@mui/x-date-pickers-pro/StaticDateRangePicker';
 import { DateRange } from '@mui/x-date-pickers-pro';
 
-const components: DatePickerProps<any>['components'] = {
+const components: Omit<DatePickerProps<any>['components'], 'Day'> = {
   LeftArrowIcon: ArrowLeft,
   RightArrowIcon: ArrowRight,
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,6 @@ export default function AggregationColDefAggregable() { @@
                 },
               },
             }}
-            experimentalFeatures={{ aggregation: true }}
           />
         </div>
       );
@@ Expand Down @@