Merge 34124254e0 into 7d47834903

Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift

@@ -83,10 +83,11 @@ public struct StatusRowView: View {
                   viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
                 }
             }
-            VStack(alignment: .leading, spacing: .statusComponentSpacing) {
             if !isCompact {
               StatusRowHeaderView(viewModel: viewModel)
             }
+          }
+          VStack(alignment: .leading, spacing: .statusComponentSpacing) {
             StatusRowContentView(viewModel: viewModel)
               .contentShape(Rectangle())
               .onTapGesture {
@@ -113,7 +114,6 @@ public struct StatusRowView: View {
           }
         }
       }
-      }
       .padding(.init(top: isCompact ? 6 : 12, leading: 0, bottom: isFocused ? 12 : 6, trailing: 0))
     }
     .onAppear {

Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift

@@ -54,6 +54,7 @@ public struct StatusRowMediaPreviewView: View {
             : CGSize(width: imageMaxHeight, height: imageMaxHeight),
           sensitive: sensitive
         )
+        .padding(.horizontal, .layoutPadding)
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(Self.accessibilityLabel(for: attachments[0]))
         .accessibilityAddTraits([.isButton, .isImage])
@@ -66,11 +67,12 @@ public struct StatusRowMediaPreviewView: View {
             }
           }
           .padding(.bottom, scrollBottomPadding)
-        }
-        .scrollClipDisabled()
+          .padding(.horizontal, .layoutPadding)
         }
       }
     }
+    .padding(.horizontal, -1 * .layoutPadding)
+  }
 
   @ViewBuilder
   private func makeAttachmentView(_ attachement: MediaAttachment) -> some View {