diff --git a/docs/data/data-grid/column-menu/CustomColumnMenuGrid.js b/docs/data/data-grid/column-menu/CustomColumnMenuGrid.js index 5393cd42d091..8b551b1c6bd7 100644 --- a/docs/data/data-grid/column-menu/CustomColumnMenuGrid.js +++ b/docs/data/data-grid/column-menu/CustomColumnMenuGrid.js @@ -30,7 +30,7 @@ function CustomColumnMenu(props) { }; return ( - + {/* Only provide filtering on desk */} {itemProps.colDef.field === 'desk' ? ( @@ -38,7 +38,7 @@ function CustomColumnMenu(props) { ) : null} - + diff --git a/docs/data/data-grid/column-menu/CustomColumnMenuGrid.tsx b/docs/data/data-grid/column-menu/CustomColumnMenuGrid.tsx index 90f7beea0dd7..bb40e473f1ae 100644 --- a/docs/data/data-grid/column-menu/CustomColumnMenuGrid.tsx +++ b/docs/data/data-grid/column-menu/CustomColumnMenuGrid.tsx @@ -27,7 +27,7 @@ function CustomColumnMenu(props: GridColumnMenuProps) { }; return ( - + {/* Only provide filtering on desk */} {itemProps.colDef.field === 'desk' ? ( @@ -35,7 +35,7 @@ function CustomColumnMenu(props: GridColumnMenuProps) { ) : null} - + diff --git a/packages/grid/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumProps.ts b/packages/grid/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumProps.ts index 01441983ec36..bfec78850bbd 100644 --- a/packages/grid/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumProps.ts +++ b/packages/grid/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumProps.ts @@ -8,7 +8,7 @@ import { } from '../models/dataGridPremiumProps'; import { GridPremiumSlotsComponent } from '../models'; import { GRID_AGGREGATION_FUNCTIONS } from '../hooks/features/aggregation'; -import { DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS } from '../constants'; +import { DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS } from '../constants/dataGridPremiumDefaultSlotsComponents'; /** * The default values of `DataGridPremiumPropsWithDefaultValue` to inject in the props of DataGridPremium. diff --git a/packages/grid/x-data-grid-premium/src/constants/dataGridPremiumDefaultSlotsComponents.ts b/packages/grid/x-data-grid-premium/src/constants/dataGridPremiumDefaultSlotsComponents.ts index 60fd1336f02e..696d00c0217c 100644 --- a/packages/grid/x-data-grid-premium/src/constants/dataGridPremiumDefaultSlotsComponents.ts +++ b/packages/grid/x-data-grid-premium/src/constants/dataGridPremiumDefaultSlotsComponents.ts @@ -1,4 +1,4 @@ -import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '@mui/x-data-grid-pro'; +import { DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from '@mui/x-data-grid-pro'; import { GridPremiumSlotsComponent, GridPremiumIconSlotsComponent } from '../models'; import { GridWorkspacesIcon, GridGroupWorkIcon, GridFunctionsIcon } from '../components'; import { GridPremiumColumnMenu } from '../components/GridPremiumColumnMenu'; @@ -10,7 +10,7 @@ export const DEFAULT_GRID_PREMIUM_ICON_SLOTS_COMPONENTS: GridPremiumIconSlotsCom }; export const DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS: GridPremiumSlotsComponent = { - ...DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS, + ...DATA_GRID_DEFAULT_SLOTS_COMPONENTS, ...DEFAULT_GRID_PREMIUM_ICON_SLOTS_COMPONENTS, ColumnMenu: GridPremiumColumnMenu, }; diff --git a/packages/grid/x-data-grid-premium/src/constants/index.ts b/packages/grid/x-data-grid-premium/src/constants/index.ts deleted file mode 100644 index 22aa4dceec69..000000000000 --- a/packages/grid/x-data-grid-premium/src/constants/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dataGridPremiumDefaultSlotsComponents'; diff --git a/packages/grid/x-data-grid-premium/src/index.ts b/packages/grid/x-data-grid-premium/src/index.ts index 5324f84633dc..2e2c937a5ff4 100644 --- a/packages/grid/x-data-grid-premium/src/index.ts +++ b/packages/grid/x-data-grid-premium/src/index.ts @@ -18,7 +18,6 @@ export * from './DataGridPremium'; export * from './hooks'; export * from './models'; export * from './components'; -export * from './constants'; export type { DataGridPremiumProps, @@ -33,3 +32,4 @@ export { GRID_COLUMN_MENU_COMPONENTS, GRID_COLUMN_MENU_COMPONENTS_PROPS, } from './components/reexports'; +export { DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS as DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from './constants/dataGridPremiumDefaultSlotsComponents'; diff --git a/packages/grid/x-data-grid-pro/src/DataGridPro/useDataGridProProps.ts b/packages/grid/x-data-grid-pro/src/DataGridPro/useDataGridProProps.ts index 0ef8f6f4962e..ae6faf00446d 100644 --- a/packages/grid/x-data-grid-pro/src/DataGridPro/useDataGridProProps.ts +++ b/packages/grid/x-data-grid-pro/src/DataGridPro/useDataGridProProps.ts @@ -11,7 +11,7 @@ import { DataGridProPropsWithDefaultValue, } from '../models/dataGridProProps'; import { GridProSlotsComponent } from '../models'; -import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '../constants'; +import { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS } from '../constants/dataGridProDefaultSlotsComponents'; /** * The default values of `DataGridProPropsWithDefaultValue` to inject in the props of DataGridPro. diff --git a/packages/grid/x-data-grid-pro/src/constants/index.ts b/packages/grid/x-data-grid-pro/src/constants/index.ts deleted file mode 100644 index 5f01ef8e43a6..000000000000 --- a/packages/grid/x-data-grid-pro/src/constants/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dataGridProDefaultSlotsComponents'; diff --git a/packages/grid/x-data-grid-pro/src/index.ts b/packages/grid/x-data-grid-pro/src/index.ts index c1f2cdc1dcd7..5018e9c865fa 100644 --- a/packages/grid/x-data-grid-pro/src/index.ts +++ b/packages/grid/x-data-grid-pro/src/index.ts @@ -19,7 +19,6 @@ export * from './DataGridPro'; export * from './hooks'; export * from './models'; export * from './components'; -export * from './constants'; export * from './utils'; export type { DataGridProProps, GridExperimentalProFeatures } from './models/dataGridProProps'; @@ -32,3 +31,4 @@ export { GRID_COLUMN_MENU_COMPONENTS, GRID_COLUMN_MENU_COMPONENTS_PROPS, } from './components/reexports'; +export { DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS as DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from './constants/dataGridProDefaultSlotsComponents'; diff --git a/packages/grid/x-data-grid-pro/src/tests/columnHeaders.DataGridPro.test.tsx b/packages/grid/x-data-grid-pro/src/tests/columnHeaders.DataGridPro.test.tsx index c70f7c2f134f..846a26c1d96f 100644 --- a/packages/grid/x-data-grid-pro/src/tests/columnHeaders.DataGridPro.test.tsx +++ b/packages/grid/x-data-grid-pro/src/tests/columnHeaders.DataGridPro.test.tsx @@ -222,7 +222,6 @@ describe(' - Column Headers', () => { diff --git a/packages/grid/x-data-grid/src/DataGrid/useDataGridProps.ts b/packages/grid/x-data-grid/src/DataGrid/useDataGridProps.ts index 4b04655007cb..792b14c10a8a 100644 --- a/packages/grid/x-data-grid/src/DataGrid/useDataGridProps.ts +++ b/packages/grid/x-data-grid/src/DataGrid/useDataGridProps.ts @@ -6,7 +6,8 @@ import { DataGridForcedPropsKey, DataGridPropsWithDefaultValues, } from '../models/props/DataGridProps'; -import { DATA_GRID_DEFAULT_SLOTS_COMPONENTS, GRID_DEFAULT_LOCALE_TEXT } from '../constants'; +import { GRID_DEFAULT_LOCALE_TEXT } from '../constants'; +import { DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from '../constants/defaultGridSlotsComponents'; import { GridDensityTypes, GridEditModes, GridSlotsComponent, GridValidRowModel } from '../models'; const DATA_GRID_FORCED_PROPS: { [key in DataGridForcedPropsKey]?: DataGridProcessedProps[key] } = { diff --git a/packages/grid/x-data-grid/src/constants/index.ts b/packages/grid/x-data-grid/src/constants/index.ts index ca413cdb79b7..667fc4d02d8c 100644 --- a/packages/grid/x-data-grid/src/constants/index.ts +++ b/packages/grid/x-data-grid/src/constants/index.ts @@ -1,4 +1,3 @@ export * from './envConstants'; export * from './localeTextConstants'; -export * from './defaultGridSlotsComponents'; export * from './gridClasses'; diff --git a/packages/grid/x-data-grid/src/index.ts b/packages/grid/x-data-grid/src/index.ts index a27b06080794..3bd21540f814 100644 --- a/packages/grid/x-data-grid/src/index.ts +++ b/packages/grid/x-data-grid/src/index.ts @@ -28,6 +28,7 @@ export { GRID_COLUMN_MENU_COMPONENTS, GRID_COLUMN_MENU_COMPONENTS_PROPS, } from './components/reexportable'; +export { DATA_GRID_DEFAULT_SLOTS_COMPONENTS } from './constants/defaultGridSlotsComponents'; /** * The full grid API. diff --git a/packages/grid/x-data-grid/src/locales/itIT.ts b/packages/grid/x-data-grid/src/locales/itIT.ts index 6dff100b1607..77ab02c846fd 100644 --- a/packages/grid/x-data-grid/src/locales/itIT.ts +++ b/packages/grid/x-data-grid/src/locales/itIT.ts @@ -123,7 +123,7 @@ const itITGrid: Partial = { // Column pinning text pinToLeft: 'Blocca a sinistra', pinToRight: 'Blocca a destra', - // unpin: 'Unpin', + unpin: 'Sblocca', // Tree Data treeDataGroupingHeaderName: 'Gruppo', diff --git a/scripts/x-data-grid-premium.exports.json b/scripts/x-data-grid-premium.exports.json index b06d166fb06d..15b34515d969 100644 --- a/scripts/x-data-grid-premium.exports.json +++ b/scripts/x-data-grid-premium.exports.json @@ -11,7 +11,6 @@ { "name": "CursorCoordinates", "kind": "Interface" }, { "name": "daDK", "kind": "Variable" }, { "name": "DATA_GRID_DEFAULT_SLOTS_COMPONENTS", "kind": "Variable" }, - { "name": "DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS", "kind": "Variable" }, { "name": "DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES", "kind": "Variable" }, { "name": "DataGrid", "kind": "Function" }, { "name": "DataGridPremium", "kind": "Variable" }, @@ -19,7 +18,6 @@ { "name": "DataGridPro", "kind": "Function" }, { "name": "deDE", "kind": "Variable" }, { "name": "DEFAULT_GRID_COL_TYPE_KEY", "kind": "Variable" }, - { "name": "DEFAULT_GRID_PREMIUM_ICON_SLOTS_COMPONENTS", "kind": "Variable" }, { "name": "ElementSize", "kind": "Interface" }, { "name": "elGR", "kind": "Variable" }, { "name": "enUS", "kind": "Variable" }, diff --git a/scripts/x-data-grid-pro.exports.json b/scripts/x-data-grid-pro.exports.json index 31e41f00803f..787ebb29ec27 100644 --- a/scripts/x-data-grid-pro.exports.json +++ b/scripts/x-data-grid-pro.exports.json @@ -10,7 +10,6 @@ { "name": "CursorCoordinates", "kind": "Interface" }, { "name": "daDK", "kind": "Variable" }, { "name": "DATA_GRID_DEFAULT_SLOTS_COMPONENTS", "kind": "Variable" }, - { "name": "DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS", "kind": "Variable" }, { "name": "DATA_GRID_PRO_PROPS_DEFAULT_VALUES", "kind": "Variable" }, { "name": "DataGrid", "kind": "Function" }, { "name": "DataGridPremium", "kind": "Function" }, @@ -18,7 +17,6 @@ { "name": "DataGridProProps", "kind": "Interface" }, { "name": "deDE", "kind": "Variable" }, { "name": "DEFAULT_GRID_COL_TYPE_KEY", "kind": "Variable" }, - { "name": "DEFAULT_GRID_PRO_ICON_SLOTS_COMPONENTS", "kind": "Variable" }, { "name": "ElementSize", "kind": "Interface" }, { "name": "elGR", "kind": "Variable" }, { "name": "enUS", "kind": "Variable" },