From 1ad34295d3b1dfeeb668af63cfb9223066a4112b Mon Sep 17 00:00:00 2001
From: Rom Grk <romgrk.cc@gmail.com>
Date: Tue, 25 Feb 2025 15:43:11 -0500
Subject: [PATCH 1/2] fix: popper focus trap

---
 packages/x-data-grid/src/components/panel/GridPanel.tsx | 1 -
 packages/x-data-grid/src/material/index.tsx             | 6 ++++--
 packages/x-data-grid/src/models/gridBaseSlots.ts        | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/x-data-grid/src/components/panel/GridPanel.tsx b/packages/x-data-grid/src/components/panel/GridPanel.tsx
index b855368f16c6b..4308203c446ce 100644
--- a/packages/x-data-grid/src/components/panel/GridPanel.tsx
+++ b/packages/x-data-grid/src/components/panel/GridPanel.tsx
@@ -110,7 +110,6 @@ const GridPanel = forwardRef<HTMLElement, GridPanelProps>((props, ref) => {
       clickAwayMouseEvent="onPointerUp"
       clickAwayTouchEvent={false}
       focusTrap
-      focusTrapEnabled
       {...other}
       {...rootProps.slotProps?.basePopper}
       ref={ref}
diff --git a/packages/x-data-grid/src/material/index.tsx b/packages/x-data-grid/src/material/index.tsx
index e90ef7f4045ca..07ff5acbf91ef 100644
--- a/packages/x-data-grid/src/material/index.tsx
+++ b/packages/x-data-grid/src/material/index.tsx
@@ -499,8 +499,10 @@ function focusTrapWrapper(props: PopperProps, content: any) {
     return content;
   }
   return (
-    <MUIFocusTrap open disableEnforceFocus isEnabled={() => props.focusTrapEnabled ?? true}>
-      {content}
+    <MUIFocusTrap open disableEnforceFocus>
+      <div tabIndex={-1}>
+        {content}
+      </div>
     </MUIFocusTrap>
   );
 }
diff --git a/packages/x-data-grid/src/models/gridBaseSlots.ts b/packages/x-data-grid/src/models/gridBaseSlots.ts
index 7c904fd4a143c..625e3e49a652d 100644
--- a/packages/x-data-grid/src/models/gridBaseSlots.ts
+++ b/packages/x-data-grid/src/models/gridBaseSlots.ts
@@ -187,7 +187,6 @@ export type PopperProps = {
   clickAwayMouseEvent?: false | ClickAwayMouseEventHandler;
   flip?: boolean;
   focusTrap?: boolean;
-  focusTrapEnabled?: boolean;
   onExited?: (node: HTMLElement | null) => void;
   onClickAway?: (event: MouseEvent | TouchEvent) => void;
   onDidShow?: () => void;

From 5d9c6da9b998831d61b7bdb8839383dfd1a41cfa Mon Sep 17 00:00:00 2001
From: Kenan Yusuf <kenan.m.yusuf@gmail.com>
Date: Wed, 26 Feb 2025 09:11:39 +0000
Subject: [PATCH 2/2] prettier

---
 packages/x-data-grid/src/material/index.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/x-data-grid/src/material/index.tsx b/packages/x-data-grid/src/material/index.tsx
index 07ff5acbf91ef..90584da90af25 100644
--- a/packages/x-data-grid/src/material/index.tsx
+++ b/packages/x-data-grid/src/material/index.tsx
@@ -500,9 +500,7 @@ function focusTrapWrapper(props: PopperProps, content: any) {
   }
   return (
     <MUIFocusTrap open disableEnforceFocus>
-      <div tabIndex={-1}>
-        {content}
-      </div>
+      <div tabIndex={-1}>{content}</div>
     </MUIFocusTrap>
   );
 }