From 9f2a1272bb0a05e4e414d8bfaeac6e9d00aade3c Mon Sep 17 00:00:00 2001
From: Ricky James Smith <jamesricky@me.com>
Date: Fri, 3 Jan 2025 10:16:09 +0100
Subject: [PATCH] Fix `defaultProps` of `MuiDataGrid` in `createCometTheme()`
 (#3005)

---
 .changeset/cool-beers-whisper.md                             | 5 +++++
 .../admin/admin-theme/src/componentsTheme/MuiDataGrid.tsx    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cool-beers-whisper.md

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: {