Fix focus state when forwarding

2026-04-18 23:49:20 +01:00 · 2026-01-09 12:52:05 -05:00
parent b6f9c17bea
commit 77ddee4ff2
2 changed files with 9 additions and 8 deletions
--- a/ts/components/conversation/MessageContextMenu.dom.tsx
+++ b/ts/components/conversation/MessageContextMenu.dom.tsx
@@ -96,7 +96,14 @@ export function MessageContextMenu({
          </AxoMenuBuilder.Item>
        )}
        {onForward && (
-          <AxoMenuBuilder.Item symbol="forward" onSelect={onForward}>
+          <AxoMenuBuilder.Item
+            symbol="forward"
+            onSelect={() => {
+              // forward modal takes focus
+              shouldReturnFocusToTrigger.current = false;
+              onForward();
+            }}
+          >
            {i18n('icu:MessageContextMenu__forward')}
          </AxoMenuBuilder.Item>
        )}