@mui/x-data-grid 6.9.2 → 6.10.0

package/node/hooks/features/export/serializers/csvSerializer.js

@@ -43,43 +43,106 @@ const serializeCellValue = (cellParams, options) => {
 };
 exports.serializeCellValue = serializeCellValue;
 const objectFormattedValueWarning = (0, _warning.buildWarning)(['MUI: When the value of a field is an object or a `renderCell` is provided, the CSV export might not display the value correctly.', 'You can provide a `valueFormatter` with a string representation to be used.']);
+class CSVRow {
+  constructor(options) {
+    this.options = void 0;
+    this.rowString = '';
+    this.isEmpty = true;
+    this.options = options;
+  }
+  addValue(value) {
+    if (!this.isEmpty) {
+      this.rowString += this.options.delimiterCharacter;
+    }
+    if (value === null || value === undefined) {
+      this.rowString += '';
+    } else if (typeof this.options.sanitizeCellValue === 'function') {
+      this.rowString += this.options.sanitizeCellValue(value, this.options.delimiterCharacter);
+    } else {
+      this.rowString += value;
+    }
+    this.isEmpty = false;
+  }
+  getRowString() {
+    return this.rowString;
+  }
+}
 const serializeRow = ({
   id,
   columns,
   getCellParams,
   delimiterCharacter,
   ignoreValueFormatter
-}) => columns.map(column => {
-  const cellParams = getCellParams(id, column.field);
-  if (process.env.NODE_ENV !== 'production') {
-    if (String(cellParams.formattedValue) === '[object Object]') {
-      objectFormattedValueWarning();
+}) => {
+  const row = new CSVRow({
+    delimiterCharacter
+  });
+  columns.forEach(column => {
+    const cellParams = getCellParams(id, column.field);
+    if (process.env.NODE_ENV !== 'production') {
+      if (String(cellParams.formattedValue) === '[object Object]') {
+        objectFormattedValueWarning();
+      }
     }
-  }
-  return serializeCellValue(cellParams, {
-    delimiterCharacter,
-    ignoreValueFormatter
+    row.addValue(serializeCellValue(cellParams, {
+      delimiterCharacter,
+      ignoreValueFormatter
+    }));
   });
-});
+  return row.getRowString();
+};
 function buildCSV(options) {
   const {
     columns,
     rowIds,
-    getCellParams,
     delimiterCharacter,
     includeHeaders,
-    ignoreValueFormatter
+    includeColumnGroupsHeaders,
+    ignoreValueFormatter,
+    apiRef
   } = options;
   const CSVBody = rowIds.reduce((acc, id) => `${acc}${serializeRow({
     id,
     columns,
-    getCellParams,
+    getCellParams: apiRef.current.getCellParams,
     delimiterCharacter,
     ignoreValueFormatter
-  }).join(delimiterCharacter)}\r\n`, '').trim();
+  })}\r\n`, '').trim();
   if (!includeHeaders) {
     return CSVBody;
   }
-  const CSVHead = `${columns.filter(column => column.field !== _colDef.GRID_CHECKBOX_SELECTION_COL_DEF.field).map(column => sanitizeCellValue(column.headerName || column.field, delimiterCharacter)).join(delimiterCharacter)}\r\n`;
+  const filteredColumns = columns.filter(column => column.field !== _colDef.GRID_CHECKBOX_SELECTION_COL_DEF.field);
+  const headerRows = [];
+  if (includeColumnGroupsHeaders) {
+    const columnGroupLookup = apiRef.current.unstable_getAllGroupDetails();
+    let maxColumnGroupsDepth = 0;
+    const columnGroupPathsLookup = filteredColumns.reduce((acc, column) => {
+      const columnGroupPath = apiRef.current.unstable_getColumnGroupPath(column.field);
+      acc[column.field] = columnGroupPath;
+      maxColumnGroupsDepth = Math.max(maxColumnGroupsDepth, columnGroupPath.length);
+      return acc;
+    }, {});
+    for (let i = 0; i < maxColumnGroupsDepth; i += 1) {
+      const headerGroupRow = new CSVRow({
+        delimiterCharacter,
+        sanitizeCellValue
+      });
+      headerRows.push(headerGroupRow);
+      filteredColumns.forEach(column => {
+        const columnGroupId = (columnGroupPathsLookup[column.field] || [])[i];
+        const columnGroup = columnGroupLookup[columnGroupId];
+        headerGroupRow.addValue(columnGroup ? columnGroup.headerName || columnGroup.groupId : '');
+      });
+    }
+  }
+  const mainHeaderRow = new CSVRow({
+    delimiterCharacter,
+    sanitizeCellValue
+  });
+  filteredColumns.forEach(column => {
+    mainHeaderRow.addValue(column.headerName || column.field);
+  });
+  headerRows.push(mainHeaderRow);
+  const CSVHead = `${headerRows.map(row => row.getRowString()).join('\r\n')}\r\n`;
   return `${CSVHead}${CSVBody}`.trim();
 }

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

@@ -39,10 +39,11 @@ const useGridCsvExport = (apiRef, props) => {
     return (0, _csvSerializer.buildCSV)({
       columns: exportedColumns,
       rowIds: exportedRowIds,
-      getCellParams: apiRef.current.getCellParams,
       delimiterCharacter: options.delimiter || ',',
       includeHeaders: options.includeHeaders ?? true,
-      ignoreValueFormatter
+      includeColumnGroupsHeaders: options.includeColumnGroupsHeaders ?? true,
+      ignoreValueFormatter,
+      apiRef
     });
   }, [logger, apiRef, ignoreValueFormatter]);
   const exportDataAsCsv = React.useCallback(options => {

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

@@ -168,7 +168,8 @@ const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef) => {
   if (quickFilterValues.length === 0) {
     return null;
   }
-  const columnFields = (0, _columns.gridColumnFieldsSelector)(apiRef);
+  const quickFilterExcludeHiddenColumns = filterModel.quickFilterExcludeHiddenColumns ?? false;
+  const columnFields = quickFilterExcludeHiddenColumns ? (0, _columns.gridVisibleColumnFieldsSelector)(apiRef) : (0, _columns.gridColumnFieldsSelector)(apiRef);
   const appliersPerField = [];
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);

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

@@ -29,6 +29,7 @@ const filterStateInitializer = (state, props, apiRef) => {
   return (0, _extends2.default)({}, state, {
     filter: {
       filterModel: (0, _gridFilterUtils.sanitizeFilterModel)(filterModel, props.disableMultipleColumnsFiltering, apiRef),
+      filteredRowsLookup: {},
       filteredDescendantCountLookup: {}
     },
     visibleRowsLookup: {}
@@ -340,6 +341,13 @@ const useGridFilter = (apiRef, props) => {
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, 'columnsChange', handleColumnsChange);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
   (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, 'rowExpansionChange', updateVisibleRowsLookupState);
+  (0, _useGridApiEventHandler.useGridApiEventHandler)(apiRef, 'columnVisibilityModelChange', () => {
+    const filterModel = (0, _gridFilterSelector.gridFilterModelSelector)(apiRef);
+    if (filterModel.quickFilterValues && filterModel.quickFilterExcludeHiddenColumns) {
+      // re-apply filters because the quick filter results may have changed
+      apiRef.current.unstable_applyFilters();
+    }
+  });
 
   /**
    * 1ST RENDER

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

@@ -15,7 +15,7 @@ var _gridRowsSelector = require("./gridRowsSelector");
 var _densitySelector = require("../density/densitySelector");
 const GRID_ROOT_GROUP_ID = `auto-generated-group-node-root`;
 exports.GRID_ROOT_GROUP_ID = GRID_ROOT_GROUP_ID;
-const GRID_ID_AUTOGENERATED = Symbol('mui-autogenerated-id');
+const GRID_ID_AUTOGENERATED = Symbol('mui.id_autogenerated');
 exports.GRID_ID_AUTOGENERATED = GRID_ID_AUTOGENERATED;
 const buildRootGroup = () => ({
   type: 'group',

package/node/hooks/utils/useGridApiMethod.js

@@ -8,28 +8,12 @@ var React = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function useGridApiMethod(privateApiRef, apiMethods, visibility) {
-  const apiMethodsRef = React.useRef(apiMethods);
-  const [apiMethodsNames] = React.useState(Object.keys(apiMethods));
-  const installMethods = React.useCallback(() => {
-    if (!privateApiRef.current) {
-      return;
-    }
-    apiMethodsNames.forEach(methodName => {
-      if (!privateApiRef.current.hasOwnProperty(methodName)) {
-        privateApiRef.current.register(visibility, {
-          [methodName]: (...args) => {
-            const fn = apiMethodsRef.current[methodName];
-            return fn(...args);
-          }
-        });
-      }
-    });
-  }, [apiMethodsNames, privateApiRef, visibility]);
+  const isFirstRender = React.useRef(true);
   React.useEffect(() => {
-    apiMethodsRef.current = apiMethods;
-  }, [apiMethods]);
-  React.useEffect(() => {
-    installMethods();
-  }, [installMethods]);
-  installMethods();
+    isFirstRender.current = false;
+    privateApiRef.current.register(visibility, apiMethods);
+  }, [privateApiRef, visibility, apiMethods]);
+  if (isFirstRender.current) {
+    privateApiRef.current.register(visibility, apiMethods);
+  }
 }

package/node/index.js

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

package/node/internals/index.js

@@ -15,6 +15,7 @@ var _exportNames = {
   useGridRegisterStrategyProcessor: true,
   GRID_DEFAULT_STRATEGY: true,
   useGridInitialization: true,
+  unwrapPrivateAPI: true,
   useGridClipboard: true,
   useGridColumnHeaders: true,
   unstable_gridHeaderFilteringEditFieldSelector: true,
@@ -403,6 +404,12 @@ Object.defineProperty(exports, "unstable_resetCreateSelectorCache", {
     return _createSelector.unstable_resetCreateSelectorCache;
   }
 });
+Object.defineProperty(exports, "unwrapPrivateAPI", {
+  enumerable: true,
+  get: function () {
+    return _useGridApiInitialization.unwrapPrivateAPI;
+  }
+});
 Object.defineProperty(exports, "useGridClipboard", {
   enumerable: true,
   get: function () {
@@ -617,6 +624,7 @@ var _GridFilterPanel = require("../components/panel/filterPanel/GridFilterPanel"
 var _pipeProcessing = require("../hooks/core/pipeProcessing");
 var _strategyProcessing = require("../hooks/core/strategyProcessing");
 var _useGridInitialization = require("../hooks/core/useGridInitialization");
+var _useGridApiInitialization = require("../hooks/core/useGridApiInitialization");
 var _useGridClipboard = require("../hooks/features/clipboard/useGridClipboard");
 var _useGridColumnHeaders = require("../hooks/features/columnHeaders/useGridColumnHeaders");
 var _gridHeaderFilteringSelectors = require("../hooks/features/headerFiltering/gridHeaderFilteringSelectors");

package/node/locales/plPL.js

@@ -43,7 +43,7 @@ const plPLGrid = {
   columnsPanelHideAllButton: 'Ukryj wszystko',
   // Filter panel text
   filterPanelAddFilter: 'Dodaj filtr',
-  // filterPanelRemoveAll: 'Remove all',
+  filterPanelRemoveAll: 'Usuń wszystkie',
   filterPanelDeleteIconLabel: 'Usuń',
   filterPanelLogicOperator: 'Operator logiczny',
   filterPanelOperator: 'Operator',
@@ -74,12 +74,12 @@ const plPLGrid = {
   // 'filterOperator<=': '<=',
 
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
+  headerFilterOperatorContains: 'Zawiera',
+  headerFilterOperatorEquals: 'Równa się',
+  headerFilterOperatorStartsWith: 'Zaczyna się od',
+  headerFilterOperatorEndsWith: 'Kończy się na',
   // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
+  headerFilterOperatorNot: 'Niepuste',
   // headerFilterOperatorAfter: 'Is after',
   // headerFilterOperatorOnOrAfter: 'Is on or after',
   // headerFilterOperatorBefore: 'Is before',
@@ -101,7 +101,7 @@ const plPLGrid = {
   // Column menu text
   columnMenuLabel: 'Menu',
   columnMenuShowColumns: 'Pokaż wszystkie kolumny',
-  // columnMenuManageColumns: 'Manage columns',
+  columnMenuManageColumns: 'Zarządzaj kolumnami',
   columnMenuFilter: 'Filtr',
   columnMenuHideColumn: 'Ukryj',
   columnMenuUnsort: 'Anuluj sortowanie',

package/package.json

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