Compare commits

...

2 commits

Author SHA1 Message Date
tkgka 99fc276fe8
Merge c6b44b23ce into 7d47834903 2024-04-07 09:16:55 +02:00
tkgka c6b44b23ce Fix StatusRowContentView invade SwipeActions area 2024-03-17 00:52:25 +09:00
2 changed files with 23 additions and 24 deletions

View file

@ -83,33 +83,33 @@ public struct StatusRowView: View {
viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
}
}
VStack(alignment: .leading, spacing: .statusComponentSpacing) {
if !isCompact {
StatusRowHeaderView(viewModel: viewModel)
if !isCompact {
StatusRowHeaderView(viewModel: viewModel)
}
}
VStack(alignment: .leading, spacing: .statusComponentSpacing) {
StatusRowContentView(viewModel: viewModel)
.contentShape(Rectangle())
.onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
}
StatusRowContentView(viewModel: viewModel)
.contentShape(Rectangle())
.onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
.accessibilityActions {
if isFocused, viewModel.showActions {
accessibilityActions
}
.accessibilityActions {
if isFocused, viewModel.showActions {
accessibilityActions
}
}
if !reasons.contains(.placeholder),
viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
!isInCaptureMode
{
StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
viewModel: viewModel)
.tint(isFocused ? theme.tintColor : .gray)
}
if !reasons.contains(.placeholder),
viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
!isInCaptureMode
{
StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
viewModel: viewModel)
.tint(isFocused ? theme.tintColor : .gray)
}
if isFocused, !isCompact {
StatusRowDetailView(viewModel: viewModel)
}
if isFocused, !isCompact {
StatusRowDetailView(viewModel: viewModel)
}
}
}

View file

@ -67,7 +67,6 @@ public struct StatusRowMediaPreviewView: View {
}
.padding(.bottom, scrollBottomPadding)
}
.scrollClipDisabled()
}
}
}