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

Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
dab246
2025-08-04 13:18:09 +07:00
committed by Dat H. Pham
parent 31549ebad3
commit fd7e349929
3 changed files with 31 additions and 6 deletions
@@ -19,9 +19,6 @@ extension HandleKeyboardShortcutActionsExtension on ComposerController {
void onKeyboardShortcutInit() {
if (PlatformInfo.isWeb) {
keyboardShortcutFocusNode = FocusNode();
keyboardShortcutFocusNode?.addListener(() {
log('$runtimeType::onKeyboardShortcutInit: keyboardShortcutFocusNode: ${keyboardShortcutFocusNode?.hasFocus}');
});
}
}
@@ -7,6 +7,7 @@ import 'package:get/get.dart';
import 'package:tmail_ui_user/features/composer/presentation/composer_bindings.dart';
import 'package:tmail_ui_user/features/composer/presentation/composer_controller.dart';
import 'package:tmail_ui_user/features/composer/presentation/composer_view_web.dart';
import 'package:tmail_ui_user/features/composer/presentation/extensions/handle_keyboard_shortcut_actions_extension.dart';
import 'package:tmail_ui_user/features/composer/presentation/extensions/update_screen_display_mode_extension.dart';
import 'package:tmail_ui_user/features/composer/presentation/model/screen_display_mode.dart';
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
@@ -249,6 +250,14 @@ class ComposerManager extends GetxController {
return composerIdsQueue.every((id) => getComposerView(id).controller.isHiddenScreen);
}
bool get isAnyComposerOpened {
final isComposerOpened = composerIdsQueue.any((id) {
final controller = getComposerView(id).controller;
return controller.isNormalScreen || controller.isFullScreen;
});
return hasComposer && isComposerOpened;
}
List<String> get hiddenComposerIds {
return composerIdsQueue
.where((id) => getComposerView(id).controller.isHiddenScreen)
@@ -293,6 +302,21 @@ class ComposerManager extends GetxController {
ComposerView getComposerView(String id) => composers[id]!;
void refocusKeyboardShortcutFocusFirstComposer() {
if (!hasComposer) return;
final listComposerIdOpened = composerIdsQueue.where((id) {
final controller = getComposerView(id).controller;
return controller.isNormalScreen || controller.isFullScreen;
});
if (listComposerIdOpened.isNotEmpty) {
final firstComposerIdOpened = listComposerIdOpened.first;
final composerView = getComposerView(firstComposerIdOpened);
composerView.controller.refocusKeyboardShortcutFocus();
}
}
@override
void onClose() {
composerIdsQueue.clear();
@@ -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);
}