eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1628 Remove HyperLink of mailbox avoid conflict WebView of email on browser

Browse Source 
(cherry picked from commit b685eae9842419a930978aaac367a8d63760291a)
This commit is contained in:
dab246
2023-03-21 14:00:50 +07:00
committed by Dat Vu
parent 9675f39659
commit 61a9414fe1
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
+2 -13
View File
@@ -11,7 +11,6 @@ import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/expand_mode.dart'; import 'package:model/mailbox/expand_mode.dart';
import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:model/mailbox/select_mode.dart'; import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/base/widget/link_browser_widget.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart'; import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart';
@@ -84,21 +83,11 @@ class MailBoxFolderTileBuilder {
Widget build() { Widget build() {
if (responsiveUtils?.isWebDesktop(_context) == true && mailboxDisplayed == MailboxDisplayed.mailbox) { if (responsiveUtils?.isWebDesktop(_context) == true && mailboxDisplayed == MailboxDisplayed.mailbox) {
return DragTarget<List<PresentationEmail>>( return DragTarget<List<PresentationEmail>>(
builder: (_, __, ___) => LinkBrowserWidget( builder: (_, __, ___) => _buildMailboxItem(_context),
uri: _mailboxNode.item.mailboxRouteWeb,
child: _buildMailboxItem(_context)
),
onAccept: (emails) => _onDragItemAccepted?.call(emails, _mailboxNode.item), onAccept: (emails) => _onDragItemAccepted?.call(emails, _mailboxNode.item),
); );
} else { } else {
if (BuildUtils.isWeb && mailboxDisplayed == MailboxDisplayed.mailbox) { return _buildMailboxItem(_context);
return LinkBrowserWidget(
uri: _mailboxNode.item.mailboxRouteWeb,
child: _buildMailboxItem(_context)
);
} else {
return _buildMailboxItem(_context);
}
} }
} }
lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart
+1 -11
View File
@@ -10,7 +10,6 @@ import 'package:focused_menu_custom/focused_menu.dart';
import 'package:focused_menu_custom/modals.dart'; import 'package:focused_menu_custom/modals.dart';
import 'package:model/email/presentation_email.dart'; import 'package:model/email/presentation_email.dart';
import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/base/widget/link_browser_widget.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart'; import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart';
import 'package:tmail_ui_user/features/search/mailbox/presentation/utils/search_mailbox_utils.dart'; import 'package:tmail_ui_user/features/search/mailbox/presentation/utils/search_mailbox_utils.dart';
@@ -53,16 +52,7 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (BuildUtils.isWeb) { if (BuildUtils.isWeb) {
return DragTarget<List<PresentationEmail>>( return DragTarget<List<PresentationEmail>>(
builder: (_, __, ___) { builder: (_, __, ___) => _buildMailboxItem(context),
if (widget._presentationMailbox.allowedToDisplay) {
return LinkBrowserWidget(
uri: widget._presentationMailbox.mailboxRouteWeb,
child: _buildMailboxItem(context)
);
} else {
return _buildMailboxItem(context);
}
},
onAccept: (emails) { onAccept: (emails) {
widget.onDragEmailToMailboxAccepted?.call(emails, widget._presentationMailbox); widget.onDragEmailToMailboxAccepted?.call(emails, widget._presentationMailbox);
} }