Fixes #2253 - Fix timeline thumbnail frames for media missing sizing …

…info
element-hq · Dec 18, 2023 · b1b8bbc · b1b8bbc
1 parent 123164f
commit b1b8bbc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/ElementX/Sources/Other/SwiftUI/Layout/TimelineMediaFrame.swift b/ElementX/Sources/Other/SwiftUI/Layout/TimelineMediaFrame.swift
@@ -27,10 +27,15 @@ extension View {
             aspectRatio(contentAspectRatio, contentMode: .fit)
                 .frame(minHeight: minMediaHeight, maxHeight: minMediaHeight)
         } else {
-            aspectRatio(contentAspectRatio, contentMode: .fit)
-                .frame(maxHeight: min(maxMediaHeight, max(minMediaHeight, contentHeight ?? .infinity)))
-                // Required to prevent the reply details to get higher priority in rendering the width of the view.
-                .aspectRatio(contentAspectRatio, contentMode: .fit)
+            if let contentAspectRatio {
+                aspectRatio(contentAspectRatio, contentMode: .fit)
+                    .frame(maxHeight: min(maxMediaHeight, max(minMediaHeight, contentHeight ?? .infinity)))
+                    // Required to prevent the reply details to get higher priority in rendering the width of the view.
+                    .aspectRatio(contentAspectRatio, contentMode: .fit)
+            } else { // Otherwise let the image load and use its native aspect ratio with a max height
+                aspectRatio(contentMode: .fit)
+                    .frame(maxHeight: maxMediaHeight)
+            }
         }
     }
 }
diff --git a/...napshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png b/...napshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png
diff --git a/changelog.d/2253.bugfix b/changelog.d/2253.bugfix
@@ -0,0 +1 @@
+Fix timeline thumbnail frames for media missing sizing info
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix timeline thumbnail frames for media missing sizing info