swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Force the timeline to stay at the bottom when first loading"

Browse Source 
This reverts commit ef8d2303289782eb46bb960a03b04985fb1db168.
This commit is contained in:
Stefan Ceriu 2022-11-21 15:02:28 +02:00
parent ef8d230328
commit 9f3ed6ca7b
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift
View File

@ -82,12 +82,20 @@ struct TimelineItemList: View {
}
}
}
.onChange(of: timelineItems) { _ in
// Run this multiple times on first appearance to fix offset issues
updatePinnedOffset(scrollViewProxy: proxy)
}
.onChange(of: pinnedItem) { _ in
updatePinnedOffset(scrollViewProxy: proxy)
.onChange(of: pinnedItem) { item in
guard let item else {
return
}
if item.animated {
withAnimation(Animation.elementDefault) {
proxy.scrollTo(item.id, anchor: item.anchor)
}
} else {
proxy.scrollTo(item.id, anchor: item.anchor)
}
pinnedItem = nil
}
}
.scrollDismissesKeyboard(.immediately)
@ -140,6 +148,8 @@ struct TimelineItemList: View {
let pinnedItem = PinnedItem(id: currentFirstItem.id, anchor: .top, animated: false)
timelineItems = context.viewState.items
self.pinnedItem = pinnedItem
return
}
// Otherwise just update the items
@ -188,25 +198,6 @@ struct TimelineItemList: View {
return selectedItemId == item.id ? 1.0 : 0.5
}
private func updatePinnedOffset(scrollViewProxy proxy: ScrollViewProxy) {
guard let item = pinnedItem else {
return
}
if item.animated {
withAnimation(.elementDefault) {
proxy.scrollTo(item.id, anchor: item.anchor)
}
} else {
proxy.scrollTo(item.id, anchor: item.anchor)
}
// Need to delay this for a bit to fix offset problems when loading the initial page
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
pinnedItem = nil
}
}
private var isRunningPreviews: Bool {
#if DEBUG
return ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"

1
changelog.d/pr-327.bugfix
View File

@ -1 +0,0 @@
Fixed timelines not sticking to the bottom on first appearance and when message heights change