Fix navigation popping in DM view
This commit is contained in:
@@ -9,10 +9,19 @@ import SwiftUI
|
|||||||
|
|
||||||
struct DirectMessagesView: View {
|
struct DirectMessagesView: View {
|
||||||
let damus_state: DamusState
|
let damus_state: DamusState
|
||||||
|
|
||||||
|
@State var open_dm: Bool = false
|
||||||
|
@State var pubkey: String = ""
|
||||||
|
@State var active_model: DirectMessageModel = DirectMessageModel()
|
||||||
@EnvironmentObject var model: DirectMessagesModel
|
@EnvironmentObject var model: DirectMessagesModel
|
||||||
|
|
||||||
var MainContent: some View {
|
var MainContent: some View {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
|
let chat = DMChatView(damus_state: damus_state, pubkey: pubkey)
|
||||||
|
.environmentObject(active_model)
|
||||||
|
NavigationLink(destination: chat, isActive: $open_dm) {
|
||||||
|
EmptyView()
|
||||||
|
}
|
||||||
LazyVStack {
|
LazyVStack {
|
||||||
if model.dms.isEmpty, !model.loading {
|
if model.dms.isEmpty, !model.loading {
|
||||||
EmptyTimelineView()
|
EmptyTimelineView()
|
||||||
@@ -30,12 +39,12 @@ struct DirectMessagesView: View {
|
|||||||
func MaybeEvent(_ tup: (String, DirectMessageModel)) -> some View {
|
func MaybeEvent(_ tup: (String, DirectMessageModel)) -> some View {
|
||||||
Group {
|
Group {
|
||||||
if let ev = tup.1.events.last {
|
if let ev = tup.1.events.last {
|
||||||
let chat = DMChatView(damus_state: damus_state, pubkey: tup.0)
|
EventView(damus: damus_state, event: ev, pubkey: tup.0, show_friend_icon: true)
|
||||||
.environmentObject(tup.1)
|
.onTapGesture {
|
||||||
NavigationLink(destination: chat) {
|
pubkey = tup.0
|
||||||
EventView(damus: damus_state, event: ev, pubkey: tup.0, show_friend_icon: true)
|
active_model = tup.1
|
||||||
}
|
open_dm = true
|
||||||
.buttonStyle(PlainButtonStyle())
|
}
|
||||||
} else {
|
} else {
|
||||||
EmptyView()
|
EmptyView()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user