TF-3427 Fix subject was not in print & click outside context menu can not close
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -4,6 +4,7 @@ import 'dart:math';
|
||||
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:core/core.dart';
|
||||
import 'package:custom_pop_up_menu/custom_pop_up_menu.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:desktop_drop/desktop_drop.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
@@ -184,6 +185,7 @@ class ComposerController extends BaseController
|
||||
|
||||
RichTextMobileTabletController? richTextMobileTabletController;
|
||||
RichTextWebController? richTextWebController;
|
||||
CustomPopupMenuController? menuMoreOptionController;
|
||||
|
||||
final ScrollController scrollController = ScrollController();
|
||||
final ScrollController scrollControllerEmailAddress = ScrollController();
|
||||
@@ -237,6 +239,7 @@ class ComposerController extends BaseController
|
||||
if (PlatformInfo.isWeb) {
|
||||
richTextWebController = getBinding<RichTextWebController>();
|
||||
responsiveContainerKey = GlobalKey();
|
||||
menuMoreOptionController = CustomPopupMenuController();
|
||||
} else {
|
||||
richTextMobileTabletController = getBinding<RichTextMobileTabletController>();
|
||||
}
|
||||
@@ -277,6 +280,8 @@ class ComposerController extends BaseController
|
||||
if (PlatformInfo.isWeb) {
|
||||
richTextWebController = null;
|
||||
responsiveContainerKey = null;
|
||||
menuMoreOptionController?.dispose();
|
||||
menuMoreOptionController = null;
|
||||
} else {
|
||||
richTextMobileTabletController = null;
|
||||
}
|
||||
@@ -476,7 +481,7 @@ class ComposerController extends BaseController
|
||||
outboxMailboxId: mailboxDashBoardController.outboxMailbox?.mailboxId,
|
||||
sentMailboxId: mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleSent],
|
||||
draftsMailboxId: mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleDrafts],
|
||||
draftsEmailId: _getDraftEmailId(),
|
||||
draftsEmailId: getDraftEmailId(),
|
||||
answerForwardEmailId: composerArguments.value!.presentationEmail?.id,
|
||||
unsubscribeEmailId: composerArguments.value!.previousEmailId,
|
||||
messageId: composerArguments.value!.messageId,
|
||||
@@ -1046,7 +1051,7 @@ class ComposerController extends BaseController
|
||||
inlineAttachments: uploadController.mapInlineAttachments,
|
||||
outboxMailboxId: mailboxDashBoardController.outboxMailbox?.mailboxId,
|
||||
sentMailboxId: mailboxDashBoardController.mapDefaultMailboxIdByRole[PresentationMailbox.roleSent],
|
||||
draftsEmailId: _getDraftEmailId(),
|
||||
draftsEmailId: getDraftEmailId(),
|
||||
answerForwardEmailId: composerArguments.value!.presentationEmail?.id,
|
||||
unsubscribeEmailId: composerArguments.value!.previousEmailId,
|
||||
messageId: composerArguments.value!.messageId,
|
||||
@@ -2000,6 +2005,9 @@ class ComposerController extends BaseController
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
richTextWebController?.editorController.setFocus();
|
||||
richTextWebController?.closeAllMenuPopup();
|
||||
if (menuMoreOptionController?.menuIsShowing == true) {
|
||||
menuMoreOptionController?.hideMenu();
|
||||
}
|
||||
}
|
||||
|
||||
void handleOnMouseDownHtmlEditorWeb() {
|
||||
@@ -2277,7 +2285,7 @@ class ComposerController extends BaseController
|
||||
popBack();
|
||||
|
||||
final emailContent = await getContentInEditor();
|
||||
final draftEmailId = _getDraftEmailId();
|
||||
final draftEmailId = getDraftEmailId();
|
||||
log('ComposerController::_handleSaveMessageToDraft: draftEmailId = $draftEmailId');
|
||||
final cancelToken = CancelToken();
|
||||
final resultState = await _showSavingMessageToDraftsDialog(
|
||||
@@ -2306,7 +2314,7 @@ class ComposerController extends BaseController
|
||||
}
|
||||
}
|
||||
|
||||
EmailId? _getDraftEmailId() {
|
||||
EmailId? getDraftEmailId() {
|
||||
if (_emailIdEditing != null &&
|
||||
_emailIdEditing != composerArguments.value!.presentationEmail?.id) {
|
||||
return _emailIdEditing;
|
||||
|
||||
Reference in New Issue
Block a user