diff --git a/.changeset/cool-beers-whisper.md b/.changeset/cool-beers-whisper.md new file mode 100644 index 0000000000..90d5644840 --- /dev/null +++ b/.changeset/cool-beers-whisper.md @@ -0,0 +1,5 @@ +--- +"@comet/admin-theme": patch +--- + +Fix an issue where setting `defaultProps` of `MuiDataGrid` would override the `defaultProps` defined by `createCometTheme()` diff --git a/packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx b/packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx index 503ae9c2ca..b924b1376f 100644 --- a/packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx +++ b/packages/admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx @@ -24,6 +24,7 @@ import { GetMuiComponentTheme } from "./getComponentsTheme"; export const getMuiDataGrid: GetMuiComponentTheme<"MuiDataGrid"> = (component, { palette, shadows, spacing }) => ({ ...component, defaultProps: { + ...component?.defaultProps, components: { /* @TODO: add FilterPanelAddIcon to display Comet Add Icon once MUI Datagrid is updated to v6 or higher */ QuickFilterIcon: Search, @@ -39,8 +40,8 @@ export const getMuiDataGrid: GetMuiComponentTheme<"MuiDataGrid"> = (component, { }, localeText: { noRowsLabel: GRID_DEFAULT_LOCALE_TEXT.noResultsOverlayLabel, + ...component?.defaultProps?.localeText, }, - ...component?.defaultProps, }, styleOverrides: mergeOverrideStyles<"MuiDataGrid">(component?.styleOverrides, { root: {