From dc962832f036090d69a930416972f251533af57c Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 3 Jan 2024 12:39:56 +0000
Subject: [PATCH] Ensure that only one toolbar dropdown is open at a time
 (#16344)

GitOrigin-RevId: db06091ec35886f38de2a320eba9126b35d33064
---
 .../components/table-generator/toolbar/toolbar-button-menu.tsx   | 1 +
 .../components/table-generator/toolbar/toolbar-dropdown.tsx      | 1 +
 .../js/features/source-editor/components/toolbar/button-menu.tsx | 1 +
 .../source-editor/components/toolbar/table-inserter-dropdown.tsx | 1 +
 4 files changed, 4 insertions(+)

diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
index d30ab754ea..e70bf1dd0e 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-button-menu.tsx
@@ -52,6 +52,7 @@ export const ToolbarButtonMenu: FC<{
       container={tableContainerRef.current}
       containerPadding={0}
       animation
+      rootClose
       onHide={() => onToggle(false)}
     >
       <Popover
diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-dropdown.tsx
index ac9a044131..5326dfced8 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/toolbar-dropdown.tsx
@@ -57,6 +57,7 @@ export const ToolbarDropdown: FC<{
       placement="bottom"
       container={tabularRef.current}
       animation
+      rootClose
       containerPadding={0}
       onHide={() => onToggle(false)}
     >
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
index 48f23fe245..a26983fe21 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/button-menu.tsx
@@ -60,6 +60,7 @@ export const ToolbarButtonMenu: FC<{
       container={view.dom}
       containerPadding={0}
       animation
+      rootClose
       onHide={() => onToggle(false)}
     >
       <Popover
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/table-inserter-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/table-inserter-dropdown.tsx
index 85cb4fa549..53c7c55922 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/table-inserter-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/table-inserter-dropdown.tsx
@@ -57,6 +57,7 @@ export const TableInserterDropdown = memo(() => {
         container={view.dom}
         containerPadding={0}
         animation
+        rootClose
         onHide={() => onToggle(false)}
       >
         <Popover