@mui/x-data-grid 7.0.0-alpha.5 → 7.0.0-alpha.6

package/components/panel/filterPanel/GridFilterForm.js

@@ -14,6 +14,7 @@ import { GridLogicOperator } from '../../../models/gridFilterItem';
 import { useGridApiContext } from '../../../hooks/utils/useGridApiContext';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { getDataGridUtilityClass } from '../../../constants/gridClasses';
+import { getValueFromValueOptions, getValueOptions } from './filterPanelUtils';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createElement as _createElement } from "react";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -131,23 +132,39 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
   const hasLogicOperatorColumn = hasMultipleFilters && logicOperators.length > 0;
   const baseFormControlProps = ((_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseFormControl) || {};
   const baseSelectProps = ((_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseSelect) || {};
-  const isBaseSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : true;
+  const isBaseSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : false;
   const baseInputLabelProps = ((_rootProps$slotProps3 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps3.baseInputLabel) || {};
   const baseSelectOptionProps = ((_rootProps$slotProps4 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps4.baseSelectOption) || {};
   const {
       InputComponentProps
     } = valueInputProps,
     valueInputPropsOther = _objectWithoutPropertiesLoose(valueInputProps, _excluded2);
-  const filteredColumns = React.useMemo(() => {
+  const {
+    filteredColumns,
+    selectedField
+  } = React.useMemo(() => {
+    let itemField = item.field;
     if (filterColumns === undefined || typeof filterColumns !== 'function') {
-      return filterableColumns;
+      return {
+        filteredColumns: filterableColumns,
+        selectedField: itemField
+      };
     }
     const filteredFields = filterColumns({
       field: item.field,
       columns: filterableColumns,
       currentFilters: (filterModel == null ? void 0 : filterModel.items) || []
     });
-    return filterableColumns.filter(column => filteredFields.includes(column.field));
+    return {
+      filteredColumns: filterableColumns.filter(column => {
+        const isFieldIncluded = filteredFields.includes(column.field);
+        if (column.field === item.field && !isFieldIncluded) {
+          itemField = undefined;
+        }
+        return isFieldIncluded;
+      }),
+      selectedField: itemField
+    };
   }, [filterColumns, filterModel == null ? void 0 : filterModel.items, filterableColumns, item.field]);
   const sortedFilteredColumns = React.useMemo(() => {
     switch (columnsSort) {
@@ -179,11 +196,29 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
     const newOperator = column.filterOperators.find(operator => operator.value === item.operator) || column.filterOperators[0];
 
     // Erase filter value if the input component or filtered column type is modified
-    const eraseItemValue = !newOperator.InputComponent || newOperator.InputComponent !== (currentOperator == null ? void 0 : currentOperator.InputComponent) || column.type !== currentColumn.type;
+    const eraseFilterValue = !newOperator.InputComponent || newOperator.InputComponent !== (currentOperator == null ? void 0 : currentOperator.InputComponent) || column.type !== currentColumn.type;
+    let filterValue = eraseFilterValue ? undefined : item.value;
+
+    // Check filter value against the new valueOptions
+    if (column.type === 'singleSelect' && filterValue !== undefined) {
+      const colDef = column;
+      const valueOptions = getValueOptions(colDef);
+      if (Array.isArray(filterValue)) {
+        filterValue = filterValue.filter(val => {
+          return (
+            // Only keep values that are in the new value options
+            getValueFromValueOptions(val, valueOptions, colDef == null ? void 0 : colDef.getOptionValue) !== undefined
+          );
+        });
+      } else if (getValueFromValueOptions(item.value, valueOptions, colDef == null ? void 0 : colDef.getOptionValue) === undefined) {
+        // Reset the filter value if it is not in the new value options
+        filterValue = undefined;
+      }
+    }
     applyFilterChanges(_extends({}, item, {
       field,
       operator: newOperator.value,
-      value: eraseItemValue ? undefined : item.value
+      value: filterValue
     }));
   }, [apiRef, applyFilterChanges, item, currentColumn, currentOperator]);
   const changeOperator = React.useCallback(event => {
@@ -259,7 +294,7 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
         inputProps: {
           'aria-label': apiRef.current.getLocaleText('filterPanelLogicOperator')
         },
-        value: multiFilterOperator,
+        value: multiFilterOperator != null ? multiFilterOperator : '',
         onChange: changeLogicOperator,
         disabled: !!disableMultiFilterOperator || logicOperators.length === 1,
         native: isBaseSelectNative
@@ -284,7 +319,7 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
         labelId: columnSelectLabelId,
         id: columnSelectId,
         label: apiRef.current.getLocaleText('filterPanelColumns'),
-        value: item.field || '',
+        value: selectedField != null ? selectedField : '',
         onChange: changeColumn,
         native: isBaseSelectNative
       }, (_rootProps$slotProps7 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps7.baseSelect, {
@@ -330,7 +365,7 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
         item: item,
         applyValue: applyFilterChanges,
         focusElementRef: valueRef
-      }, currentOperator.InputComponentProps, InputComponentProps)) : null
+      }, currentOperator.InputComponentProps, InputComponentProps), item.field) : null
     }))]
   }));
 });

package/components/panel/filterPanel/GridFilterInputBoolean.js

@@ -33,7 +33,7 @@ function GridFilterInputBoolean(props) {
   const labelId = useId();
   const selectId = useId();
   const baseSelectProps = ((_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseSelect) || {};
-  const isSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : true;
+  const isSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : false;
   const baseSelectOptionProps = ((_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseSelectOption) || {};
   const onFilterChange = React.useCallback(event => {
     const value = event.target.value;

package/components/panel/filterPanel/GridFilterInputDate.js

@@ -7,8 +7,25 @@ import { unstable_useId as useId } from '@mui/utils';
 import { useTimeout } from '../../../hooks/utils/useTimeout';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
+function convertFilterItemValueToInputValue(itemValue, inputType) {
+  if (itemValue == null) {
+    return '';
+  }
+  const dateCopy = new Date(itemValue);
+  // The date picker expects the date to be in the local timezone.
+  // But .toISOString() converts it to UTC with zero offset.
+  // So we need to subtract the timezone offset.
+  dateCopy.setMinutes(dateCopy.getMinutes() - dateCopy.getTimezoneOffset());
+  if (inputType === 'date') {
+    return dateCopy.toISOString().substring(0, 10);
+  }
+  if (inputType === 'datetime-local') {
+    return dateCopy.toISOString().substring(0, 19);
+  }
+  return dateCopy.toISOString().substring(0, 10);
+}
 function GridFilterInputDate(props) {
-  var _item$value, _rootProps$slotProps;
+  var _rootProps$slotProps;
   const {
       item,
       applyValue,
@@ -22,26 +39,26 @@ function GridFilterInputDate(props) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const filterTimeout = useTimeout();
-  const [filterValueState, setFilterValueState] = React.useState((_item$value = item.value) != null ? _item$value : '');
+  const [filterValueState, setFilterValueState] = React.useState(() => convertFilterItemValueToInputValue(item.value, type));
   const [applying, setIsApplying] = React.useState(false);
   const id = useId();
   const rootProps = useGridRootProps();
   const onFilterChange = React.useCallback(event => {
+    filterTimeout.clear();
     const value = event.target.value;
-    setFilterValueState(String(value));
+    setFilterValueState(value);
     setIsApplying(true);
     filterTimeout.start(rootProps.filterDebounceMs, () => {
       applyValue(_extends({}, item, {
-        value
+        value: new Date(value)
       }));
       setIsApplying(false);
     });
   }, [applyValue, item, rootProps.filterDebounceMs, filterTimeout]);
   React.useEffect(() => {
-    var _item$value2;
-    const itemValue = (_item$value2 = item.value) != null ? _item$value2 : '';
-    setFilterValueState(String(itemValue));
-  }, [item.value]);
+    const value = convertFilterItemValueToInputValue(item.value, type);
+    setFilterValueState(value);
+  }, [item.value, type]);
   return /*#__PURE__*/_jsx(rootProps.slots.baseTextField, _extends({
     fullWidth: true,
     id: id,

package/components/panel/filterPanel/GridFilterInputMultipleSingleSelect.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { AutocompleteProps } from '@mui/material/Autocomplete';
 import { GridFilterInputValueProps } from './GridFilterInputValueProps';
-import type { GridSingleSelectColDef, ValueOptions } from '../../../models/colDef/gridColDef';
-export interface GridFilterInputMultipleSingleSelectProps extends Omit<AutocompleteProps<ValueOptions, true, false, true>, 'options' | 'renderInput' | 'onChange' | 'value' | 'id' | 'filterOptions' | 'isOptionEqualToValue' | 'multiple' | 'color' | 'getOptionLabel'>, Pick<GridSingleSelectColDef, 'getOptionLabel' | 'getOptionValue'>, GridFilterInputValueProps {
+import type { ValueOptions } from '../../../models/colDef/gridColDef';
+export interface GridFilterInputMultipleSingleSelectProps extends Omit<AutocompleteProps<ValueOptions, true, false, true>, 'options' | 'renderInput' | 'onChange' | 'value' | 'id' | 'filterOptions' | 'isOptionEqualToValue' | 'multiple' | 'color' | 'getOptionLabel'>, GridFilterInputValueProps {
     type?: 'singleSelect';
 }
 declare function GridFilterInputMultipleSingleSelect(props: GridFilterInputMultipleSingleSelectProps): React.JSX.Element;

package/components/panel/filterPanel/GridFilterInputMultipleSingleSelect.js

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "color", "error", "helperText", "size", "variant", "getOptionLabel", "getOptionValue"];
+const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "color", "error", "helperText", "size", "variant"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import Autocomplete, { createFilterOptions } from '@mui/material/Autocomplete';
 import { unstable_useId as useId } from '@mui/utils';
-import { isSingleSelectColDef } from './filterPanelUtils';
+import { getValueOptions, isSingleSelectColDef } from './filterPanelUtils';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 const filter = createFilterOptions();
@@ -20,9 +20,7 @@ function GridFilterInputMultipleSingleSelect(props) {
       error,
       helperText,
       size,
-      variant = 'standard',
-      getOptionLabel: getOptionLabelProp,
-      getOptionValue: getOptionValueProp
+      variant = 'standard'
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const TextFieldProps = {
@@ -41,24 +39,12 @@ function GridFilterInputMultipleSingleSelect(props) {
       resolvedColumn = column;
     }
   }
-  const getOptionValue = getOptionValueProp || ((_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue);
-  const getOptionLabel = getOptionLabelProp || ((_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel);
+  const getOptionValue = (_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue;
+  const getOptionLabel = (_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel;
   const isOptionEqualToValue = React.useCallback((option, value) => getOptionValue(option) === getOptionValue(value), [getOptionValue]);
   const resolvedValueOptions = React.useMemo(() => {
-    var _resolvedColumn3;
-    if (!((_resolvedColumn3 = resolvedColumn) != null && _resolvedColumn3.valueOptions)) {
-      return [];
-    }
-    if (typeof resolvedColumn.valueOptions === 'function') {
-      return resolvedColumn.valueOptions({
-        field: resolvedColumn.field
-      });
-    }
-    return resolvedColumn.valueOptions;
+    return getValueOptions(resolvedColumn) || [];
   }, [resolvedColumn]);
-  const resolvedFormattedValueOptions = React.useMemo(() => {
-    return resolvedValueOptions == null ? void 0 : resolvedValueOptions.map(getOptionValue);
-  }, [resolvedValueOptions, getOptionValue]);
 
   // The value is computed from the item.value and used directly
   // If it was done by a useEffect/useState, the Autocomplete could receive incoherent value and options
@@ -66,23 +52,8 @@ function GridFilterInputMultipleSingleSelect(props) {
     if (!Array.isArray(item.value)) {
       return [];
     }
-    if (resolvedValueOptions !== undefined) {
-      const itemValueIndexes = item.value.map(element => {
-        // Gets the index matching between values and valueOptions
-        return resolvedFormattedValueOptions == null ? void 0 : resolvedFormattedValueOptions.findIndex(formattedOption => formattedOption === element);
-      });
-      return itemValueIndexes.filter(index => index >= 0).map(index => resolvedValueOptions[index]);
-    }
     return item.value;
-  }, [item.value, resolvedValueOptions, resolvedFormattedValueOptions]);
-  React.useEffect(() => {
-    if (!Array.isArray(item.value) || filteredValues.length !== item.value.length) {
-      // Updates the state if the filter value has been cleaned by the component
-      applyValue(_extends({}, item, {
-        value: filteredValues.map(getOptionValue)
-      }));
-    }
-  }, [item, filteredValues, applyValue, getOptionValue]);
+  }, [item.value]);
   const handleChange = React.useCallback((event, value) => {
     applyValue(_extends({}, item, {
       value: value.map(getOptionValue)
@@ -128,18 +99,6 @@ process.env.NODE_ENV !== "production" ? GridFilterInputMultipleSingleSelect.prop
   }).isRequired,
   applyValue: PropTypes.func.isRequired,
   focusElementRef: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.func, PropTypes.object]),
-  /**
-   * Used to determine the label displayed for a given value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The text to be displayed.
-   */
-  getOptionLabel: PropTypes.func,
-  /**
-   * Used to determine the value used for a value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The value to be used.
-   */
-  getOptionValue: PropTypes.func,
   item: PropTypes.shape({
     field: PropTypes.string.isRequired,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),

package/components/panel/filterPanel/GridFilterInputSingleSelect.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
 import { GridFilterInputValueProps } from './GridFilterInputValueProps';
-import { GridSingleSelectColDef } from '../../../models/colDef/gridColDef';
-export type GridFilterInputSingleSelectProps = GridFilterInputValueProps & TextFieldProps & Pick<GridSingleSelectColDef, 'getOptionLabel' | 'getOptionValue'> & {
+export type GridFilterInputSingleSelectProps = GridFilterInputValueProps & TextFieldProps & {
     clearButton?: React.ReactNode | null;
     /**
      * It is `true` if the filter either has a value or an operator with no value

package/components/panel/filterPanel/GridFilterInputSingleSelect.js

@@ -1,32 +1,30 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "getOptionLabel", "getOptionValue", "placeholder", "tabIndex", "label", "isFilterActive", "clearButton", "InputLabelProps"];
+const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "placeholder", "tabIndex", "label", "isFilterActive", "clearButton", "InputLabelProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/utils';
 import { styled } from '@mui/material/styles';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
-import { getValueFromValueOptions, isSingleSelectColDef } from './filterPanelUtils';
+import { getValueFromValueOptions, getValueOptions, isSingleSelectColDef } from './filterPanelUtils';
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const renderSingleSelectOptions = ({
-  column: {
-    valueOptions,
-    field
-  },
+  column,
   OptionComponent,
   getOptionLabel,
   getOptionValue,
   isSelectNative,
   baseSelectOptionProps
 }) => {
-  const iterableColumnValues = typeof valueOptions === 'function' ? ['', ...valueOptions({
-    field
-  })] : ['', ...(valueOptions || [])];
+  const iterableColumnValues = ['', ...(getValueOptions(column) || [])];
   return iterableColumnValues.map(option => {
     const value = getOptionValue(option);
-    const label = getOptionLabel(option);
+    let label = getOptionLabel(option);
+    if (label === '') {
+      label = ' '; // To force the height of the empty option
+    }
     return /*#__PURE__*/_createElement(OptionComponent, _extends({}, baseSelectOptionProps, {
       native: isSelectNative,
       key: value,
@@ -50,19 +48,17 @@ function GridFilterInputSingleSelect(props) {
       type,
       apiRef,
       focusElementRef,
-      getOptionLabel: getOptionLabelProp,
-      getOptionValue: getOptionValueProp,
       placeholder,
       tabIndex,
       label: labelProp,
       clearButton
     } = props,
     others = _objectWithoutPropertiesLoose(props, _excluded);
-  const [filterValueState, setFilterValueState] = React.useState((_item$value = item.value) != null ? _item$value : '');
+  const filterValue = (_item$value = item.value) != null ? _item$value : '';
   const id = useId();
   const labelId = useId();
   const rootProps = useGridRootProps();
-  const isSelectNative = (_rootProps$slotProps$ = (_rootProps$slotProps = rootProps.slotProps) == null || (_rootProps$slotProps = _rootProps$slotProps.baseSelect) == null ? void 0 : _rootProps$slotProps.native) != null ? _rootProps$slotProps$ : true;
+  const isSelectNative = (_rootProps$slotProps$ = (_rootProps$slotProps = rootProps.slotProps) == null || (_rootProps$slotProps = _rootProps$slotProps.baseSelect) == null ? void 0 : _rootProps$slotProps.native) != null ? _rootProps$slotProps$ : false;
   let resolvedColumn = null;
   if (item.field) {
     const column = apiRef.current.getColumn(item.field);
@@ -70,53 +66,27 @@ function GridFilterInputSingleSelect(props) {
       resolvedColumn = column;
     }
   }
-  const getOptionValue = getOptionValueProp || ((_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue);
-  const getOptionLabel = getOptionLabelProp || ((_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel);
+  const getOptionValue = (_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue;
+  const getOptionLabel = (_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel;
   const currentValueOptions = React.useMemo(() => {
-    if (!resolvedColumn) {
-      return undefined;
-    }
-    return typeof resolvedColumn.valueOptions === 'function' ? resolvedColumn.valueOptions({
-      field: resolvedColumn.field
-    }) : resolvedColumn.valueOptions;
+    return getValueOptions(resolvedColumn);
   }, [resolvedColumn]);
   const onFilterChange = React.useCallback(event => {
     let value = event.target.value;
 
     // NativeSelect casts the value to a string.
     value = getValueFromValueOptions(value, currentValueOptions, getOptionValue);
-    setFilterValueState(String(value));
     applyValue(_extends({}, item, {
       value
     }));
   }, [currentValueOptions, getOptionValue, applyValue, item]);
-  React.useEffect(() => {
-    var _itemValue;
-    let itemValue;
-    if (currentValueOptions !== undefined) {
-      // sanitize if valueOptions are provided
-      itemValue = getValueFromValueOptions(item.value, currentValueOptions, getOptionValue);
-      if (itemValue !== item.value) {
-        applyValue(_extends({}, item, {
-          value: itemValue
-        }));
-        return;
-      }
-    } else {
-      itemValue = item.value;
-    }
-    itemValue = (_itemValue = itemValue) != null ? _itemValue : '';
-    setFilterValueState(String(itemValue));
-  }, [item, currentValueOptions, applyValue, getOptionValue]);
-  if (!isSingleSelectColDef(resolvedColumn)) {
-    return null;
-  }
   if (!isSingleSelectColDef(resolvedColumn)) {
     return null;
   }
   const label = labelProp != null ? labelProp : apiRef.current.getLocaleText('filterPanelInputLabel');
   return /*#__PURE__*/_jsxs(SingleSelectOperatorContainer, {
     children: [/*#__PURE__*/_jsxs(rootProps.slots.baseFormControl, {
+      fullWidth: true,
       children: [/*#__PURE__*/_jsx(rootProps.slots.baseInputLabel, _extends({}, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseInputLabel, {
         id: labelId,
         htmlFor: id,
@@ -127,7 +97,7 @@ function GridFilterInputSingleSelect(props) {
         id: id,
         label: label,
         labelId: labelId,
-        value: filterValueState,
+        value: filterValue,
         onChange: onFilterChange,
         variant: "standard",
         type: type || 'text',
@@ -161,18 +131,6 @@ process.env.NODE_ENV !== "production" ? GridFilterInputSingleSelect.propTypes =
   applyValue: PropTypes.func.isRequired,
   clearButton: PropTypes.node,
   focusElementRef: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.func, PropTypes.object]),
-  /**
-   * Used to determine the label displayed for a given value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The text to be displayed.
-   */
-  getOptionLabel: PropTypes.func,
-  /**
-   * Used to determine the value used for a value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The value to be used.
-   */
-  getOptionValue: PropTypes.func,
   /**
    * It is `true` if the filter either has a value or an operator with no value
    * required is selected (e.g. `isEmpty`)

package/components/panel/filterPanel/filterPanelUtils.d.ts

@@ -1,4 +1,5 @@
-import type { GridColDef, GridSingleSelectColDef, ValueOptions } from '../../../models/colDef/gridColDef';
+import type { GridColDef, GridSingleSelectColDef } from '../../../models/colDef/gridColDef';
+import type { GridValueOptionsParams } from '../../../models/params/gridValueOptionsParams';
 export declare function isSingleSelectColDef(colDef: GridColDef | null): colDef is GridSingleSelectColDef;
+export declare function getValueOptions(column: GridSingleSelectColDef, additionalParams?: Omit<GridValueOptionsParams, 'field'>): import("../../../models/colDef/gridColDef").ValueOptions[] | undefined;
 export declare function getValueFromValueOptions(value: string, valueOptions: any[] | undefined, getOptionValue: NonNullable<GridSingleSelectColDef['getOptionValue']>): any;
-export declare const getLabelFromValueOption: (valueOption: ValueOptions) => string;

package/components/panel/filterPanel/filterPanelUtils.js

@@ -1,6 +1,15 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 export function isSingleSelectColDef(colDef) {
   return (colDef == null ? void 0 : colDef.type) === 'singleSelect';
 }
+export function getValueOptions(column, additionalParams) {
+  if (!column) {
+    return undefined;
+  }
+  return typeof column.valueOptions === 'function' ? column.valueOptions(_extends({
+    field: column.field
+  }, additionalParams)) : column.valueOptions;
+}
 export function getValueFromValueOptions(value, valueOptions, getOptionValue) {
   if (valueOptions === undefined) {
     return undefined;
@@ -10,8 +19,4 @@ export function getValueFromValueOptions(value, valueOptions, getOptionValue) {
     return String(optionValue) === String(value);
   });
   return getOptionValue(result);
-}
-export const getLabelFromValueOption = valueOption => {
-  const label = typeof valueOption === 'object' ? valueOption.label : valueOption;
-  return label != null ? String(label) : '';
-};
+}

package/hooks/features/rowSelection/useGridRowSelection.js

@@ -15,6 +15,7 @@ import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPanelToggleField';
 import { gridClasses } from '../../../constants/gridClasses';
 import { isEventTargetInPortal } from '../../../utils/domUtils';
+import { isMultipleRowSelectionEnabled } from './utils';
 const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
   if (selectionModelProp == null) {
     return selectionModelProp;
@@ -60,11 +61,10 @@ export const useGridRowSelection = (apiRef, props) => {
   });
   const {
     checkboxSelection,
-    disableMultipleRowSelection,
     disableRowSelectionOnClick,
     isRowSelectable: propIsRowSelectable
   } = props;
-  const canHaveMultipleSelection = !disableMultipleRowSelection || checkboxSelection;
+  const canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
   const visibleRows = useGridVisibleRows(apiRef, props);
   const expandMouseRowRangeSelection = React.useCallback(id => {
     var _lastRowToggled$curre;
@@ -95,7 +95,7 @@ export const useGridRowSelection = (apiRef, props) => {
    * API METHODS
    */
   const setRowSelectionModel = React.useCallback(model => {
-    if (props.signature === GridSignature.DataGrid && !props.checkboxSelection && Array.isArray(model) && model.length > 1) {
+    if (props.signature === GridSignature.DataGrid && !canHaveMultipleSelection && Array.isArray(model) && model.length > 1) {
       throw new Error(['MUI: `rowSelectionModel` can only contain 1 item in DataGrid.', 'You need to upgrade to DataGridPro or DataGridPremium component to unlock multiple selection.'].join('\n'));
     }
     const currentModel = gridRowSelectionStateSelector(apiRef.current.state);
@@ -106,7 +106,7 @@ export const useGridRowSelection = (apiRef, props) => {
       }));
       apiRef.current.forceUpdate();
     }
-  }, [apiRef, logger, props.rowSelection, props.signature, props.checkboxSelection]);
+  }, [apiRef, logger, props.rowSelection, props.signature, canHaveMultipleSelection]);
   const isRowSelected = React.useCallback(id => gridRowSelectionStateSelector(apiRef.current.state).includes(id), [apiRef]);
   const isRowSelectable = React.useCallback(id => {
     if (propIsRowSelectable && !propIsRowSelectable(apiRef.current.getRowParams(id))) {
@@ -258,12 +258,12 @@ export const useGridRowSelection = (apiRef, props) => {
     if (rowNode.type === 'pinnedRow') {
       return;
     }
-    if (event.shiftKey && (canHaveMultipleSelection || checkboxSelection)) {
+    if (event.shiftKey && canHaveMultipleSelection) {
       expandMouseRowRangeSelection(params.id);
     } else {
       handleSingleRowSelection(params.id, event);
     }
-  }, [disableRowSelectionOnClick, canHaveMultipleSelection, checkboxSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
+  }, [disableRowSelectionOnClick, canHaveMultipleSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
   const preventSelectionOnShift = React.useCallback((params, event) => {
     if (canHaveMultipleSelection && event.shiftKey) {
       var _window$getSelection;
@@ -271,12 +271,12 @@ export const useGridRowSelection = (apiRef, props) => {
     }
   }, [canHaveMultipleSelection]);
   const handleRowSelectionCheckboxChange = React.useCallback((params, event) => {
-    if (event.nativeEvent.shiftKey) {
+    if (canHaveMultipleSelection && event.nativeEvent.shiftKey) {
       expandMouseRowRangeSelection(params.id);
     } else {
-      apiRef.current.selectRow(params.id, params.value);
+      apiRef.current.selectRow(params.id, params.value, !canHaveMultipleSelection);
     }
-  }, [apiRef, expandMouseRowRangeSelection]);
+  }, [apiRef, expandMouseRowRangeSelection, canHaveMultipleSelection]);
   const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
     const shouldLimitSelectionToCurrentPage = props.checkboxSelectionVisibleOnly && props.pagination;
     const rowsToBeSelected = shouldLimitSelectionToCurrentPage ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);

package/hooks/features/rowSelection/utils.d.ts

@@ -0,0 +1,2 @@
+import type { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+export declare function isMultipleRowSelectionEnabled(props: Pick<DataGridProcessedProps, 'signature' | 'disableMultipleRowSelection' | 'checkboxSelection'>): boolean;

package/hooks/features/rowSelection/utils.js

@@ -0,0 +1,8 @@
+import { GridSignature } from '../../utils/useGridApiEventHandler';
+export function isMultipleRowSelectionEnabled(props) {
+  if (props.signature === GridSignature.DataGrid) {
+    // DataGrid Community has multiple row selection enabled only if checkbox selection is enabled.
+    return props.checkboxSelection && props.disableMultipleRowSelection !== true;
+  }
+  return !props.disableMultipleRowSelection;
+}

package/hooks/utils/useGridAriaAttributes.js

@@ -4,6 +4,7 @@ import { useGridRootProps } from './useGridRootProps';
 import { gridColumnGroupsHeaderMaxDepthSelector } from '../features/columnGrouping/gridColumnGroupsSelector';
 import { gridPinnedRowsCountSelector, gridRowCountSelector } from '../features/rows/gridRowsSelector';
 import { useGridPrivateApiContext } from './useGridPrivateApiContext';
+import { isMultipleRowSelectionEnabled } from '../features/rowSelection/utils';
 export const useGridAriaAttributes = () => {
   var _rootProps$experiment;
   const apiRef = useGridPrivateApiContext();
@@ -20,6 +21,6 @@ export const useGridAriaAttributes = () => {
     role,
     'aria-colcount': visibleColumns.length,
     'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + totalRowCount,
-    'aria-multiselectable': !rootProps.disableMultipleRowSelection
+    'aria-multiselectable': isMultipleRowSelectionEnabled(rootProps)
   };
 };

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.0.0-alpha.5
+ * @mui/x-data-grid v7.0.0-alpha.6
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the