@mui/x-data-grid 7.0.0-alpha.8 → 7.0.0-beta.0

package/legacy/hooks/features/columnMenu/useGridColumnMenu.js

@@ -22,19 +22,25 @@ export var useGridColumnMenu = function useGridColumnMenu(apiRef) {
    * API METHODS
    */
   var showColumnMenu = React.useCallback(function (field) {
-    var shouldUpdate = apiRef.current.setState(function (state) {
-      if (state.columnMenu.open && state.columnMenu.field === field) {
-        return state;
-      }
-      logger.debug('Opening Column Menu');
-      return _extends({}, state, {
-        columnMenu: {
-          open: true,
-          field: field
+    var columnMenuState = gridColumnMenuSelector(apiRef.current.state);
+    var newState = {
+      open: true,
+      field: field
+    };
+    var shouldUpdate = newState.open !== columnMenuState.open || newState.field !== columnMenuState.field;
+    if (shouldUpdate) {
+      apiRef.current.setState(function (state) {
+        if (state.columnMenu.open && state.columnMenu.field === field) {
+          return state;
         }
+        logger.debug('Opening Column Menu');
+        return _extends({}, state, {
+          columnMenu: {
+            open: true,
+            field: field
+          }
+        });
       });
-    });
-    if (shouldUpdate) {
       apiRef.current.hidePreferences();
       apiRef.current.forceUpdate();
     }
@@ -66,19 +72,18 @@ export var useGridColumnMenu = function useGridColumnMenu(apiRef) {
       }
       apiRef.current.setColumnHeaderFocus(fieldToFocus);
     }
-    var shouldUpdate = apiRef.current.setState(function (state) {
-      if (!state.columnMenu.open && state.columnMenu.field === undefined) {
-        return state;
-      }
-      logger.debug('Hiding Column Menu');
-      return _extends({}, state, {
-        columnMenu: _extends({}, state.columnMenu, {
-          open: false,
-          field: undefined
-        })
-      });
-    });
+    var newState = {
+      open: false,
+      field: undefined
+    };
+    var shouldUpdate = newState.open !== columnMenuState.open || newState.field !== columnMenuState.field;
     if (shouldUpdate) {
+      apiRef.current.setState(function (state) {
+        logger.debug('Hiding Column Menu');
+        return _extends({}, state, {
+          columnMenu: newState
+        });
+      });
       apiRef.current.forceUpdate();
     }
   }, [apiRef, logger]);

package/legacy/hooks/features/columns/gridColumnsInterfaces.js

@@ -1 +1,9 @@
-export {};
+export var GridPinnedColumnPosition = /*#__PURE__*/function (GridPinnedColumnPosition) {
+  GridPinnedColumnPosition["LEFT"] = "left";
+  GridPinnedColumnPosition["RIGHT"] = "right";
+  return GridPinnedColumnPosition;
+}({});
+export var EMPTY_PINNED_COLUMN_FIELDS = {
+  left: [],
+  right: []
+};

package/legacy/hooks/features/columns/gridColumnsSelector.js

@@ -1,4 +1,7 @@
 import { createSelector, createSelectorMemoized } from '../../../utils/createSelector';
+import { EMPTY_PINNED_COLUMN_FIELDS } from './gridColumnsInterfaces';
+import { gridThemeSelector } from '../../core/gridCoreSelector';
+
 /**
  * Get the columns state
  * @category Columns
@@ -62,6 +65,65 @@ export var gridVisibleColumnFieldsSelector = createSelectorMemoized(gridVisibleC
   });
 });
 
+/**
+ * Get the visible pinned columns model.
+ * @category Visible Columns
+ */
+export var gridPinnedColumnsSelector = function gridPinnedColumnsSelector(state) {
+  return state.pinnedColumns;
+};
+
+/**
+ * Get the visible pinned columns.
+ * @category Visible Columns
+ */
+export var gridVisiblePinnedColumnDefinitionsSelector = createSelectorMemoized(gridColumnsStateSelector, gridPinnedColumnsSelector, gridVisibleColumnFieldsSelector, gridThemeSelector, function (columnsState, model, visibleColumnFields, theme) {
+  var visiblePinnedFields = filterVisibleColumns(model, visibleColumnFields, theme.direction === 'rtl');
+  var visiblePinnedColumns = {
+    left: visiblePinnedFields.left.map(function (field) {
+      return columnsState.lookup[field];
+    }),
+    right: visiblePinnedFields.right.map(function (field) {
+      return columnsState.lookup[field];
+    })
+  };
+  return visiblePinnedColumns;
+});
+function filterVisibleColumns(pinnedColumns, columns, invert) {
+  var _pinnedColumns$left, _pinnedColumns$right;
+  if (!Array.isArray(pinnedColumns.left) && !Array.isArray(pinnedColumns.right)) {
+    return EMPTY_PINNED_COLUMN_FIELDS;
+  }
+  if (((_pinnedColumns$left = pinnedColumns.left) == null ? void 0 : _pinnedColumns$left.length) === 0 && ((_pinnedColumns$right = pinnedColumns.right) == null ? void 0 : _pinnedColumns$right.length) === 0) {
+    return EMPTY_PINNED_COLUMN_FIELDS;
+  }
+  var filter = function filter(newPinnedColumns, remainingColumns) {
+    if (!Array.isArray(newPinnedColumns)) {
+      return [];
+    }
+    return newPinnedColumns.filter(function (field) {
+      return remainingColumns.includes(field);
+    });
+  };
+  var leftPinnedColumns = filter(pinnedColumns.left, columns);
+  var columnsWithoutLeftPinnedColumns = columns.filter(
+  // Filter out from the remaining columns those columns already pinned to the left
+  function (field) {
+    return !leftPinnedColumns.includes(field);
+  });
+  var rightPinnedColumns = filter(pinnedColumns.right, columnsWithoutLeftPinnedColumns);
+  if (invert) {
+    return {
+      left: rightPinnedColumns,
+      right: leftPinnedColumns
+    };
+  }
+  return {
+    left: leftPinnedColumns,
+    right: rightPinnedColumns
+  };
+}
+
 /**
  * Get the left position in pixel of each visible columns relative to the left of the first column.
  * @category Visible Columns

package/legacy/hooks/features/columns/gridColumnsUtils.js

@@ -2,12 +2,14 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { DEFAULT_GRID_COL_TYPE_KEY, GRID_STRING_COL_DEF } from '../../../colDef';
+import { DEFAULT_GRID_COL_TYPE_KEY, GRID_STRING_COL_DEF, getGridDefaultColumnTypes } from '../../../colDef';
 import { gridColumnsStateSelector, gridColumnVisibilityModelSelector } from './gridColumnsSelector';
 import { clamp } from '../../../utils/utils';
 import { gridDensityFactorSelector } from '../density/densitySelector';
 import { gridColumnGroupsHeaderMaxDepthSelector } from '../columnGrouping/gridColumnGroupsSelector';
 export var COLUMNS_DIMENSION_PROPERTIES = ['maxWidth', 'minWidth', 'width', 'flex'];
+var COLUMN_TYPES = getGridDefaultColumnTypes();
+
 /**
  * Computes width for flex columns.
  * Based on CSS Flexbox specification:
@@ -207,10 +209,10 @@ export var applyInitialState = function applyInitialState(columnsState, initialS
   });
   return newColumnsState;
 };
-function getDefaultColTypeDef(columnTypes, type) {
-  var colDef = columnTypes[DEFAULT_GRID_COL_TYPE_KEY];
-  if (type && columnTypes[type]) {
-    colDef = columnTypes[type];
+function getDefaultColTypeDef(type) {
+  var colDef = COLUMN_TYPES[DEFAULT_GRID_COL_TYPE_KEY];
+  if (type && COLUMN_TYPES[type]) {
+    colDef = COLUMN_TYPES[type];
   }
   return colDef;
 }
@@ -219,7 +221,6 @@ export var createColumnsState = function createColumnsState(_ref5) {
   var apiRef = _ref5.apiRef,
     columnsToUpsert = _ref5.columnsToUpsert,
     initialState = _ref5.initialState,
-    columnTypes = _ref5.columnTypes,
     _ref5$columnVisibilit = _ref5.columnVisibilityModel,
     columnVisibilityModel = _ref5$columnVisibilit === void 0 ? gridColumnVisibilityModelSelector(apiRef) : _ref5$columnVisibilit,
     _ref5$keepOnlyColumns = _ref5.keepOnlyColumnsToUpsert,
@@ -254,7 +255,7 @@ export var createColumnsState = function createColumnsState(_ref5) {
     columnsToKeep[field] = true;
     var existingState = columnsState.lookup[field];
     if (existingState == null) {
-      existingState = _extends({}, getDefaultColTypeDef(columnTypes, newColumn.type), {
+      existingState = _extends({}, getDefaultColTypeDef(newColumn.type), {
         field: field,
         hasBeenResized: false
       });
@@ -265,7 +266,7 @@ export var createColumnsState = function createColumnsState(_ref5) {
 
     // If the column type has changed - merge the existing state with the default column type definition
     if (existingState && existingState.type !== newColumn.type) {
-      existingState = _extends({}, getDefaultColTypeDef(columnTypes, newColumn.type), {
+      existingState = _extends({}, getDefaultColTypeDef(newColumn.type), {
         field: field
       });
     }
@@ -291,14 +292,7 @@ export var createColumnsState = function createColumnsState(_ref5) {
   }
   var columnsStateWithPreProcessing = apiRef.current.unstable_applyPipeProcessors('hydrateColumns', columnsState);
   var columnsStateWithPortableColumns = applyInitialState(columnsStateWithPreProcessing, initialState);
-  return hydrateColumnsWidth(columnsStateWithPortableColumns, (_apiRef$current$getRo = (_apiRef$current$getRo2 = (_apiRef$current = apiRef.current).getRootDimensions) == null || (_apiRef$current$getRo2 = _apiRef$current$getRo2.call(_apiRef$current)) == null ? void 0 : _apiRef$current$getRo2.viewportInnerSize.width) != null ? _apiRef$current$getRo : 0);
-};
-export var mergeColumnsState = function mergeColumnsState(columnsState) {
-  return function (state) {
-    return _extends({}, state, {
-      columns: columnsState
-    });
-  };
+  return hydrateColumnsWidth(columnsStateWithPortableColumns, (_apiRef$current$getRo = (_apiRef$current$getRo2 = (_apiRef$current = apiRef.current).getRootDimensions) == null ? void 0 : _apiRef$current$getRo2.call(_apiRef$current).viewportInnerSize.width) != null ? _apiRef$current$getRo : 0);
 };
 export function getFirstNonSpannedColumnToRender(_ref6) {
   var firstColumnToRender = _ref6.firstColumnToRender,

package/legacy/hooks/features/columns/index.js

@@ -1 +1,2 @@
-export { gridColumnFieldsSelector, gridColumnLookupSelector, gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector, gridVisibleColumnDefinitionsSelector, gridVisibleColumnFieldsSelector, gridColumnPositionsSelector, gridColumnsTotalWidthSelector, gridFilterableColumnDefinitionsSelector, gridFilterableColumnLookupSelector } from './gridColumnsSelector';
+export * from './gridColumnsSelector';
+export * from './gridColumnsInterfaces';

package/legacy/hooks/features/columns/useGridColumnSpanning.js

@@ -7,65 +7,10 @@ import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
  */
 export var useGridColumnSpanning = function useGridColumnSpanning(apiRef) {
   var lookup = React.useRef({});
-  var setCellColSpanInfo = React.useCallback(function (rowId, columnIndex, cellColSpanInfo) {
-    var sizes = lookup.current;
-    if (!sizes[rowId]) {
-      sizes[rowId] = {};
-    }
-    sizes[rowId][columnIndex] = cellColSpanInfo;
-  }, []);
-  var getCellColSpanInfo = React.useCallback(function (rowId, columnIndex) {
+  var getCellColSpanInfo = function getCellColSpanInfo(rowId, columnIndex) {
     var _lookup$current$rowId;
     return (_lookup$current$rowId = lookup.current[rowId]) == null ? void 0 : _lookup$current$rowId[columnIndex];
-  }, []);
-
-  // Calculate `colSpan` for the cell.
-  var calculateCellColSpan = React.useCallback(function (params) {
-    var columnIndex = params.columnIndex,
-      rowId = params.rowId,
-      minFirstColumnIndex = params.minFirstColumnIndex,
-      maxLastColumnIndex = params.maxLastColumnIndex,
-      columns = params.columns;
-    var columnsLength = columns.length;
-    var column = columns[columnIndex];
-    var colSpan = typeof column.colSpan === 'function' ? column.colSpan(apiRef.current.getCellParams(rowId, column.field)) : column.colSpan;
-    if (!colSpan || colSpan === 1) {
-      setCellColSpanInfo(rowId, columnIndex, {
-        spannedByColSpan: false,
-        cellProps: {
-          colSpan: 1,
-          width: column.computedWidth
-        }
-      });
-      return {
-        colSpan: 1
-      };
-    }
-    var width = column.computedWidth;
-    for (var j = 1; j < colSpan; j += 1) {
-      var nextColumnIndex = columnIndex + j;
-      // Cells should be spanned only within their column section (left-pinned, right-pinned and unpinned).
-      if (nextColumnIndex >= minFirstColumnIndex && nextColumnIndex < maxLastColumnIndex) {
-        var nextColumn = columns[nextColumnIndex];
-        width += nextColumn.computedWidth;
-        setCellColSpanInfo(rowId, columnIndex + j, {
-          spannedByColSpan: true,
-          rightVisibleCellIndex: Math.min(columnIndex + colSpan, columnsLength - 1),
-          leftVisibleCellIndex: columnIndex
-        });
-      }
-      setCellColSpanInfo(rowId, columnIndex, {
-        spannedByColSpan: false,
-        cellProps: {
-          colSpan: colSpan,
-          width: width
-        }
-      });
-    }
-    return {
-      colSpan: colSpan
-    };
-  }, [apiRef, setCellColSpanInfo]);
+  };
 
   // Calculate `colSpan` for each cell in the row
   var calculateColSpan = React.useCallback(function (_ref) {
@@ -75,6 +20,8 @@ export var useGridColumnSpanning = function useGridColumnSpanning(apiRef) {
       columns = _ref.columns;
     for (var i = minFirstColumn; i < maxLastColumn; i += 1) {
       var cellProps = calculateCellColSpan({
+        apiRef: apiRef,
+        lookup: lookup.current,
         columnIndex: i,
         rowId: rowId,
         minFirstColumnIndex: minFirstColumn,
@@ -85,7 +32,7 @@ export var useGridColumnSpanning = function useGridColumnSpanning(apiRef) {
         i += cellProps.colSpan - 1;
       }
     }
-  }, [calculateCellColSpan]);
+  }, [apiRef]);
   var columnSpanningPublicApi = {
     unstable_getCellColSpanInfo: getCellColSpanInfo
   };
@@ -99,4 +46,58 @@ export var useGridColumnSpanning = function useGridColumnSpanning(apiRef) {
     lookup.current = {};
   }, []);
   useGridApiEventHandler(apiRef, 'columnOrderChange', handleColumnReorderChange);
-};
+};
+function calculateCellColSpan(params) {
+  var apiRef = params.apiRef,
+    lookup = params.lookup,
+    columnIndex = params.columnIndex,
+    rowId = params.rowId,
+    minFirstColumnIndex = params.minFirstColumnIndex,
+    maxLastColumnIndex = params.maxLastColumnIndex,
+    columns = params.columns;
+  var columnsLength = columns.length;
+  var column = columns[columnIndex];
+  var colSpan = typeof column.colSpan === 'function' ? column.colSpan(apiRef.current.getCellParams(rowId, column.field)) : column.colSpan;
+  if (!colSpan || colSpan === 1) {
+    setCellColSpanInfo(lookup, rowId, columnIndex, {
+      spannedByColSpan: false,
+      cellProps: {
+        colSpan: 1,
+        width: column.computedWidth
+      }
+    });
+    return {
+      colSpan: 1
+    };
+  }
+  var width = column.computedWidth;
+  for (var j = 1; j < colSpan; j += 1) {
+    var nextColumnIndex = columnIndex + j;
+    // Cells should be spanned only within their column section (left-pinned, right-pinned and unpinned).
+    if (nextColumnIndex >= minFirstColumnIndex && nextColumnIndex < maxLastColumnIndex) {
+      var nextColumn = columns[nextColumnIndex];
+      width += nextColumn.computedWidth;
+      setCellColSpanInfo(lookup, rowId, columnIndex + j, {
+        spannedByColSpan: true,
+        rightVisibleCellIndex: Math.min(columnIndex + colSpan, columnsLength - 1),
+        leftVisibleCellIndex: columnIndex
+      });
+    }
+    setCellColSpanInfo(lookup, rowId, columnIndex, {
+      spannedByColSpan: false,
+      cellProps: {
+        colSpan: colSpan,
+        width: width
+      }
+    });
+  }
+  return {
+    colSpan: colSpan
+  };
+}
+function setCellColSpanInfo(lookup, rowId, columnIndex, cellColSpanInfo) {
+  if (!lookup[rowId]) {
+    lookup[rowId] = {};
+  }
+  lookup[rowId][columnIndex] = cellColSpanInfo;
+}

package/legacy/hooks/features/columns/useGridColumns.js

@@ -7,23 +7,24 @@ import { useGridLogger } from '../../utils/useGridLogger';
 import { gridColumnFieldsSelector, gridColumnDefinitionsSelector, gridColumnLookupSelector, gridColumnsStateSelector, gridColumnVisibilityModelSelector, gridVisibleColumnDefinitionsSelector, gridColumnPositionsSelector } from './gridColumnsSelector';
 import { GridSignature, useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { useGridRegisterPipeProcessor, useGridRegisterPipeApplier } from '../../core/pipeProcessing';
-import { hydrateColumnsWidth, createColumnsState, mergeColumnsState, COLUMNS_DIMENSION_PROPERTIES } from './gridColumnsUtils';
+import { EMPTY_PINNED_COLUMN_FIELDS } from './gridColumnsInterfaces';
+import { hydrateColumnsWidth, createColumnsState, COLUMNS_DIMENSION_PROPERTIES } from './gridColumnsUtils';
 import { GridPreferencePanelsValue } from '../preferencesPanel';
-import { getGridDefaultColumnTypes } from '../../../colDef';
 import { jsx as _jsx } from "react/jsx-runtime";
-var defaultColumnTypes = getGridDefaultColumnTypes();
 export var columnsStateInitializer = function columnsStateInitializer(state, props, apiRef) {
-  var _props$initialState, _ref, _props$columnVisibili, _props$initialState2;
+  var _props$initialState, _ref, _props$columnVisibili, _props$initialState2, _state$pinnedColumns;
   var columnsState = createColumnsState({
     apiRef: apiRef,
-    columnTypes: defaultColumnTypes,
     columnsToUpsert: props.columns,
     initialState: (_props$initialState = props.initialState) == null ? void 0 : _props$initialState.columns,
     columnVisibilityModel: (_ref = (_props$columnVisibili = props.columnVisibilityModel) != null ? _props$columnVisibili : (_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.columns) == null ? void 0 : _props$initialState2.columnVisibilityModel) != null ? _ref : {},
     keepOnlyColumnsToUpsert: true
   });
   return _extends({}, state, {
-    columns: columnsState
+    columns: columnsState,
+    // In pro/premium, this part of the state is defined. We give it an empty but defined value
+    // for the community version.
+    pinnedColumns: (_state$pinnedColumns = state.pinnedColumns) != null ? _state$pinnedColumns : EMPTY_PINNED_COLUMN_FIELDS
   });
 };
 
@@ -35,9 +36,7 @@ export var columnsStateInitializer = function columnsStateInitializer(state, pro
 export function useGridColumns(apiRef, props) {
   var _props$initialState4, _props$slotProps2;
   var logger = useGridLogger(apiRef, 'useGridColumns');
-  var columnTypes = defaultColumnTypes;
   var previousColumnsProp = React.useRef(props.columns);
-  var previousColumnTypesProp = React.useRef(columnTypes);
   apiRef.current.registerControlState({
     stateId: 'visibleColumns',
     propModel: props.columnVisibilityModel,
@@ -48,8 +47,8 @@ export function useGridColumns(apiRef, props) {
   var setGridColumnsState = React.useCallback(function (columnsState) {
     logger.debug('Updating columns state.');
     apiRef.current.setState(mergeColumnsState(columnsState));
-    apiRef.current.forceUpdate();
     apiRef.current.publishEvent('columnsChange', columnsState.orderedFields);
+    apiRef.current.forceUpdate();
   }, [logger, apiRef]);
 
   /**
@@ -82,7 +81,6 @@ export function useGridColumns(apiRef, props) {
         return _extends({}, state, {
           columns: createColumnsState({
             apiRef: apiRef,
-            columnTypes: columnTypes,
             columnsToUpsert: [],
             initialState: undefined,
             columnVisibilityModel: model,
@@ -92,17 +90,16 @@ export function useGridColumns(apiRef, props) {
       });
       apiRef.current.forceUpdate();
     }
-  }, [apiRef, columnTypes]);
+  }, [apiRef]);
   var updateColumns = React.useCallback(function (columns) {
     var columnsState = createColumnsState({
       apiRef: apiRef,
-      columnTypes: columnTypes,
       columnsToUpsert: columns,
       initialState: undefined,
       keepOnlyColumnsToUpsert: false
     });
     setGridColumnsState(columnsState);
-  }, [apiRef, setGridColumnsState, columnTypes]);
+  }, [apiRef, setGridColumnsState]);
   var setColumnVisibility = React.useCallback(function (field, isVisible) {
     var _columnVisibilityMode;
     var columnVisibilityModel = gridColumnVisibilityModelSelector(apiRef);
@@ -139,7 +136,6 @@ export function useGridColumns(apiRef, props) {
     apiRef.current.publishEvent('columnIndexChange', params);
   }, [apiRef, logger, setGridColumnsState, getColumnIndexRelativeToVisibleColumns]);
   var setColumnWidth = React.useCallback(function (field, width) {
-    var _apiRef$current$getRo, _apiRef$current$getRo2;
     logger.debug("Updating column ".concat(field, " width to ").concat(width));
     var columnsState = gridColumnsStateSelector(apiRef.current.state);
     var column = columnsState.lookup[field];
@@ -149,7 +145,7 @@ export function useGridColumns(apiRef, props) {
     });
     setGridColumnsState(hydrateColumnsWidth(_extends({}, columnsState, {
       lookup: _extends({}, columnsState.lookup, _defineProperty({}, field, newColumn))
-    }), (_apiRef$current$getRo = (_apiRef$current$getRo2 = apiRef.current.getRootDimensions()) == null ? void 0 : _apiRef$current$getRo2.viewportInnerSize.width) != null ? _apiRef$current$getRo : 0));
+    }), apiRef.current.getRootDimensions().viewportInnerSize.width));
     apiRef.current.publishEvent('columnWidthChange', {
       element: apiRef.current.getColumnHeaderElement(field),
       colDef: newColumn,
@@ -226,7 +222,6 @@ export function useGridColumns(apiRef, props) {
     }
     var columnsState = createColumnsState({
       apiRef: apiRef,
-      columnTypes: columnTypes,
       columnsToUpsert: [],
       initialState: initialState,
       columnVisibilityModel: columnVisibilityModelToImport,
@@ -237,7 +232,7 @@ export function useGridColumns(apiRef, props) {
       apiRef.current.publishEvent('columnsChange', columnsState.orderedFields);
     }
     return params;
-  }, [apiRef, columnTypes]);
+  }, [apiRef]);
   var preferencePanelPreProcessing = React.useCallback(function (initialValue, value) {
     if (value === GridPreferencePanelsValue.columns) {
       var _props$slotProps;
@@ -276,13 +271,12 @@ export function useGridColumns(apiRef, props) {
     logger.info("Columns pipe processing have changed, regenerating the columns");
     var columnsState = createColumnsState({
       apiRef: apiRef,
-      columnTypes: columnTypes,
       columnsToUpsert: [],
       initialState: undefined,
       keepOnlyColumnsToUpsert: false
     });
     setGridColumnsState(columnsState);
-  }, [apiRef, logger, setGridColumnsState, columnTypes]);
+  }, [apiRef, logger, setGridColumnsState]);
   useGridRegisterPipeApplier(apiRef, 'hydrateColumns', hydrateColumns);
 
   /**
@@ -297,24 +291,29 @@ export function useGridColumns(apiRef, props) {
       return;
     }
     logger.info("GridColumns have changed, new length ".concat(props.columns.length));
-    if (previousColumnsProp.current === props.columns && previousColumnTypesProp.current === columnTypes) {
+    if (previousColumnsProp.current === props.columns) {
       return;
     }
     var columnsState = createColumnsState({
       apiRef: apiRef,
-      columnTypes: columnTypes,
       initialState: undefined,
       // If the user provides a model, we don't want to set it in the state here because it has it's dedicated `useEffect` which calls `setColumnVisibilityModel`
       columnsToUpsert: props.columns,
       keepOnlyColumnsToUpsert: true
     });
     previousColumnsProp.current = props.columns;
-    previousColumnTypesProp.current = columnTypes;
     setGridColumnsState(columnsState);
-  }, [logger, apiRef, setGridColumnsState, props.columns, columnTypes]);
+  }, [logger, apiRef, setGridColumnsState, props.columns]);
   React.useEffect(function () {
     if (props.columnVisibilityModel !== undefined) {
       apiRef.current.setColumnVisibilityModel(props.columnVisibilityModel);
     }
   }, [apiRef, logger, props.columnVisibilityModel]);
+}
+function mergeColumnsState(columnsState) {
+  return function (state) {
+    return _extends({}, state, {
+      columns: columnsState
+    });
+  };
 }

package/legacy/hooks/features/dimensions/gridDimensionsSelectors.js

@@ -0,0 +1,3 @@
+export var gridDimensionsSelector = function gridDimensionsSelector(state) {
+  return state.dimensions;
+};

package/legacy/hooks/features/dimensions/index.js

@@ -1 +1,2 @@
+export * from './gridDimensionsSelectors';
 export {};