[EuiDataGrid] Fix cell popover close on cell click unintentionally affecting complex cell popovers

src/components/datagrid/body/data_grid_cell.tsx

@@ -400,6 +400,10 @@ export class EuiDataGridCell extends Component<
         },
         0
       );
+      // Close the cell popover if the popover was open and the user clicked the cell
+      if (this.props.popoverContext.popoverIsOpen) {
+        this.props.popoverContext.closeCellPopover();
+      }
     }
   };
 

src/components/datagrid/body/data_grid_cell_popover.spec.tsx

@@ -83,4 +83,21 @@ describe('EuiDataGridCellPopover', () => {
         .should('have.attr', 'data-gridcell-row-index', '1');
     });
   });
+
+  it('closes the cell popover when the originating cell is clicked', () => {
+    cy.realMount(<EuiDataGrid {...baseProps} />);
+    cy.get(
+      '[data-gridcell-row-index="0"][data-gridcell-column-index="0"]'
+    ).realClick();
+
+    cy.get('[data-test-subj="euiDataGridCellExpandButton"]').realClick();
+    cy.get('[data-test-subj="euiDataGridExpansionPopover"]').should('exist');
+
+    cy.get(
+      '[data-gridcell-row-index="0"][data-gridcell-column-index="0"]'
+    ).realClick();
+    cy.get('[data-test-subj="euiDataGridExpansionPopover"]').should(
+      'not.exist'
+    );
+  });
 });

src/components/datagrid/body/data_grid_cell_popover.test.tsx

@@ -101,7 +101,6 @@ describe('useCellPopover', () => {
           hasArrow={false}
           isOpen={true}
           onKeyDown={[Function]}
-          onTrapDeactivation={[Function]}
           panelClassName="euiDataGridRowCell__popover"
           panelPaddingSize="s"
           panelProps={

src/components/datagrid/body/data_grid_cell_popover.tsx

@@ -83,7 +83,6 @@ export const useCellPopover = (): {
         'data-test-subj': 'euiDataGridExpansionPopover',
       }}
       closePopover={closeCellPopover}
-      onTrapDeactivation={closeCellPopover}
       onKeyDown={(event) => {
         if (event.key === keys.F2 || event.key === keys.ESCAPE) {
           event.preventDefault();

upcoming_changelogs/5797.md

@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed an `EuiDataGrid` bug occurring when closing cell popovers on clicking the originating cell. The original fix was unintentionally affecting cell popovers with nested modals, popovers, etc.