Work

docs/src/pages/components/data-grid/components/CustomSortIcons.js

@@ -1,49 +0,0 @@
-import * as React from 'react';
-import ExpandLessIcon from '@mui/icons-material/ExpandLess';
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import { DataGrid } from '@mui/x-data-grid';
-
-export function SortedDescendingIcon() {
-  return <ExpandMoreIcon className="icon" />;
-}
-
-export function SortedAscendingIcon() {
-  return <ExpandLessIcon className="icon" />;
-}
-
-const rows = [
-  {
-    id: 1,
-    name: 'MUI',
-    stars: 28000,
-  },
-  {
-    id: 2,
-    name: 'DataGrid',
-    stars: 15000,
-  },
-];
-
-const columns = [
-  { field: 'name', width: 150 },
-  { field: 'stars', width: 150 },
-];
-
-export default function CustomSortIcons() {
-  return (
-    <div style={{ height: 250, width: '100%' }}>
-      <DataGrid
-        columns={columns}
-        rows={rows}
-        sortModel={[
-          { field: 'name', sort: 'asc' },
-          { field: 'stars', sort: 'desc' },
-        ]}
-        components={{
-          ColumnSortedDescendingIcon: SortedDescendingIcon,
-          ColumnSortedAscendingIcon: SortedAscendingIcon,
-        }}
-      />
-    </div>
-  );
-}

docs/src/pages/components/data-grid/state/RestoreStateApiRef.js

@@ -141,6 +141,7 @@ ViewListItem.propTypes = {
     label: PropTypes.string.isRequired,
     value: PropTypes.shape({
       columns: PropTypes.shape({
+        columns: PropTypes.arrayOf(PropTypes.object),
         columnVisibilityModel: PropTypes.object,
       }),
       filter: PropTypes.shape({

packages/grid/x-data-grid/src/tests/columns.DataGrid.test.tsx

@@ -25,7 +25,7 @@ describe('<DataGridPro /> - Columns', () => {
     </div>
   );
 
-  describe.only('prop: initialState.columns.columns', () => {
+  describe('prop: initialState.columns.columns', () => {
     it('should allow to initialize the columns order and dimensions', () => {
       render(
         <TestDataGrid