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

package/legacy/components/panel/GridColumnsPanel.js

@@ -1,216 +1,15 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["sort", "searchPredicate", "autoFocusSearchField", "disableHideAllButton", "disableShowAllButton", "getTogglableColumns"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { unstable_composeClasses as composeClasses } from '@mui/utils';
-import IconButton from '@mui/material/IconButton';
-import { switchClasses } from '@mui/material/Switch';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import { styled } from '@mui/material/styles';
-import { gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector } from '../../hooks/features/columns/gridColumnsSelector';
-import { useGridSelector } from '../../hooks/utils/useGridSelector';
-import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
-import { GridPanelContent } from './GridPanelContent';
-import { GridPanelFooter } from './GridPanelFooter';
-import { GridPanelHeader } from './GridPanelHeader';
 import { GridPanelWrapper } from './GridPanelWrapper';
-import { GRID_EXPERIMENTAL_ENABLED } from '../../constants/envConstants';
+import { GridColumnsManagement } from '../columnsManagement';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { getDataGridUtilityClass } from '../../constants/gridClasses';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-var useUtilityClasses = function useUtilityClasses(ownerState) {
-  var classes = ownerState.classes;
-  var slots = {
-    root: ['columnsPanel'],
-    columnsPanelRow: ['columnsPanelRow']
-  };
-  return composeClasses(slots, getDataGridUtilityClass, classes);
-};
-var GridColumnsPanelRoot = styled('div', {
-  name: 'MuiDataGrid',
-  slot: 'ColumnsPanel',
-  overridesResolver: function overridesResolver(props, styles) {
-    return styles.columnsPanel;
-  }
-})({
-  padding: '8px 0px 8px 8px'
-});
-var GridColumnsPanelRowRoot = styled('div', {
-  name: 'MuiDataGrid',
-  slot: 'ColumnsPanelRow',
-  overridesResolver: function overridesResolver(props, styles) {
-    return styles.columnsPanelRow;
-  }
-})(function (_ref) {
-  var theme = _ref.theme;
-  return _defineProperty({
-    display: 'flex',
-    justifyContent: 'space-between',
-    padding: '1px 8px 1px 7px'
-  }, "& .".concat(switchClasses.root), {
-    marginRight: theme.spacing(0.5)
-  });
-});
-var GridIconButtonRoot = styled(IconButton)({
-  justifyContent: 'flex-end'
-});
-var collator = new Intl.Collator();
-var defaultSearchPredicate = function defaultSearchPredicate(column, searchValue) {
-  return (column.headerName || column.field).toLowerCase().indexOf(searchValue) > -1;
-};
 function GridColumnsPanel(props) {
-  var _rootProps$slotProps, _rootProps$slotProps3, _rootProps$slotProps4;
-  var apiRef = useGridApiContext();
-  var searchInputRef = React.useRef(null);
-  var columns = useGridSelector(apiRef, gridColumnDefinitionsSelector);
-  var columnVisibilityModel = useGridSelector(apiRef, gridColumnVisibilityModelSelector);
+  var _rootProps$slotProps;
   var rootProps = useGridRootProps();
-  var _React$useState = React.useState(''),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    searchValue = _React$useState2[0],
-    setSearchValue = _React$useState2[1];
-  var classes = useUtilityClasses(rootProps);
-  var sort = props.sort,
-    _props$searchPredicat = props.searchPredicate,
-    searchPredicate = _props$searchPredicat === void 0 ? defaultSearchPredicate : _props$searchPredicat,
-    _props$autoFocusSearc = props.autoFocusSearchField,
-    autoFocusSearchField = _props$autoFocusSearc === void 0 ? true : _props$autoFocusSearc,
-    _props$disableHideAll = props.disableHideAllButton,
-    disableHideAllButton = _props$disableHideAll === void 0 ? false : _props$disableHideAll,
-    _props$disableShowAll = props.disableShowAllButton,
-    disableShowAllButton = _props$disableShowAll === void 0 ? false : _props$disableShowAll,
-    getTogglableColumns = props.getTogglableColumns,
-    other = _objectWithoutProperties(props, _excluded);
-  var sortedColumns = React.useMemo(function () {
-    switch (sort) {
-      case 'asc':
-        return _toConsumableArray(columns).sort(function (a, b) {
-          return collator.compare(a.headerName || a.field, b.headerName || b.field);
-        });
-      case 'desc':
-        return _toConsumableArray(columns).sort(function (a, b) {
-          return -collator.compare(a.headerName || a.field, b.headerName || b.field);
-        });
-      default:
-        return columns;
-    }
-  }, [columns, sort]);
-  var toggleColumn = function toggleColumn(event) {
-    var _ref3 = event.target,
-      field = _ref3.name;
-    apiRef.current.setColumnVisibility(field, columnVisibilityModel[field] === false);
-  };
-  var toggleAllColumns = React.useCallback(function (isVisible) {
-    var currentModel = gridColumnVisibilityModelSelector(apiRef);
-    var newModel = _extends({}, currentModel);
-    var togglableColumns = getTogglableColumns ? getTogglableColumns(columns) : null;
-    columns.forEach(function (col) {
-      if (col.hideable && (togglableColumns == null || togglableColumns.includes(col.field))) {
-        if (isVisible) {
-          // delete the key from the model instead of setting it to `true`
-          delete newModel[col.field];
-        } else {
-          newModel[col.field] = false;
-        }
-      }
-    });
-    return apiRef.current.setColumnVisibilityModel(newModel);
-  }, [apiRef, columns, getTogglableColumns]);
-  var handleSearchValueChange = React.useCallback(function (event) {
-    setSearchValue(event.target.value);
-  }, []);
-  var currentColumns = React.useMemo(function () {
-    var togglableColumns = getTogglableColumns ? getTogglableColumns(sortedColumns) : null;
-    var togglableSortedColumns = togglableColumns ? sortedColumns.filter(function (_ref4) {
-      var field = _ref4.field;
-      return togglableColumns.includes(field);
-    }) : sortedColumns;
-    if (!searchValue) {
-      return togglableSortedColumns;
-    }
-    return togglableSortedColumns.filter(function (column) {
-      return searchPredicate(column, searchValue.toLowerCase());
-    });
-  }, [sortedColumns, searchValue, searchPredicate, getTogglableColumns]);
-  var firstSwitchRef = React.useRef(null);
-  React.useEffect(function () {
-    if (autoFocusSearchField) {
-      searchInputRef.current.focus();
-    } else if (firstSwitchRef.current && typeof firstSwitchRef.current.focus === 'function') {
-      firstSwitchRef.current.focus();
-    }
-  }, [autoFocusSearchField]);
-  var firstHideableColumnFound = false;
-  var isFirstHideableColumn = function isFirstHideableColumn(column) {
-    if (firstHideableColumnFound === false && column.hideable !== false) {
-      firstHideableColumnFound = true;
-      return true;
-    }
-    return false;
-  };
-  return /*#__PURE__*/_jsxs(GridPanelWrapper, _extends({}, other, {
-    children: [/*#__PURE__*/_jsx(GridPanelHeader, {
-      children: /*#__PURE__*/_jsx(rootProps.slots.baseTextField, _extends({
-        label: apiRef.current.getLocaleText('columnsPanelTextFieldLabel'),
-        placeholder: apiRef.current.getLocaleText('columnsPanelTextFieldPlaceholder'),
-        inputRef: searchInputRef,
-        value: searchValue,
-        onChange: handleSearchValueChange,
-        variant: "standard",
-        fullWidth: true
-      }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseTextField))
-    }), /*#__PURE__*/_jsx(GridPanelContent, {
-      children: /*#__PURE__*/_jsx(GridColumnsPanelRoot, {
-        className: classes.root,
-        ownerState: rootProps,
-        children: currentColumns.map(function (column) {
-          var _rootProps$slotProps2;
-          return /*#__PURE__*/_jsxs(GridColumnsPanelRowRoot, {
-            className: classes.columnsPanelRow,
-            ownerState: rootProps,
-            children: [/*#__PURE__*/_jsx(FormControlLabel, {
-              control: /*#__PURE__*/_jsx(rootProps.slots.baseSwitch, _extends({
-                disabled: column.hideable === false,
-                checked: columnVisibilityModel[column.field] !== false,
-                onClick: toggleColumn,
-                name: column.field,
-                size: "small",
-                inputRef: isFirstHideableColumn(column) ? firstSwitchRef : undefined
-              }, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseSwitch)),
-              label: column.headerName || column.field
-            }), !rootProps.disableColumnReorder && GRID_EXPERIMENTAL_ENABLED && /*#__PURE__*/_jsx(GridIconButtonRoot, {
-              draggable: true,
-              "aria-label": apiRef.current.getLocaleText('columnsPanelDragIconLabel'),
-              title: apiRef.current.getLocaleText('columnsPanelDragIconLabel'),
-              size: "small",
-              disabled: true,
-              children: /*#__PURE__*/_jsx(rootProps.slots.columnReorderIcon, {})
-            })]
-          }, column.field);
-        })
-      })
-    }), disableShowAllButton && disableHideAllButton ? null : /*#__PURE__*/_jsxs(GridPanelFooter, {
-      children: [!disableHideAllButton ? /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
-        onClick: function onClick() {
-          return toggleAllColumns(false);
-        }
-      }, (_rootProps$slotProps3 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps3.baseButton, {
-        disabled: disableHideAllButton,
-        children: apiRef.current.getLocaleText('columnsPanelHideAllButton')
-      })) : /*#__PURE__*/_jsx("span", {}), !disableShowAllButton ? /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
-        onClick: function onClick() {
-          return toggleAllColumns(true);
-        }
-      }, (_rootProps$slotProps4 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps4.baseButton, {
-        disabled: disableShowAllButton,
-        children: apiRef.current.getLocaleText('columnsPanelShowAllButton')
-      })) : null]
-    })]
+  return /*#__PURE__*/_jsx(GridPanelWrapper, _extends({}, props, {
+    children: /*#__PURE__*/_jsx(GridColumnsManagement, _extends({}, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.columnsManagement))
   }));
 }
 process.env.NODE_ENV !== "production" ? GridColumnsPanel.propTypes = {
@@ -218,33 +17,6 @@ process.env.NODE_ENV !== "production" ? GridColumnsPanel.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
-  /**
-   * If `true`, the column search field will be focused automatically.
-   * If `false`, the first column switch input will be focused automatically.
-   * This helps to avoid input keyboard panel to popup automatically on touch devices.
-   * @default true
-   */
-  autoFocusSearchField: PropTypes.bool,
-  /**
-   * If `true`, the `Hide all` button will not be displayed.
-   * @default false
-   */
-  disableHideAllButton: PropTypes.bool,
-  /**
-   * If `true`, the `Show all` button will be disabled
-   * @default false
-   */
-  disableShowAllButton: PropTypes.bool,
-  /**
-   * Returns the list of togglable columns.
-   * If used, only those columns will be displayed in the panel
-   * which are passed as the return value of the function.
-   * @param {GridColDef[]} columns The `ColDef` list of all columns.
-   * @returns {GridColDef['field'][]} The list of togglable columns' field names.
-   */
-  getTogglableColumns: PropTypes.func,
-  searchPredicate: PropTypes.func,
-  slotProps: PropTypes.object,
-  sort: PropTypes.oneOf(['asc', 'desc'])
+  slotProps: PropTypes.object
 } : void 0;
 export { GridColumnsPanel };

package/legacy/components/panel/GridPanel.js

@@ -12,7 +12,6 @@ import Paper from '@mui/material/Paper';
 import Popper from '@mui/material/Popper';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { isEscapeKey } from '../../utils/keyboardUtils';
-import { gridClasses } from '../../constants/gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var gridPanelClasses = generateUtilityClasses('MuiDataGrid', ['panel', 'paper']);
@@ -87,9 +86,9 @@ var GridPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setAnchorEl = _React$useState4[1];
   React.useEffect(function () {
     var _apiRef$current$rootE;
-    var columnHeadersElement = (_apiRef$current$rootE = apiRef.current.rootElementRef) == null || (_apiRef$current$rootE = _apiRef$current$rootE.current) == null ? void 0 : _apiRef$current$rootE.querySelector(".".concat(gridClasses.columnHeaders));
-    if (columnHeadersElement) {
-      setAnchorEl(columnHeadersElement);
+    var panelAnchor = (_apiRef$current$rootE = apiRef.current.rootElementRef) == null || (_apiRef$current$rootE = _apiRef$current$rootE.current) == null ? void 0 : _apiRef$current$rootE.querySelector('[data-id="gridPanelAnchor"]');
+    if (panelAnchor) {
+      setAnchorEl(panelAnchor);
     }
   }, [apiRef]);
   if (!anchorEl) {

package/legacy/components/panel/filterPanel/GridFilterForm.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "multiFilterOperator", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "logicOperators", "columnsSort", "filterColumns", "deleteIconProps", "logicOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "children"],
+var _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "logicOperators", "columnsSort", "filterColumns", "deleteIconProps", "logicOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "readOnly", "children"],
   _excluded2 = ["InputComponentProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_composeClasses as composeClasses, unstable_useId as useId, unstable_capitalize as capitalize } from '@mui/utils';
 import { styled } from '@mui/material/styles';
 import clsx from 'clsx';
-import { gridFilterableColumnDefinitionsSelector } from '../../../hooks/features/columns/gridColumnsSelector';
+import { gridFilterableColumnDefinitionsSelector, gridColumnLookupSelector } from '../../../hooks/features/columns/gridColumnsSelector';
 import { gridFilterModelSelector } from '../../../hooks/features/filter/gridFilterSelector';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { GridLogicOperator } from '../../../models/gridFilterItem';
@@ -111,12 +111,11 @@ var getColumnLabel = function getColumnLabel(col) {
 };
 var collator = new Intl.Collator();
 var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props, ref) {
-  var _rootProps$slotProps, _rootProps$slotProps2, _baseSelectProps$nati, _rootProps$slotProps3, _rootProps$slotProps4, _rootProps$slotProps5, _rootProps$slotProps6, _rootProps$slotProps7, _rootProps$slotProps8, _currentColumn$filter2;
+  var _filterModel$logicOpe, _rootProps$slotProps, _rootProps$slotProps2, _baseSelectProps$nati, _rootProps$slotProps3, _rootProps$slotProps4, _rootProps$slotProps5, _rootProps$slotProps6, _rootProps$slotProps7, _rootProps$slotProps8, _currentColumn$filter2;
   var item = props.item,
     hasMultipleFilters = props.hasMultipleFilters,
     deleteFilter = props.deleteFilter,
     applyFilterChanges = props.applyFilterChanges,
-    multiFilterOperator = props.multiFilterOperator,
     showMultiFilterOperators = props.showMultiFilterOperators,
     disableMultiFilterOperator = props.disableMultiFilterOperator,
     applyMultiFilterOperatorChanges = props.applyMultiFilterOperatorChanges,
@@ -135,9 +134,11 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
     columnInputProps = _props$columnInputPro === void 0 ? {} : _props$columnInputPro,
     _props$valueInputProp = props.valueInputProps,
     valueInputProps = _props$valueInputProp === void 0 ? {} : _props$valueInputProp,
+    readOnly = props.readOnly,
     children = props.children,
     other = _objectWithoutProperties(props, _excluded);
   var apiRef = useGridApiContext();
+  var columnLookup = useGridSelector(apiRef, gridColumnLookupSelector);
   var filterableColumns = useGridSelector(apiRef, gridFilterableColumnDefinitionsSelector);
   var filterModel = useGridSelector(apiRef, gridFilterModelSelector);
   var columnSelectId = useId();
@@ -148,6 +149,7 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
   var classes = useUtilityClasses(rootProps);
   var valueRef = React.useRef(null);
   var filterSelectorRef = React.useRef(null);
+  var multiFilterOperator = (_filterModel$logicOpe = filterModel.logicOperator) != null ? _filterModel$logicOpe : GridLogicOperator.And;
   var hasLogicOperatorColumn = hasMultipleFilters && logicOperators.length > 0;
   var baseFormControlProps = ((_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseFormControl) || {};
   var baseSelectProps = ((_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseSelect) || {};
@@ -158,6 +160,15 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
     valueInputPropsOther = _objectWithoutProperties(valueInputProps, _excluded2);
   var _React$useMemo = React.useMemo(function () {
       var itemField = item.field;
+
+      // Yields a valid value if the current filter belongs to a column that is not filterable
+      var selectedNonFilterableColumn = columnLookup[item.field].filterable === false ? columnLookup[item.field] : null;
+      if (selectedNonFilterableColumn) {
+        return {
+          filteredColumns: [selectedNonFilterableColumn],
+          selectedField: itemField
+        };
+      }
       if (filterColumns === undefined || typeof filterColumns !== 'function') {
         return {
           filteredColumns: filterableColumns,
@@ -179,7 +190,7 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         }),
         selectedField: itemField
       };
-    }, [filterColumns, filterModel == null ? void 0 : filterModel.items, filterableColumns, item.field]),
+    }, [filterColumns, filterModel == null ? void 0 : filterModel.items, filterableColumns, item.field, columnLookup]),
     filteredColumns = _React$useMemo.filteredColumns,
     selectedField = _React$useMemo.selectedField;
   var sortedFilteredColumns = React.useMemo(function () {
@@ -302,7 +313,8 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         "aria-label": apiRef.current.getLocaleText('filterPanelDeleteIconLabel'),
         title: apiRef.current.getLocaleText('filterPanelDeleteIconLabel'),
         onClick: handleDeleteFilter,
-        size: "small"
+        size: "small",
+        disabled: readOnly
       }, (_rootProps$slotProps5 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps5.baseIconButton, {
         children: /*#__PURE__*/_jsx(rootProps.slots.filterPanelDeleteIcon, {
           fontSize: "small"
@@ -351,7 +363,8 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         label: apiRef.current.getLocaleText('filterPanelColumns'),
         value: selectedField != null ? selectedField : '',
         onChange: changeColumn,
-        native: isBaseSelectNative
+        native: isBaseSelectNative,
+        disabled: readOnly
       }, (_rootProps$slotProps7 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps7.baseSelect, {
         children: sortedFilteredColumns.map(function (col) {
           return /*#__PURE__*/_createElement(rootProps.slots.baseSelectOption, _extends({}, baseSelectOptionProps, {
@@ -378,7 +391,8 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         value: item.operator,
         onChange: changeOperator,
         native: isBaseSelectNative,
-        inputRef: filterSelectorRef
+        inputRef: filterSelectorRef,
+        disabled: readOnly
       }, (_rootProps$slotProps8 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps8.baseSelect, {
         children: currentColumn == null || (_currentColumn$filter2 = currentColumn.filterOperators) == null ? void 0 : _currentColumn$filter2.map(function (operator) {
           return /*#__PURE__*/_createElement(rootProps.slots.baseSelectOption, _extends({}, baseSelectOptionProps, {
@@ -398,7 +412,8 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         apiRef: apiRef,
         item: item,
         applyValue: applyFilterChanges,
-        focusElementRef: valueRef
+        focusElementRef: valueRef,
+        disabled: readOnly
       }, currentOperator.InputComponentProps, InputComponentProps), item.field) : null
     }))]
   }));
@@ -481,15 +496,17 @@ process.env.NODE_ENV !== "production" ? GridFilterForm.propTypes = {
    * @default [GridLogicOperator.And, GridLogicOperator.Or]
    */
   logicOperators: PropTypes.arrayOf(PropTypes.oneOf(['and', 'or']).isRequired),
-  /**
-   * The current logic operator applied.
-   */
-  multiFilterOperator: PropTypes.oneOf(['and', 'or']),
   /**
    * Props passed to the operator input component.
    * @default {}
    */
   operatorInputProps: PropTypes.any,
+  /**
+   * `true` if the filter is disabled/read only.
+   * i.e. `colDef.fiterable = false` but passed in `filterModel`
+   * @default false
+   */
+  readOnly: PropTypes.bool,
   /**
    * If `true`, the logic operator field is visible.
    */

package/legacy/components/panel/filterPanel/GridFilterPanel.js

@@ -13,7 +13,7 @@ import { GridFilterForm } from './GridFilterForm';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { gridFilterModelSelector } from '../../../hooks/features/filter/gridFilterSelector';
-import { gridFilterableColumnDefinitionsSelector } from '../../../hooks/features/columns/gridColumnsSelector';
+import { gridFilterableColumnDefinitionsSelector, gridFilterableColumnLookupSelector } from '../../../hooks/features/columns/gridColumnsSelector';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var getGridFilter = function getGridFilter(col) {
@@ -29,6 +29,7 @@ var GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(pro
   var rootProps = useGridRootProps();
   var filterModel = useGridSelector(apiRef, gridFilterModelSelector);
   var filterableColumns = useGridSelector(apiRef, gridFilterableColumnDefinitionsSelector);
+  var filterableColumnsLookup = useGridSelector(apiRef, gridFilterableColumnLookupSelector);
   var lastFilterRef = React.useRef(null);
   var placeholderFilter = React.useRef(null);
   var _props$logicOperators = props.logicOperators,
@@ -105,65 +106,93 @@ var GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(pro
     return placeholderFilter.current ? [placeholderFilter.current] : [];
   }, [filterModel.items, getDefaultFilter]);
   var hasMultipleFilters = items.length > 1;
-  var addNewFilter = function addNewFilter() {
+  var _React$useMemo = React.useMemo(function () {
+      return items.reduce(function (acc, item) {
+        if (filterableColumnsLookup[item.field]) {
+          acc.validFilters.push(item);
+        } else {
+          acc.readOnlyFilters.push(item);
+        }
+        return acc;
+      }, {
+        readOnlyFilters: [],
+        validFilters: []
+      });
+    }, [items, filterableColumnsLookup]),
+    readOnlyFilters = _React$useMemo.readOnlyFilters,
+    validFilters = _React$useMemo.validFilters;
+  var addNewFilter = React.useCallback(function () {
     var newFilter = getNewFilter();
     if (!newFilter) {
       return;
     }
     apiRef.current.upsertFilterItems([].concat(_toConsumableArray(items), [newFilter]));
-  };
+  }, [apiRef, getNewFilter, items]);
   var deleteFilter = React.useCallback(function (item) {
-    var shouldCloseFilterPanel = items.length === 1;
+    var shouldCloseFilterPanel = validFilters.length === 1;
     apiRef.current.deleteFilterItem(item);
     if (shouldCloseFilterPanel) {
       apiRef.current.hideFilterPanel();
     }
-  }, [apiRef, items.length]);
-  var handleRemoveAll = function handleRemoveAll() {
-    if (items.length === 1 && items[0].value === undefined) {
-      apiRef.current.deleteFilterItem(items[0]);
-      apiRef.current.hideFilterPanel();
+  }, [apiRef, validFilters.length]);
+  var handleRemoveAll = React.useCallback(function () {
+    if (validFilters.length === 1 && validFilters[0].value === undefined) {
+      apiRef.current.deleteFilterItem(validFilters[0]);
+      return apiRef.current.hideFilterPanel();
     }
-    apiRef.current.setFilterModel(_extends({}, filterModel, {
-      items: []
+    return apiRef.current.setFilterModel(_extends({}, filterModel, {
+      items: readOnlyFilters
     }));
-  };
+  }, [apiRef, readOnlyFilters, filterModel, validFilters]);
   React.useEffect(function () {
     if (logicOperators.length > 0 && filterModel.logicOperator && !logicOperators.includes(filterModel.logicOperator)) {
       applyFilterLogicOperator(logicOperators[0]);
     }
   }, [logicOperators, applyFilterLogicOperator, filterModel.logicOperator]);
   React.useEffect(function () {
-    if (items.length > 0) {
+    if (validFilters.length > 0) {
       lastFilterRef.current.focus();
     }
-  }, [items.length]);
+  }, [validFilters.length]);
   return /*#__PURE__*/_jsxs(GridPanelWrapper, _extends({
     ref: ref
   }, other, {
-    children: [/*#__PURE__*/_jsx(GridPanelContent, {
-      children: items.map(function (item, index) {
+    children: [/*#__PURE__*/_jsxs(GridPanelContent, {
+      children: [readOnlyFilters.map(function (item, index) {
         return /*#__PURE__*/_jsx(GridFilterForm, _extends({
           item: item,
           applyFilterChanges: applyFilter,
           deleteFilter: deleteFilter,
           hasMultipleFilters: hasMultipleFilters,
           showMultiFilterOperators: index > 0,
-          multiFilterOperator: filterModel.logicOperator,
           disableMultiFilterOperator: index !== 1,
           applyMultiFilterOperatorChanges: applyFilterLogicOperator,
-          focusElementRef: index === items.length - 1 ? lastFilterRef : null,
+          focusElementRef: null,
+          readOnly: true,
           logicOperators: logicOperators,
           columnsSort: columnsSort
         }, filterFormProps), item.id == null ? index : item.id);
-      })
+      }), validFilters.map(function (item, index) {
+        return /*#__PURE__*/_jsx(GridFilterForm, _extends({
+          item: item,
+          applyFilterChanges: applyFilter,
+          deleteFilter: deleteFilter,
+          hasMultipleFilters: hasMultipleFilters,
+          showMultiFilterOperators: readOnlyFilters.length + index > 0,
+          disableMultiFilterOperator: readOnlyFilters.length + index !== 1,
+          applyMultiFilterOperatorChanges: applyFilterLogicOperator,
+          focusElementRef: index === validFilters.length - 1 ? lastFilterRef : null,
+          logicOperators: logicOperators,
+          columnsSort: columnsSort
+        }, filterFormProps), item.id == null ? index + readOnlyFilters.length : item.id);
+      })]
     }), !rootProps.disableMultipleColumnsFiltering && !(disableAddFilterButton && disableRemoveAllButton) ? /*#__PURE__*/_jsxs(GridPanelFooter, {
       children: [!disableAddFilterButton ? /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
         onClick: addNewFilter,
         startIcon: /*#__PURE__*/_jsx(rootProps.slots.filterPanelAddIcon, {})
       }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseButton, {
         children: apiRef.current.getLocaleText('filterPanelAddFilter')
-      })) : /*#__PURE__*/_jsx("span", {}), !disableRemoveAllButton ? /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
+      })) : /*#__PURE__*/_jsx("span", {}), !disableRemoveAllButton && validFilters.length > 0 ? /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
         onClick: handleRemoveAll,
         startIcon: /*#__PURE__*/_jsx(rootProps.slots.filterPanelRemoveAllIcon, {})
       }, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseButton, {

package/legacy/components/toolbar/GridToolbarColumnsButton.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onClick"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/material/utils';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridPreferencePanelStateSelector } from '../../hooks/features/preferencesPanel/gridPreferencePanelSelector';
@@ -9,22 +8,25 @@ import { GridPreferencePanelsValue } from '../../hooks/features/preferencesPanel
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
-export var GridToolbarColumnsButton = /*#__PURE__*/React.forwardRef(function GridToolbarColumnsButton(props, ref) {
-  var _rootProps$slotProps;
-  var onClick = props.onClick,
-    other = _objectWithoutProperties(props, _excluded);
+var GridToolbarColumnsButton = /*#__PURE__*/React.forwardRef(function GridToolbarColumnsButton(props, ref) {
+  var _rootProps$slotProps, _rootProps$slotProps2;
+  var _props$slotProps = props.slotProps,
+    slotProps = _props$slotProps === void 0 ? {} : _props$slotProps;
+  var buttonProps = slotProps.button || {};
+  var tooltipProps = slotProps.tooltip || {};
   var columnButtonId = useId();
   var columnPanelId = useId();
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
   var preferencePanel = useGridSelector(apiRef, gridPreferencePanelStateSelector);
   var showColumns = function showColumns(event) {
+    var _buttonProps$onClick;
     if (preferencePanel.open && preferencePanel.openedPanelValue === GridPreferencePanelsValue.columns) {
       apiRef.current.hidePreferences();
     } else {
       apiRef.current.showPreferences(GridPreferencePanelsValue.columns, columnPanelId, columnButtonId);
     }
-    onClick == null || onClick(event);
+    (_buttonProps$onClick = buttonProps.onClick) == null || _buttonProps$onClick.call(buttonProps, event);
   };
 
   // Disable the button if the corresponding is disabled
@@ -32,18 +34,35 @@ export var GridToolbarColumnsButton = /*#__PURE__*/React.forwardRef(function Gri
     return null;
   }
   var isOpen = preferencePanel.open && preferencePanel.panelId === columnPanelId;
-  return /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
-    ref: ref,
-    id: columnButtonId,
-    size: "small",
-    "aria-label": apiRef.current.getLocaleText('toolbarColumnsLabel'),
-    "aria-haspopup": "menu",
-    "aria-expanded": isOpen,
-    "aria-controls": isOpen ? columnPanelId : undefined,
-    startIcon: /*#__PURE__*/_jsx(rootProps.slots.columnSelectorIcon, {})
-  }, other, {
-    onClick: showColumns
-  }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseButton, {
-    children: apiRef.current.getLocaleText('toolbarColumns')
+  return /*#__PURE__*/_jsx(rootProps.slots.baseTooltip, _extends({
+    title: apiRef.current.getLocaleText('toolbarColumnsLabel'),
+    enterDelay: 1000
+  }, tooltipProps, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseTooltip, {
+    children: /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
+      ref: ref,
+      id: columnButtonId,
+      size: "small",
+      "aria-label": apiRef.current.getLocaleText('toolbarColumnsLabel'),
+      "aria-haspopup": "menu",
+      "aria-expanded": isOpen,
+      "aria-controls": isOpen ? columnPanelId : undefined,
+      startIcon: /*#__PURE__*/_jsx(rootProps.slots.columnSelectorIcon, {})
+    }, buttonProps, {
+      onClick: showColumns
+    }, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseButton, {
+      children: apiRef.current.getLocaleText('toolbarColumns')
+    }))
   }));
-});
+});
+process.env.NODE_ENV !== "production" ? GridToolbarColumnsButton.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The props used for each slot inside.
+   * @default {}
+   */
+  slotProps: PropTypes.object
+} : void 0;
+export { GridToolbarColumnsButton };