@mui/x-data-grid 6.0.0-alpha.0 → 6.0.0-alpha.2

package/node/hooks/features/virtualization/useGridVirtualScroller.js

@@ -26,8 +26,6 @@ var _useGridSelector = require("../../utils/useGridSelector");
 
 var _gridColumnsSelector = require("../columns/gridColumnsSelector");
 
-var _densitySelector = require("../density/densitySelector");
-
 var _gridFocusStateSelector = require("../focus/gridFocusStateSelector");
 
 var _gridEditRowsSelector = require("../editRows/gridEditRowsSelector");
@@ -44,6 +42,8 @@ var _gridRowsMetaSelector = require("../rows/gridRowsMetaSelector");
 
 var _gridColumnsUtils = require("../columns/gridColumnsUtils");
 
+var _gridRowsUtils = require("../rows/gridRowsUtils");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["style"];
@@ -106,7 +106,6 @@ const useGridVirtualScroller = props => {
   } = props;
   const columnPositions = (0, _useGridSelector.useGridSelector)(apiRef, _gridColumnsSelector.gridColumnPositionsSelector);
   const columnsTotalWidth = (0, _useGridSelector.useGridSelector)(apiRef, _gridColumnsSelector.gridColumnsTotalWidthSelector);
-  const rowHeight = (0, _useGridSelector.useGridSelector)(apiRef, _densitySelector.gridDensityRowHeightSelector);
   const cellFocus = (0, _useGridSelector.useGridSelector)(apiRef, _gridFocusStateSelector.gridFocusCellSelector);
   const cellTabIndex = (0, _useGridSelector.useGridSelector)(apiRef, _gridFocusStateSelector.gridTabIndexCellSelector);
   const rowsMeta = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsMetaSelector.gridRowsMetaSelector);
@@ -128,16 +127,16 @@ const useGridVirtualScroller = props => {
     var _currentPage$range, _currentPage$range2;
 
     const lastMeasuredIndexRelativeToAllRows = apiRef.current.unstable_getLastMeasuredRowIndex();
-    const lastMeasuredIndexRelativeToCurrentPage = lastMeasuredIndexRelativeToAllRows - (((_currentPage$range = currentPage.range) == null ? void 0 : _currentPage$range.firstRowIndex) || 0);
-    const lastMeasuredIndex = Math.max(0, lastMeasuredIndexRelativeToCurrentPage);
-    let allRowsMeasured = lastMeasuredIndex === Infinity;
+    let allRowsMeasured = lastMeasuredIndexRelativeToAllRows === Infinity;
 
-    if ((_currentPage$range2 = currentPage.range) != null && _currentPage$range2.lastRowIndex && !allRowsMeasured) {
+    if ((_currentPage$range = currentPage.range) != null && _currentPage$range.lastRowIndex && !allRowsMeasured) {
       // Check if all rows in this page are already measured
-      allRowsMeasured = lastMeasuredIndex >= currentPage.range.lastRowIndex;
+      allRowsMeasured = lastMeasuredIndexRelativeToAllRows >= currentPage.range.lastRowIndex;
     }
 
-    if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndex] >= offset) {
+    const lastMeasuredIndexRelativeToCurrentPage = (0, _utils2.clamp)(lastMeasuredIndexRelativeToAllRows - (((_currentPage$range2 = currentPage.range) == null ? void 0 : _currentPage$range2.firstRowIndex) || 0), 0, rowsMeta.positions.length);
+
+    if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndexRelativeToCurrentPage] >= offset) {
       // If all rows were measured (when no row has "auto" as height) or all rows before the offset
       // were measured, then use a binary search because it's faster.
       return binarySearch(offset, rowsMeta.positions);
@@ -147,7 +146,7 @@ const useGridVirtualScroller = props => {
     // Inspired by https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/utils/CellSizeAndPositionManager.js
 
 
-    return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndex);
+    return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndexRelativeToCurrentPage);
   }, [apiRef, (_currentPage$range3 = currentPage.range) == null ? void 0 : _currentPage$range3.firstRowIndex, (_currentPage$range4 = currentPage.range) == null ? void 0 : _currentPage$range4.lastRowIndex, rowsMeta.positions]);
   const computeRenderContext = React.useCallback(() => {
     if (disableVirtualization) {
@@ -457,19 +456,14 @@ const useGridVirtualScroller = props => {
       height,
       minHeight: shouldExtendContent ? '100%' : 'auto'
     };
-
-    if (rootProps.autoHeight && currentPage.rows.length === 0) {
-      size.height = 2 * rowHeight; // Give room to show the overlay when there's no row.
-    }
-
     return size;
-  }, [rootRef, columnsTotalWidth, rowsMeta.currentPageTotalHeight, currentPage.rows.length, needsHorizontalScrollbar, rootProps.autoHeight, rowHeight]);
+  }, [rootRef, columnsTotalWidth, rowsMeta.currentPageTotalHeight, needsHorizontalScrollbar]);
   React.useEffect(() => {
     apiRef.current.publishEvent('virtualScrollerContentSizeChange');
   }, [apiRef, contentSize]);
 
   if (rootProps.autoHeight && currentPage.rows.length === 0) {
-    contentSize.height = 2 * rowHeight; // Give room to show the overlay when there no rows.
+    contentSize.height = (0, _gridRowsUtils.getMinimalContentHeight)(apiRef); // Give room to show the overlay when there no rows.
   }
 
   const rootStyle = {};

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v6.0.0-alpha.0
+/** @license MUI v6.0.0-alpha.2
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/internals/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "GridVirtualScrollerRenderZone", {
     return _GridVirtualScrollerRenderZone.GridVirtualScrollerRenderZone;
   }
 });
+Object.defineProperty(exports, "buildRootGroup", {
+  enumerable: true,
+  get: function () {
+    return _gridRowsUtils.buildRootGroup;
+  }
+});
 Object.defineProperty(exports, "buildWarning", {
   enumerable: true,
   get: function () {
@@ -147,6 +153,12 @@ Object.defineProperty(exports, "getRowIdFromRowModel", {
     return _gridRowsUtils.getRowIdFromRowModel;
   }
 });
+Object.defineProperty(exports, "getTreeNodeDescendants", {
+  enumerable: true,
+  get: function () {
+    return _gridRowsUtils.getTreeNodeDescendants;
+  }
+});
 Object.defineProperty(exports, "gridAdditionalRowGroupsSelector", {
   enumerable: true,
   get: function () {
@@ -492,12 +504,12 @@ var _useGridRows = require("../hooks/features/rows/useGridRows");
 
 var _useGridRowsPreProcessors = require("../hooks/features/rows/useGridRowsPreProcessors");
 
+var _gridRowsUtils = require("../hooks/features/rows/gridRowsUtils");
+
 var _useGridRowsMeta = require("../hooks/features/rows/useGridRowsMeta");
 
 var _useGridParamsApi = require("../hooks/features/rows/useGridParamsApi");
 
-var _gridRowsUtils = require("../hooks/features/rows/gridRowsUtils");
-
 var _gridRowsSelector = require("../hooks/features/rows/gridRowsSelector");
 
 var _useGridSelection = require("../hooks/features/selection/useGridSelection");

package/node/models/gridFeatureMode.js

@@ -2,10 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.GridFeatureModeConstant = void 0;
-const GridFeatureModeConstant = {
-  client: 'client',
-  server: 'server'
-};
-exports.GridFeatureModeConstant = GridFeatureModeConstant;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "6.0.0-alpha.0",
+  "version": "6.0.0-alpha.2",
   "description": "The community edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",

package/themeAugmentation/props.d.ts

@@ -1,4 +1,4 @@
-import { ComponentsOverrides, ComponentsProps } from '@mui/material/styles';
+import { ComponentsOverrides, ComponentsProps, Theme } from '@mui/material/styles';
 import { DataGridProps } from '../models/props/DataGridProps';
 export interface DataGridComponentsPropsList {
     MuiDataGrid: DataGridProps;
@@ -6,7 +6,7 @@ export interface DataGridComponentsPropsList {
 export interface DataGridComponents {
     MuiDataGrid?: {
         defaultProps?: ComponentsProps['MuiDataGrid'];
-        styleOverrides?: ComponentsOverrides['MuiDataGrid'];
+        styleOverrides?: ComponentsOverrides<Theme>['MuiDataGrid'];
     };
 }
 declare module '@mui/material/styles' {

package/hooks/features/rows/gridRowsState.d.ts

@@ -1,60 +0,0 @@
-import { GridRowId, GridRowsLookup, GridRowTreeConfig, GridRowEntry } from '../../../models/gridRows';
-import type { DataGridProcessedProps } from '../../../models/props/DataGridProps';
-export interface GridRowTreeCreationParams {
-    ids: GridRowId[];
-    idRowsLookup: GridRowsLookup;
-    idToIdLookup: Record<string, GridRowId>;
-    previousTree: GridRowTreeConfig | null;
-}
-export interface GridRowTreeCreationValue {
-    /**
-     * Name of the algorithm used to group the rows
-     * It is useful to decide which filtering / sorting algorithm to apply, to avoid applying tree-data filtering on a grouping-by-column dataset for instance.
-     */
-    groupingName: string;
-    tree: GridRowTreeConfig;
-    treeDepth: number;
-    ids: GridRowId[];
-    idRowsLookup: GridRowsLookup;
-    idToIdLookup: Record<string, GridRowId>;
-    additionalRowGroups?: {
-        pinnedRows?: GridPinnedRowsState;
-    };
-}
-export interface GridRowsInternalCache extends Omit<GridRowTreeCreationParams, 'previousTree'> {
-    /**
-     * The rows as they were the last time all the rows have been updated at once
-     * It is used to avoid processing several time the same set of rows
-     */
-    rowsBeforePartialUpdates: DataGridProcessedProps['rows'];
-    /**
-     * The value of the `loading` prop since the last time that the rows state was updated.
-     */
-    loadingPropBeforePartialUpdates: DataGridProcessedProps['loading'];
-}
-export interface GridRowsState extends GridRowTreeCreationValue {
-    /**
-     * Matches the value of the `loading` prop.
-     */
-    loading?: boolean;
-    /**
-     * Amount of rows before applying the filtering.
-     * It also counts the expanded and collapsed children rows.
-     */
-    totalRowCount: number;
-    /**
-     * Amount of rows before applying the filtering.
-     * It does not count the expanded children rows.
-     */
-    totalTopLevelRowCount: number;
-    /**
-     * Tree returned by the `rowTreeCreation` strategy processor.
-     * It is used to re-apply the `hydrateRows` pipe processor without having to recreate the tree.
-     */
-    groupingResponseBeforeRowHydration: GridRowTreeCreationValue;
-}
-export declare type GridHydrateRowsValue = GridRowTreeCreationValue;
-export interface GridPinnedRowsState {
-    top?: GridRowEntry[];
-    bottom?: GridRowEntry[];
-}