@mui/x-data-grid 6.11.0 → 6.11.2

package/node/components/toolbar/GridToolbarQuickFilter.js

@@ -54,15 +54,15 @@ const GridToolbarQuickFilterRoot = (0, _styles.styled)(_TextField.default, {
 const defaultSearchValueParser = searchText => searchText.split(' ').filter(word => word !== '');
 const defaultSearchValueFormatter = values => values.join(' ');
 function GridToolbarQuickFilter(props) {
+  const apiRef = (0, _useGridApiContext.useGridApiContext)();
+  const rootProps = (0, _useGridRootProps.useGridRootProps)();
+  const quickFilterValues = (0, _useGridSelector.useGridSelector)(apiRef, _filter.gridQuickFilterValuesSelector);
   const {
       quickFilterParser = defaultSearchValueParser,
       quickFilterFormatter = defaultSearchValueFormatter,
-      debounceMs = 500
+      debounceMs = rootProps.filterDebounceMs
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
-  const apiRef = (0, _useGridApiContext.useGridApiContext)();
-  const rootProps = (0, _useGridRootProps.useGridRootProps)();
-  const quickFilterValues = (0, _useGridSelector.useGridSelector)(apiRef, _filter.gridQuickFilterValuesSelector);
   const [searchValue, setSearchValue] = React.useState(() => quickFilterFormatter(quickFilterValues ?? []));
   const prevQuickFilterValuesRef = React.useRef(quickFilterValues);
   React.useEffect(() => {
@@ -125,7 +125,7 @@ process.env.NODE_ENV !== "production" ? GridToolbarQuickFilter.propTypes = {
   // ----------------------------------------------------------------------
   /**
    * The debounce time in milliseconds.
-   * @default 500
+   * @default 150
    */
   debounceMs: _propTypes.default.number,
   /**

package/node/hooks/features/export/useGridPrintExport.js

@@ -55,11 +55,6 @@ const useGridPrintExport = (apiRef, props) => {
   // Returns a promise because updateColumns triggers state update and
   // the new state needs to be in place before the grid can be sized correctly
   const updateGridColumnsForPrint = React.useCallback((fields, allColumns) => new Promise(resolve => {
-    // TODO remove unused Promise
-    if (!fields && !allColumns) {
-      resolve();
-      return;
-    }
     const exportedColumnFields = (0, _utils2.getColumnsToExport)({
       apiRef,
       options: {

package/node/hooks/features/export/utils.js

@@ -13,7 +13,13 @@ const getColumnsToExport = ({
 }) => {
   const columns = (0, _columns.gridColumnDefinitionsSelector)(apiRef);
   if (options.fields) {
-    return options.fields.map(field => columns.find(column => column.field === field)).filter(column => !!column);
+    return options.fields.reduce((currentColumns, field) => {
+      const column = columns.find(col => col.field === field);
+      if (column) {
+        currentColumns.push(column);
+      }
+      return currentColumns;
+    }, []);
   }
   const validColumns = options.allColumns ? columns : (0, _columns.gridVisibleColumnDefinitionsSelector)(apiRef);
   return validColumns.filter(column => !column.disableExport);

package/node/hooks/features/filter/gridFilterUtils.js

@@ -11,6 +11,13 @@ var _utils = require("../../../colDef/utils");
 var _gridFilterState = require("./gridFilterState");
 var _warning = require("../../../utils/warning");
 var _columns = require("../columns");
+let hasEval;
+try {
+  // eslint-disable-next-line no-eval
+  hasEval = eval('true');
+} catch (_) {
+  hasEval = false;
+}
 /**
  * Adds default values to the optional fields of a filter items.
  * @param {GridFilterItem} item The raw filter item.
@@ -136,7 +143,7 @@ let filterItemsApplierId = 1;
  * @param {React.MutableRefObject<GridApiCommunity>} apiRef The API of the grid.
  * @returns {GridAggregatedFilterItemApplier | null} A method that checks if a row is matching the current filter model. If `null`, we consider that all the rows are matching the filters.
  */
-const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef) => {
+const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef, disableEval) => {
   const {
     items
   } = filterModel;
@@ -144,22 +151,19 @@ const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef) => {
   if (appliers.length === 0) {
     return null;
   }
-
-  // Original logic:
-  // return (row, shouldApplyFilter) => {
-  //   const resultPerItemId: GridFilterItemResult = {};
-  //
-  //   for (let i = 0; i < appliers.length; i += 1) {
-  //     const applier = appliers[i];
-  //     if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
-  //       resultPerItemId[applier.item.id!] = applier.v7
-  //         ? applier.fn(row)
-  //         : applier.fn(getRowId ? getRowId(row) : row.id);
-  //     }
-  //   }
-  //
-  //   return resultPerItemId;
-  // };
+  if (!hasEval || disableEval) {
+    // This is the original logic, which is used if `eval()` is not supported (aka prevented by CSP).
+    return (row, shouldApplyFilter) => {
+      const resultPerItemId = {};
+      for (let i = 0; i < appliers.length; i += 1) {
+        const applier = appliers[i];
+        if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
+          resultPerItemId[applier.item.id] = applier.v7 ? applier.fn(row) : applier.fn(getRowId ? getRowId(row) : row.id);
+        }
+      }
+      return resultPerItemId;
+    };
+  }
 
   // We generate a new function with `eval()` to avoid expensive patterns for JS engines
   // such as a dynamic object assignment, e.g. `{ [dynamicKey]: value }`.
@@ -269,8 +273,8 @@ const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef) => {
   };
 };
 exports.buildAggregatedQuickFilterApplier = buildAggregatedQuickFilterApplier;
-const buildAggregatedFilterApplier = (getRowId, filterModel, apiRef) => {
-  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(getRowId, filterModel, apiRef);
+const buildAggregatedFilterApplier = (getRowId, filterModel, apiRef, disableEval) => {
+  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(getRowId, filterModel, apiRef, disableEval);
   const isRowMatchingQuickFilter = buildAggregatedQuickFilterApplier(getRowId, filterModel, apiRef);
   return function isRowMatchingFilters(row, shouldApplyFilter, result) {
     result.passingFilterItems = isRowMatchingFilterItems?.(row, shouldApplyFilter) ?? null;

package/node/hooks/features/filter/useGridFilter.js

@@ -69,7 +69,7 @@ const useGridFilter = (apiRef, props) => {
   const updateFilteredRows = React.useCallback(() => {
     apiRef.current.setState(state => {
       const filterModel = (0, _gridFilterSelector.gridFilterModelSelector)(state, apiRef.current.instanceId);
-      const isRowMatchingFilters = props.filterMode === 'client' ? (0, _gridFilterUtils.buildAggregatedFilterApplier)(props.getRowId, filterModel, apiRef) : null;
+      const isRowMatchingFilters = props.filterMode === 'client' ? (0, _gridFilterUtils.buildAggregatedFilterApplier)(props.getRowId, filterModel, apiRef, props.disableEval) : null;
       const filteringResult = apiRef.current.applyStrategyProcessor('filtering', {
         isRowMatchingFilters,
         filterModel: filterModel ?? (0, _gridFilterState.getDefaultGridFilterModel)()
@@ -83,7 +83,7 @@ const useGridFilter = (apiRef, props) => {
       });
     });
     apiRef.current.publishEvent('filteredRowsSet');
-  }, [apiRef, props.filterMode, props.getRowId]);
+  }, [apiRef, props.filterMode, props.getRowId, props.disableEval]);
   const addColumnMenuItem = React.useCallback((columnMenuItems, colDef) => {
     if (colDef == null || colDef.filterable === false || props.disableColumnFilter) {
       return columnMenuItems;

package/node/hooks/features/rows/useGridRows.js

@@ -62,6 +62,16 @@ const useGridRows = (apiRef, props) => {
     }
     return null;
   }, [apiRef]);
+  const getRowIdProp = props.getRowId;
+  const getRowId = React.useCallback(row => {
+    if (_gridRowsUtils.GRID_ID_AUTOGENERATED in row) {
+      return row[_gridRowsUtils.GRID_ID_AUTOGENERATED];
+    }
+    if (getRowIdProp) {
+      return getRowIdProp(row);
+    }
+    return row.id;
+  }, [getRowIdProp]);
   const lookup = React.useMemo(() => currentPage.rows.reduce((acc, {
     id
   }, index) => {
@@ -301,6 +311,7 @@ const useGridRows = (apiRef, props) => {
   }, [apiRef, props.signature, props.getRowId]);
   const rowApi = {
     getRow,
+    getRowId,
     getRowModels,
     getRowsCount,
     getAllRowIds,

package/node/hooks/utils/useTimeout.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTimeout = useTimeout;
+var _useLazyRef = require("./useLazyRef");
+var _useOnMount = require("./useOnMount");
+class Timeout {
+  constructor() {
+    this.currentId = 0;
+    this.clear = () => {
+      if (this.currentId !== 0) {
+        clearTimeout(this.currentId);
+        this.currentId = 0;
+      }
+    };
+    this.disposeEffect = () => {
+      return this.clear;
+    };
+  }
+  static create() {
+    return new Timeout();
+  }
+  start(delay, fn) {
+    this.clear();
+    this.currentId = setTimeout(fn, delay);
+  }
+}
+function useTimeout() {
+  const timeout = (0, _useLazyRef.useLazyRef)(Timeout.create).current;
+  (0, _useOnMount.useOnMount)(timeout.disposeEffect);
+  return timeout;
+}

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.11.0
+ * @mui/x-data-grid v6.11.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/locales/esES.js

@@ -63,37 +63,35 @@ const esESGrid = {
   filterOperatorOnOrAfter: 'es en o posterior',
   filterOperatorBefore: 'es anterior',
   filterOperatorOnOrBefore: 'es en o anterior',
-  filterOperatorIsEmpty: 'está vacío',
+  filterOperatorIsEmpty: 'esta vacío',
   filterOperatorIsNotEmpty: 'no esta vacío',
   filterOperatorIsAnyOf: 'es cualquiera de',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Contiene',
+  headerFilterOperatorEquals: 'Es igual a',
+  headerFilterOperatorStartsWith: 'Comienza con',
+  headerFilterOperatorEndsWith: 'Termina con',
+  headerFilterOperatorIs: 'Es',
+  headerFilterOperatorNot: 'No es',
+  headerFilterOperatorAfter: 'Esta después de',
+  headerFilterOperatorOnOrAfter: 'Esta en o después de',
+  headerFilterOperatorBefore: 'Esta antes de',
+  headerFilterOperatorOnOrBefore: 'Esta en o antes de',
+  headerFilterOperatorIsEmpty: 'Esta vacío',
+  headerFilterOperatorIsNotEmpty: 'No esta vacío',
+  headerFilterOperatorIsAnyOf: 'Es cualquiera de',
+  'headerFilterOperator=': 'Es igual a',
+  'headerFilterOperator!=': 'Es diferente a',
+  'headerFilterOperator>': 'Es mayor que',
+  'headerFilterOperator>=': 'Es mayor o igual que',
+  'headerFilterOperator<': 'Es menor que',
+  'headerFilterOperator<=': 'Es menor o igual que',
   // Filter values text
   filterValueAny: 'cualquiera',
   filterValueTrue: 'verdadero',

package/node/locales/zhCN.js

@@ -66,34 +66,32 @@ const zhCNGrid = {
   filterOperatorIsEmpty: '为空',
   filterOperatorIsNotEmpty: '不为空',
   filterOperatorIsAnyOf: '属于',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: '包含',
+  headerFilterOperatorEquals: '等于',
+  headerFilterOperatorStartsWith: '开始于',
+  headerFilterOperatorEndsWith: '结束于',
+  headerFilterOperatorIs: '是',
+  headerFilterOperatorNot: '不是',
+  headerFilterOperatorAfter: '在后面',
+  headerFilterOperatorOnOrAfter: '在当前或后面',
+  headerFilterOperatorBefore: '在前面',
+  headerFilterOperatorOnOrBefore: '在当前或前面',
+  headerFilterOperatorIsEmpty: '为空',
+  headerFilterOperatorIsNotEmpty: '不为空',
+  headerFilterOperatorIsAnyOf: '属于',
+  'headerFilterOperator=': '等于',
+  'headerFilterOperator!=': '不等于',
+  'headerFilterOperator>': '大于',
+  'headerFilterOperator>=': '大于或等于',
+  'headerFilterOperator<': '小雨',
+  'headerFilterOperator<=': '小于或等于',
   // Filter values text
   filterValueAny: '任何',
   filterValueTrue: '真',

package/node/locales/zhTW.js

@@ -43,7 +43,7 @@ const zhTWGrid = {
   columnsPanelHideAllButton: '隱藏所有',
   // Filter panel text
   filterPanelAddFilter: '增加篩選器',
-  // filterPanelRemoveAll: 'Remove all',
+  filterPanelRemoveAll: '清除所有',
   filterPanelDeleteIconLabel: '刪除',
   filterPanelLogicOperator: '邏輯運算子',
   filterPanelOperator: '運算子',
@@ -66,34 +66,32 @@ const zhTWGrid = {
   filterOperatorIsEmpty: '為空',
   filterOperatorIsNotEmpty: '不為空',
   filterOperatorIsAnyOf: '是其中之一',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: '包含',
+  headerFilterOperatorEquals: '等於',
+  headerFilterOperatorStartsWith: '以...開頭',
+  headerFilterOperatorEndsWith: '以...結束',
+  headerFilterOperatorIs: '為',
+  headerFilterOperatorNot: '不為',
+  headerFilterOperatorAfter: '...之後',
+  headerFilterOperatorOnOrAfter: '...(含)之後',
+  headerFilterOperatorBefore: '...之前',
+  headerFilterOperatorOnOrBefore: '...(含)之前',
+  headerFilterOperatorIsEmpty: '為空',
+  headerFilterOperatorIsNotEmpty: '不為空',
+  headerFilterOperatorIsAnyOf: '是其中之一',
+  'headerFilterOperator=': '等於',
+  'headerFilterOperator!=': '不等於',
+  'headerFilterOperator>': '大於',
+  'headerFilterOperator>=': '大於或等於',
+  'headerFilterOperator<': '小於',
+  'headerFilterOperator<=': '小於或等於',
   // Filter values text
   filterValueAny: '任何值',
   filterValueTrue: '真',
@@ -101,7 +99,7 @@ const zhTWGrid = {
   // Column menu text
   columnMenuLabel: '選單',
   columnMenuShowColumns: '顯示欄位',
-  // columnMenuManageColumns: 'Manage columns',
+  columnMenuManageColumns: '管理欄位',
   columnMenuFilter: '篩選器',
   columnMenuHideColumn: '隱藏',
   columnMenuUnsort: '預設排序',
@@ -145,16 +143,14 @@ const zhTWGrid = {
   expandDetailPanel: '展開',
   collapseDetailPanel: '摺疊',
   // Row reordering text
-  rowReorderingHeaderName: '排序'
-
+  rowReorderingHeaderName: '排序',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
+  aggregationMenuItemHeader: '集合',
+  aggregationFunctionLabelSum: '總數',
+  aggregationFunctionLabelAvg: '平均數',
+  aggregationFunctionLabelMin: '最小',
+  aggregationFunctionLabelMax: '最大',
+  aggregationFunctionLabelSize: '尺寸'
 };
-
 const zhTW = (0, _getGridLocalization.getGridLocalization)(zhTWGrid, _locale.zhTW);
 exports.zhTW = zhTW;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "6.11.0",
+  "version": "6.11.2",
   "description": "The community edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.6",
-    "@mui/utils": "^5.14.1",
-    "clsx": "^1.2.1",
+    "@mui/utils": "^5.14.5",
+    "clsx": "^2.0.0",
     "prop-types": "^15.8.1",
     "reselect": "^4.1.8"
   },