diff --git a/docs/data/data-grid/export/ExportDefaultToolbar.js b/docs/data/data-grid/export/ExportDefaultToolbar.js index 0d8dfe3310267..79435dbede68f 100644 --- a/docs/data/data-grid/export/ExportDefaultToolbar.js +++ b/docs/data/data-grid/export/ExportDefaultToolbar.js @@ -5,7 +5,7 @@ import { DataGrid, GridToolbar } from '@mui/x-data-grid'; export default function ExportDefaultToolbar() { const { data, loading } = useDemoData({ dataSet: 'Commodity', - rowLength: 4, + rowLength: 50, maxColumns: 6, }); diff --git a/docs/data/data-grid/export/ExportDefaultToolbar.tsx b/docs/data/data-grid/export/ExportDefaultToolbar.tsx index 0d8dfe3310267..79435dbede68f 100644 --- a/docs/data/data-grid/export/ExportDefaultToolbar.tsx +++ b/docs/data/data-grid/export/ExportDefaultToolbar.tsx @@ -5,7 +5,7 @@ import { DataGrid, GridToolbar } from '@mui/x-data-grid'; export default function ExportDefaultToolbar() { const { data, loading } = useDemoData({ dataSet: 'Commodity', - rowLength: 4, + rowLength: 50, maxColumns: 6, }); diff --git a/packages/x-data-grid/src/hooks/features/export/useGridPrintExport.tsx b/packages/x-data-grid/src/hooks/features/export/useGridPrintExport.tsx index 650cf8e9b6c08..0957d63056f46 100644 --- a/packages/x-data-grid/src/hooks/features/export/useGridPrintExport.tsx +++ b/packages/x-data-grid/src/hooks/features/export/useGridPrintExport.tsx @@ -279,8 +279,9 @@ export const useGridPrintExport = ( // Revert grid to previous state apiRef.current.restoreState(previousGridState.current || {}); + if (!previousGridState.current?.columns?.columnVisibilityModel) { - // if the apiRef.current.exportState(); did not exported the column visibility, we update it + // if the apiRef.current.exportState(); did not export the column visibility, we update it apiRef.current.setColumnVisibilityModel(previousColumnVisibility.current); } @@ -288,6 +289,7 @@ export const useGridPrintExport = ( ...state, virtualization: previousVirtualizationState.current!, })); + apiRef.current.setRows(previousRows.current); // Clear local state @@ -333,14 +335,8 @@ export const useGridPrintExport = ( })); } previousVirtualizationState.current = apiRef.current.state.virtualization; - apiRef.current.setState((state) => ({ - ...state, - virtualization: { - ...state.virtualization, - enabled: false, - enabledForColumns: false, - }, - })); + + apiRef.current.unstable_setVirtualization(false); await updateGridColumnsForPrint( options?.fields,