From 953eba1d0d254b925fbabd608195dbf09092d900 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Fri, 12 Dec 2025 10:43:52 +0000
Subject: [PATCH] Avoid beta badge focus when word count modal is opened
 (#30281)

GitOrigin-RevId: 570002a4dade41d393c66508e36c2863840f57f6
---
 .../word-count-modal/components/word-count-modal.tsx       | 1 +
 services/web/frontend/js/shared/components/ol/ol-modal.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx b/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
index 0b57862a6d..66227f8e1d 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
@@ -17,6 +17,7 @@ const WordCountModal = memo(function WordCountModal({
       onHide={handleHide}
       id="word-count-modal"
       data-testid="word-count-modal"
+      initialFocus={false}
     >
       <WordCountModalContent handleHide={handleHide} />
     </OLModal>
diff --git a/services/web/frontend/js/shared/components/ol/ol-modal.tsx b/services/web/frontend/js/shared/components/ol/ol-modal.tsx
index 35fecd471b..c8cd502e0f 100644
--- a/services/web/frontend/js/shared/components/ol/ol-modal.tsx
+++ b/services/web/frontend/js/shared/components/ol/ol-modal.tsx
@@ -16,7 +16,10 @@ type OLModalProps = ModalProps & {
   show?: boolean
 } & Pick<
     FocusTrapOptions,
-    'escapeDeactivates' | 'clickOutsideDeactivates' | 'returnFocusOnDeactivate'
+    | 'escapeDeactivates'
+    | 'clickOutsideDeactivates'
+    | 'returnFocusOnDeactivate'
+    | 'initialFocus'
   >
 
 type OLModalHeaderProps = ModalHeaderProps & {
@@ -30,6 +33,7 @@ export function OLModal({
   returnFocusOnDeactivate = true, // Return focus to trigger element when modal closes
   escapeDeactivates = false, // Let React-Bootstrap Modal handle Escape key to avoid double Escape key handling
   clickOutsideDeactivates = true, // Allow focus trap to deactivate on outside click and let React-Bootstrap Modal handle it
+  initialFocus,
   ...props
 }: OLModalProps) {
   return (
@@ -40,6 +44,7 @@ export function OLModal({
           escapeDeactivates,
           clickOutsideDeactivates,
           returnFocusOnDeactivate,
+          initialFocus,
         }}
       >
         {children}