fixup! TF-4684 Add drive card hover close button

Author: tddang-linagora

core/lib/presentation/utils/html_transformer/dom/ensure_drive_card_delete_button_transformer.dart

@@ -24,12 +24,11 @@ class EnsureDriveCardDeleteButtonTransformer extends DomTransformer {
     Map<String, String>? mapUrlDownloadCID,
   }) async {
     try {
-      final cardsMissingButton = document
-          .querySelectorAll('.tmail-drive-card')
-          .where((card) => card.querySelector('.tmail-drive-card-delete') == null)
-          .toList();
+      final cards = document.querySelectorAll('.tmail-drive-card');
+      if (cards.isEmpty) return;
 
-      if (cardsMissingButton.isEmpty) return;
+      final cardsMissingButton = cards
+          .where((card) => card.querySelector('.tmail-drive-card-delete') == null);
 
       for (final card in cardsMissingButton) {
         card.append(Element.html(FileLinkCardHtmlBuilder.buildFileCardDeleteButton(

core/lib/presentation/utils/html_transformer/dom/remove_drive_card_delete_button_transformer.dart

@@ -21,12 +21,12 @@ class RemoveDriveCardDeleteButtonTransformer extends DomTransformer {
       final deleteButtonStyles = document.querySelectorAll('style')
           .where((style) => style.text.contains('.tmail-drive-card-delete'));
 
-      if (deleteButtons.isEmpty && deleteButtonStyles.isEmpty) return;
-
-      await Future.wait([
-        ...deleteButtons.map((element) async => element.remove()),
-        ...deleteButtonStyles.map((element) async => element.remove()),
-      ]);
+      for (final element in deleteButtons) {
+        element.remove();
+      }
+      for (final element in deleteButtonStyles) {
+        element.remove();
+      }
     } catch (e) {
       logWarning('$runtimeType::process:Exception = $e');
     }

core/lib/utils/html/file_link_card_html_builder.dart

@@ -103,5 +103,10 @@ class FileLinkCardHtmlBuilder {
       .tmail-drive-card:hover .tmail-drive-card-delete {
         opacity: 1 !important;
       }
+      @media (hover: none), (pointer: coarse) {
+        .tmail-drive-card .tmail-drive-card-delete {
+          opacity: 1 !important;
+        }
+      }
     </style>''';
 }

lib/features/composer/presentation/manager/drive_attachment_handler.dart

@@ -13,12 +13,6 @@ class DriveAttachmentHandler {
   /// without this class depending on `BuildUtils` directly.
   final bool requireHttps;
 
-  /// One [DriveAttachmentHandler] instance is bound per composer session
-  /// (see `composer_bindings.dart`), so this flag is enough to ensure the
-  /// delete-button `<style>` block is inserted only once even when the
-  /// Drive picker is used multiple times in the same composer.
-  bool _hasInsertedDeleteButtonStyle = false;
-
   void handleDrivePickResult(
     List<DriveDocument> result, {
     required void Function(String html) insertHtml,
@@ -55,12 +49,7 @@ class DriveAttachmentHandler {
         )
         .nonNulls
         .join();
-    final html = FileLinkCardHtmlBuilder.wrapFileCardsHtml(
-      cards,
-      includeStyle: !_hasInsertedDeleteButtonStyle,
-    );
-    if (cards.isNotEmpty) _hasInsertedDeleteButtonStyle = true;
-    return html;
+    return FileLinkCardHtmlBuilder.wrapFileCardsHtml(cards);
   }
 
   String? _driveFileCard(

test/features/composer/presentation/manager/drive_attachment_handler_test.dart

@@ -81,7 +81,7 @@ void main() {
       expect(insertedHtml.first, contains('<style>'));
     });
 
-    test('Should NOT duplicate the delete-button style on a second Drive pick in the same composer session', () async {
+    test('Should include the delete-button style on every Drive pick in the same composer session', () async {
       handler.handleDrivePickResult([
         linkDoc,
       ], insertHtml: (html) => insertedHtml.add(html), appLocalizations: appLocalizations);
@@ -91,10 +91,10 @@ void main() {
 
       expect(insertedHtml, hasLength(2));
       expect(insertedHtml.first, contains('<style>'));
-      expect(insertedHtml.last, isNot(contains('<style>')));
+      expect(insertedHtml.last, contains('<style>'));
     });
 
-    test('Should still omit the style on a pick with no insertable docs, without consuming the "first insert" slot', () async {
+    test('Should omit the style on a pick with no insertable docs, and still include it on the next pick', () async {
       handler.handleDrivePickResult([
         noLinkDoc,
       ], insertHtml: (html) => insertedHtml.add(html), appLocalizations: appLocalizations);