Merge pull request #2007 from nextcloud/fix/1999/autocomplete-keyboard-support

Add keyboard support to autocompletion

Author: Ivansss

NextcloudTalk.xcodeproj/project.pbxproj

@@ -236,6 +236,7 @@
 		1FA38C9029A4B3C6008871B8 /* NCNotificationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA38C8F29A4B3C6008871B8 /* NCNotificationAction.swift */; };
 		1FA38C9129A4B3C6008871B8 /* NCNotificationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA38C8F29A4B3C6008871B8 /* NCNotificationAction.swift */; };
 		1FA732FC2966CBB7003D2103 /* CallFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA732FB2966CBB7003D2103 /* CallFlowLayout.swift */; };
+		1FA940B92D74F3B500DF6CDF /* UITableViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC316692CC26186007CBE16 /* UITableViewExtension.swift */; };
 		1FAB2E7D2AC99326001214EB /* TOCropViewController in Frameworks */ = {isa = PBXBuildFile; productRef = 1FAB2E7C2AC99326001214EB /* TOCropViewController */; };
 		1FAB2E7F2AC99367001214EB /* TOCropViewController in Frameworks */ = {isa = PBXBuildFile; productRef = 1FAB2E7E2AC99367001214EB /* TOCropViewController */; };
 		1FAB2E832AC9EC3F001214EB /* BaseChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FAB2E822AC9EC3F001214EB /* BaseChatViewController.swift */; };
@@ -3184,6 +3185,7 @@
 				F644A2E02CE28C9A00E2ED81 /* NCChatFileStatus.swift in Sources */,
 				1F4DD3ED2571C688007DC98E /* EmojiUtils.swift in Sources */,
 				1F35F8EB2AEEBC1100044BDA /* UIResponder+SLKAdditions.m in Sources */,
+				1FA940B92D74F3B500DF6CDF /* UITableViewExtension.swift in Sources */,
 				2C62B02424C1BDCF007E460A /* NCAppBranding.m in Sources */,
 				1F35F90B2AEEE76C00044BDA /* ReplyMessageView.m in Sources */,
 				1F1C999E2909846400EACF02 /* BGTaskHelper.swift in Sources */,

NextcloudTalk/BaseChatViewController.swift

@@ -483,7 +483,7 @@ import SwiftUI
 
         guard let lastMessageBeforeInteraction, let tableView else { return }
 
-        if NCUtils.isValid(indexPath: lastMessageBeforeInteraction, forTableView: tableView) {
+        if tableView.isValid(indexPath: lastMessageBeforeInteraction) {
             DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
                 tableView.scrollToRow(at: lastMessageBeforeInteraction, at: .bottom, animated: true)
             }

NextcloudTalk/ChatViewController.swift

@@ -1011,7 +1011,7 @@ import SwiftyAttributes
 
                     self.tableView?.reloadData()
 
-                    if NCUtils.isValid(indexPath: lastHistoryMessageIP, forTableView: tableView) {
+                    if tableView.isValid(indexPath: lastHistoryMessageIP) {
                         self.tableView?.scrollToRow(at: lastHistoryMessageIP, at: .top, animated: false)
                     }
                 }

NextcloudTalk/InputbarViewController.swift

@@ -19,6 +19,7 @@ import UIKit
     internal var autocompletionUsers: [MentionSuggestion] = []
     internal var mentionsDict: [String: NCMessageParameter] = [:]
     internal var contentView: UIView?
+    internal var selectedAutocompletionRow: IndexPath?
 
     public init?(forRoom room: NCRoom, withAccount account: TalkAccount, tableViewStyle style: UITableView.Style) {
         self.room = room
@@ -230,6 +231,8 @@ import UIKit
 
             // Check if "@" is still there
             self.textView.look(forPrefixes: self.registeredPrefixes) { prefix, word, _ in
+                self.selectedAutocompletionRow = nil
+
                 if prefix?.count ?? 0 > 0 && word?.count ?? 0 > 0 {
                     self.showAutoCompletionView(showAutocomplete)
                 } else {
@@ -254,6 +257,38 @@ import UIKit
         return resultMessage
     }
 
+    override public func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
+        guard self.isAutoCompleting, !self.autocompletionUsers.isEmpty
+        else {
+            super.pressesBegan(presses, with: event)
+            return
+        }
+
+        let oldIndexPath = self.selectedAutocompletionRow ?? IndexPath(row: 0, section: 0)
+        var newIndexPath: IndexPath?
+
+        // Support selecting the auto complete with return/enter key
+        if presses.contains(where: { $0.key?.keyCode == .keyboardReturnOrEnter }) {
+            self.acceptAutoCompletion(withIndexPath: oldIndexPath)
+
+            return
+        } else if presses.contains(where: { $0.key?.keyCode == .keyboardUpArrow }) {
+            newIndexPath = IndexPath(row: oldIndexPath.row - 1, section: 0)
+        } else if presses.contains(where: { $0.key?.keyCode == .keyboardDownArrow }) {
+            newIndexPath = IndexPath(row: oldIndexPath.row + 1, section: 0)
+        }
+
+        if let newIndexPath, self.autoCompletionView.isValid(indexPath: newIndexPath) {
+            self.selectedAutocompletionRow = newIndexPath
+            self.autoCompletionView.reloadRows(at: [oldIndexPath, newIndexPath], with: .none)
+            self.autoCompletionView.scrollToRow(at: newIndexPath, at: .none, animated: true)
+
+            return
+        }
+
+        super.pressesBegan(presses, with: event)
+    }
+
     // MARK: - UITableViewDataSource methods
 
     public override func numberOfSections(in tableView: UITableView) -> Int {
@@ -316,14 +351,25 @@ import UIKit
             cell.avatarButton.setActorAvatar(forId: suggestion.mention.id, withType: suggestion.source, withDisplayName: suggestion.mention.label, withRoomToken: self.room.token, using: self.account)
         }
 
+        if let selectedAutocompletionRow, selectedAutocompletionRow == indexPath {
+            cell.layer.borderColor = UIColor.systemGray.cgColor
+            cell.layer.borderWidth = 2.0
+        } else {
+            cell.layer.borderWidth = 0.0
+        }
+
         cell.accessibilityIdentifier = AutoCompletionCellIdentifier
         return cell
     }
 
     public override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        guard tableView == self.autoCompletionView,
-              indexPath.row < self.autocompletionUsers.count
-        else { return }
+        guard tableView == self.autoCompletionView else { return }
+
+        self.acceptAutoCompletion(withIndexPath: indexPath)
+    }
+
+    private func acceptAutoCompletion(withIndexPath indexPath: IndexPath) {
+        guard indexPath.row < self.autocompletionUsers.count else { return }
 
         let suggestion = self.autocompletionUsers[indexPath.row]
 
@@ -332,6 +378,7 @@ import UIKit
 
         let mentionWithWhitespace = suggestion.mention.label + " "
         self.acceptAutoCompletion(with: mentionWithWhitespace, keepPrefix: true)
+        self.selectedAutocompletionRow = nil
     }
 
     public override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

NextcloudTalk/NCUtils.swift

@@ -440,12 +440,6 @@ import AVFoundation
         )
     }
 
-    // MARK: - UITableView utils
-
-    public static func isValid(indexPath: IndexPath, forTableView tableView: UITableView) -> Bool {
-        indexPath.section < tableView.numberOfSections && indexPath.row < tableView.numberOfRows(inSection: indexPath.section)
-    }
-
     // MARK: - QueryItems utils
 
     public static func value(forKey key: String, fromQueryItems queryItems: NSArray) -> String? {

NextcloudTalk/UITableViewExtension.swift

@@ -14,4 +14,10 @@ extension UITableView {
 
         return T(style: style, reuseIdentifier: identifier)
     }
+
+    func isValid(indexPath: IndexPath) -> Bool {
+        indexPath.row >= 0 && indexPath.section >= 0 &&
+        indexPath.section < self.numberOfSections &&
+        indexPath.row < self.numberOfRows(inSection: indexPath.section)
+    }
 }