permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 17:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: fix DM autoscroll IDs by using dm:<peer>|<id> for private chat item IDs and preserve anchors, ensuring scrollTo targets exist when opening/switching/new messages

Browse Source
This commit is contained in:
jack
2025-08-24 17:16:31 +02:00
parent 605bff3249
commit fe098cdae9
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Views/ContentView.swift
+12 -4
View File
@@ -291,13 +291,17 @@ struct ContentView: View {
// Build stable UI IDs with a context key to avoid ID collisions when switching channels // Build stable UI IDs with a context key to avoid ID collisions when switching channels
#if os(iOS) #if os(iOS)
let contextKey: String = { let contextKey: String = {
if let peer = privatePeer { return "dm:\\(peer)" }
switch locationManager.selectedChannel { switch locationManager.selectedChannel {
case .mesh: return "mesh" case .mesh: return "mesh"
case .location(let ch): return "geo:\(ch.geohash)" case .location(let ch): return "geo:\\(ch.geohash)"
} }
}() }()
#else #else
let contextKey: String = "mesh" let contextKey: String = {
if let peer = privatePeer { return "dm:\\(peer)" }
return "mesh"
}()
#endif #endif
let items = windowedMessages.map { (uiID: "\(contextKey)|\($0.id)", message: $0) } let items = windowedMessages.map { (uiID: "\(contextKey)|\($0.id)", message: $0) }
@@ -396,13 +400,17 @@ struct ContentView: View {
let step = 200 let step = 200
#if os(iOS) #if os(iOS)
let contextKey: String = { let contextKey: String = {
if let peer = privatePeer { return "dm:\\(peer)" }
switch locationManager.selectedChannel { switch locationManager.selectedChannel {
case .mesh: return "mesh" case .mesh: return "mesh"
case .location(let ch): return "geo:\(ch.geohash)" case .location(let ch): return "geo:\\(ch.geohash)"
} }
}() }()
#else #else
let contextKey: String = "mesh" let contextKey: String = {
if let peer = privatePeer { return "dm:\\(peer)" }
return "mesh"
}()
#endif #endif
let preserveID = "\(contextKey)|\(message.id)" let preserveID = "\(contextKey)|\(message.id)"
if let peer = privatePeer { if let peer = privatePeer {