Fix MediaFileRoomTimelineContent tap gesture taking over media even…

…t timeline taps.
element-hq · Dec 13, 2024 · 13875e6 · 13875e6
1 parent b0f4f42
commit 13875e6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/AudioFileEventsTimelineView.swift b/...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/AudioFileEventsTimelineView.swift
@@ -12,8 +12,7 @@ struct AudioMediaEventsTimelineView: View {
     let timelineItem: AudioRoomTimelineItem
 
     var body: some View {
-        MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
-                                     filename: timelineItem.content.filename,
+        MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
                                      fileSize: timelineItem.content.fileSize,
                                      caption: timelineItem.content.caption,
                                      formattedCaption: timelineItem.content.formattedCaption,

diff --git a/...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/FileMediaEventsTimelineView.swift b/...es/Screens/MediaEventsTimelineScreen/View/TimelineViews/FileMediaEventsTimelineView.swift
@@ -12,8 +12,7 @@ struct FileMediaEventsTimelineView: View {
     let timelineItem: FileRoomTimelineItem
 
     var body: some View {
-        MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
-                                     filename: timelineItem.content.filename,
+        MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
                                      fileSize: timelineItem.content.fileSize,
                                      caption: timelineItem.content.caption,
                                      formattedCaption: timelineItem.content.formattedCaption,

diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/AudioRoomTimelineView.swift b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/AudioRoomTimelineView.swift
@@ -9,18 +9,20 @@ import Foundation
 import SwiftUI
 
 struct AudioRoomTimelineView: View {
+    @Environment(\.timelineContext) private var context
     let timelineItem: AudioRoomTimelineItem
 
     var body: some View {
         TimelineStyler(timelineItem: timelineItem) {
-            MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
-                                         filename: timelineItem.content.filename,
+            MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
                                          fileSize: timelineItem.content.fileSize,
                                          caption: timelineItem.content.caption,
                                          formattedCaption: timelineItem.content.formattedCaption,
                                          additionalWhitespaces: timelineItem.additionalWhitespaces(),
-                                         isAudioFile: true)
-                .accessibilityLabel(L10n.commonAudio)
+                                         isAudioFile: true) {
+                context?.send(viewAction: .mediaTapped(itemID: timelineItem.id))
+            }
+            .accessibilityLabel(L10n.commonAudio)
         }
     }
 }

diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FileRoomTimelineView.swift b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FileRoomTimelineView.swift
@@ -9,44 +9,49 @@ import Compound
 import SwiftUI
 
 struct FileRoomTimelineView: View {
+    @Environment(\.timelineContext) private var context
     let timelineItem: FileRoomTimelineItem
 
     var body: some View {
         TimelineStyler(timelineItem: timelineItem) {
-            MediaFileRoomTimelineContent(timelineItemID: timelineItem.id,
-                                         filename: timelineItem.content.filename,
+            MediaFileRoomTimelineContent(filename: timelineItem.content.filename,
                                          fileSize: timelineItem.content.fileSize,
                                          caption: timelineItem.content.caption,
                                          formattedCaption: timelineItem.content.formattedCaption,
-                                         additionalWhitespaces: timelineItem.additionalWhitespaces())
-                .accessibilityLabel(L10n.commonFile)
+                                         additionalWhitespaces: timelineItem.additionalWhitespaces()) {
+                context?.send(viewAction: .mediaTapped(itemID: timelineItem.id))
+            }
+            .accessibilityLabel(L10n.commonFile)
         }
     }
 }
 
 // MARK: Content
 
 struct MediaFileRoomTimelineContent: View {
-    @Environment(\.timelineContext) private var context
-
-    let timelineItemID: TimelineItemIdentifier
     let filename: String
     let fileSize: UInt?
     let caption: String?
     let formattedCaption: AttributedString?
     let additionalWhitespaces: Int
     var isAudioFile = false
 
-    var icon: KeyPath<CompoundIcons, Image> {
+    var onMediaTap: (() -> Void)? = nil
+
+    private var icon: KeyPath<CompoundIcons, Image> {
         isAudioFile ? \.audio : \.attachment
     }
 
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
-            filePreview
-                .onTapGesture {
-                    context?.send(viewAction: .mediaTapped(itemID: timelineItemID))
-                }
+            if let onMediaTap {
+                filePreview
+                    .onTapGesture {
+                        onMediaTap()
+                    }
+            } else {
+                filePreview
+            }
 
             if let formattedCaption {
                 FormattedBodyText(attributedString: formattedCaption,