@mui/x-data-grid-premium 8.0.0-alpha.6 → 8.0.0-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/CHANGELOG.md +242 -1
  2. package/DataGridPremium/DataGridPremium.js +7 -8
  3. package/DataGridPremium/useDataGridPremiumComponent.d.ts +1 -1
  4. package/DataGridPremium/useDataGridPremiumComponent.js +3 -2
  5. package/DataGridPremium/useDataGridPremiumProps.js +3 -1
  6. package/components/GridColumnMenuAggregationItem.js +53 -20
  7. package/esm/DataGridPremium/DataGridPremium.js +9 -10
  8. package/esm/DataGridPremium/useDataGridPremiumComponent.js +4 -3
  9. package/esm/DataGridPremium/useDataGridPremiumProps.js +3 -1
  10. package/esm/components/GridColumnMenuAggregationItem.js +51 -18
  11. package/esm/hooks/features/aggregation/createAggregationLookup.js +52 -55
  12. package/esm/hooks/features/aggregation/gridAggregationUtils.js +17 -13
  13. package/esm/hooks/features/aggregation/index.js +0 -1
  14. package/esm/hooks/features/aggregation/useGridAggregation.js +22 -10
  15. package/esm/hooks/features/aggregation/useGridAggregationPreProcessors.js +7 -14
  16. package/esm/hooks/features/cellSelection/useGridCellSelection.js +3 -3
  17. package/esm/hooks/features/clipboard/useGridClipboardImport.js +1 -1
  18. package/esm/hooks/features/dataSource/cache.js +3 -0
  19. package/esm/hooks/features/dataSource/models.js +1 -0
  20. package/esm/hooks/features/dataSource/useGridDataSourcePremium.js +53 -0
  21. package/esm/utils/releaseInfo.js +1 -1
  22. package/hooks/features/aggregation/createAggregationLookup.d.ts +6 -5
  23. package/hooks/features/aggregation/createAggregationLookup.js +52 -55
  24. package/hooks/features/aggregation/gridAggregationInterfaces.d.ts +18 -5
  25. package/hooks/features/aggregation/gridAggregationUtils.d.ts +11 -12
  26. package/hooks/features/aggregation/gridAggregationUtils.js +17 -13
  27. package/hooks/features/aggregation/index.d.ts +1 -1
  28. package/hooks/features/aggregation/index.js +0 -12
  29. package/hooks/features/aggregation/useGridAggregation.d.ts +1 -1
  30. package/hooks/features/aggregation/useGridAggregation.js +22 -10
  31. package/hooks/features/aggregation/useGridAggregationPreProcessors.d.ts +1 -1
  32. package/hooks/features/aggregation/useGridAggregationPreProcessors.js +7 -14
  33. package/hooks/features/aggregation/wrapColumnWithAggregation.d.ts +1 -1
  34. package/hooks/features/cellSelection/gridCellSelectionInterfaces.d.ts +3 -3
  35. package/hooks/features/cellSelection/useGridCellSelection.d.ts +1 -1
  36. package/hooks/features/cellSelection/useGridCellSelection.js +3 -3
  37. package/hooks/features/clipboard/useGridClipboardImport.d.ts +1 -1
  38. package/hooks/features/clipboard/useGridClipboardImport.js +1 -1
  39. package/hooks/features/dataSource/cache.d.ts +2 -0
  40. package/hooks/features/dataSource/cache.js +9 -0
  41. package/hooks/features/dataSource/models.d.ts +47 -0
  42. package/hooks/features/dataSource/models.js +5 -0
  43. package/hooks/features/dataSource/useGridDataSourcePremium.d.ts +4 -0
  44. package/hooks/features/dataSource/useGridDataSourcePremium.js +62 -0
  45. package/hooks/features/export/serializer/excelSerializer.d.ts +2 -2
  46. package/hooks/features/export/useGridExcelExport.d.ts +1 -1
  47. package/hooks/features/rowGrouping/createGroupingColDef.d.ts +1 -1
  48. package/hooks/features/rowGrouping/gridRowGroupingUtils.d.ts +3 -3
  49. package/hooks/features/rowGrouping/useGridDataSourceRowGroupingPreProcessors.d.ts +1 -1
  50. package/hooks/features/rowGrouping/useGridRowGrouping.d.ts +1 -1
  51. package/hooks/features/rowGrouping/useGridRowGroupingPreProcessors.d.ts +1 -1
  52. package/hooks/utils/useGridApiContext.d.ts +1 -1
  53. package/hooks/utils/useGridApiRef.d.ts +1 -1
  54. package/hooks/utils/useGridPrivateApiContext.d.ts +1 -1
  55. package/hooks/utils/useKeepGroupedColumnsHidden.d.ts +1 -1
  56. package/index.d.ts +2 -0
  57. package/index.js +1 -1
  58. package/models/dataGridPremiumProps.d.ts +7 -5
  59. package/models/gridApiPremium.d.ts +5 -3
  60. package/models/gridGroupingValueGetter.d.ts +1 -1
  61. package/models/gridPastedValueParser.d.ts +1 -1
  62. package/modern/DataGridPremium/DataGridPremium.js +9 -10
  63. package/modern/DataGridPremium/useDataGridPremiumComponent.js +4 -3
  64. package/modern/DataGridPremium/useDataGridPremiumProps.js +3 -1
  65. package/modern/components/GridColumnMenuAggregationItem.js +51 -18
  66. package/modern/hooks/features/aggregation/createAggregationLookup.js +52 -55
  67. package/modern/hooks/features/aggregation/gridAggregationUtils.js +17 -13
  68. package/modern/hooks/features/aggregation/index.js +0 -1
  69. package/modern/hooks/features/aggregation/useGridAggregation.js +22 -10
  70. package/modern/hooks/features/aggregation/useGridAggregationPreProcessors.js +7 -14
  71. package/modern/hooks/features/cellSelection/useGridCellSelection.js +3 -3
  72. package/modern/hooks/features/clipboard/useGridClipboardImport.js +1 -1
  73. package/modern/hooks/features/dataSource/cache.js +3 -0
  74. package/modern/hooks/features/dataSource/models.js +1 -0
  75. package/modern/hooks/features/dataSource/useGridDataSourcePremium.js +53 -0
  76. package/modern/index.js +1 -1
  77. package/modern/utils/releaseInfo.js +1 -1
  78. package/package.json +5 -5
  79. package/utils/releaseInfo.js +1 -1
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
@@ -0,0 +1,4 @@
1
+ import * as React from 'react';
2
+ import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
3
+ import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
4
+ export declare const useGridDataSourcePremium: (apiRef: React.RefObject<GridPrivateApiPremium>, props: DataGridPremiumProcessedProps) => void;
@@ -0,0 +1,62 @@
1
+ "use strict";
2
+
3
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.useGridDataSourcePremium = void 0;
9
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
+ var React = _interopRequireWildcard(require("react"));
11
+ var _xDataGridPro = require("@mui/x-data-grid-pro");
12
+ var _internals = require("@mui/x-data-grid-pro/internals");
13
+ var _cache = require("./cache");
14
+ const options = {
15
+ cacheOptions: {
16
+ getKey: _cache.getKeyPremium
17
+ }
18
+ };
19
+ const useGridDataSourcePremium = (apiRef, props) => {
20
+ const {
21
+ api,
22
+ strategyProcessor,
23
+ events
24
+ } = (0, _internals.useGridDataSourceBase)(apiRef, props, options);
25
+ const aggregateRowRef = React.useRef({});
26
+ const processDataSourceRows = React.useCallback(({
27
+ params,
28
+ response
29
+ }, applyRowHydration) => {
30
+ if (response.aggregateRow) {
31
+ aggregateRowRef.current = response.aggregateRow;
32
+ }
33
+ if (Object.keys(params.aggregationModel || {}).length > 0) {
34
+ if (applyRowHydration) {
35
+ apiRef.current.requestPipeProcessorsApplication('hydrateRows');
36
+ }
37
+ apiRef.current.applyAggregation();
38
+ }
39
+ return {
40
+ params,
41
+ response
42
+ };
43
+ }, [apiRef]);
44
+ const resolveGroupAggregation = React.useCallback((groupId, field) => {
45
+ if (groupId === _xDataGridPro.GRID_ROOT_GROUP_ID) {
46
+ return props.unstable_dataSource?.getAggregatedValue?.(aggregateRowRef.current, field);
47
+ }
48
+ const row = apiRef.current.getRow(groupId);
49
+ return props.unstable_dataSource?.getAggregatedValue?.(row, field);
50
+ }, [apiRef, props.unstable_dataSource]);
51
+ const privateApi = (0, _extends2.default)({}, api.private, {
52
+ resolveGroupAggregation
53
+ });
54
+ (0, _xDataGridPro.useGridApiMethod)(apiRef, api.public, 'public');
55
+ (0, _xDataGridPro.useGridApiMethod)(apiRef, privateApi, 'private');
56
+ (0, _internals.useGridRegisterStrategyProcessor)(apiRef, strategyProcessor.strategyName, strategyProcessor.group, strategyProcessor.processor);
57
+ (0, _internals.useGridRegisterPipeProcessor)(apiRef, 'processDataSourceRows', processDataSourceRows);
58
+ Object.entries(events).forEach(([event, handler]) => {
59
+ (0, _xDataGridPro.useGridApiEventHandler)(apiRef, event, handler);
60
+ });
61
+ };
62
+ exports.useGridDataSourcePremium = useGridDataSourcePremium;
@@ -18,7 +18,7 @@ interface SerializedRow {
18
18
  * actual rendered columns.
19
19
  * The caller of this function MUST call `resetColSpan()` before and after usage.
20
20
  */
21
- export declare const serializeRowUnsafe: (id: GridRowId, columns: GridStateColDef[], apiRef: React.MutableRefObject<GridPrivateApiPremium>, defaultValueOptionsFormulae: {
21
+ export declare const serializeRowUnsafe: (id: GridRowId, columns: GridStateColDef[], apiRef: React.RefObject<GridPrivateApiPremium>, defaultValueOptionsFormulae: {
22
22
  [field: string]: {
23
23
  address: string;
24
24
  };
@@ -53,7 +53,7 @@ interface BuildExcelOptions extends Pick<GridExcelExportOptions, 'exceljsPreProc
53
53
  rowIds: GridRowId[];
54
54
  columnsStyles?: ColumnsStylesInterface;
55
55
  }
56
- export declare function buildExcel(options: BuildExcelOptions, apiRef: React.MutableRefObject<GridPrivateApiPremium>): Promise<Excel.Workbook>;
56
+ export declare function buildExcel(options: BuildExcelOptions, apiRef: React.RefObject<GridPrivateApiPremium>): Promise<Excel.Workbook>;
57
57
  export interface ExcelExportInitEvent {
58
58
  serializedColumns: SerializedColumns;
59
59
  serializedRows: SerializedRow[];
@@ -8,4 +8,4 @@ import { DataGridPremiumProps } from '../../../models/dataGridPremiumProps';
8
8
  * @requires useGridSelection (state)
9
9
  * @requires useGridParamsApi (method)
10
10
  */
11
- export declare const useGridExcelExport: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: DataGridPremiumProps) => void;
11
+ export declare const useGridExcelExport: (apiRef: React.RefObject<GridPrivateApiPremium>, props: DataGridPremiumProps) => void;
@@ -25,7 +25,7 @@ interface CreateGroupingColDefMonoCriteriaParams {
25
25
  */
26
26
  export declare const createGroupingColDefForOneGroupingCriteria: ({ columnsLookup, groupedByColDef, groupingCriteria, colDefOverride, strategy, }: CreateGroupingColDefMonoCriteriaParams) => GridColDef;
27
27
  interface CreateGroupingColDefSeveralCriteriaParams {
28
- apiRef: React.MutableRefObject<GridApiPremium>;
28
+ apiRef: React.RefObject<GridApiPremium>;
29
29
  columnsLookup: GridColumnRawLookup;
30
30
  /**
31
31
  * The fields from which we are grouping the rows.
@@ -15,7 +15,7 @@ interface FilterRowTreeFromTreeDataParams {
15
15
  rowTree: GridRowTreeConfig;
16
16
  isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
17
17
  filterModel: GridFilterModel;
18
- apiRef: React.MutableRefObject<GridPrivateApiPremium>;
18
+ apiRef: React.RefObject<GridPrivateApiPremium>;
19
19
  }
20
20
  /**
21
21
  * A leaf is visible if it passed the filter
@@ -26,12 +26,12 @@ interface FilterRowTreeFromTreeDataParams {
26
26
  export declare const filterRowTreeFromGroupingColumns: (params: FilterRowTreeFromTreeDataParams) => Omit<GridFilterState, "filterModel">;
27
27
  export declare const getColDefOverrides: (groupingColDefProp: DataGridPremiumProcessedProps["groupingColDef"], fields: string[], strategy?: RowGroupingStrategy) => import("@mui/x-data-grid-pro").GridGroupingColDefOverride<any> | null | undefined;
28
28
  export declare const mergeStateWithRowGroupingModel: (rowGroupingModel: GridRowGroupingModel) => (state: GridStatePremium) => GridStatePremium;
29
- export declare const setStrategyAvailability: (privateApiRef: React.MutableRefObject<GridPrivateApiPremium>, disableRowGrouping: boolean, dataSource?: GridDataSource) => void;
29
+ export declare const setStrategyAvailability: (privateApiRef: React.RefObject<GridPrivateApiPremium>, disableRowGrouping: boolean, dataSource?: GridDataSource) => void;
30
30
  export declare const getCellGroupingCriteria: ({ row, colDef, groupingRule, apiRef, }: {
31
31
  row: GridRowModel;
32
32
  colDef: GridColDef;
33
33
  groupingRule: GridGroupingRule;
34
- apiRef: React.MutableRefObject<GridPrivateApiPremium>;
34
+ apiRef: React.RefObject<GridPrivateApiPremium>;
35
35
  }) => {
36
36
  key: GridKeyValue | null | undefined;
37
37
  field: string;
@@ -1,4 +1,4 @@
1
1
  import * as React from 'react';
2
2
  import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
3
3
  import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
4
- export declare const useGridDataSourceRowGroupingPreProcessors: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
4
+ export declare const useGridDataSourceRowGroupingPreProcessors: (apiRef: React.RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
@@ -8,4 +8,4 @@ export declare const rowGroupingStateInitializer: GridStateInitializer<Pick<Data
8
8
  * @requires useGridRows (state, method) - can be after, async only
9
9
  * @requires useGridParamsApi (method) - can be after, async only
10
10
  */
11
- export declare const useGridRowGrouping: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "groupingColDef" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "unstable_dataSource">) => void;
11
+ export declare const useGridRowGrouping: (apiRef: React.RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "initialState" | "rowGroupingModel" | "onRowGroupingModelChange" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "groupingColDef" | "rowGroupingColumnMode" | "disableRowGrouping" | "slotProps" | "slots" | "unstable_dataSource">) => void;
@@ -1,4 +1,4 @@
1
1
  import * as React from 'react';
2
2
  import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
3
3
  import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
4
- export declare const useGridRowGroupingPreProcessors: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
4
+ export declare const useGridRowGroupingPreProcessors: (apiRef: React.RefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, "disableRowGrouping" | "groupingColDef" | "rowGroupingColumnMode" | "defaultGroupingExpansionDepth" | "isGroupExpandedByDefault" | "unstable_dataSource">) => void;
@@ -1,2 +1,2 @@
1
1
  import { GridApiPremium } from '../../models/gridApiPremium';
2
- export declare const useGridApiContext: () => import("react").MutableRefObject<GridApiPremium>;
2
+ export declare const useGridApiContext: () => import("react").RefObject<GridApiPremium>;
@@ -1,2 +1,2 @@
1
1
  import { GridApiPremium } from '../../models/gridApiPremium';
2
- export declare const useGridApiRef: () => import("react").MutableRefObject<GridApiPremium>;
2
+ export declare const useGridApiRef: () => import("react").RefObject<GridApiPremium>;
@@ -1,2 +1,2 @@
1
1
  import { GridPrivateApiPremium } from '../../models/gridApiPremium';
2
- export declare const useGridPrivateApiContext: () => import("react").MutableRefObject<GridPrivateApiPremium>;
2
+ export declare const useGridPrivateApiContext: () => import("react").RefObject<GridPrivateApiPremium>;
@@ -8,5 +8,5 @@ import { DataGridPremiumProps } from '../../models/dataGridPremiumProps';
8
8
  * Does not work when used with the `hide` property of `GridColDef`
9
9
  */
10
10
  export declare const useKeepGroupedColumnsHidden: (props: {
11
- apiRef: React.MutableRefObject<GridApi>;
11
+ apiRef: React.RefObject<GridApi>;
12
12
  } & Pick<DataGridPremiumProps, "initialState" | "rowGroupingModel">) => GridInitialStatePremium;
package/index.d.ts CHANGED
@@ -27,3 +27,5 @@ export type { DataGridPremiumProps, GridExperimentalPremiumFeatures, } from './m
27
27
  export { useGridApiContext, useGridApiRef, useGridRootProps } from './typeOverloads/reexports';
28
28
  export type { GridApi, GridInitialState, GridState } from './typeOverloads/reexports';
29
29
  export { GridColumnMenu, GRID_COLUMN_MENU_SLOTS, GRID_COLUMN_MENU_SLOT_PROPS, } from './components/reexports';
30
+ export type { GridDataSourceCache } from '@mui/x-data-grid-pro';
31
+ export type { GridGetRowsParamsPremium as GridGetRowsParams, GridGetRowsResponsePremium as GridGetRowsResponse, GridDataSourcePremium as GridDataSource, GridDataSourceApiPremium as GridDataSourceApi, GridDataSourceApiBasePremium as GridDataSourceApiBase, GridDataSourcePremiumPrivateApi as GridDataSourcePrivateApi, } from './hooks/features/dataSource/models';
package/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-data-grid-premium v8.0.0-alpha.6
2
+ * @mui/x-data-grid-premium v8.0.0-alpha.8
3
3
  *
4
4
  * @license MUI X Commercial
5
5
  * This source code is licensed under the commercial license found in the
@@ -2,11 +2,12 @@ import * as React from 'react';
2
2
  import { GridCallbackDetails, GridValidRowModel, GridGroupNode, GridEventListener } from '@mui/x-data-grid-pro';
3
3
  import { GridExperimentalProFeatures, DataGridProPropsWithDefaultValue, DataGridProPropsWithoutDefaultValue, DataGridPropsWithComplexDefaultValueAfterProcessing, DataGridPropsWithComplexDefaultValueBeforeProcessing, DataGridPremiumSharedPropsWithDefaultValue } from '@mui/x-data-grid-pro/internals';
4
4
  import type { GridRowGroupingModel } from '../hooks/features/rowGrouping';
5
- import type { GridAggregationModel, GridAggregationFunction, GridAggregationPosition } from '../hooks/features/aggregation';
5
+ import type { GridAggregationModel, GridAggregationFunction, GridAggregationFunctionDataSource, GridAggregationPosition } from '../hooks/features/aggregation';
6
6
  import { GridPremiumSlotsComponent } from './gridPremiumSlotsComponent';
7
7
  import { GridInitialStatePremium } from './gridStatePremium';
8
8
  import { GridApiPremium } from './gridApiPremium';
9
9
  import { GridCellSelectionModel } from '../hooks/features/cellSelection';
10
+ import { GridDataSourcePremium as GridDataSource } from '../hooks/features/dataSource/models';
10
11
  export interface GridExperimentalPremiumFeatures extends GridExperimentalProFeatures {
11
12
  }
12
13
  export interface DataGridPremiumPropsWithComplexDefaultValueBeforeProcessing extends Pick<DataGridPropsWithComplexDefaultValueBeforeProcessing, 'localeText'> {
@@ -53,9 +54,9 @@ export interface DataGridPremiumPropsWithDefaultValue<R extends GridValidRowMode
53
54
  rowGroupingColumnMode: 'single' | 'multiple';
54
55
  /**
55
56
  * Aggregation functions available on the grid.
56
- * @default GRID_AGGREGATION_FUNCTIONS
57
+ * @default GRID_AGGREGATION_FUNCTIONS when `unstable_dataSource` is not provided, `{}` when `unstable_dataSource` is provided
57
58
  */
58
- aggregationFunctions: Record<string, GridAggregationFunction>;
59
+ aggregationFunctions: Record<string, GridAggregationFunction> | Record<string, GridAggregationFunctionDataSource>;
59
60
  /**
60
61
  * Rows used to generate the aggregated value.
61
62
  * If `filtered`, the aggregated values are generated using only the rows currently passing the filtering process.
@@ -83,11 +84,11 @@ export interface DataGridPremiumPropsWithDefaultValue<R extends GridValidRowMode
83
84
  */
84
85
  splitClipboardPastedText: (text: string) => string[][] | null;
85
86
  }
86
- export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowModel = any> extends Omit<DataGridProPropsWithoutDefaultValue<R>, 'initialState' | 'apiRef'> {
87
+ export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowModel = any> extends Omit<DataGridProPropsWithoutDefaultValue<R>, 'initialState' | 'apiRef' | 'unstable_dataSource'> {
87
88
  /**
88
89
  * The ref object that allows grid manipulation. Can be instantiated with `useGridApiRef()`.
89
90
  */
90
- apiRef?: React.MutableRefObject<GridApiPremium>;
91
+ apiRef?: React.RefObject<GridApiPremium>;
91
92
  /**
92
93
  * The initial state of the DataGridPremium.
93
94
  * The data in it is set in the state on initialization but isn't controlled.
@@ -152,4 +153,5 @@ export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowM
152
153
  * For each feature, if the flag is not explicitly set to `true`, then the feature is fully disabled, and neither property nor method calls will have any effect.
153
154
  */
154
155
  experimentalFeatures?: Partial<GridExperimentalPremiumFeatures>;
156
+ unstable_dataSource?: GridDataSource;
155
157
  }
@@ -1,14 +1,16 @@
1
1
  import { GridPrivateOnlyApiCommon } from '@mui/x-data-grid/internals';
2
- import { GridApiCommon, GridColumnPinningApi, GridDetailPanelApi, GridDetailPanelPrivateApi, GridRowPinningApi, GridRowMultiSelectionApi, GridColumnReorderApi, GridRowProApi, GridDataSourceApi, GridDataSourcePrivateApi } from '@mui/x-data-grid-pro';
2
+ import { GridApiCommon, GridColumnPinningApi, GridDetailPanelApi, GridDetailPanelPrivateApi, GridRowPinningApi, GridRowMultiSelectionApi, GridColumnReorderApi, GridRowProApi } from '@mui/x-data-grid-pro';
3
3
  import { GridInitialStatePremium, GridStatePremium } from './gridStatePremium';
4
4
  import type { GridRowGroupingApi, GridExcelExportApi, GridAggregationApi } from '../hooks';
5
5
  import { GridCellSelectionApi } from '../hooks/features/cellSelection/gridCellSelectionInterfaces';
6
6
  import type { DataGridPremiumProcessedProps } from './dataGridPremiumProps';
7
+ import type { GridDataSourcePremiumPrivateApi, GridDataSourceApiPremium } from '../hooks/features/dataSource/models';
8
+ import type { GridAggregationPrivateApi } from '../hooks/features/aggregation/gridAggregationInterfaces';
7
9
  /**
8
10
  * The api of Data Grid Premium.
9
11
  * TODO: Do not redefine manually the pro features
10
12
  */
11
- export interface GridApiPremium extends GridApiCommon<GridStatePremium, GridInitialStatePremium>, GridRowProApi, GridColumnPinningApi, GridDetailPanelApi, GridRowGroupingApi, GridExcelExportApi, GridAggregationApi, GridRowPinningApi, GridDataSourceApi, GridCellSelectionApi, GridRowMultiSelectionApi, GridColumnReorderApi {
13
+ export interface GridApiPremium extends GridApiCommon<GridStatePremium, GridInitialStatePremium>, GridRowProApi, GridColumnPinningApi, GridDetailPanelApi, GridRowGroupingApi, GridExcelExportApi, GridAggregationApi, GridRowPinningApi, GridDataSourceApiPremium, GridCellSelectionApi, GridRowMultiSelectionApi, GridColumnReorderApi {
12
14
  }
13
- export interface GridPrivateApiPremium extends GridApiPremium, GridPrivateOnlyApiCommon<GridApiPremium, GridPrivateApiPremium, DataGridPremiumProcessedProps>, GridDataSourcePrivateApi, GridDetailPanelPrivateApi {
15
+ export interface GridPrivateApiPremium extends GridApiPremium, GridPrivateOnlyApiCommon<GridApiPremium, GridPrivateApiPremium, DataGridPremiumProcessedProps>, GridDataSourcePremiumPrivateApi, GridAggregationPrivateApi, GridDetailPanelPrivateApi {
14
16
  }
@@ -1,3 +1,3 @@
1
1
  import { GridValidRowModel, GridColDef, GridKeyValue } from '@mui/x-data-grid-pro';
2
2
  import { GridApiPremium } from './gridApiPremium';
3
- export type GridGroupingValueGetter<R extends GridValidRowModel = GridValidRowModel, TValue = never> = (value: TValue, row: R, column: GridColDef<R>, apiRef: React.MutableRefObject<GridApiPremium>) => GridKeyValue | null | undefined;
3
+ export type GridGroupingValueGetter<R extends GridValidRowModel = GridValidRowModel, TValue = never> = (value: TValue, row: R, column: GridColDef<R>, apiRef: React.RefObject<GridApiPremium>) => GridKeyValue | null | undefined;
@@ -1,3 +1,3 @@
1
1
  import { GridColDef, GridValidRowModel } from '@mui/x-data-grid';
2
2
  import { GridApiPremium } from './gridApiPremium';
3
- export type GridPastedValueParser<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: string, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiPremium>) => V | undefined;
3
+ export type GridPastedValueParser<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: string, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiPremium>) => V | undefined;
@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
4
4
  import * as React from 'react';
5
5
  import PropTypes from 'prop-types';
6
6
  import { useLicenseVerifier, Watermark } from '@mui/x-license';
7
- import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot, GridContextProvider } from '@mui/x-data-grid-pro';
7
+ import { GridRoot, GridContextProvider } from '@mui/x-data-grid-pro';
8
8
  import { propValidatorsDataGrid, propValidatorsDataGridPro, validateProps } from '@mui/x-data-grid-pro/internals';
9
9
  import { forwardRef } from '@mui/x-internals/forwardRef';
10
10
  import { useDataGridPremiumComponent } from "./useDataGridPremiumComponent.js";
@@ -12,7 +12,7 @@ import { useDataGridPremiumProps } from "./useDataGridPremiumProps.js";
12
12
  import { getReleaseInfo } from "../utils/releaseInfo.js";
13
13
  import { useGridAriaAttributes } from "../hooks/utils/useGridAriaAttributes.js";
14
14
  import { useGridRowAriaAttributes } from "../hooks/features/rows/useGridRowAriaAttributes.js";
15
- import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
15
+ import { jsx as _jsx } from "react/jsx-runtime";
16
16
  const configuration = {
17
17
  hooks: {
18
18
  useGridAriaAttributes,
@@ -35,18 +35,16 @@ const DataGridPremiumRaw = forwardRef(function DataGridPremium(inProps, ref) {
35
35
  privateApiRef: privateApiRef,
36
36
  configuration: configuration,
37
37
  props: props,
38
- children: /*#__PURE__*/_jsxs(GridRoot, _extends({
38
+ children: /*#__PURE__*/_jsx(GridRoot, _extends({
39
39
  className: props.className,
40
40
  style: props.style,
41
41
  sx: props.sx
42
42
  }, props.slotProps?.root, {
43
43
  ref: ref,
44
- children: [/*#__PURE__*/_jsx(GridHeader, {}), /*#__PURE__*/_jsx(GridBody, {
45
- children: /*#__PURE__*/_jsx(Watermark, {
46
- packageName: "x-data-grid-premium",
47
- releaseInfo: releaseInfo
48
- })
49
- }), /*#__PURE__*/_jsx(GridFooterPlaceholder, {})]
44
+ children: /*#__PURE__*/_jsx(Watermark, {
45
+ packageName: "x-data-grid-premium",
46
+ releaseInfo: releaseInfo
47
+ })
50
48
  }))
51
49
  });
52
50
  });
@@ -57,7 +55,7 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
57
55
  // ----------------------------------------------------------------------
58
56
  /**
59
57
  * Aggregation functions available on the grid.
60
- * @default GRID_AGGREGATION_FUNCTIONS
58
+ * @default GRID_AGGREGATION_FUNCTIONS when `unstable_dataSource` is not provided, `{}` when `unstable_dataSource` is provided
61
59
  */
62
60
  aggregationFunctions: PropTypes.object,
63
61
  /**
@@ -1037,6 +1035,7 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
1037
1035
  */
1038
1036
  treeData: PropTypes.bool,
1039
1037
  unstable_dataSource: PropTypes.shape({
1038
+ getAggregatedValue: PropTypes.func,
1040
1039
  getChildrenCount: PropTypes.func,
1041
1040
  getGroupKey: PropTypes.func,
1042
1041
  getRows: PropTypes.func.isRequired,
@@ -1,4 +1,5 @@
1
- import { useGridInitialization, useGridInitializeState, useGridClipboard, useGridColumnMenu, useGridColumns, columnsStateInitializer, useGridDensity, useGridCsvExport, useGridPrintExport, useGridFilter, filterStateInitializer, useGridFocus, useGridKeyboardNavigation, useGridPagination, paginationStateInitializer, useGridPreferencesPanel, useGridEditing, editingStateInitializer, useGridRows, useGridRowsPreProcessors, rowsStateInitializer, useGridRowsMeta, useGridParamsApi, useGridRowSelection, useGridSorting, sortingStateInitializer, useGridScroll, useGridEvents, dimensionsStateInitializer, useGridDimensions, useGridStatePersistence, useGridRowSelectionPreProcessors, columnMenuStateInitializer, densityStateInitializer, focusStateInitializer, preferencePanelStateInitializer, rowsMetaStateInitializer, rowSelectionStateInitializer, useGridColumnReorder, columnReorderStateInitializer, useGridColumnResize, columnResizeStateInitializer, useGridTreeData, useGridTreeDataPreProcessors, useGridColumnPinning, columnPinningStateInitializer, useGridColumnPinningPreProcessors, useGridDetailPanel, detailPanelStateInitializer, useGridDetailPanelPreProcessors, useGridInfiniteLoader, useGridColumnSpanning, useGridRowReorder, useGridRowReorderPreProcessors, useGridRowPinning, useGridRowPinningPreProcessors, rowPinningStateInitializer, useGridColumnGrouping, columnGroupsStateInitializer, useGridLazyLoader, useGridLazyLoaderPreProcessors, useGridDataSourceLazyLoader, headerFilteringStateInitializer, useGridHeaderFiltering, virtualizationStateInitializer, useGridVirtualization, useGridDataSourceTreeDataPreProcessors, useGridDataSource, dataSourceStateInitializer, useGridRowSpanning, rowSpanningStateInitializer, useGridListView, listViewStateInitializer } from '@mui/x-data-grid-pro/internals';
1
+ import { useGridInitialization, useGridInitializeState, useGridClipboard, useGridColumnMenu, useGridColumns, columnsStateInitializer, useGridDensity, useGridCsvExport, useGridPrintExport, useGridFilter, filterStateInitializer, useGridFocus, useGridKeyboardNavigation, useGridPagination, paginationStateInitializer, useGridPreferencesPanel, useGridEditing, editingStateInitializer, useGridRows, useGridRowsPreProcessors, rowsStateInitializer, useGridRowsMeta, useGridParamsApi, useGridRowSelection, useGridSorting, sortingStateInitializer, useGridScroll, useGridEvents, dimensionsStateInitializer, useGridDimensions, useGridStatePersistence, useGridRowSelectionPreProcessors, columnMenuStateInitializer, densityStateInitializer, focusStateInitializer, preferencePanelStateInitializer, rowsMetaStateInitializer, rowSelectionStateInitializer, useGridColumnReorder, columnReorderStateInitializer, useGridColumnResize, columnResizeStateInitializer, useGridTreeData, useGridTreeDataPreProcessors, useGridColumnPinning, columnPinningStateInitializer, useGridColumnPinningPreProcessors, useGridDetailPanel, detailPanelStateInitializer, useGridDetailPanelPreProcessors, useGridInfiniteLoader, useGridColumnSpanning, useGridRowReorder, useGridRowReorderPreProcessors, useGridRowPinning, useGridRowPinningPreProcessors, rowPinningStateInitializer, useGridColumnGrouping, columnGroupsStateInitializer, useGridLazyLoader, useGridLazyLoaderPreProcessors, useGridDataSourceLazyLoader, headerFilteringStateInitializer, useGridHeaderFiltering, virtualizationStateInitializer, useGridVirtualization, useGridDataSourceTreeDataPreProcessors, dataSourceStateInitializer, useGridRowSpanning, rowSpanningStateInitializer, useGridListView, listViewStateInitializer } from '@mui/x-data-grid-pro/internals';
2
+ import { useGridDataSourcePremium as useGridDataSource } from "../hooks/features/dataSource/useGridDataSourcePremium.js";
2
3
  // Premium-only features
3
4
  import { useGridAggregation, aggregationStateInitializer } from "../hooks/features/aggregation/useGridAggregation.js";
4
5
  import { useGridAggregationPreProcessors } from "../hooks/features/aggregation/useGridAggregationPreProcessors.js";
@@ -42,6 +43,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
42
43
  useGridInitializeState(columnPinningStateInitializer, apiRef, props);
43
44
  useGridInitializeState(columnsStateInitializer, apiRef, props);
44
45
  useGridInitializeState(rowPinningStateInitializer, apiRef, props);
46
+ useGridInitializeState(paginationStateInitializer, apiRef, props);
45
47
  useGridInitializeState(rowsStateInitializer, apiRef, props);
46
48
  useGridInitializeState(editingStateInitializer, apiRef, props);
47
49
  useGridInitializeState(focusStateInitializer, apiRef, props);
@@ -52,7 +54,6 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
52
54
  useGridInitializeState(densityStateInitializer, apiRef, props);
53
55
  useGridInitializeState(columnReorderStateInitializer, apiRef, props);
54
56
  useGridInitializeState(columnResizeStateInitializer, apiRef, props);
55
- useGridInitializeState(paginationStateInitializer, apiRef, props);
56
57
  useGridInitializeState(rowsMetaStateInitializer, apiRef, props);
57
58
  useGridInitializeState(columnMenuStateInitializer, apiRef, props);
58
59
  useGridInitializeState(columnGroupsStateInitializer, apiRef, props);
@@ -62,6 +63,7 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
62
63
  useGridRowGrouping(apiRef, props);
63
64
  useGridHeaderFiltering(apiRef, props);
64
65
  useGridTreeData(apiRef, props);
66
+ useGridDataSource(apiRef, props);
65
67
  useGridAggregation(apiRef, props);
66
68
  useGridKeyboardNavigation(apiRef, props);
67
69
  useGridRowSelection(apiRef, props);
@@ -99,7 +101,6 @@ export const useDataGridPremiumComponent = (inputApiRef, props) => {
99
101
  useGridDimensions(apiRef, props);
100
102
  useGridEvents(apiRef, props);
101
103
  useGridStatePersistence(apiRef);
102
- useGridDataSource(apiRef, props);
103
104
  useGridVirtualization(apiRef, props);
104
105
  useGridListView(apiRef, props);
105
106
  return apiRef;
@@ -45,7 +45,9 @@ export const useDataGridPremiumProps = inProps => {
45
45
  defaultSlots,
46
46
  slots: themedProps.slots
47
47
  }), [themedProps.slots]);
48
- return React.useMemo(() => _extends({}, DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES, themedProps, {
48
+ return React.useMemo(() => _extends({}, DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES, themedProps.unstable_dataSource ? {
49
+ aggregationFunctions: {}
50
+ } : {}, themedProps, {
49
51
  localeText,
50
52
  slots
51
53
  }, getDataGridPremiumForcedProps(themedProps)), [themedProps, localeText, slots]);
@@ -1,6 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
3
2
  import _toPropertyKey from "@babel/runtime/helpers/esm/toPropertyKey";
3
+ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
4
+ const _excluded = ["native"];
4
5
  import * as React from 'react';
5
6
  import PropTypes from 'prop-types';
6
7
  import { useGridSelector } from '@mui/x-data-grid-pro';
@@ -12,18 +13,27 @@ import { useGridRootProps } from "../hooks/utils/useGridRootProps.js";
12
13
  import { canColumnHaveAggregationFunction, getAggregationFunctionLabel, getAvailableAggregationFunctions } from "../hooks/features/aggregation/gridAggregationUtils.js";
13
14
  import { gridAggregationModelSelector } from "../hooks/features/aggregation/gridAggregationSelectors.js";
14
15
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
16
+ import { createElement as _createElement } from "react";
15
17
  function GridColumnMenuAggregationItem(props) {
16
18
  const {
17
19
  colDef
18
20
  } = props;
19
21
  const apiRef = useGridApiContext();
22
+ const inputRef = React.useRef(null);
20
23
  const rootProps = useGridRootProps();
21
24
  const id = useId();
22
25
  const aggregationModel = useGridSelector(apiRef, gridAggregationModelSelector);
23
26
  const availableAggregationFunctions = React.useMemo(() => getAvailableAggregationFunctions({
24
27
  aggregationFunctions: rootProps.aggregationFunctions,
25
- colDef
26
- }), [colDef, rootProps.aggregationFunctions]);
28
+ colDef,
29
+ isDataSource: !!rootProps.unstable_dataSource
30
+ }), [colDef, rootProps.aggregationFunctions, rootProps.unstable_dataSource]);
31
+ const _ref = rootProps.slotProps?.baseSelect || {},
32
+ {
33
+ native: isBaseSelectNative = false
34
+ } = _ref,
35
+ baseSelectProps = _objectWithoutPropertiesLoose(_ref, _excluded);
36
+ const baseSelectOptionProps = rootProps.slotProps?.baseSelectOption || {};
27
37
  const selectedAggregationRule = React.useMemo(() => {
28
38
  if (!colDef || !aggregationModel[colDef.field]) {
29
39
  return '';
@@ -32,12 +42,13 @@ function GridColumnMenuAggregationItem(props) {
32
42
  if (canColumnHaveAggregationFunction({
33
43
  colDef,
34
44
  aggregationFunctionName,
35
- aggregationFunction: rootProps.aggregationFunctions[aggregationFunctionName]
45
+ aggregationFunction: rootProps.aggregationFunctions[aggregationFunctionName],
46
+ isDataSource: !!rootProps.unstable_dataSource
36
47
  })) {
37
48
  return aggregationFunctionName;
38
49
  }
39
50
  return '';
40
- }, [rootProps.aggregationFunctions, aggregationModel, colDef]);
51
+ }, [rootProps.aggregationFunctions, rootProps.unstable_dataSource, aggregationModel, colDef]);
41
52
  const handleAggregationItemChange = event => {
42
53
  const newAggregationItem = event.target?.value || undefined;
43
54
  const currentModel = gridAggregationModelSelector(apiRef);
@@ -50,11 +61,22 @@ function GridColumnMenuAggregationItem(props) {
50
61
  apiRef.current.hideColumnMenu();
51
62
  };
52
63
  const label = apiRef.current.getLocaleText('aggregationMenuItemHeader');
64
+ const handleMenuItemKeyDown = React.useCallback(event => {
65
+ if (event.key === 'Enter' || event.key === ' ') {
66
+ inputRef.current.focus();
67
+ }
68
+ }, []);
69
+ const handleSelectKeyDown = React.useCallback(event => {
70
+ if (event.key === 'ArrowDown' || event.key === 'ArrowUp' || event.key === ' ') {
71
+ event.stopPropagation();
72
+ }
73
+ }, []);
53
74
  return /*#__PURE__*/_jsx(rootProps.slots.baseMenuItem, {
54
75
  inert: true,
55
76
  iconStart: /*#__PURE__*/_jsx(rootProps.slots.columnMenuAggregationIcon, {
56
77
  fontSize: "small"
57
78
  }),
79
+ onKeyDown: handleMenuItemKeyDown,
58
80
  children: /*#__PURE__*/_jsxs(FormControl, {
59
81
  size: "small",
60
82
  fullWidth: true,
@@ -63,30 +85,41 @@ function GridColumnMenuAggregationItem(props) {
63
85
  },
64
86
  children: [/*#__PURE__*/_jsx(InputLabel, {
65
87
  id: `${id}-label`,
88
+ htmlFor: `${id}-input`,
66
89
  children: label
67
- }), /*#__PURE__*/_jsxs(rootProps.slots.baseSelect, {
90
+ }), /*#__PURE__*/_jsxs(rootProps.slots.baseSelect, _extends({
68
91
  labelId: `${id}-label`,
92
+ inputRef: inputRef,
69
93
  id: `${id}-input`,
70
94
  value: selectedAggregationRule,
71
95
  label: label,
72
96
  color: "primary",
73
97
  onChange: handleAggregationItemChange,
98
+ MenuProps: {
99
+ PaperProps: {
100
+ onKeyDown: handleSelectKeyDown
101
+ }
102
+ },
74
103
  onBlur: event => event.stopPropagation(),
75
- fullWidth: true,
76
- children: [/*#__PURE__*/_jsx(rootProps.slots.baseMenuItem, {
104
+ native: isBaseSelectNative,
105
+ fullWidth: true
106
+ }, baseSelectProps, {
107
+ children: [/*#__PURE__*/_jsx(rootProps.slots.baseSelectOption, _extends({}, baseSelectOptionProps, {
108
+ native: isBaseSelectNative,
77
109
  value: "",
78
110
  children: "..."
79
- }), availableAggregationFunctions.map(aggFunc => /*#__PURE__*/_jsx(rootProps.slots.baseMenuItem, {
111
+ })), availableAggregationFunctions.map(aggFunc => /*#__PURE__*/_createElement(rootProps.slots.baseSelectOption, _extends({}, baseSelectOptionProps, {
112
+ key: aggFunc,
80
113
  value: aggFunc,
81
- children: getAggregationFunctionLabel({
82
- apiRef,
83
- aggregationRule: {
84
- aggregationFunctionName: aggFunc,
85
- aggregationFunction: rootProps.aggregationFunctions[aggFunc]
86
- }
87
- })
88
- }, aggFunc))]
89
- })]
114
+ native: isBaseSelectNative
115
+ }), getAggregationFunctionLabel({
116
+ apiRef,
117
+ aggregationRule: {
118
+ aggregationFunctionName: aggFunc,
119
+ aggregationFunction: rootProps.aggregationFunctions[aggFunc]
120
+ }
121
+ })))]
122
+ }))]
90
123
  })
91
124
  });
92
125
  }