[DataGridPremium] Make aggregation public (#5592)

mui · Jul 28, 2022 · 9270486 · 9270486
1 parent e273835
commit 9270486
Show file tree

Hide file tree

Showing 64 changed files with 604 additions and 703 deletions.
diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.js b/docs/data/data-grid/aggregation/AggregationColDefAggregable.js
@@ -15,7 +15,7 @@ const COLUMNS = [
     headerName: 'Title',
     width: 200,
     groupable: false,
-    private_aggregable: false,
+    aggregable: false,
   },
   {
     field: 'gross',
@@ -34,7 +34,7 @@ const COLUMNS = [
     field: 'year',
     headerName: 'Year',
     type: 'number',
-    private_aggregable: false,
+    aggregable: false,
   },
 ];
 
@@ -47,16 +47,14 @@ export default function AggregationColDefAggregable() {
         rows={data.rows}
         columns={COLUMNS}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               gross: 'sum',
               year: 'sum',
             },
           },
         }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx b/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx
@@ -15,7 +15,7 @@ const COLUMNS: GridColDef[] = [
     headerName: 'Title',
     width: 200,
     groupable: false,
-    private_aggregable: false,
+    aggregable: false,
   },
   {
     field: 'gross',
@@ -34,7 +34,7 @@ const COLUMNS: GridColDef[] = [
     field: 'year',
     headerName: 'Year',
     type: 'number',
-    private_aggregable: false,
+    aggregable: false,
   },
 ];
 
@@ -47,16 +47,14 @@ export default function AggregationColDefAggregable() {
         rows={data.rows}
         columns={COLUMNS}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               gross: 'sum',
               year: 'sum',
             },
           },
         }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx.preview b/docs/data/data-grid/aggregation/AggregationColDefAggregable.tsx.preview
@@ -2,14 +2,12 @@
   rows={data.rows}
   columns={COLUMNS}
   initialState={{
-    private_aggregation: {
+    aggregation: {
       model: {
         gross: 'sum',
         year: 'sum',
       },
     },
   }}
-  experimentalFeatures={{
-    private_aggregation: true,
-  }}
+  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationControlled.js b/docs/data/data-grid/aggregation/AggregationControlled.js
@@ -38,13 +38,9 @@ export default function AggregationControlled() {
       <DataGridPremium
         rows={data.rows}
         columns={COLUMNS}
-        private_aggregationModel={aggregationModel}
-        private_onAggregationModelChange={(newModel) =>
-          setAggregationModel(newModel)
-        }
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        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
@@ -43,13 +43,9 @@ export default function AggregationControlled() {
       <DataGridPremium
         rows={data.rows}
         columns={COLUMNS}
-        private_aggregationModel={aggregationModel}
-        private_onAggregationModelChange={(newModel) =>
-          setAggregationModel(newModel)
-        }
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        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
@@ -1,11 +1,7 @@
 <DataGridPremium
   rows={data.rows}
   columns={COLUMNS}
-  private_aggregationModel={aggregationModel}
-  private_onAggregationModelChange={(newModel) =>
-    setAggregationModel(newModel)
-  }
-  experimentalFeatures={{
-    private_aggregation: true,
-  }}
+  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
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {
   DataGridPremium,
-  PRIVATE_GRID_AGGREGATION_FUNCTIONS,
+  GRID_AGGREGATION_FUNCTIONS,
 } from '@mui/x-data-grid-premium';
 import { useMovieData } from '@mui/x-data-grid-generator';
 
@@ -18,7 +18,7 @@ const COLUMNS = [
     headerName: 'Title',
     width: 200,
     groupable: false,
-    private_aggregable: false,
+    aggregable: false,
   },
   {
     field: 'director',
@@ -76,21 +76,19 @@ export default function AggregationCustomFunction() {
       <DataGridPremium
         rows={data.rows}
         columns={COLUMNS}
-        private_aggregationFunctions={{
-          ...PRIVATE_GRID_AGGREGATION_FUNCTIONS,
+        aggregationFunctions={{
+          ...GRID_AGGREGATION_FUNCTIONS,
           firstAlphabetical: firstAlphabeticalAggregation,
           lastAlphabetical: lastAlphabeticalAggregation,
         }}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               director: 'firstAlphabetical',
             },
           },
         }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx b/docs/data/data-grid/aggregation/AggregationCustomFunction.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {
   DataGridPremium,
-  PRIVATE_GRID_AGGREGATION_FUNCTIONS,
+  GRID_AGGREGATION_FUNCTIONS,
   GridAggregationFunction,
   GridColDef,
 } from '@mui/x-data-grid-premium';
@@ -20,7 +20,7 @@ const COLUMNS: GridColDef[] = [
     headerName: 'Title',
     width: 200,
     groupable: false,
-    private_aggregable: false,
+    aggregable: false,
   },
   {
     field: 'director',
@@ -79,21 +79,19 @@ export default function AggregationCustomFunction() {
       <DataGridPremium
         rows={data.rows}
         columns={COLUMNS}
-        private_aggregationFunctions={{
-          ...PRIVATE_GRID_AGGREGATION_FUNCTIONS,
+        aggregationFunctions={{
+          ...GRID_AGGREGATION_FUNCTIONS,
           firstAlphabetical: firstAlphabeticalAggregation,
           lastAlphabetical: lastAlphabeticalAggregation,
         }}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               director: 'firstAlphabetical',
             },
           },
         }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationDisabled.js b/docs/data/data-grid/aggregation/AggregationDisabled.js
@@ -9,11 +9,9 @@ export default function AggregationDisabled() {
     <div style={{ height: 400, width: '100%' }}>
       <DataGridPremium
         {...data}
-        private_disableAggregation
-        initialState={{ private_aggregation: { model: { gross: 'sum' } } }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        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
@@ -9,11 +9,9 @@ export default function AggregationDisabled() {
     <div style={{ height: 400, width: '100%' }}>
       <DataGridPremium
         {...data}
-        private_disableAggregation
-        initialState={{ private_aggregation: { model: { gross: 'sum' } } }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        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
@@ -1,8 +1,6 @@
 <DataGridPremium
   {...data}
-  private_disableAggregation
-  initialState={{ private_aggregation: { model: { gross: 'sum' } } }}
-  experimentalFeatures={{
-    private_aggregation: true,
-  }}
+  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
@@ -35,7 +35,7 @@ export default function AggregationFiltering() {
         rows={data.rows}
         columns={COLUMNS}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               gross: 'max',
             },
@@ -48,9 +48,9 @@ export default function AggregationFiltering() {
             },
           },
         }}
-        private_aggregationRowsScope="all"
+        aggregationRowsScope="all"
         experimentalFeatures={{
-          private_aggregation: true,
+          aggregation: true,
         }}
       />
     </div>

diff --git a/docs/data/data-grid/aggregation/AggregationFiltering.tsx b/docs/data/data-grid/aggregation/AggregationFiltering.tsx
@@ -35,7 +35,7 @@ export default function AggregationFiltering() {
         rows={data.rows}
         columns={COLUMNS}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               gross: 'max',
             },
@@ -48,9 +48,9 @@ export default function AggregationFiltering() {
             },
           },
         }}
-        private_aggregationRowsScope="all"
+        aggregationRowsScope="all"
         experimentalFeatures={{
-          private_aggregation: true,
+          aggregation: true,
         }}
       />
     </div>

diff --git a/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.js b/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.js
@@ -50,7 +50,7 @@ export default function AggregationGetAggregationPosition() {
       rowGrouping: {
         model: ['company', 'director'],
       },
-      private_aggregation: {
+      aggregation: {
         model: {
           gross: 'sum',
         },
@@ -66,12 +66,8 @@ export default function AggregationGetAggregationPosition() {
         columns={COLUMNS}
         disableSelectionOnClick
         initialState={initialState}
-        private_getAggregationPosition={(groupNode) =>
-          groupNode == null ? null : 'footer'
-        }
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        getAggregationPosition={(groupNode) => (groupNode == null ? null : 'footer')}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );

diff --git a/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx b/docs/data/data-grid/aggregation/AggregationGetAggregationPosition.tsx
@@ -51,7 +51,7 @@ export default function AggregationGetAggregationPosition() {
       rowGrouping: {
         model: ['company', 'director'],
       },
-      private_aggregation: {
+      aggregation: {
         model: {
           gross: 'sum',
         },
@@ -67,12 +67,8 @@ export default function AggregationGetAggregationPosition() {
         columns={COLUMNS}
         disableSelectionOnClick
         initialState={initialState}
-        private_getAggregationPosition={(groupNode) =>
-          groupNode == null ? null : 'footer'
-        }
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        getAggregationPosition={(groupNode) => (groupNode == null ? 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
@@ -4,10 +4,6 @@
   columns={COLUMNS}
   disableSelectionOnClick
   initialState={initialState}
-  private_getAggregationPosition={(groupNode) =>
-    groupNode == null ? null : 'footer'
-  }
-  experimentalFeatures={{
-    private_aggregation: true,
-  }}
+  getAggregationPosition={(groupNode) => (groupNode == null ? null : 'footer')}
+  experimentalFeatures={{ aggregation: true }}
 />
diff --git a/docs/data/data-grid/aggregation/AggregationInitialState.js b/docs/data/data-grid/aggregation/AggregationInitialState.js
@@ -35,15 +35,13 @@ export default function AggregationInitialState() {
         rows={data.rows}
         columns={COLUMNS}
         initialState={{
-          private_aggregation: {
+          aggregation: {
             model: {
               gross: 'sum',
             },
           },
         }}
-        experimentalFeatures={{
-          private_aggregation: true,
-        }}
+        experimentalFeatures={{ aggregation: true }}
       />
     </div>
   );