diff --git a/docs/data/material/components/table/DataTable.js b/docs/data/material/components/table/DataTable.js index 140a43ac724245..19223749a35a33 100644 --- a/docs/data/material/components/table/DataTable.js +++ b/docs/data/material/components/table/DataTable.js @@ -17,8 +17,7 @@ const columns = [ description: 'This column has a value getter and is not sortable.', sortable: false, width: 160, - valueGetter: (params) => - `${params.row.firstName || ''} ${params.row.lastName || ''}`, + valueGetter: (value, row) => `${row.firstName || ''} ${row.lastName || ''}`, }, ]; diff --git a/docs/data/material/components/table/DataTable.tsx b/docs/data/material/components/table/DataTable.tsx index ded4d20968901b..386a2adc0afdd6 100644 --- a/docs/data/material/components/table/DataTable.tsx +++ b/docs/data/material/components/table/DataTable.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { DataGrid, GridColDef, GridValueGetterParams } from '@mui/x-data-grid'; +import { DataGrid, GridColDef } from '@mui/x-data-grid'; const columns: GridColDef[] = [ { field: 'id', headerName: 'ID', width: 70 }, @@ -17,8 +17,7 @@ const columns: GridColDef[] = [ description: 'This column has a value getter and is not sortable.', sortable: false, width: 160, - valueGetter: (params: GridValueGetterParams) => - `${params.row.firstName || ''} ${params.row.lastName || ''}`, + valueGetter: (value, row) => `${row.firstName || ''} ${row.lastName || ''}`, }, ]; diff --git a/docs/data/material/components/table/table.md b/docs/data/material/components/table/table.md index a597243c90fa8c..a51d2b2d9833e6 100644 --- a/docs/data/material/components/table/table.md +++ b/docs/data/material/components/table/table.md @@ -33,6 +33,11 @@ This constraint makes building rich data tables challenging. The [`DataGrid` component](/x/react-data-grid/) is designed for use-cases that are focused on handling large amounts of tabular data. While it comes with a more rigid structure, in exchange, you gain more powerful features. +:::info +The demo below uses the MUI X Data Grid v7, which is currently in beta. +Visit [the documentation](https://next.mui.com/x/react-data-grid/) to learn more about it. +::: + {{"demo": "DataTable.js", "bg": "inline"}} ## Dense table diff --git a/docs/package.json b/docs/package.json index 922a25c5c5730a..dc1b044b649314 100644 --- a/docs/package.json +++ b/docs/package.json @@ -46,10 +46,10 @@ "@mui/types": "workspace:^", "@mui/utils": "workspace:^", "@mui/x-charts": "6.19.5", - "@mui/x-data-grid": "6.19.6", - "@mui/x-data-grid-generator": "6.19.6", - "@mui/x-data-grid-premium": "6.19.6", - "@mui/x-data-grid-pro": "6.19.6", + "@mui/x-data-grid": "7.0.0-beta.6", + "@mui/x-data-grid-generator": "7.0.0-beta.6", + "@mui/x-data-grid-premium": "7.0.0-beta.6", + "@mui/x-data-grid-pro": "7.0.0-beta.6", "@mui/x-date-pickers": "6.19.6", "@mui/x-date-pickers-pro": "6.19.6", "@mui/x-license-pro": "6.10.2", diff --git a/docs/src/components/home/XGridGlobalStyles.tsx b/docs/src/components/home/XGridGlobalStyles.tsx index f0f7796bdddda7..a8925787b9d43e 100644 --- a/docs/src/components/home/XGridGlobalStyles.tsx +++ b/docs/src/components/home/XGridGlobalStyles.tsx @@ -18,6 +18,7 @@ export default function XGridGlobalStyles({ border: 'none', fontSize: '0.75rem', borderRadius: '0px', + '--DataGrid-rowBorderColor': (theme.vars || theme).palette.grey[200], // toolbar // style GridToolbar '& .MuiDataGrid-toolbarContainer': { @@ -51,9 +52,6 @@ export default function XGridGlobalStyles({ '& .MuiDataGrid-menuIcon svg': { fontSize: '1rem', }, - '& .MuiDataGrid-columnHeaders': { - borderColor: (theme.vars || theme).palette.grey[200], - }, '& .MuiDataGrid-columnSeparator': { color: (theme.vars || theme).palette.grey[200], '&:hover': { @@ -66,10 +64,6 @@ export default function XGridGlobalStyles({ '& .MuiDataGrid-virtualScroller': { backgroundColor: (theme.vars || theme).palette.grey[50], }, - '& .MuiDataGrid-cell': { - borderBottom: '1px solid', - borderColor: (theme.vars || theme).palette.grey[200], - }, '& .MuiDataGrid-editInputCell': { fontSize: '0.75rem', '& > input': { @@ -118,6 +112,7 @@ export default function XGridGlobalStyles({ theme.applyDarkStyles({ [selector]: { '& .MuiDataGrid-root': { + '--DataGrid-rowBorderColor': alpha(theme.palette.primaryDark[500], 0.5), '& .MuiDataGrid-toolbarContainer': { '& > button': { borderColor: (theme.vars || theme).palette.divider, @@ -129,9 +124,6 @@ export default function XGridGlobalStyles({ '& .MuiIconButton-root:not(.Mui-disabled)': { color: (theme.vars || theme).palette.primary[300], }, - '& .MuiDataGrid-columnHeaders': { - borderColor: (theme.vars || theme).palette.divider, - }, '& .MuiDataGrid-columnSeparator': { color: (theme.vars || theme).palette.primaryDark[400], '&:hover': { @@ -143,9 +135,6 @@ export default function XGridGlobalStyles({ '& .MuiDataGrid-virtualScroller': { backgroundColor: (theme.vars || theme).palette.primaryDark[900], }, - '& .MuiDataGrid-cell': { - borderColor: alpha(theme.palette.primaryDark[500], 0.5), - }, '& .MuiTablePagination-root': { '& .MuiIconButton-root': { '&:not([disabled])': { diff --git a/docs/src/components/productX/XGridFullDemo.tsx b/docs/src/components/productX/XGridFullDemo.tsx index 23a226eb81832b..194cdd8d9136c7 100644 --- a/docs/src/components/productX/XGridFullDemo.tsx +++ b/docs/src/components/productX/XGridFullDemo.tsx @@ -269,8 +269,8 @@ export default function XGridFullDemo() { theme.palette.grey[200], '& .MuiCheckbox-root': { p: 0.5, '& > svg': { fontSize: '1.25rem', }, }, - '& .MuiDataGrid-columnHeaders': { - borderBottom: '1px solid', - borderColor: 'grey.200', - }, [`& .MuiDataGrid-columnHeader:focus, & .MuiDataGrid-columnHeader:focus-within`]: { outline: 'none', @@ -188,22 +185,6 @@ export default function XHero() { '& button, & button > svg': { fontSize: 16, }, - '& .MuiDataGrid-cell': { - fontSize: '0.875rem', - color: 'text.secondary', - borderBottom: '1px solid', - borderColor: 'grey.200', - }, - '& .MuiDataGrid-viewport': { - '& .MuiDataGrid-cell': { - fontSize: '0.875rem', - color: 'text.secondary', - }, - '& .MuiInputBase-input': { - fontSize: '0.875rem', - px: 0.5, - }, - }, '& .MuiChip-root.Rejected': { color: red[800], backgroundColor: red[50], @@ -232,12 +213,7 @@ export default function XHero() { (theme) => theme.applyDarkStyles({ '& .MuiDataGrid-root': { - '& .MuiDataGrid-columnHeaders': { - borderColor: 'divider', - }, - '& .MuiDataGrid-cell': { - borderColor: alpha(theme.palette.primaryDark[600], 0.5), - }, + '--DataGrid-rowBorderColor': alpha(theme.palette.primaryDark[600], 0.5), '& .MuiChip-root.Rejected': { color: red[200], backgroundColor: alpha(red[900], 0.2), diff --git a/docs/src/components/productX/XTheming.tsx b/docs/src/components/productX/XTheming.tsx index a2571519f4a0c1..42bd5aee4f5dc8 100644 --- a/docs/src/components/productX/XTheming.tsx +++ b/docs/src/components/productX/XTheming.tsx @@ -40,7 +40,7 @@ export default function XTheming() { const columns: Array = [ { field: 'desk', - headerName: 'desk', + headerName: 'Desk', width: customized ? 72 : 100, sortable: false, editable: true, @@ -65,6 +65,7 @@ export default function XTheming() { sortable: false, editable: true, ...(customized && { + display: 'flex', renderCell: (params: GridCellParams) => { return ; }, @@ -81,6 +82,7 @@ export default function XTheming() { sortable: false, editable: true, ...(customized && { + display: 'flex', renderCell: (params: GridCellParams) => { return ; }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90b1d2655f346e..5af7b9880151c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -519,17 +519,17 @@ importers: specifier: 6.19.5 version: 6.19.5(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/x-data-grid': - specifier: 6.19.6 - version: 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + specifier: 7.0.0-beta.6 + version: 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/x-data-grid-generator': - specifier: 6.19.6 - version: 6.19.6(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + specifier: 7.0.0-beta.6 + version: 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/x-data-grid-premium': - specifier: 6.19.6 - version: 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + specifier: 7.0.0-beta.6 + version: 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/x-data-grid-pro': - specifier: 6.19.6 - version: 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + specifier: 7.0.0-beta.6 + version: 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/x-date-pickers': specifier: 6.19.6 version: 6.19.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(react-dom@18.2.0)(react@18.2.0) @@ -5118,7 +5118,7 @@ packages: '@babel/runtime': 7.23.9 '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.55) - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@popperjs/core': 2.11.8 '@types/react': 18.2.55 clsx: 2.1.0 @@ -5141,7 +5141,30 @@ packages: '@babel/runtime': 7.23.9 '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.55) - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) + '@popperjs/core': 2.11.8 + '@types/react': 18.2.55 + clsx: 2.1.0 + prop-types: 15.8.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /@mui/base@5.0.0-beta.37(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-/o3anbb+DeCng8jNsd3704XtmmLDZju1Fo8R2o7ugrVtPQ/QpcqddwKNzKPZwa0J5T8YNW3ZVuHyQgbTnQLisQ==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/react': ^18.2.55 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + dependencies: + '@babel/runtime': 7.23.9 + '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0) + '@mui/types': 7.2.13(@types/react@18.2.55) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@popperjs/core': 2.11.8 '@types/react': 18.2.55 clsx: 2.1.0 @@ -5176,9 +5199,9 @@ packages: '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.55)(react@18.2.0) '@mui/base': 5.0.0-beta.31(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/core-downloads-tracker': 5.15.8 - '@mui/system': 5.15.8(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) + '@mui/system': 5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.55) - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react': 18.2.55 clsx: 2.1.0 prop-types: 15.8.1 @@ -5208,9 +5231,9 @@ packages: '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.55)(react@18.2.0) '@mui/base': 5.0.0-beta.31(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/core-downloads-tracker': 5.15.8 - '@mui/system': 5.15.8(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) + '@mui/system': 5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.55) - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react': 18.2.55 '@types/react-transition-group': 4.4.10 clsx: 2.1.0 @@ -5222,8 +5245,8 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.15.8(@types/react@18.2.55)(react@18.2.0): - resolution: {integrity: sha512-HMDPO416iMZPqs8nGUL3GJMDNpJtE1Uefw/Aw+zTKJHX5JnT+Bms41e2065BUT/zR5dYcKjFP4gQMwW5QX7nvA==} + /@mui/private-theming@5.15.12(@types/react@18.2.55)(react@18.2.0): + resolution: {integrity: sha512-cqoSo9sgA5HE+8vZClbLrq9EkyOnYysooepi5eKaKvJ41lReT2c5wOZAeDDM1+xknrMDos+0mT2zr3sZmUiRRA==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^18.2.55 @@ -5233,14 +5256,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.9 - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react': 18.2.55 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/styled-engine@5.15.8(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0): - resolution: {integrity: sha512-31ZKPGsS0OiSwuzi8RWoTiWRdUWXPRiOQkyG9bRYX/zvoYeBXEdbsLEgbryug5mVRsPpvwbH5q/i/t6MkjQ71g==} + /@mui/styled-engine@5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0): + resolution: {integrity: sha512-So21AhAngqo07ces4S/JpX5UaMU2RHXpEA6hNzI6IQjd/1usMPxpgK8wkGgTe3JKmC2KDmH8cvoycq5H3Ii7/w==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -5261,8 +5284,8 @@ packages: react: 18.2.0 dev: false - /@mui/system@5.15.8(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0): - resolution: {integrity: sha512-BUMJvlz1UqIqDPyrvc+MwjOUkWKskUPAOUuRh2KMAworiXuuUmtIivxSfdGll2ex6RHSylu4yc5dJZByOI8EcQ==} + /@mui/system@5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0): + resolution: {integrity: sha512-/pq+GO6yN3X7r3hAwFTrzkAh7K1bTF5r8IzS79B9eyKJg7v6B/t4/zZYMR6OT9qEPtwf6rYN2Utg1e6Z7F1OgQ==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -5280,10 +5303,10 @@ packages: '@babel/runtime': 7.23.9 '@emotion/react': 11.11.4(@types/react@18.2.55)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.55)(react@18.2.0) - '@mui/private-theming': 5.15.8(@types/react@18.2.55)(react@18.2.0) - '@mui/styled-engine': 5.15.8(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0) + '@mui/private-theming': 5.15.12(@types/react@18.2.55)(react@18.2.0) + '@mui/styled-engine': 5.15.11(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.55) - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react': 18.2.55 clsx: 2.1.0 csstype: 3.1.3 @@ -5302,8 +5325,8 @@ packages: '@types/react': 18.2.55 dev: false - /@mui/utils@5.15.8(@types/react@18.2.55)(react@18.2.0): - resolution: {integrity: sha512-Q6Z/xSxi1Z6xQ5Qj9p4ZTHudwfrrwFALtU6H1O222pXudg9Qm0zHdiwJQiHT9L6jMIN78ZujEfGHserMoHUrQw==} + /@mui/utils@5.15.12(@types/react@18.2.55)(react@18.2.0): + resolution: {integrity: sha512-8SDGCnO2DY9Yy+5bGzu00NZowSDtuyHP4H8gunhHGQoIlhlY2Z3w64wBzAOLpYw/ZhJNzksDTnS/i8qdJvxuow==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^18.2.55 @@ -5355,71 +5378,72 @@ packages: - '@types/react' dev: false - /@mui/x-data-grid-generator@6.19.6(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-NULYBJgJQpTcQlp6uPPGIzWfYEagi+rdsxKCpTDQLuWQ8sCCgTA/f9NLC0cmev8DQSb0utvIBTdWq3sTT1rzAQ==} + /@mui/x-data-grid-generator@7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-c97vTSISYHp4MNAbYApjOZIf8d/Xe6Y0TQG0iZi91PtdX4ixwbtOhZtNwqTpXNan5sBi/Qqm07U7IHMS7BC90w==} engines: {node: '>=14.0.0'} peerDependencies: '@mui/icons-material': ^5.4.1 - '@mui/material': ^5.4.1 + '@mui/material': ^5.15.0 react: ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.23.9 - '@mui/base': 5.0.0-beta.30(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + '@mui/base': 5.0.0-beta.37(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/icons-material': link:packages/mui-icons-material/build '@mui/material': link:packages/mui-material/build - '@mui/x-data-grid-premium': 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + '@mui/x-data-grid-premium': 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) chance: 1.1.11 clsx: 2.1.0 lru-cache: 7.18.3 react: 18.2.0 transitivePeerDependencies: - - '@mui/system' + - '@emotion/react' + - '@emotion/styled' - '@types/react' - react-dom dev: false - /@mui/x-data-grid-premium@6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-G0wQeagVcq2Sl8yDWVXolJk6JJwVIzeW9wUU55niF9a+i1VN0r8Wipp858liIA3A+sS++H/Ai6CDyx7KwqylhQ==} + /@mui/x-data-grid-premium@7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Gb+kVOaXw8v4knU8kjds9I+qrBEdkeWuF823NhTDd4F3DNH+9QAQ05M+QW+zTyrLx3TzIT3XcsTlpSBReNWh1g==} engines: {node: '>=14.0.0'} peerDependencies: - '@mui/material': ^5.4.1 - '@mui/system': ^5.4.1 + '@mui/material': ^5.15.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.23.9 '@mui/material': link:packages/mui-material/build - '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) - '@mui/x-data-grid': 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) - '@mui/x-data-grid-pro': 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) - '@mui/x-license-pro': 6.10.2(@types/react@18.2.55)(react@18.2.0) + '@mui/system': 5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) + '@mui/x-data-grid': 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + '@mui/x-data-grid-pro': 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + '@mui/x-license': 7.0.0-beta.6(@types/react@18.2.55)(react@18.2.0) '@types/format-util': 1.0.4 clsx: 2.1.0 - exceljs: 4.3.0 + exceljs: 4.4.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) reselect: 4.1.8 transitivePeerDependencies: + - '@emotion/react' + - '@emotion/styled' - '@types/react' dev: false - /@mui/x-data-grid-pro@6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Bh2qvRHoHxgrUHKMeu46VRzl2lOSvxjtPAhJncRUJuYE6hVu2VZxvqrdmdxdIWkom2ygpFwq6YP6xMJsDFX+QQ==} + /@mui/x-data-grid-pro@7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-3Z8m66vyDAQeMZM8zcL/jXJEbKLuAq+wnIsMkMkN3Z+d1m6rqyvbyvWhz4tMg+SK86Ao6Kqmc4dR5Jy3v3QqGA==} engines: {node: '>=14.0.0'} peerDependencies: - '@mui/material': ^5.4.1 - '@mui/system': ^5.4.1 + '@mui/material': ^5.15.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.23.9 '@mui/material': link:packages/mui-material/build - '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) - '@mui/x-data-grid': 6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) - '@mui/x-license-pro': 6.10.2(@types/react@18.2.55)(react@18.2.0) + '@mui/system': 5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) + '@mui/x-data-grid': 7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) + '@mui/x-license': 7.0.0-beta.6(@types/react@18.2.55)(react@18.2.0) '@types/format-util': 1.0.4 clsx: 2.1.0 prop-types: 15.8.1 @@ -5427,28 +5451,31 @@ packages: react-dom: 18.2.0(react@18.2.0) reselect: 4.1.8 transitivePeerDependencies: + - '@emotion/react' + - '@emotion/styled' - '@types/react' dev: false - /@mui/x-data-grid@6.19.6(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-jpZkX1Gnlo87gKcD10mKMY8YoAzUD8Cv3/IvedH3FINDKO3hnraMeOciKDeUk0tYSj8RUDB02kpTHCM8ojLVBA==} + /@mui/x-data-grid@7.0.0-beta.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-CNv86iHxLSNbDR/vAR7c0tQls7zzu5sJ4YxFdbwPgHTwfIt1OQRsKKlR+51QFKO/e677r20EKu4LHcqU5y/pyQ==} engines: {node: '>=14.0.0'} peerDependencies: - '@mui/material': ^5.4.1 - '@mui/system': ^5.4.1 + '@mui/material': ^5.15.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.23.9 '@mui/material': link:packages/mui-material/build - '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/system': 5.15.12(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) clsx: 2.1.0 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) reselect: 4.1.8 transitivePeerDependencies: + - '@emotion/react' + - '@emotion/styled' - '@types/react' dev: false @@ -5495,7 +5522,7 @@ packages: '@mui/base': 5.0.0-beta.30(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/material': link:packages/mui-material/build '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@mui/x-date-pickers': 6.19.6(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@packages+mui-material+build)(@mui/system@packages+mui-system+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(react-dom@18.2.0)(react@18.2.0) '@mui/x-license-pro': 6.10.2(@types/react@18.2.55)(react@18.2.0) clsx: 2.1.0 @@ -5552,7 +5579,7 @@ packages: '@mui/base': 5.0.0-beta.30(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/material': link:packages/mui-material/build '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react-transition-group': 4.4.10 clsx: 2.1.0 date-fns: 2.30.0 @@ -5572,7 +5599,20 @@ packages: react: ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.23.9 - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) + react: 18.2.0 + transitivePeerDependencies: + - '@types/react' + dev: false + + /@mui/x-license@7.0.0-beta.6(@types/react@18.2.55)(react@18.2.0): + resolution: {integrity: sha512-S1HYQFf9DqDfjNN1nxPvrHyp+lhkcGUeSTpCEpzX9FX9ZfRuZEP9n9B3Vh3QuuXlETRK4aLg4jWKws5kzAoWgg==} + engines: {node: '>=14.0.0'} + peerDependencies: + react: ^17.0.0 || ^18.0.0 + dependencies: + '@babel/runtime': 7.23.9 + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) react: 18.2.0 transitivePeerDependencies: - '@types/react' @@ -5595,7 +5635,7 @@ packages: '@mui/base': 5.0.0-beta.30(@types/react@18.2.55)(react-dom@18.2.0)(react@18.2.0) '@mui/material': link:packages/mui-material/build '@mui/system': link:packages/mui-system/build - '@mui/utils': 5.15.8(@types/react@18.2.55)(react@18.2.0) + '@mui/utils': 5.15.12(@types/react@18.2.55)(react@18.2.0) '@types/react-transition-group': 4.4.10 clsx: 2.1.0 prop-types: 15.8.1 @@ -11886,8 +11926,8 @@ packages: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} - /exceljs@4.3.0: - resolution: {integrity: sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==} + /exceljs@4.4.0: + resolution: {integrity: sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==} engines: {node: '>=8.3.0'} dependencies: archiver: 5.3.1