@mui/x-data-grid 7.18.0 → 7.20.0

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 (196) hide show
  1. package/CHANGELOG.md +213 -11
  2. package/DataGrid/DataGrid.js +12 -0
  3. package/components/cell/GridCell.js +7 -8
  4. package/components/columnHeaders/GridBaseColumnHeaders.js +1 -1
  5. package/components/columnHeaders/GridColumnHeaderItem.js +1 -0
  6. package/components/columnSelection/GridCellCheckboxRenderer.js +12 -4
  7. package/components/columnSelection/GridHeaderCheckbox.d.ts +1 -1
  8. package/components/containers/GridRoot.js +1 -1
  9. package/components/containers/GridRootStyles.js +32 -23
  10. package/components/containers/GridToolbarContainer.js +1 -1
  11. package/components/menu/GridMenu.js +1 -1
  12. package/components/panel/GridPanel.d.ts +1 -1
  13. package/components/panel/GridPanel.js +1 -1
  14. package/components/panel/GridPanelContent.js +1 -1
  15. package/components/panel/GridPanelFooter.js +1 -1
  16. package/components/panel/GridPanelHeader.js +1 -1
  17. package/components/panel/GridPanelWrapper.js +1 -1
  18. package/components/panel/filterPanel/filterPanelUtils.d.ts +1 -1
  19. package/components/toolbar/GridToolbarQuickFilter.js +1 -1
  20. package/components/virtualization/GridBottomContainer.d.ts +1 -1
  21. package/components/virtualization/GridBottomContainer.js +18 -1
  22. package/components/virtualization/GridMainContainer.js +3 -1
  23. package/components/virtualization/GridTopContainer.d.ts +1 -1
  24. package/components/virtualization/GridTopContainer.js +1 -1
  25. package/components/virtualization/GridVirtualScrollbar.js +1 -7
  26. package/components/virtualization/GridVirtualScroller.js +1 -0
  27. package/components/virtualization/GridVirtualScrollerFiller.js +3 -4
  28. package/hooks/core/useGridRefs.js +4 -0
  29. package/hooks/features/columnGrouping/gridColumnGroupsSelector.d.ts +4 -4
  30. package/hooks/features/columnHeaders/useGridColumnHeaders.d.ts +1 -1
  31. package/hooks/features/columnResize/columnResizeSelector.d.ts +1 -1
  32. package/hooks/features/columns/gridColumnsSelector.d.ts +12 -12
  33. package/hooks/features/columns/gridColumnsUtils.js +3 -2
  34. package/hooks/features/density/densitySelector.d.ts +1 -1
  35. package/hooks/features/dimensions/useGridDimensions.js +2 -2
  36. package/hooks/features/editing/useGridCellEditing.js +4 -2
  37. package/hooks/features/editing/useGridRowEditing.js +4 -2
  38. package/hooks/features/events/useGridEvents.d.ts +1 -1
  39. package/hooks/features/events/useGridEvents.js +1 -0
  40. package/hooks/features/filter/gridFilterSelector.d.ts +17 -17
  41. package/hooks/features/filter/gridFilterUtils.js +1 -1
  42. package/hooks/features/focus/gridFocusStateSelector.d.ts +8 -8
  43. package/hooks/features/headerFiltering/gridHeaderFilteringSelectors.d.ts +3 -3
  44. package/hooks/features/keyboardNavigation/utils.d.ts +1 -1
  45. package/hooks/features/pagination/gridPaginationSelector.d.ts +9 -9
  46. package/hooks/features/rowSelection/gridRowSelectionSelector.d.ts +3 -3
  47. package/hooks/features/rowSelection/useGridRowSelection.d.ts +1 -1
  48. package/hooks/features/rowSelection/useGridRowSelection.js +105 -29
  49. package/hooks/features/rowSelection/utils.d.ts +10 -0
  50. package/hooks/features/rowSelection/utils.js +156 -1
  51. package/hooks/features/rows/gridRowSpanningSelectors.d.ts +3 -3
  52. package/hooks/features/rows/gridRowsSelector.d.ts +14 -14
  53. package/hooks/features/rows/gridRowsUtils.js +1 -1
  54. package/hooks/features/rows/useGridRowSpanning.js +1 -1
  55. package/hooks/features/rows/useGridRows.d.ts +1 -1
  56. package/hooks/features/rows/useGridRows.js +7 -1
  57. package/hooks/features/scroll/useGridScroll.js +26 -22
  58. package/hooks/features/sorting/gridSortingSelector.d.ts +4 -4
  59. package/hooks/features/sorting/gridSortingUtils.js +1 -1
  60. package/hooks/features/virtualization/gridVirtualizationSelectors.d.ts +5 -5
  61. package/hooks/features/virtualization/useGridVirtualScroller.js +2 -2
  62. package/hooks/utils/useGridApiContext.js +1 -1
  63. package/hooks/utils/useGridApiEventHandler.d.ts +1 -1
  64. package/hooks/utils/useGridApiEventHandler.js +1 -1
  65. package/hooks/utils/useGridConfiguration.js +1 -1
  66. package/hooks/utils/useGridPrivateApiContext.js +1 -1
  67. package/hooks/utils/useGridVisibleRows.d.ts +2 -2
  68. package/index.d.ts +2 -2
  69. package/index.js +3 -3
  70. package/internals/index.d.ts +1 -0
  71. package/internals/index.js +1 -0
  72. package/joy/icons.js +0 -1
  73. package/locales/bgBG.js +8 -9
  74. package/locales/deDE.js +4 -4
  75. package/locales/frFR.js +4 -4
  76. package/locales/hrHR.d.ts +1 -1
  77. package/locales/hrHR.js +69 -46
  78. package/locales/jaJP.js +5 -6
  79. package/locales/ptPT.d.ts +1 -1
  80. package/locales/ptPT.js +4 -4
  81. package/locales/viVN.js +20 -20
  82. package/locales/zhHK.d.ts +1 -1
  83. package/models/api/gridApiCommunity.d.ts +1 -1
  84. package/models/api/gridCoreApi.d.ts +9 -1
  85. package/models/api/gridFilterApi.d.ts +1 -1
  86. package/models/events/gridEventLookup.d.ts +7 -0
  87. package/models/gridRowSelectionModel.d.ts +4 -0
  88. package/models/gridStateCommunity.d.ts +2 -2
  89. package/models/props/DataGridProps.d.ts +38 -10
  90. package/modern/DataGrid/DataGrid.js +12 -0
  91. package/modern/components/cell/GridCell.js +7 -8
  92. package/modern/components/columnHeaders/GridBaseColumnHeaders.js +1 -1
  93. package/modern/components/columnHeaders/GridColumnHeaderItem.js +1 -0
  94. package/modern/components/columnSelection/GridCellCheckboxRenderer.js +12 -4
  95. package/modern/components/containers/GridRoot.js +1 -1
  96. package/modern/components/containers/GridRootStyles.js +32 -23
  97. package/modern/components/containers/GridToolbarContainer.js +1 -1
  98. package/modern/components/menu/GridMenu.js +1 -1
  99. package/modern/components/panel/GridPanel.js +1 -1
  100. package/modern/components/panel/GridPanelContent.js +1 -1
  101. package/modern/components/panel/GridPanelFooter.js +1 -1
  102. package/modern/components/panel/GridPanelHeader.js +1 -1
  103. package/modern/components/panel/GridPanelWrapper.js +1 -1
  104. package/modern/components/toolbar/GridToolbarQuickFilter.js +1 -1
  105. package/modern/components/virtualization/GridBottomContainer.js +18 -1
  106. package/modern/components/virtualization/GridMainContainer.js +3 -1
  107. package/modern/components/virtualization/GridTopContainer.js +1 -1
  108. package/modern/components/virtualization/GridVirtualScrollbar.js +1 -7
  109. package/modern/components/virtualization/GridVirtualScroller.js +1 -0
  110. package/modern/components/virtualization/GridVirtualScrollerFiller.js +3 -4
  111. package/modern/hooks/core/useGridRefs.js +4 -0
  112. package/modern/hooks/features/columns/gridColumnsUtils.js +3 -2
  113. package/modern/hooks/features/dimensions/useGridDimensions.js +2 -2
  114. package/modern/hooks/features/editing/useGridCellEditing.js +4 -2
  115. package/modern/hooks/features/editing/useGridRowEditing.js +4 -2
  116. package/modern/hooks/features/events/useGridEvents.js +1 -0
  117. package/modern/hooks/features/filter/gridFilterUtils.js +1 -1
  118. package/modern/hooks/features/rowSelection/useGridRowSelection.js +105 -29
  119. package/modern/hooks/features/rowSelection/utils.js +156 -1
  120. package/modern/hooks/features/rows/gridRowsUtils.js +1 -1
  121. package/modern/hooks/features/rows/useGridRowSpanning.js +1 -1
  122. package/modern/hooks/features/rows/useGridRows.js +7 -1
  123. package/modern/hooks/features/scroll/useGridScroll.js +26 -22
  124. package/modern/hooks/features/sorting/gridSortingUtils.js +1 -1
  125. package/modern/hooks/features/virtualization/useGridVirtualScroller.js +2 -2
  126. package/modern/hooks/utils/useGridApiContext.js +1 -1
  127. package/modern/hooks/utils/useGridApiEventHandler.js +1 -1
  128. package/modern/hooks/utils/useGridConfiguration.js +1 -1
  129. package/modern/hooks/utils/useGridPrivateApiContext.js +1 -1
  130. package/modern/index.js +3 -3
  131. package/modern/internals/index.js +1 -0
  132. package/modern/joy/icons.js +0 -1
  133. package/modern/locales/bgBG.js +8 -9
  134. package/modern/locales/deDE.js +4 -4
  135. package/modern/locales/frFR.js +4 -4
  136. package/modern/locales/hrHR.js +69 -46
  137. package/modern/locales/jaJP.js +5 -6
  138. package/modern/locales/ptPT.js +4 -4
  139. package/modern/locales/viVN.js +20 -20
  140. package/modern/utils/createSelector.js +6 -0
  141. package/modern/utils/domUtils.js +1 -1
  142. package/node/DataGrid/DataGrid.js +12 -0
  143. package/node/components/cell/GridCell.js +7 -8
  144. package/node/components/columnHeaders/GridBaseColumnHeaders.js +1 -1
  145. package/node/components/columnHeaders/GridColumnHeaderItem.js +1 -0
  146. package/node/components/columnSelection/GridCellCheckboxRenderer.js +12 -4
  147. package/node/components/containers/GridRoot.js +1 -1
  148. package/node/components/containers/GridRootStyles.js +32 -23
  149. package/node/components/containers/GridToolbarContainer.js +1 -1
  150. package/node/components/menu/GridMenu.js +1 -1
  151. package/node/components/panel/GridPanel.js +1 -1
  152. package/node/components/panel/GridPanelContent.js +1 -1
  153. package/node/components/panel/GridPanelFooter.js +1 -1
  154. package/node/components/panel/GridPanelHeader.js +1 -1
  155. package/node/components/panel/GridPanelWrapper.js +1 -1
  156. package/node/components/toolbar/GridToolbarQuickFilter.js +1 -1
  157. package/node/components/virtualization/GridBottomContainer.js +18 -1
  158. package/node/components/virtualization/GridMainContainer.js +3 -1
  159. package/node/components/virtualization/GridTopContainer.js +1 -1
  160. package/node/components/virtualization/GridVirtualScrollbar.js +1 -7
  161. package/node/components/virtualization/GridVirtualScroller.js +1 -0
  162. package/node/components/virtualization/GridVirtualScrollerFiller.js +3 -4
  163. package/node/hooks/core/useGridRefs.js +4 -0
  164. package/node/hooks/features/columns/gridColumnsUtils.js +3 -2
  165. package/node/hooks/features/dimensions/useGridDimensions.js +2 -2
  166. package/node/hooks/features/editing/useGridCellEditing.js +4 -2
  167. package/node/hooks/features/editing/useGridRowEditing.js +4 -2
  168. package/node/hooks/features/events/useGridEvents.js +1 -0
  169. package/node/hooks/features/filter/gridFilterUtils.js +1 -1
  170. package/node/hooks/features/rowSelection/useGridRowSelection.js +102 -26
  171. package/node/hooks/features/rowSelection/utils.js +160 -1
  172. package/node/hooks/features/rows/gridRowsUtils.js +1 -1
  173. package/node/hooks/features/rows/useGridRowSpanning.js +1 -1
  174. package/node/hooks/features/rows/useGridRows.js +7 -1
  175. package/node/hooks/features/scroll/useGridScroll.js +26 -22
  176. package/node/hooks/features/sorting/gridSortingUtils.js +1 -1
  177. package/node/hooks/features/virtualization/useGridVirtualScroller.js +2 -2
  178. package/node/hooks/utils/useGridApiContext.js +1 -1
  179. package/node/hooks/utils/useGridApiEventHandler.js +1 -1
  180. package/node/hooks/utils/useGridConfiguration.js +1 -1
  181. package/node/hooks/utils/useGridPrivateApiContext.js +1 -1
  182. package/node/index.js +1 -1
  183. package/node/internals/index.js +23 -15
  184. package/node/joy/icons.js +0 -1
  185. package/node/locales/bgBG.js +8 -9
  186. package/node/locales/deDE.js +4 -4
  187. package/node/locales/frFR.js +4 -4
  188. package/node/locales/hrHR.js +69 -46
  189. package/node/locales/jaJP.js +5 -6
  190. package/node/locales/ptPT.js +4 -4
  191. package/node/locales/viVN.js +20 -20
  192. package/node/utils/createSelector.js +6 -0
  193. package/node/utils/domUtils.js +1 -1
  194. package/package.json +4 -4
  195. package/utils/createSelector.js +6 -0
  196. package/utils/domUtils.js +1 -1
@@ -8,37 +8,37 @@ export declare const gridPaginationSelector: (state: GridStateCommunity) => impo
8
8
  * Get the pagination model
9
9
  * @category Pagination
10
10
  */
11
- export declare const gridPaginationModelSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridPaginationModel>;
11
+ export declare const gridPaginationModelSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridPaginationModel>;
12
12
  /**
13
13
  * Get the row count
14
14
  * @category Pagination
15
15
  */
16
- export declare const gridPaginationRowCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
16
+ export declare const gridPaginationRowCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
17
17
  /**
18
18
  * Get the pagination meta
19
19
  * @category Pagination
20
20
  */
21
- export declare const gridPaginationMetaSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridPaginationMeta>;
21
+ export declare const gridPaginationMetaSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridPaginationMeta>;
22
22
  /**
23
23
  * Get the index of the page to render if the pagination is enabled
24
24
  * @category Pagination
25
25
  */
26
- export declare const gridPageSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
26
+ export declare const gridPageSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
27
27
  /**
28
28
  * Get the maximum amount of rows to display on a single page if the pagination is enabled
29
29
  * @category Pagination
30
30
  */
31
- export declare const gridPageSizeSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
31
+ export declare const gridPageSizeSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
32
32
  /**
33
33
  * Get the amount of pages needed to display all the rows if the pagination is enabled
34
34
  * @category Pagination
35
35
  */
36
- export declare const gridPageCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
36
+ export declare const gridPageCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
37
37
  /**
38
38
  * Get the index of the first and the last row to include in the current page if the pagination is enabled.
39
39
  * @category Pagination
40
40
  */
41
- export declare const gridPaginationRowRangeSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, {
41
+ export declare const gridPaginationRowRangeSelector: import("../../..").OutputSelector<GridStateCommunity, {
42
42
  firstRowIndex: number;
43
43
  lastRowIndex: number;
44
44
  } | null>;
@@ -46,9 +46,9 @@ export declare const gridPaginationRowRangeSelector: import("../../../utils/crea
46
46
  * Get the id and the model of each row to include in the current page if the pagination is enabled.
47
47
  * @category Pagination
48
48
  */
49
- export declare const gridPaginatedVisibleSortedGridRowEntriesSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowEntry<import("../../..").GridValidRowModel>[]>;
49
+ export declare const gridPaginatedVisibleSortedGridRowEntriesSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowEntry<import("../../..").GridValidRowModel>[]>;
50
50
  /**
51
51
  * Get the id of each row to include in the current page if the pagination is enabled.
52
52
  * @category Pagination
53
53
  */
54
- export declare const gridPaginatedVisibleSortedGridRowIdsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowId[]>;
54
+ export declare const gridPaginatedVisibleSortedGridRowIdsSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowId[]>;
@@ -1,6 +1,6 @@
1
1
  import { GridStateCommunity } from '../../../models/gridStateCommunity';
2
2
  import { GridRowId } from '../../../models/gridRows';
3
3
  export declare const gridRowSelectionStateSelector: (state: GridStateCommunity) => import("../../..").GridRowSelectionModel;
4
- export declare const selectedGridRowsCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
5
- export declare const selectedGridRowsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, Map<GridRowId, import("../../../models/gridRows").GridValidRowModel>>;
6
- export declare const selectedIdsLookupSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, Record<GridRowId, GridRowId>>;
4
+ export declare const selectedGridRowsCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
5
+ export declare const selectedGridRowsSelector: import("../../..").OutputSelector<GridStateCommunity, Map<GridRowId, import("../../..").GridValidRowModel>>;
6
+ export declare const selectedIdsLookupSelector: import("../../..").OutputSelector<GridStateCommunity, Record<GridRowId, GridRowId>>;
@@ -9,4 +9,4 @@ export declare const rowSelectionStateInitializer: GridStateInitializer<Pick<Dat
9
9
  * @requires useGridFocus (state) - can be after
10
10
  * @requires useGridKeyboardNavigation (`cellKeyDown` event must first be consumed by it)
11
11
  */
12
- export declare const useGridRowSelection: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "checkboxSelection" | "rowSelectionModel" | "onRowSelectionModelChange" | "disableMultipleRowSelection" | "disableRowSelectionOnClick" | "isRowSelectable" | "checkboxSelectionVisibleOnly" | "pagination" | "paginationMode" | "classes" | "keepNonExistentRowsSelected" | "rowSelection" | "signature">) => void;
12
+ export declare const useGridRowSelection: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "checkboxSelection" | "rowSelectionModel" | "onRowSelectionModelChange" | "disableMultipleRowSelection" | "disableRowSelectionOnClick" | "isRowSelectable" | "checkboxSelectionVisibleOnly" | "pagination" | "paginationMode" | "classes" | "keepNonExistentRowsSelected" | "rowSelection" | "rowSelectionPropagation" | "signature">) => void;
@@ -3,11 +3,12 @@ import * as React from 'react';
3
3
  import { GridSignature, useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
4
4
  import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
5
5
  import { useGridLogger } from "../../utils/useGridLogger.js";
6
- import { gridRowsLookupSelector } from "../rows/gridRowsSelector.js";
6
+ import { useGridSelector } from "../../utils/useGridSelector.js";
7
+ import { gridRowMaximumTreeDepthSelector, gridRowTreeSelector } from "../rows/gridRowsSelector.js";
7
8
  import { gridRowSelectionStateSelector, selectedGridRowsSelector, selectedIdsLookupSelector } from "./gridRowSelectionSelector.js";
8
9
  import { gridPaginatedVisibleSortedGridRowIdsSelector } from "../pagination/index.js";
9
10
  import { gridFocusCellSelector } from "../focus/gridFocusStateSelector.js";
10
- import { gridExpandedSortedRowIdsSelector, gridFilterModelSelector } from "../filter/gridFilterSelector.js";
11
+ import { gridExpandedSortedRowIdsSelector, gridFilteredRowsLookupSelector } from "../filter/gridFilterSelector.js";
11
12
  import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from "../../../colDef/index.js";
12
13
  import { GridCellModes } from "../../../models/gridEditRowModel.js";
13
14
  import { isKeyboardEvent, isNavigationKey } from "../../../utils/keyboardUtils.js";
@@ -15,7 +16,7 @@ import { useGridVisibleRows } from "../../utils/useGridVisibleRows.js";
15
16
  import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from "../../../constants/gridDetailPanelToggleField.js";
16
17
  import { gridClasses } from "../../../constants/gridClasses.js";
17
18
  import { isEventTargetInPortal } from "../../../utils/domUtils.js";
18
- import { isMultipleRowSelectionEnabled } from "./utils.js";
19
+ import { isMultipleRowSelectionEnabled, findRowsToSelect, findRowsToDeselect } from "./utils.js";
19
20
  const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
20
21
  if (selectionModelProp == null) {
21
22
  return selectionModelProp;
@@ -40,11 +41,12 @@ export const rowSelectionStateInitializer = (state, props) => _extends({}, state
40
41
  */
41
42
  export const useGridRowSelection = (apiRef, props) => {
42
43
  const logger = useGridLogger(apiRef, 'useGridSelection');
43
- const runIfRowSelectionIsEnabled = callback => (...args) => {
44
+ const runIfRowSelectionIsEnabled = React.useCallback(callback => (...args) => {
44
45
  if (props.rowSelection) {
45
46
  callback(...args);
46
47
  }
47
- };
48
+ }, [props.rowSelection]);
49
+ const applyAutoSelection = props.signature !== GridSignature.DataGrid && (props.rowSelectionPropagation?.parents || props.rowSelectionPropagation?.descendants);
48
50
  const propRowSelectionModel = React.useMemo(() => {
49
51
  return getSelectionModelPropValue(props.rowSelectionModel, gridRowSelectionStateSelector(apiRef.current.state));
50
52
  }, [apiRef, props.rowSelectionModel]);
@@ -63,6 +65,8 @@ export const useGridRowSelection = (apiRef, props) => {
63
65
  } = props;
64
66
  const canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
65
67
  const visibleRows = useGridVisibleRows(apiRef, props);
68
+ const tree = useGridSelector(apiRef, gridRowTreeSelector);
69
+ const isNestedData = useGridSelector(apiRef, gridRowMaximumTreeDepthSelector) > 1;
66
70
  const expandMouseRowRangeSelection = React.useCallback(id => {
67
71
  let endId = id;
68
72
  const startId = lastRowToggled.current ?? id;
@@ -87,7 +91,7 @@ export const useGridRowSelection = (apiRef, props) => {
87
91
  }, !isSelected);
88
92
  }, [apiRef]);
89
93
 
90
- /**
94
+ /*
91
95
  * API METHODS
92
96
  */
93
97
  const setRowSelectionModel = React.useCallback(model => {
@@ -125,34 +129,80 @@ export const useGridRowSelection = (apiRef, props) => {
125
129
  lastRowToggled.current = id;
126
130
  if (resetSelection) {
127
131
  logger.debug(`Setting selection for row ${id}`);
128
- apiRef.current.setRowSelectionModel(isSelected ? [id] : []);
132
+ const newSelection = [];
133
+ const addRow = rowId => {
134
+ newSelection.push(rowId);
135
+ };
136
+ if (isSelected) {
137
+ addRow(id);
138
+ if (applyAutoSelection) {
139
+ findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
140
+ }
141
+ }
142
+ apiRef.current.setRowSelectionModel(newSelection);
129
143
  } else {
130
144
  logger.debug(`Toggling selection for row ${id}`);
131
145
  const selection = gridRowSelectionStateSelector(apiRef.current.state);
132
- const newSelection = selection.filter(el => el !== id);
146
+ const newSelection = new Set(selection);
147
+ newSelection.delete(id);
148
+ const addRow = rowId => {
149
+ newSelection.add(rowId);
150
+ };
151
+ const removeRow = rowId => {
152
+ newSelection.delete(rowId);
153
+ };
133
154
  if (isSelected) {
134
- newSelection.push(id);
155
+ addRow(id);
156
+ if (applyAutoSelection) {
157
+ findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
158
+ }
159
+ } else if (applyAutoSelection) {
160
+ findRowsToDeselect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, removeRow);
135
161
  }
136
- const isSelectionValid = newSelection.length < 2 || canHaveMultipleSelection;
162
+ const isSelectionValid = newSelection.size < 2 || canHaveMultipleSelection;
137
163
  if (isSelectionValid) {
138
- apiRef.current.setRowSelectionModel(newSelection);
164
+ apiRef.current.setRowSelectionModel(Array.from(newSelection));
139
165
  }
140
166
  }
141
- }, [apiRef, logger, canHaveMultipleSelection]);
167
+ }, [apiRef, logger, applyAutoSelection, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents, canHaveMultipleSelection]);
142
168
  const selectRows = React.useCallback((ids, isSelected = true, resetSelection = false) => {
143
169
  logger.debug(`Setting selection for several rows`);
144
170
  const selectableIds = ids.filter(id => apiRef.current.isRowSelectable(id));
145
171
  let newSelection;
146
172
  if (resetSelection) {
147
- newSelection = isSelected ? selectableIds : [];
173
+ if (isSelected) {
174
+ newSelection = selectableIds;
175
+ if (applyAutoSelection) {
176
+ const addRow = rowId => {
177
+ newSelection.push(rowId);
178
+ };
179
+ selectableIds.forEach(id => {
180
+ findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
181
+ });
182
+ }
183
+ } else {
184
+ newSelection = [];
185
+ }
148
186
  } else {
149
187
  // We clone the existing object to avoid mutating the same object returned by the selector to others part of the project
150
188
  const selectionLookup = _extends({}, selectedIdsLookupSelector(apiRef));
189
+ const addRow = rowId => {
190
+ selectionLookup[rowId] = rowId;
191
+ };
192
+ const removeRow = rowId => {
193
+ delete selectionLookup[rowId];
194
+ };
151
195
  selectableIds.forEach(id => {
152
196
  if (isSelected) {
153
197
  selectionLookup[id] = id;
198
+ if (applyAutoSelection) {
199
+ findRowsToSelect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, addRow);
200
+ }
154
201
  } else {
155
- delete selectionLookup[id];
202
+ removeRow(id);
203
+ if (applyAutoSelection) {
204
+ findRowsToDeselect(apiRef, tree, id, props.rowSelectionPropagation?.descendants ?? false, props.rowSelectionPropagation?.parents ?? false, removeRow);
205
+ }
156
206
  }
157
207
  });
158
208
  newSelection = Object.values(selectionLookup);
@@ -161,7 +211,7 @@ export const useGridRowSelection = (apiRef, props) => {
161
211
  if (isSelectionValid) {
162
212
  apiRef.current.setRowSelectionModel(newSelection);
163
213
  }
164
- }, [apiRef, logger, canHaveMultipleSelection]);
214
+ }, [logger, applyAutoSelection, canHaveMultipleSelection, apiRef, tree, props.rowSelectionPropagation?.descendants, props.rowSelectionPropagation?.parents]);
165
215
  const selectRowRange = React.useCallback(({
166
216
  startId,
167
217
  endId
@@ -193,29 +243,52 @@ export const useGridRowSelection = (apiRef, props) => {
193
243
  useGridApiMethod(apiRef, selectionPublicApi, 'public');
194
244
  useGridApiMethod(apiRef, selectionPrivateApi, props.signature === GridSignature.DataGrid ? 'private' : 'public');
195
245
 
196
- /**
246
+ /*
197
247
  * EVENTS
198
248
  */
199
- const removeOutdatedSelection = React.useCallback(() => {
200
- if (props.keepNonExistentRowsSelected) {
201
- return;
202
- }
249
+ const removeOutdatedSelection = React.useCallback((sortModelUpdated = false) => {
203
250
  const currentSelection = gridRowSelectionStateSelector(apiRef.current.state);
204
- const rowsLookup = gridRowsLookupSelector(apiRef);
251
+ const filteredRowsLookup = gridFilteredRowsLookupSelector(apiRef);
205
252
 
206
253
  // We clone the existing object to avoid mutating the same object returned by the selector to others part of the project
207
254
  const selectionLookup = _extends({}, selectedIdsLookupSelector(apiRef));
208
255
  let hasChanged = false;
209
256
  currentSelection.forEach(id => {
210
- if (!rowsLookup[id]) {
257
+ if (filteredRowsLookup[id] === false) {
258
+ if (props.keepNonExistentRowsSelected) {
259
+ return;
260
+ }
211
261
  delete selectionLookup[id];
212
262
  hasChanged = true;
263
+ return;
264
+ }
265
+ if (!props.rowSelectionPropagation?.parents) {
266
+ return;
267
+ }
268
+ const node = tree[id];
269
+ if (node.type === 'group') {
270
+ const isAutoGenerated = node.isAutoGenerated;
271
+ if (isAutoGenerated) {
272
+ delete selectionLookup[id];
273
+ hasChanged = true;
274
+ return;
275
+ }
276
+ // Keep previously selected tree data parents selected if all their children are filtered out
277
+ if (!node.children.every(childId => filteredRowsLookup[childId] === false)) {
278
+ delete selectionLookup[id];
279
+ hasChanged = true;
280
+ }
213
281
  }
214
282
  });
215
- if (hasChanged) {
216
- apiRef.current.setRowSelectionModel(Object.values(selectionLookup));
283
+ if (hasChanged || isNestedData && !sortModelUpdated) {
284
+ const newSelection = Object.values(selectionLookup);
285
+ if (isNestedData) {
286
+ apiRef.current.selectRows(newSelection, true, true);
287
+ } else {
288
+ apiRef.current.setRowSelectionModel(newSelection);
289
+ }
217
290
  }
218
- }, [apiRef, props.keepNonExistentRowsSelected]);
291
+ }, [apiRef, isNestedData, props.rowSelectionPropagation?.parents, props.keepNonExistentRowsSelected, tree]);
219
292
  const handleSingleRowSelection = React.useCallback((id, event) => {
220
293
  const hasCtrlKey = event.metaKey || event.ctrlKey;
221
294
 
@@ -276,8 +349,7 @@ export const useGridRowSelection = (apiRef, props) => {
276
349
  }, [apiRef, expandMouseRowRangeSelection, canHaveMultipleSelection]);
277
350
  const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
278
351
  const rowsToBeSelected = props.pagination && props.checkboxSelectionVisibleOnly && props.paginationMode === 'client' ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);
279
- const filterModel = gridFilterModelSelector(apiRef);
280
- apiRef.current.selectRows(rowsToBeSelected, params.value, filterModel?.items.length > 0);
352
+ apiRef.current.selectRows(rowsToBeSelected, params.value);
281
353
  }, [apiRef, props.checkboxSelectionVisibleOnly, props.pagination, props.paginationMode]);
282
354
  const handleCellKeyDown = React.useCallback((params, event) => {
283
355
  // Get the most recent cell mode because it may have been changed by another listener
@@ -341,14 +413,15 @@ export const useGridRowSelection = (apiRef, props) => {
341
413
  selectRows(apiRef.current.getAllRowIds(), true);
342
414
  }
343
415
  }, [apiRef, handleSingleRowSelection, selectRows, visibleRows.rows, canHaveMultipleSelection]);
344
- useGridApiEventHandler(apiRef, 'sortedRowsSet', runIfRowSelectionIsEnabled(removeOutdatedSelection));
416
+ useGridApiEventHandler(apiRef, 'sortedRowsSet', runIfRowSelectionIsEnabled(() => removeOutdatedSelection(true)));
417
+ useGridApiEventHandler(apiRef, 'filteredRowsSet', runIfRowSelectionIsEnabled(removeOutdatedSelection));
345
418
  useGridApiEventHandler(apiRef, 'rowClick', runIfRowSelectionIsEnabled(handleRowClick));
346
419
  useGridApiEventHandler(apiRef, 'rowSelectionCheckboxChange', runIfRowSelectionIsEnabled(handleRowSelectionCheckboxChange));
347
420
  useGridApiEventHandler(apiRef, 'headerSelectionCheckboxChange', handleHeaderSelectionCheckboxChange);
348
421
  useGridApiEventHandler(apiRef, 'cellMouseDown', runIfRowSelectionIsEnabled(preventSelectionOnShift));
349
422
  useGridApiEventHandler(apiRef, 'cellKeyDown', runIfRowSelectionIsEnabled(handleCellKeyDown));
350
423
 
351
- /**
424
+ /*
352
425
  * EFFECTS
353
426
  */
354
427
  React.useEffect(() => {
@@ -386,4 +459,7 @@ export const useGridRowSelection = (apiRef, props) => {
386
459
  apiRef.current.setRowSelectionModel([]);
387
460
  }
388
461
  }, [apiRef, canHaveMultipleSelection, checkboxSelection, isStateControlled, props.rowSelection]);
462
+ React.useEffect(() => {
463
+ runIfRowSelectionIsEnabled(removeOutdatedSelection);
464
+ }, [removeOutdatedSelection, runIfRowSelectionIsEnabled]);
389
465
  };
@@ -1,2 +1,12 @@
1
+ import type { GridRowId, GridRowTreeConfig } from '../../../models/gridRows';
1
2
  import type { DataGridProcessedProps } from '../../../models/props/DataGridProps';
3
+ import type { GridPrivateApiCommunity } from '../../../models/api/gridApiCommunity';
4
+ import type { GridRowSelectionPropagation } from '../../../models/gridRowSelectionModel';
5
+ export declare const ROW_SELECTION_PROPAGATION_DEFAULT: GridRowSelectionPropagation;
6
+ export declare function getCheckboxPropsSelector(groupId: GridRowId, autoSelectParents: boolean): import("../../..").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, {
7
+ isIndeterminate: boolean;
8
+ isChecked: boolean;
9
+ }>;
2
10
  export declare function isMultipleRowSelectionEnabled(props: Pick<DataGridProcessedProps, 'signature' | 'disableMultipleRowSelection' | 'checkboxSelection'>): boolean;
11
+ export declare const findRowsToSelect: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, tree: GridRowTreeConfig, selectedRow: GridRowId, autoSelectDescendants: boolean, autoSelectParents: boolean, addRow: (rowId: GridRowId) => void) => void;
12
+ export declare const findRowsToDeselect: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, tree: GridRowTreeConfig, deselectedRow: GridRowId, autoSelectDescendants: boolean, autoSelectParents: boolean, removeRow: (rowId: GridRowId) => void) => void;
@@ -1,8 +1,163 @@
1
1
  import { GridSignature } from "../../utils/useGridApiEventHandler.js";
2
+ import { GRID_ROOT_GROUP_ID } from "../rows/gridRowsUtils.js";
3
+ import { gridFilteredRowsLookupSelector } from "../filter/gridFilterSelector.js";
4
+ import { gridSortedRowIdsSelector } from "../sorting/gridSortingSelector.js";
5
+ import { selectedIdsLookupSelector } from "./gridRowSelectionSelector.js";
6
+ import { gridRowTreeSelector } from "../rows/gridRowsSelector.js";
7
+ import { createSelector } from "../../../utils/createSelector.js";
8
+ export const ROW_SELECTION_PROPAGATION_DEFAULT = {
9
+ parents: false,
10
+ descendants: false
11
+ };
12
+ function getGridRowGroupSelectableDescendants(apiRef, groupId) {
13
+ const rowTree = gridRowTreeSelector(apiRef);
14
+ const sortedRowIds = gridSortedRowIdsSelector(apiRef);
15
+ const filteredRowsLookup = gridFilteredRowsLookupSelector(apiRef);
16
+ const groupNode = rowTree[groupId];
17
+ if (!groupNode || groupNode.type !== 'group') {
18
+ return [];
19
+ }
20
+ const descendants = [];
21
+ const startIndex = sortedRowIds.findIndex(id => id === groupId) + 1;
22
+ for (let index = startIndex; index < sortedRowIds.length && rowTree[sortedRowIds[index]]?.depth > groupNode.depth; index += 1) {
23
+ const id = sortedRowIds[index];
24
+ if (filteredRowsLookup[id] !== false && apiRef.current.isRowSelectable(id)) {
25
+ descendants.push(id);
26
+ }
27
+ }
28
+ return descendants;
29
+ }
30
+
31
+ // TODO v8: Use `createSelectorV8`
32
+ export function getCheckboxPropsSelector(groupId, autoSelectParents) {
33
+ return createSelector(gridRowTreeSelector, gridSortedRowIdsSelector, gridFilteredRowsLookupSelector, selectedIdsLookupSelector, (rowTree, sortedRowIds, filteredRowsLookup, rowSelectionLookup) => {
34
+ const groupNode = rowTree[groupId];
35
+ if (!groupNode || groupNode.type !== 'group') {
36
+ return {
37
+ isIndeterminate: false,
38
+ isChecked: rowSelectionLookup[groupId] === groupId
39
+ };
40
+ }
41
+ if (rowSelectionLookup[groupId] === groupId) {
42
+ return {
43
+ isIndeterminate: false,
44
+ isChecked: true
45
+ };
46
+ }
47
+ let selectableDescendantsCount = 0;
48
+ let selectedDescendantsCount = 0;
49
+ const startIndex = sortedRowIds.findIndex(id => id === groupId) + 1;
50
+ for (let index = startIndex; index < sortedRowIds.length && rowTree[sortedRowIds[index]]?.depth > groupNode.depth; index += 1) {
51
+ const id = sortedRowIds[index];
52
+ if (filteredRowsLookup[id] !== false) {
53
+ selectableDescendantsCount += 1;
54
+ if (rowSelectionLookup[id] !== undefined) {
55
+ selectedDescendantsCount += 1;
56
+ }
57
+ }
58
+ }
59
+ return {
60
+ isIndeterminate: selectedDescendantsCount > 0 && selectedDescendantsCount < selectableDescendantsCount || selectedDescendantsCount === selectableDescendantsCount && rowSelectionLookup[groupId] === undefined,
61
+ isChecked: autoSelectParents ? selectedDescendantsCount > 0 : rowSelectionLookup[groupId] === groupId
62
+ };
63
+ });
64
+ }
2
65
  export function isMultipleRowSelectionEnabled(props) {
3
66
  if (props.signature === GridSignature.DataGrid) {
4
67
  // DataGrid Community has multiple row selection enabled only if checkbox selection is enabled.
5
68
  return props.checkboxSelection && props.disableMultipleRowSelection !== true;
6
69
  }
7
70
  return !props.disableMultipleRowSelection;
8
- }
71
+ }
72
+ const getRowNodeParents = (tree, id) => {
73
+ const parents = [];
74
+ let parent = id;
75
+ while (parent != null && parent !== GRID_ROOT_GROUP_ID) {
76
+ const node = tree[parent];
77
+ if (!node) {
78
+ return parents;
79
+ }
80
+ parents.push(parent);
81
+ parent = node.parent;
82
+ }
83
+ return parents;
84
+ };
85
+ const getFilteredRowNodeSiblings = (tree, filteredRows, id) => {
86
+ const node = tree[id];
87
+ if (!node) {
88
+ return [];
89
+ }
90
+ const parent = node.parent;
91
+ if (parent == null) {
92
+ return [];
93
+ }
94
+ const parentNode = tree[parent];
95
+ return parentNode.children.filter(childId => childId !== id && filteredRows[childId]);
96
+ };
97
+ export const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendants, autoSelectParents, addRow) => {
98
+ const filteredRows = gridFilteredRowsLookupSelector(apiRef);
99
+ const selectedIdsLookup = selectedIdsLookupSelector(apiRef);
100
+ const selectedDescendants = new Set([]);
101
+ if (!autoSelectDescendants && !autoSelectParents) {
102
+ return;
103
+ }
104
+ if (autoSelectDescendants) {
105
+ const rowNode = tree[selectedRow];
106
+ if (rowNode?.type === 'group') {
107
+ const descendants = getGridRowGroupSelectableDescendants(apiRef, selectedRow);
108
+ descendants.forEach(rowId => {
109
+ addRow(rowId);
110
+ selectedDescendants.add(rowId);
111
+ });
112
+ }
113
+ }
114
+ if (autoSelectParents) {
115
+ const checkAllDescendantsSelected = rowId => {
116
+ if (selectedIdsLookup[rowId] !== rowId && !selectedDescendants.has(rowId)) {
117
+ return false;
118
+ }
119
+ const node = tree[rowId];
120
+ if (node?.type !== 'group') {
121
+ return true;
122
+ }
123
+ return node.children.every(checkAllDescendantsSelected);
124
+ };
125
+ const traverseParents = rowId => {
126
+ const siblings = getFilteredRowNodeSiblings(tree, filteredRows, rowId);
127
+ if (siblings.length === 0 || siblings.every(checkAllDescendantsSelected)) {
128
+ const rowNode = tree[rowId];
129
+ const parent = rowNode.parent;
130
+ if (parent != null && parent !== GRID_ROOT_GROUP_ID && apiRef.current.isRowSelectable(parent)) {
131
+ addRow(parent);
132
+ selectedDescendants.add(parent);
133
+ traverseParents(parent);
134
+ }
135
+ }
136
+ };
137
+ traverseParents(selectedRow);
138
+ }
139
+ };
140
+ export const findRowsToDeselect = (apiRef, tree, deselectedRow, autoSelectDescendants, autoSelectParents, removeRow) => {
141
+ const selectedIdsLookup = selectedIdsLookupSelector(apiRef);
142
+ if (!autoSelectParents && !autoSelectDescendants) {
143
+ return;
144
+ }
145
+ if (autoSelectParents) {
146
+ const allParents = getRowNodeParents(tree, deselectedRow);
147
+ allParents.forEach(parent => {
148
+ const isSelected = selectedIdsLookup[parent] === parent;
149
+ if (isSelected) {
150
+ removeRow(parent);
151
+ }
152
+ });
153
+ }
154
+ if (autoSelectDescendants) {
155
+ const rowNode = tree[deselectedRow];
156
+ if (rowNode?.type === 'group') {
157
+ const descendants = getGridRowGroupSelectableDescendants(apiRef, deselectedRow);
158
+ descendants.forEach(descendant => {
159
+ removeRow(descendant);
160
+ });
161
+ }
162
+ }
163
+ };
@@ -1,4 +1,4 @@
1
1
  import { GridStateCommunity } from '../../../models/gridStateCommunity';
2
- export declare const gridRowSpanningHiddenCellsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, Record<import("../../..").GridRowId, Record<string, boolean>>>;
3
- export declare const gridRowSpanningSpannedCellsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, Record<import("../../..").GridRowId, Record<string, number>>>;
4
- export declare const gridRowSpanningHiddenCellsOriginMapSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, Record<number, Record<string, number>>>;
2
+ export declare const gridRowSpanningHiddenCellsSelector: import("../../..").OutputSelector<GridStateCommunity, Record<import("../../..").GridRowId, Record<string, boolean>>>;
3
+ export declare const gridRowSpanningSpannedCellsSelector: import("../../..").OutputSelector<GridStateCommunity, Record<import("../../..").GridRowId, Record<string, number>>>;
4
+ export declare const gridRowSpanningHiddenCellsOriginMapSelector: import("../../..").OutputSelector<GridStateCommunity, Record<number, Record<string, number>>>;
@@ -1,25 +1,25 @@
1
1
  import { GridStateCommunity } from '../../../models/gridStateCommunity';
2
- export declare const gridRowCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
3
- export declare const gridRowsLoadingSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, boolean | undefined>;
4
- export declare const gridTopLevelRowCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
5
- export declare const gridRowsLookupSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowIdToModelLookup<import("../../..").GridValidRowModel>>;
6
- export declare const gridRowsDataRowIdToIdLookupSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowIdToIdLookup>;
7
- export declare const gridRowTreeSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowTreeConfig>;
8
- export declare const gridRowGroupsToFetchSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowId[] | undefined>;
9
- export declare const gridRowGroupingNameSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, string>;
10
- export declare const gridRowTreeDepthsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridTreeDepths>;
11
- export declare const gridRowMaximumTreeDepthSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
12
- export declare const gridDataRowIdsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, import("../../..").GridRowId[]>;
2
+ export declare const gridRowCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
3
+ export declare const gridRowsLoadingSelector: import("../../..").OutputSelector<GridStateCommunity, boolean | undefined>;
4
+ export declare const gridTopLevelRowCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
5
+ export declare const gridRowsLookupSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowIdToModelLookup<import("../../..").GridValidRowModel>>;
6
+ export declare const gridRowsDataRowIdToIdLookupSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowIdToIdLookup>;
7
+ export declare const gridRowTreeSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowTreeConfig>;
8
+ export declare const gridRowGroupsToFetchSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowId[] | undefined>;
9
+ export declare const gridRowGroupingNameSelector: import("../../..").OutputSelector<GridStateCommunity, string>;
10
+ export declare const gridRowTreeDepthsSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridTreeDepths>;
11
+ export declare const gridRowMaximumTreeDepthSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
12
+ export declare const gridDataRowIdsSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowId[]>;
13
13
  /**
14
14
  * @ignore - do not document.
15
15
  */
16
- export declare const gridAdditionalRowGroupsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, {
16
+ export declare const gridAdditionalRowGroupsSelector: import("../../..").OutputSelector<GridStateCommunity, {
17
17
  pinnedRows?: import("./gridRowsInterfaces").GridPinnedRowsState;
18
18
  } | undefined>;
19
19
  /**
20
20
  * @ignore - do not document.
21
21
  */
22
- export declare const gridPinnedRowsSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, {
22
+ export declare const gridPinnedRowsSelector: import("../../..").OutputSelector<GridStateCommunity, {
23
23
  bottom: {
24
24
  id: import("../../..").GridRowId;
25
25
  model: import("../../..").GridValidRowModel;
@@ -32,4 +32,4 @@ export declare const gridPinnedRowsSelector: import("../../../utils/createSelect
32
32
  /**
33
33
  * @ignore - do not document.
34
34
  */
35
- export declare const gridPinnedRowsCountSelector: import("../../../utils/createSelector").OutputSelector<GridStateCommunity, number>;
35
+ export declare const gridPinnedRowsCountSelector: import("../../..").OutputSelector<GridStateCommunity, number>;
@@ -24,7 +24,7 @@ export const buildRootGroup = () => ({
24
24
  */
25
25
  export function checkGridRowIdIsValid(id, row, detailErrorMessage = 'A row was provided without id in the rows prop:') {
26
26
  if (id == null) {
27
- throw new Error(['MUI X: The data grid component requires all rows to have a unique `id` property.', 'Alternatively, you can use the `getRowId` prop to specify a custom id for each row.', detailErrorMessage, JSON.stringify(row)].join('\n'));
27
+ throw new Error(['MUI X: The Data Grid component requires all rows to have a unique `id` property.', 'Alternatively, you can use the `getRowId` prop to specify a custom id for each row.', detailErrorMessage, JSON.stringify(row)].join('\n'));
28
28
  }
29
29
  }
30
30
  export const getRowIdFromRowModel = (rowModel, getRowId, detailErrorMessage) => {
@@ -202,7 +202,7 @@ export const useGridRowSpanning = (apiRef, props) => {
202
202
  }
203
203
  const rangeToProcess = getUnprocessedRange({
204
204
  firstRowIndex: renderContext.firstRowIndex,
205
- lastRowIndex: renderContext.lastRowIndex - 1
205
+ lastRowIndex: Math.min(renderContext.lastRowIndex - 1, range.lastRowIndex)
206
206
  }, processedRange.current);
207
207
  if (rangeToProcess === null) {
208
208
  return;
@@ -3,4 +3,4 @@ import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
3
3
  import { GridPrivateApiCommunity } from '../../../models/api/gridApiCommunity';
4
4
  import { GridStateInitializer } from '../../utils/useGridInitializeState';
5
5
  export declare const rowsStateInitializer: GridStateInitializer<Pick<DataGridProcessedProps, 'unstable_dataSource' | 'rows' | 'rowCount' | 'getRowId' | 'loading'>>;
6
- export declare const useGridRows: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "rows" | "getRowId" | "rowCount" | "throttleRowsMs" | "signature" | "pagination" | "paginationMode" | "loading">) => void;
6
+ export declare const useGridRows: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "rows" | "getRowId" | "rowCount" | "throttleRowsMs" | "signature" | "pagination" | "paginationMode" | "loading" | "unstable_dataSource">) => void;
@@ -1,5 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import * as React from 'react';
3
+ import useLazyRef from '@mui/utils/useLazyRef';
3
4
  import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
4
5
  import { useGridLogger } from "../../utils/useGridLogger.js";
5
6
  import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowGroupingNameSelector, gridRowTreeDepthsSelector, gridDataRowIdsSelector, gridRowsDataRowIdToIdLookupSelector, gridRowMaximumTreeDepthSelector, gridRowGroupsToFetchSelector } from "./gridRowsSelector.js";
@@ -367,11 +368,16 @@ export const useGridRows = (apiRef, props) => {
367
368
  throttle: false
368
369
  });
369
370
  }, [logger, apiRef, props.rows, props.getRowId, props.loading, props.rowCount, throttledRowsChange]);
371
+ const previousDataSource = useLazyRef(() => props.unstable_dataSource);
370
372
  const handleStrategyProcessorChange = React.useCallback(methodName => {
373
+ if (props.unstable_dataSource && props.unstable_dataSource !== previousDataSource.current) {
374
+ previousDataSource.current = props.unstable_dataSource;
375
+ return;
376
+ }
371
377
  if (methodName === 'rowTreeCreation') {
372
378
  groupRows();
373
379
  }
374
- }, [groupRows]);
380
+ }, [groupRows, previousDataSource, props.unstable_dataSource]);
375
381
  const handleStrategyActivityChange = React.useCallback(() => {
376
382
  // `rowTreeCreation` is the only processor ran when `strategyAvailabilityChange` is fired.
377
383
  // All the other processors listen to `rowsSet` which will be published by the `groupRows` method below.