@mui/x-data-grid 6.19.10 → 6.20.0

package/CHANGELOG.md

@@ -3,6 +3,82 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 6.20.0
+
+_May 24, 2024_
+
+We'd like to offer a big thanks to the 2 contributors who made this release possible. Here are some highlights ✨:
+
+- 🐞 Bugfixes
+
+### Data Grid
+
+#### `@mui/x-data-grid@6.20.0`
+
+- [DataGrid] Escape formulas in CSV and Excel export (#13190) @cherniavskii
+
+#### `@mui/x-data-grid-pro@6.20.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@6.20.0`.
+
+#### `@mui/x-data-grid-premium@6.20.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@6.20.0`.
+
+### Date Pickers
+
+#### `@mui/x-date-pickers@6.20.0`
+
+- [pickers] Fix `disableOpenPicker` prop behavior (#13221) @LukasTy
+
+#### `@mui/x-date-pickers-pro@6.20.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@6.20.0`.
+
+## 6.19.12
+
+_May 17, 2024_
+
+We'd like to offer a big thanks to the 2 contributors who made this release possible. Here are some highlights ✨:
+
+- 🐞 Bugfixes
+
+### Date Pickers
+
+#### `@mui/x-date-pickers@6.19.12`
+
+- [pickers] Fix `AdapterMomentJalaali` regression (#13150) @LukasTy
+
+#### `@mui/x-date-pickers-pro@6.19.12` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@6.19.12`.
+
+### Docs
+
+- [docs] Use MUI X v6 in Codesandbox and Stackblitz demos (#12838) @cherniavskii
+
+## 6.19.11
+
+_Apr 18, 2024_
+
+We'd like to offer a big thanks to the 1 contributor who made this release possible. Here are some highlights ✨:
+
+- 🐞 Bugfixes
+
+### Data Grid
+
+#### `@mui/x-data-grid@6.19.11`
+
+- [DataGrid] Fix virtualization memory leak (#12812) @romgrk
+
+#### `@mui/x-data-grid-pro@6.19.11` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@6.19.11`.
+
+#### `@mui/x-data-grid-premium@6.19.11` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@6.19.11`.
+
 ## 6.19.10
 
 _Apr 12, 2024_

package/hooks/features/clipboard/useGridClipboard.js

@@ -67,18 +67,21 @@ export const useGridClipboard = (apiRef, props) => {
     if (selectedRows.size > 0) {
       textToCopy = apiRef.current.getDataAsCsv({
         includeHeaders: false,
-        // TODO: make it configurable
         delimiter: clipboardCopyCellDelimiter,
-        shouldAppendQuotes: false
+        shouldAppendQuotes: false,
+        escapeFormulas: false
       });
     } else {
       const focusedCell = gridFocusCellSelector(apiRef);
       if (focusedCell) {
         const cellParams = apiRef.current.getCellParams(focusedCell.id, focusedCell.field);
         textToCopy = serializeCellValue(cellParams, {
-          delimiterCharacter: clipboardCopyCellDelimiter,
-          ignoreValueFormatter,
-          shouldAppendQuotes: false
+          csvOptions: {
+            delimiter: clipboardCopyCellDelimiter,
+            shouldAppendQuotes: false,
+            escapeFormulas: false
+          },
+          ignoreValueFormatter
         });
       }
     }

package/hooks/features/export/serializers/csvSerializer.d.ts

@@ -4,19 +4,16 @@ import type { GridCellParams } from '../../../../models/params/gridCellParams';
 import type { GridStateColDef } from '../../../../models/colDef/gridColDef';
 import type { GridApiCommunity } from '../../../../models/api/gridApiCommunity';
 export declare const serializeCellValue: (cellParams: GridCellParams, options: {
-    delimiterCharacter: string;
+    csvOptions: CSVOptions;
     ignoreValueFormatter: boolean;
-    shouldAppendQuotes: boolean;
 }) => any;
+type CSVOptions = Required<Pick<GridCsvExportOptions, 'delimiter' | 'shouldAppendQuotes' | 'escapeFormulas'>>;
 interface BuildCSVOptions {
     columns: GridStateColDef[];
     rowIds: GridRowId[];
-    delimiterCharacter: NonNullable<GridCsvExportOptions['delimiter']>;
-    includeHeaders: NonNullable<GridCsvExportOptions['includeHeaders']>;
-    includeColumnGroupsHeaders: NonNullable<GridCsvExportOptions['includeColumnGroupsHeaders']>;
+    csvOptions: Required<Pick<GridCsvExportOptions, 'delimiter' | 'includeColumnGroupsHeaders' | 'includeHeaders' | 'shouldAppendQuotes' | 'escapeFormulas'>>;
     ignoreValueFormatter: boolean;
     apiRef: React.MutableRefObject<GridApiCommunity>;
-    shouldAppendQuotes: boolean;
 }
 export declare function buildCSV(options: BuildCSVOptions): string;
 export {};

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

@@ -1,13 +1,19 @@
 import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../../colDef';
 import { buildWarning } from '../../../../utils/warning';
-function sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes) {
+function sanitizeCellValue(value, csvOptions) {
   if (typeof value === 'string') {
-    if (shouldAppendQuotes) {
+    if (csvOptions.shouldAppendQuotes || csvOptions.escapeFormulas) {
       const escapedValue = value.replace(/"/g, '""');
-      // Make sure value containing delimiter or line break won't be split into multiple rows
-      if ([delimiterCharacter, '\n', '\r', '"'].some(delimiter => value.includes(delimiter))) {
+      // Make sure value containing delimiter or line break won't be split into multiple cells
+      if ([csvOptions.delimiter, '\n', '\r', '"'].some(delimiter => value.includes(delimiter))) {
         return `"${escapedValue}"`;
       }
+      if (csvOptions.escapeFormulas) {
+        // See https://owasp.org/www-community/attacks/CSV_Injection
+        if (['=', '+', '-', '@', '\t', '\r'].includes(escapedValue[0])) {
+          return `'${escapedValue}`;
+        }
+      }
       return escapedValue;
     }
     return value;
@@ -16,9 +22,8 @@ function sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes) {
 }
 export const serializeCellValue = (cellParams, options) => {
   const {
-    delimiterCharacter,
-    ignoreValueFormatter,
-    shouldAppendQuotes
+    csvOptions,
+    ignoreValueFormatter
   } = options;
   let value;
   if (ignoreValueFormatter) {
@@ -37,7 +42,7 @@ export const serializeCellValue = (cellParams, options) => {
   } else {
     value = cellParams.formattedValue;
   }
-  return sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes);
+  return sanitizeCellValue(value, csvOptions);
 };
 const objectFormattedValueWarning = 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 {
@@ -49,12 +54,12 @@ class CSVRow {
   }
   addValue(value) {
     if (!this.isEmpty) {
-      this.rowString += this.options.delimiterCharacter;
+      this.rowString += this.options.csvOptions.delimiter;
     }
     if (value === null || value === undefined) {
       this.rowString += '';
     } else if (typeof this.options.sanitizeCellValue === 'function') {
-      this.rowString += this.options.sanitizeCellValue(value, this.options.delimiterCharacter, this.options.shouldAppendQuotes);
+      this.rowString += this.options.sanitizeCellValue(value, this.options.csvOptions);
     } else {
       this.rowString += value;
     }
@@ -68,13 +73,11 @@ const serializeRow = ({
   id,
   columns,
   getCellParams,
-  delimiterCharacter,
-  ignoreValueFormatter,
-  shouldAppendQuotes
+  csvOptions,
+  ignoreValueFormatter
 }) => {
   const row = new CSVRow({
-    delimiterCharacter,
-    shouldAppendQuotes
+    csvOptions
   });
   columns.forEach(column => {
     const cellParams = getCellParams(id, column.field);
@@ -84,9 +87,8 @@ const serializeRow = ({
       }
     }
     row.addValue(serializeCellValue(cellParams, {
-      delimiterCharacter,
       ignoreValueFormatter,
-      shouldAppendQuotes
+      csvOptions
     }));
   });
   return row.getRowString();
@@ -95,27 +97,23 @@ export function buildCSV(options) {
   const {
     columns,
     rowIds,
-    delimiterCharacter,
-    includeHeaders,
-    includeColumnGroupsHeaders,
+    csvOptions,
     ignoreValueFormatter,
-    apiRef,
-    shouldAppendQuotes
+    apiRef
   } = options;
   const CSVBody = rowIds.reduce((acc, id) => `${acc}${serializeRow({
     id,
     columns,
     getCellParams: apiRef.current.getCellParams,
-    delimiterCharacter,
     ignoreValueFormatter,
-    shouldAppendQuotes
+    csvOptions
   })}\r\n`, '').trim();
-  if (!includeHeaders) {
+  if (!csvOptions.includeHeaders) {
     return CSVBody;
   }
   const filteredColumns = columns.filter(column => column.field !== GRID_CHECKBOX_SELECTION_COL_DEF.field);
   const headerRows = [];
-  if (includeColumnGroupsHeaders) {
+  if (csvOptions.includeColumnGroupsHeaders) {
     const columnGroupLookup = apiRef.current.unstable_getAllGroupDetails();
     let maxColumnGroupsDepth = 0;
     const columnGroupPathsLookup = filteredColumns.reduce((acc, column) => {
@@ -126,9 +124,8 @@ export function buildCSV(options) {
     }, {});
     for (let i = 0; i < maxColumnGroupsDepth; i += 1) {
       const headerGroupRow = new CSVRow({
-        delimiterCharacter,
-        sanitizeCellValue,
-        shouldAppendQuotes
+        csvOptions,
+        sanitizeCellValue
       });
       headerRows.push(headerGroupRow);
       filteredColumns.forEach(column => {
@@ -139,9 +136,8 @@ export function buildCSV(options) {
     }
   }
   const mainHeaderRow = new CSVRow({
-    delimiterCharacter,
-    sanitizeCellValue,
-    shouldAppendQuotes
+    csvOptions,
+    sanitizeCellValue
   });
   filteredColumns.forEach(column => {
     mainHeaderRow.addValue(column.headerName || column.field);

package/hooks/features/export/useGridCsvExport.js

@@ -19,7 +19,7 @@ export const useGridCsvExport = (apiRef, props) => {
   const ignoreValueFormatterProp = props.unstable_ignoreValueFormatterDuringExport;
   const ignoreValueFormatter = (typeof ignoreValueFormatterProp === 'object' ? ignoreValueFormatterProp == null ? void 0 : ignoreValueFormatterProp.csvExport : ignoreValueFormatterProp) || false;
   const getDataAsCsv = React.useCallback((options = {}) => {
-    var _options$getRowsToExp, _options$includeHeade, _options$includeColum, _options$shouldAppend;
+    var _options$getRowsToExp, _options$shouldAppend, _options$includeHeade, _options$includeColum, _options$escapeFormul;
     logger.debug(`Get data as CSV`);
     const exportedColumns = getColumnsToExport({
       apiRef,
@@ -32,12 +32,15 @@ export const useGridCsvExport = (apiRef, props) => {
     return buildCSV({
       columns: exportedColumns,
       rowIds: exportedRowIds,
-      delimiterCharacter: options.delimiter || ',',
-      includeHeaders: (_options$includeHeade = options.includeHeaders) != null ? _options$includeHeade : true,
-      includeColumnGroupsHeaders: (_options$includeColum = options.includeColumnGroupsHeaders) != null ? _options$includeColum : true,
+      csvOptions: {
+        delimiter: options.delimiter || ',',
+        shouldAppendQuotes: (_options$shouldAppend = options.shouldAppendQuotes) != null ? _options$shouldAppend : true,
+        includeHeaders: (_options$includeHeade = options.includeHeaders) != null ? _options$includeHeade : true,
+        includeColumnGroupsHeaders: (_options$includeColum = options.includeColumnGroupsHeaders) != null ? _options$includeColum : true,
+        escapeFormulas: (_options$escapeFormul = options.escapeFormulas) != null ? _options$escapeFormul : true
+      },
       ignoreValueFormatter,
-      apiRef,
-      shouldAppendQuotes: (_options$shouldAppend = options.shouldAppendQuotes) != null ? _options$shouldAppend : true
+      apiRef
     });
   }, [logger, apiRef, ignoreValueFormatter]);
   const exportDataAsCsv = React.useCallback(options => {

package/hooks/features/virtualization/useGridVirtualScroller.js

@@ -63,7 +63,6 @@ const MEMOIZE_OPTIONS = {
   maxSize: 3
 };
 export const useGridVirtualScroller = props => {
-  var _currentPage$range3, _currentPage$range4;
   const apiRef = useGridPrivateApiContext();
   const rootProps = useGridRootProps();
   const visibleColumns = useGridSelector(apiRef, gridVisibleColumnDefinitionsSelector);
@@ -134,27 +133,6 @@ export const useGridVirtualScroller = props => {
     }
     return -1;
   }, [cellFocus, visibleColumns]);
-  const getNearestIndexToRender = React.useCallback(offset => {
-    var _currentPage$range, _currentPage$range2;
-    const lastMeasuredIndexRelativeToAllRows = apiRef.current.getLastMeasuredRowIndex();
-    let allRowsMeasured = lastMeasuredIndexRelativeToAllRows === Infinity;
-    if ((_currentPage$range = currentPage.range) != null && _currentPage$range.lastRowIndex && !allRowsMeasured) {
-      // Check if all rows in this page are already measured
-      allRowsMeasured = lastMeasuredIndexRelativeToAllRows >= currentPage.range.lastRowIndex;
-    }
-    const lastMeasuredIndexRelativeToCurrentPage = clamp(lastMeasuredIndexRelativeToAllRows - (((_currentPage$range2 = currentPage.range) == null ? void 0 : _currentPage$range2.firstRowIndex) || 0), 0, rowsMeta.positions.length);
-    if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndexRelativeToCurrentPage] >= offset) {
-      // If all rows were measured (when no row has "auto" as height) or all rows before the offset
-      // were measured, then use a binary search because it's faster.
-      return binarySearch(offset, rowsMeta.positions);
-    }
-
-    // Otherwise, use an exponential search.
-    // If rows have "auto" as height, their positions will be based on estimated heights.
-    // In this case, we can skip several steps until we find a position higher than the offset.
-    // Inspired by https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/utils/CellSizeAndPositionManager.js
-    return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndexRelativeToCurrentPage);
-  }, [apiRef, (_currentPage$range3 = currentPage.range) == null ? void 0 : _currentPage$range3.firstRowIndex, (_currentPage$range4 = currentPage.range) == null ? void 0 : _currentPage$range4.lastRowIndex, rowsMeta.positions]);
   const computeRenderContext = React.useCallback(() => {
     if (!enabled) {
       return {
@@ -171,8 +149,8 @@ export const useGridVirtualScroller = props => {
 
     // Clamp the value because the search may return an index out of bounds.
     // In the last index, this is not needed because Array.slice doesn't include it.
-    const firstRowIndex = Math.min(getNearestIndexToRender(top), rowsMeta.positions.length - 1);
-    const lastRowIndex = rootProps.autoHeight ? firstRowIndex + currentPage.rows.length : getNearestIndexToRender(top + containerDimensions.height);
+    const firstRowIndex = Math.min(getNearestIndexToRender(apiRef, currentPage, rowsMeta, top), rowsMeta.positions.length - 1);
+    const lastRowIndex = rootProps.autoHeight ? firstRowIndex + currentPage.rows.length : getNearestIndexToRender(apiRef, currentPage, rowsMeta, top + containerDimensions.height);
     let firstColumnIndex = 0;
     let lastColumnIndex = columnPositions.length;
     if (enabledForColumns) {
@@ -199,7 +177,7 @@ export const useGridVirtualScroller = props => {
       firstColumnIndex,
       lastColumnIndex
     };
-  }, [enabled, enabledForColumns, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerDimensions]);
+  }, [enabled, enabledForColumns, rowsMeta, rootProps.autoHeight, rootProps.rowBuffer, currentPage, columnPositions, visibleColumns.length, apiRef, containerDimensions]);
   useEnhancedEffect(() => {
     if (enabled) {
       // TODO a scroll reset should not be necessary
@@ -470,7 +448,7 @@ export const useGridVirtualScroller = props => {
     const rows = [];
     let isRowWithFocusedCellRendered = false;
     for (let i = 0; i < renderedRows.length; i += 1) {
-      var _currentPage$range5;
+      var _currentPage$range;
       const {
         id,
         model
@@ -504,7 +482,7 @@ export const useGridVirtualScroller = props => {
         const style = _extends({}, rowStyle, rootRowStyle);
         rowStyleCache.current[id] = style;
       }
-      let index = rowIndexOffset + ((currentPage == null || (_currentPage$range5 = currentPage.range) == null ? void 0 : _currentPage$range5.firstRowIndex) || 0) + firstRowToRender + i;
+      let index = rowIndexOffset + ((currentPage == null || (_currentPage$range = currentPage.range) == null ? void 0 : _currentPage$range.firstRowIndex) || 0) + firstRowToRender + i;
       if (isRowWithFocusedCellNotInRange && (cellFocus == null ? void 0 : cellFocus.id) === id) {
         index = indexOfRowWithFocusedCell;
         isRowWithFocusedCellRendered = true;
@@ -597,4 +575,25 @@ export const useGridVirtualScroller = props => {
       role: 'rowgroup'
     })
   };
-};
+};
+function getNearestIndexToRender(apiRef, currentPage, rowsMeta, offset) {
+  var _currentPage$range2, _currentPage$range3;
+  const lastMeasuredIndexRelativeToAllRows = apiRef.current.getLastMeasuredRowIndex();
+  let allRowsMeasured = lastMeasuredIndexRelativeToAllRows === Infinity;
+  if ((_currentPage$range2 = currentPage.range) != null && _currentPage$range2.lastRowIndex && !allRowsMeasured) {
+    // Check if all rows in this page are already measured
+    allRowsMeasured = lastMeasuredIndexRelativeToAllRows >= currentPage.range.lastRowIndex;
+  }
+  const lastMeasuredIndexRelativeToCurrentPage = clamp(lastMeasuredIndexRelativeToAllRows - (((_currentPage$range3 = currentPage.range) == null ? void 0 : _currentPage$range3.firstRowIndex) || 0), 0, rowsMeta.positions.length);
+  if (allRowsMeasured || rowsMeta.positions[lastMeasuredIndexRelativeToCurrentPage] >= offset) {
+    // If all rows were measured (when no row has "auto" as height) or all rows before the offset
+    // were measured, then use a binary search because it's faster.
+    return binarySearch(offset, rowsMeta.positions);
+  }
+
+  // Otherwise, use an exponential search.
+  // If rows have "auto" as height, their positions will be based on estimated heights.
+  // In this case, we can skip several steps until we find a position higher than the offset.
+  // Inspired by https://github.com/bvaughn/react-virtualized/blob/master/source/Grid/utils/CellSizeAndPositionManager.js
+  return exponentialSearch(offset, rowsMeta.positions, lastMeasuredIndexRelativeToCurrentPage);
+}

package/index.js

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

package/legacy/hooks/features/clipboard/useGridClipboard.js

@@ -68,18 +68,21 @@ export var useGridClipboard = function useGridClipboard(apiRef, props) {
     if (selectedRows.size > 0) {
       textToCopy = apiRef.current.getDataAsCsv({
         includeHeaders: false,
-        // TODO: make it configurable
         delimiter: clipboardCopyCellDelimiter,
-        shouldAppendQuotes: false
+        shouldAppendQuotes: false,
+        escapeFormulas: false
       });
     } else {
       var focusedCell = gridFocusCellSelector(apiRef);
       if (focusedCell) {
         var cellParams = apiRef.current.getCellParams(focusedCell.id, focusedCell.field);
         textToCopy = serializeCellValue(cellParams, {
-          delimiterCharacter: clipboardCopyCellDelimiter,
-          ignoreValueFormatter: ignoreValueFormatter,
-          shouldAppendQuotes: false
+          csvOptions: {
+            delimiter: clipboardCopyCellDelimiter,
+            shouldAppendQuotes: false,
+            escapeFormulas: false
+          },
+          ignoreValueFormatter: ignoreValueFormatter
         });
       }
     }

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

@@ -2,16 +2,22 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { GRID_CHECKBOX_SELECTION_COL_DEF } from '../../../../colDef';
 import { buildWarning } from '../../../../utils/warning';
-function sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes) {
+function sanitizeCellValue(value, csvOptions) {
   if (typeof value === 'string') {
-    if (shouldAppendQuotes) {
+    if (csvOptions.shouldAppendQuotes || csvOptions.escapeFormulas) {
       var escapedValue = value.replace(/"/g, '""');
-      // Make sure value containing delimiter or line break won't be split into multiple rows
-      if ([delimiterCharacter, '\n', '\r', '"'].some(function (delimiter) {
+      // Make sure value containing delimiter or line break won't be split into multiple cells
+      if ([csvOptions.delimiter, '\n', '\r', '"'].some(function (delimiter) {
         return value.includes(delimiter);
       })) {
         return "\"".concat(escapedValue, "\"");
       }
+      if (csvOptions.escapeFormulas) {
+        // See https://owasp.org/www-community/attacks/CSV_Injection
+        if (['=', '+', '-', '@', '\t', '\r'].includes(escapedValue[0])) {
+          return "'".concat(escapedValue);
+        }
+      }
       return escapedValue;
     }
     return value;
@@ -19,9 +25,8 @@ function sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes) {
   return value;
 }
 export var serializeCellValue = function serializeCellValue(cellParams, options) {
-  var delimiterCharacter = options.delimiterCharacter,
-    ignoreValueFormatter = options.ignoreValueFormatter,
-    shouldAppendQuotes = options.shouldAppendQuotes;
+  var csvOptions = options.csvOptions,
+    ignoreValueFormatter = options.ignoreValueFormatter;
   var value;
   if (ignoreValueFormatter) {
     var _cellParams$value2;
@@ -39,7 +44,7 @@ export var serializeCellValue = function serializeCellValue(cellParams, options)
   } else {
     value = cellParams.formattedValue;
   }
-  return sanitizeCellValue(value, delimiterCharacter, shouldAppendQuotes);
+  return sanitizeCellValue(value, csvOptions);
 };
 var objectFormattedValueWarning = 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.']);
 var CSVRow = /*#__PURE__*/function () {
@@ -54,12 +59,12 @@ var CSVRow = /*#__PURE__*/function () {
     key: "addValue",
     value: function addValue(value) {
       if (!this.isEmpty) {
-        this.rowString += this.options.delimiterCharacter;
+        this.rowString += this.options.csvOptions.delimiter;
       }
       if (value === null || value === undefined) {
         this.rowString += '';
       } else if (typeof this.options.sanitizeCellValue === 'function') {
-        this.rowString += this.options.sanitizeCellValue(value, this.options.delimiterCharacter, this.options.shouldAppendQuotes);
+        this.rowString += this.options.sanitizeCellValue(value, this.options.csvOptions);
       } else {
         this.rowString += value;
       }
@@ -77,12 +82,10 @@ var serializeRow = function serializeRow(_ref) {
   var id = _ref.id,
     columns = _ref.columns,
     getCellParams = _ref.getCellParams,
-    delimiterCharacter = _ref.delimiterCharacter,
-    ignoreValueFormatter = _ref.ignoreValueFormatter,
-    shouldAppendQuotes = _ref.shouldAppendQuotes;
+    csvOptions = _ref.csvOptions,
+    ignoreValueFormatter = _ref.ignoreValueFormatter;
   var row = new CSVRow({
-    delimiterCharacter: delimiterCharacter,
-    shouldAppendQuotes: shouldAppendQuotes
+    csvOptions: csvOptions
   });
   columns.forEach(function (column) {
     var cellParams = getCellParams(id, column.field);
@@ -92,9 +95,8 @@ var serializeRow = function serializeRow(_ref) {
       }
     }
     row.addValue(serializeCellValue(cellParams, {
-      delimiterCharacter: delimiterCharacter,
       ignoreValueFormatter: ignoreValueFormatter,
-      shouldAppendQuotes: shouldAppendQuotes
+      csvOptions: csvOptions
     }));
   });
   return row.getRowString();
@@ -102,30 +104,26 @@ var serializeRow = function serializeRow(_ref) {
 export function buildCSV(options) {
   var columns = options.columns,
     rowIds = options.rowIds,
-    delimiterCharacter = options.delimiterCharacter,
-    includeHeaders = options.includeHeaders,
-    includeColumnGroupsHeaders = options.includeColumnGroupsHeaders,
+    csvOptions = options.csvOptions,
     ignoreValueFormatter = options.ignoreValueFormatter,
-    apiRef = options.apiRef,
-    shouldAppendQuotes = options.shouldAppendQuotes;
+    apiRef = options.apiRef;
   var CSVBody = rowIds.reduce(function (acc, id) {
     return "".concat(acc).concat(serializeRow({
       id: id,
       columns: columns,
       getCellParams: apiRef.current.getCellParams,
-      delimiterCharacter: delimiterCharacter,
       ignoreValueFormatter: ignoreValueFormatter,
-      shouldAppendQuotes: shouldAppendQuotes
+      csvOptions: csvOptions
     }), "\r\n");
   }, '').trim();
-  if (!includeHeaders) {
+  if (!csvOptions.includeHeaders) {
     return CSVBody;
   }
   var filteredColumns = columns.filter(function (column) {
     return column.field !== GRID_CHECKBOX_SELECTION_COL_DEF.field;
   });
   var headerRows = [];
-  if (includeColumnGroupsHeaders) {
+  if (csvOptions.includeColumnGroupsHeaders) {
     var columnGroupLookup = apiRef.current.unstable_getAllGroupDetails();
     var maxColumnGroupsDepth = 0;
     var columnGroupPathsLookup = filteredColumns.reduce(function (acc, column) {
@@ -136,9 +134,8 @@ export function buildCSV(options) {
     }, {});
     var _loop = function _loop(i) {
       var headerGroupRow = new CSVRow({
-        delimiterCharacter: delimiterCharacter,
-        sanitizeCellValue: sanitizeCellValue,
-        shouldAppendQuotes: shouldAppendQuotes
+        csvOptions: csvOptions,
+        sanitizeCellValue: sanitizeCellValue
       });
       headerRows.push(headerGroupRow);
       filteredColumns.forEach(function (column) {
@@ -152,9 +149,8 @@ export function buildCSV(options) {
     }
   }
   var mainHeaderRow = new CSVRow({
-    delimiterCharacter: delimiterCharacter,
-    sanitizeCellValue: sanitizeCellValue,
-    shouldAppendQuotes: shouldAppendQuotes
+    csvOptions: csvOptions,
+    sanitizeCellValue: sanitizeCellValue
   });
   filteredColumns.forEach(function (column) {
     mainHeaderRow.addValue(column.headerName || column.field);

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

@@ -21,7 +21,7 @@ export var useGridCsvExport = function useGridCsvExport(apiRef, props) {
   var ignoreValueFormatterProp = props.unstable_ignoreValueFormatterDuringExport;
   var ignoreValueFormatter = (_typeof(ignoreValueFormatterProp) === 'object' ? ignoreValueFormatterProp == null ? void 0 : ignoreValueFormatterProp.csvExport : ignoreValueFormatterProp) || false;
   var getDataAsCsv = React.useCallback(function () {
-    var _options$getRowsToExp, _options$includeHeade, _options$includeColum, _options$shouldAppend;
+    var _options$getRowsToExp, _options$shouldAppend, _options$includeHeade, _options$includeColum, _options$escapeFormul;
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     logger.debug("Get data as CSV");
     var exportedColumns = getColumnsToExport({
@@ -35,12 +35,15 @@ export var useGridCsvExport = function useGridCsvExport(apiRef, props) {
     return buildCSV({
       columns: exportedColumns,
       rowIds: exportedRowIds,
-      delimiterCharacter: options.delimiter || ',',
-      includeHeaders: (_options$includeHeade = options.includeHeaders) != null ? _options$includeHeade : true,
-      includeColumnGroupsHeaders: (_options$includeColum = options.includeColumnGroupsHeaders) != null ? _options$includeColum : true,
+      csvOptions: {
+        delimiter: options.delimiter || ',',
+        shouldAppendQuotes: (_options$shouldAppend = options.shouldAppendQuotes) != null ? _options$shouldAppend : true,
+        includeHeaders: (_options$includeHeade = options.includeHeaders) != null ? _options$includeHeade : true,
+        includeColumnGroupsHeaders: (_options$includeColum = options.includeColumnGroupsHeaders) != null ? _options$includeColum : true,
+        escapeFormulas: (_options$escapeFormul = options.escapeFormulas) != null ? _options$escapeFormul : true
+      },
       ignoreValueFormatter: ignoreValueFormatter,
-      apiRef: apiRef,
-      shouldAppendQuotes: (_options$shouldAppend = options.shouldAppendQuotes) != null ? _options$shouldAppend : true
+      apiRef: apiRef
     });
   }, [logger, apiRef, ignoreValueFormatter]);
   var exportDataAsCsv = React.useCallback(function (options) {