ios: fix search disappearing in forward view (#4337)

* ios: fix search disappearing in forward view * update * diff * refactor * use List
2026-07-21 09:01:36 +00:00 · 2024-06-19 12:51:56 +01:00
parent 6ba82c8c39
commit 0fa8d77214
2 changed files with 58 additions and 67 deletions
@@ -19,7 +19,9 @@ struct ChatItemForwardingView: View {

    @State private var searchText: String = ""
    @FocusState private var searchFocused
-    @State private var alert: SomeAlert? = nil
+    @State private var alert: SomeAlert?
+    @State private var hasSimplexLink_: Bool?
+    private let chatsToForwardTo = filterChatsToForwardTo()

    var body: some View {
        NavigationView {
@@ -36,53 +38,29 @@ struct ChatItemForwardingView: View {
                    }
                }
        }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .someAlert(alert, _):
-                return alert
-            }
-        }
+        .alert(item: $alert) { $0.alert }
    }

    @ViewBuilder private func forwardListView() -> some View {
        VStack(alignment: .leading) {
-            let chatsToForwardTo = filterChatsToForwardTo()
            if !chatsToForwardTo.isEmpty {
-                ScrollView {
-                    LazyVStack(alignment: .leading, spacing: 8) {
-                        searchFieldView(text: $searchText, focussed: $searchFocused)
-                            .padding(.leading, 2)
-                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                        let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { filterChatSearched($0, s) }
-                        ForEach(chats) { chat in
-                            Divider()
-                            forwardListChatView(chat)
-                                .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
-                        }
+                List {
+                    searchFieldView(text: $searchText, focussed: $searchFocused)
+                        .padding(.leading, 2)
+                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+                    let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
+                    ForEach(chats) { chat in
+                        forwardListChatView(chat)
+                            .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
                    }
-                    .padding(.horizontal)
-                    .padding(.vertical, 8)
-                    .background(Color(uiColor: .systemBackground))
-                    .cornerRadius(12)
-                    .padding(.horizontal)
                }
-                .background(Color(.systemGroupedBackground))
            } else {
                emptyList()
            }
        }
    }

-    private func filterChatsToForwardTo() -> [Chat] {
-        var filteredChats = chatModel.chats.filter({ canForwardToChat($0) })
-        if let index = filteredChats.firstIndex(where: { $0.chatInfo.chatType == .local }) {
-            let privateNotes = filteredChats.remove(at: index)
-            filteredChats.insert(privateNotes, at: 0)
-        }
-        return filteredChats
-    }
-
-    private func filterChatSearched(_ chat: Chat, _ searchStr: String) -> Bool {
+    private func foundChat(_ chat: Chat, _ searchStr: String) -> Bool {
        let cInfo = chat.chatInfo
        return switch cInfo {
        case let .direct(contact):
@@ -98,17 +76,6 @@ struct ChatItemForwardingView: View {
        }
    }

-    private func canForwardToChat(_ chat: Chat) -> Bool {
-        switch chat.chatInfo {
-        case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
-        case let .group(groupInfo): groupInfo.sendMsgEnabled
-        case let .local(noteFolder): noteFolder.sendMsgEnabled
-        case .contactRequest: false
-        case .contactConnection: false
-        case .invalidJSON: false
-        }
-    }
-
    private func prohibitedByPref(_ chat: Chat) -> Bool {
        // preference checks should match checks in compose view
        let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
@@ -125,9 +92,16 @@ struct ChatItemForwardingView: View {
    }

    private var hasSimplexLink: Bool {
-        guard let mcText = ci.content.msgContent?.text else { return false }
-        guard let parsedMsg = parseSimpleXMarkdown(mcText) else { return false }
-        return parsedMsgHasSimplexLink(parsedMsg)
+        if let hasSimplexLink_ { return hasSimplexLink_ }
+        let r =
+            if let mcText = ci.content.msgContent?.text,
+               let parsedMsg = parseSimpleXMarkdown(mcText) {
+                parsedMsgHasSimplexLink(parsedMsg)
+            } else {
+                false
+            }
+        hasSimplexLink_ = r
+        return r
    }

    private func emptyList() -> some View {
@@ -135,11 +109,12 @@ struct ChatItemForwardingView: View {
            .foregroundColor(.secondary)
            .frame(maxWidth: .infinity)
    }
-
+    
    @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
+        let prohibited = prohibitedByPref(chat)
        Button {
-            if prohibitedByPref(chat) {
-                alert = .someAlert(
+            if prohibited {
+                alert = SomeAlert(
                    alert: mkAlert(
                        title: "Cannot forward message",
                        message: "Selected chat preferences prohibit this message."
@@ -164,7 +139,7 @@ struct ChatItemForwardingView: View {
                ChatInfoImage(chat: chat, size: 30)
                    .padding(.trailing, 2)
                Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(prohibitedByPref(chat) ? .secondary : .primary)
+                    .foregroundColor(prohibited ? .secondary : .primary)
                    .lineLimit(1)
                if chat.chatInfo.incognito {
                    Spacer()
@@ -180,6 +155,27 @@ struct ChatItemForwardingView: View {
    }
 }

+private func filterChatsToForwardTo() -> [Chat] {
+    var filteredChats = ChatModel.shared.chats.filter { c in
+        c.chatInfo.chatType != .local && canForwardToChat(c)
+    }
+    if let privateNotes = ChatModel.shared.chats.first(where: { $0.chatInfo.chatType == .local }) {
+        filteredChats.insert(privateNotes, at: 0)
+    }
+    return filteredChats
+}
+
+private func canForwardToChat(_ chat: Chat) -> Bool {
+    switch chat.chatInfo {
+    case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
+    case let .group(groupInfo): groupInfo.sendMsgEnabled
+    case let .local(noteFolder): noteFolder.sendMsgEnabled
+    case .contactRequest: false
+    case .contactConnection: false
+    case .invalidJSON: false
+    }
+}
+
 #Preview {
    ChatItemForwardingView(
        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
@@ -11,14 +11,9 @@ import SimpleXChat
 import CodeScanner
 import AVFoundation

-enum SomeAlert: Identifiable {
-    case someAlert(alert: Alert, id: String)
-
-    var id: String {
-        switch self {
-        case let .someAlert(_, id): return id
-        }
-    }
+struct SomeAlert: Identifiable {
+    var alert: Alert
+    var id: String
 }

 private enum NewChatViewAlert: Identifiable {
@@ -142,8 +137,8 @@ struct NewChatView: View {
            switch(a) {
            case let .planAndConnectAlert(alert):
                return planAndConnectAlert(alert, dismiss: true, cleanup: { pastedLink = "" })
-            case let .newChatSomeAlert(.someAlert(alert, _)):
-                return alert
+            case let .newChatSomeAlert(a):
+                return a.alert
            }
        }
    }
@@ -181,7 +176,7 @@ struct NewChatView: View {
                    await MainActor.run {
                        creatingConnReq = false
                        if let apiAlert = apiAlert {
-                            alert = .newChatSomeAlert(alert: .someAlert(alert: apiAlert, id: "createInvitation error"))
+                            alert = .newChatSomeAlert(alert: SomeAlert(alert: apiAlert, id: "createInvitation error"))
                        }
                    }
                }
@@ -315,7 +310,7 @@ private struct ConnectView: View {
                        // showQRCodeScanner = false
                        connect(pastedLink)
                    } else {
-                        alert = .newChatSomeAlert(alert: .someAlert(
+                        alert = .newChatSomeAlert(alert: SomeAlert(
                            alert: mkAlert(title: "Invalid link", message: "The text you pasted is not a SimpleX link."),
                            id: "pasteLinkView: code is not a SimpleX link"
                        ))
@@ -338,14 +333,14 @@ private struct ConnectView: View {
            if strIsSimplexLink(r.string) {
                connect(link)
            } else {
-                alert = .newChatSomeAlert(alert: .someAlert(
+                alert = .newChatSomeAlert(alert: SomeAlert(
                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
                    id: "processQRCode: code is not a SimpleX link"
                ))
            }
        case let .failure(e):
            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: .someAlert(
+            alert = .newChatSomeAlert(alert: SomeAlert(
                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
                id: "processQRCode: failure"
            ))