Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mitigate #623

This commit is contained in:
Thomas Ricouard 2023-02-03 08:06:16 +01:00
parent cba9378a5f
commit eb80225bb0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Packages/Timeline/Sources/Timeline/TimelineView.swift
View File

@ -21,6 +21,7 @@ public struct TimelineView: View {
@StateObject private var viewModel = TimelineViewModel() @StateObject private var viewModel = TimelineViewModel()
@State private var wasBackgrounded: Bool = false @State private var wasBackgrounded: Bool = false
@State private var listOpacity: CGFloat = 1
@Binding var timeline: TimelineFilter @Binding var timeline: TimelineFilter
@Binding var scrollToTopSignal: Int @Binding var scrollToTopSignal: Int
@ -46,7 +47,8 @@ public struct TimelineView: View {
StatusesListView(fetcher: viewModel) StatusesListView(fetcher: viewModel)
} }
} }
.id(client.id) .id(client.id + (viewModel.scrollToStatus ?? ""))
.opacity(listOpacity)
.environment(\.defaultMinListRowHeight, 1) .environment(\.defaultMinListRowHeight, 1)
.listStyle(.plain) .listStyle(.plain)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
@ -58,7 +60,11 @@ public struct TimelineView: View {
.onChange(of: viewModel.scrollToStatus) { statusId in .onChange(of: viewModel.scrollToStatus) { statusId in
if let statusId { if let statusId {
viewModel.scrollToStatus = nil viewModel.scrollToStatus = nil
proxy.scrollTo(statusId, anchor: .center) listOpacity = 0
DispatchQueue.main.async {
proxy.scrollTo(statusId, anchor: .top)
listOpacity = 1
}
} }
} }
.onChange(of: scrollToTopSignal, perform: { _ in .onChange(of: scrollToTopSignal, perform: { _ in