TF-3911 Support keyboard shortcut actions ESC to close multiple composer on web

Signed-off-by: dab246 <tdvu@linagora.com>
2025-08-04 13:18:09 +07:00
parent 31549ebad3
commit fd7e349929
3 changed files with 31 additions and 6 deletions
@@ -113,11 +113,15 @@ extension OpenAndCloseComposerExtension on MailboxDashBoardController {
      twakeAppManager.setHasComposer(false);
    }

-    dispatchThreadDetailUIAction(ReclaimMailViewKeyboardShortcutFocusAction());
-    dispatchAction(ReclaimMailListKeyboardShortcutFocusAction());
-
    _handleResultAfterCloseComposer(result);

+    if (!composerManager.isAnyComposerOpened) {
+      dispatchThreadDetailUIAction(ReclaimMailViewKeyboardShortcutFocusAction());
+      dispatchAction(ReclaimMailListKeyboardShortcutFocusAction());
+    } else {
+      composerManager.refocusKeyboardShortcutFocusFirstComposer();
+    }
+
    if (composerId != null) {
      await removeComposerCacheByIdOnWeb(composerId);
    }