implemented selection of a command

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -132,13 +132,13 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
             }
         }
         .overlay(
-            viewModel.typingSuggestion != nil ? CommandsContainerView(
+            viewModel.composerCommand != nil ? CommandsContainerView(
                 suggestions: viewModel.suggestions,
                 handleCommand: { commandInfo in
                     viewModel.handleCommand(
                         for: $viewModel.text,
                         selectedRangeLocation: $viewModel.selectedRangeLocation,
-                        typingSuggestion: $viewModel.typingSuggestion,
+                        command: $viewModel.composerCommand,
                         extraData: commandInfo
                     )
                 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -39,7 +39,7 @@ public class MessageComposerViewModel: ObservableObject {
                 channelController.sendKeystrokeEvent()
                 checkTypingSuggestions()
             } else {
-                typingSuggestion = nil
+                composerCommand = nil
                 selectedRangeLocation = 0
             }
         }
@@ -78,7 +78,7 @@ public class MessageComposerViewModel: ObservableObject {
         }
     }
 
-    @Published var typingSuggestion: TypingSuggestion?
+    @Published var composerCommand: ComposerCommand?
 
     @Published var filePickerShown = false
     @Published var cameraPickerShown = false
@@ -307,32 +307,17 @@ public class MessageComposerViewModel: ObservableObject {
     func handleCommand(
         for text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        typingSuggestion: Binding<TypingSuggestion?>,
+        command: Binding<ComposerCommand?>,
         extraData: [String: Any]
     ) {
         commandsHandler.handleCommand(
             for: text,
             selectedRangeLocation: selectedRangeLocation,
-            typingSuggestion: typingSuggestion,
+            command: command,
             extraData: extraData
         )
     }
 
-    func mentionedUserSelected(_ chatUser: ChatUser) {
-        guard let typingSuggestion = typingSuggestion else { return }
-        let mentionText = self.mentionText(for: chatUser)
-        let newText = (text as NSString).replacingCharacters(
-            in: typingSuggestion.locationRange,
-            with: mentionText
-        )
-        text = newText
-
-        let newCaretLocation =
-            selectedRangeLocation + (mentionText.count - typingSuggestion.text.count)
-        selectedRangeLocation = newCaretLocation
-        self.typingSuggestion = nil
-    }
-    
     // MARK: - private
 
     private func mentionText(for user: ChatUser) -> String {
@@ -380,13 +365,13 @@ public class MessageComposerViewModel: ObservableObject {
     }
 
     private func checkTypingSuggestions() {
-        typingSuggestion = commandsHandler.canHandleCommand(
+        composerCommand = commandsHandler.canHandleCommand(
             in: text,
             caretLocation: selectedRangeLocation
         )
 
-        if let typingSuggestion = typingSuggestion {
-            commandsHandler.showSuggestions(for: typingSuggestion)
+        if let composerCommand = composerCommand {
+            commandsHandler.showSuggestions(for: composerCommand)
                 .sink { [weak self] suggestionInfo in
                     withAnimation {
                         self?.suggestions[suggestionInfo.key] = suggestionInfo.value

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/CommandsHandler.swift

@@ -8,23 +8,30 @@ import SwiftUI
 
 protocol CommandHandler {
 
+    var id: String { get }
+    
     func canHandleCommand(
         in text: String,
         caretLocation: Int
-    ) -> TypingSuggestion?
+    ) -> ComposerCommand?
 
     func showSuggestions(
-        for typingSuggestion: TypingSuggestion
+        for command: ComposerCommand
     ) -> Future<SuggestionInfo, Never>
 
     func handleCommand(
         for text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        typingSuggestion: Binding<TypingSuggestion?>,
+        command: Binding<ComposerCommand?>,
         extraData: [String: Any]
     )
 }
 
+struct ComposerCommand {
+    let id: String
+    let typingSuggestion: TypingSuggestion
+}
+
 struct SuggestionInfo {
     let key: String
     let value: Any
@@ -33,43 +40,54 @@ struct SuggestionInfo {
 class CommandsHandler: CommandHandler {
 
     private let commands: [CommandHandler]
+    let id: String = "main"
 
     init(commands: [CommandHandler]) {
         self.commands = commands
     }
 
-    func canHandleCommand(in text: String, caretLocation: Int) -> TypingSuggestion? {
+    func canHandleCommand(in text: String, caretLocation: Int) -> ComposerCommand? {
         for command in commands {
-            if let suggestion = command.canHandleCommand(
+            if let composerCommand = command.canHandleCommand(
                 in: text,
                 caretLocation: caretLocation
             ) {
-                return suggestion
+                return composerCommand
             }
         }
 
         return nil
     }
 
     func showSuggestions(
-        for typingSuggestion: TypingSuggestion
+        for command: ComposerCommand
     ) -> Future<SuggestionInfo, Never> {
-        // TODO: picking of command
-        commands.first!.showSuggestions(for: typingSuggestion)
+        for handler in commands {
+            if handler.id == command.id {
+                return handler.showSuggestions(for: command)
+            }
+        }
+        
+        // TODO: gracefully
+        fatalError("misconfiguration of commands")
     }
 
     func handleCommand(
         for text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        typingSuggestion: Binding<TypingSuggestion?>,
+        command: Binding<ComposerCommand?>,
         extraData: [String: Any]
     ) {
-        // TODO: picking of command
-        commands.first?.handleCommand(
-            for: text,
-            selectedRangeLocation: selectedRangeLocation,
-            typingSuggestion: typingSuggestion,
-            extraData: extraData
-        )
+        for handler in commands {
+            let commandValue = command.wrappedValue
+            if handler.id == commandValue?.id {
+                handler.handleCommand(
+                    for: text,
+                    selectedRangeLocation: selectedRangeLocation,
+                    command: command,
+                    extraData: extraData
+                )
+            }
+        }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/MentionsSuggester.swift

@@ -8,6 +8,8 @@ import SwiftUI
 
 public struct MentionsSuggester: CommandHandler {
 
+    let id: String = "mentions"
+    
     // TODO: read from config
     private var mentionAllAppUsers = false
     private let typingSuggester = TypingSuggester(options: .init(symbol: "@"))
@@ -20,18 +22,25 @@ public struct MentionsSuggester: CommandHandler {
         userSearchController = channelController.client.userSearchController()
     }
 
-    func canHandleCommand(in text: String, caretLocation: Int) -> TypingSuggestion? {
-        typingSuggester.typingSuggestion(in: text, caretLocation: caretLocation)
+    func canHandleCommand(in text: String, caretLocation: Int) -> ComposerCommand? {
+        if let suggestion = typingSuggester.typingSuggestion(
+            in: text,
+            caretLocation: caretLocation
+        ) {
+            return ComposerCommand(id: id, typingSuggestion: suggestion)
+        } else {
+            return nil
+        }
     }
 
     func handleCommand(
         for text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        typingSuggestion: Binding<TypingSuggestion?>,
+        command: Binding<ComposerCommand?>,
         extraData: [String: Any]
     ) {
         guard let chatUser = extraData["chatUser"] as? ChatUser,
-              let typingSuggestionValue = typingSuggestion.wrappedValue else {
+              let typingSuggestionValue = command.wrappedValue?.typingSuggestion else {
             return
         }
 
@@ -45,15 +54,15 @@ public struct MentionsSuggester: CommandHandler {
         let newCaretLocation =
             selectedRangeLocation.wrappedValue + (mentionText.count - typingSuggestionValue.text.count)
         selectedRangeLocation.wrappedValue = newCaretLocation
-        typingSuggestion.wrappedValue = nil
+        command.wrappedValue = nil
     }
 
     func showSuggestions(
-        for typingSuggestion: TypingSuggestion
+        for command: ComposerCommand
     ) -> Future<SuggestionInfo, Never> {
         showMentionSuggestions(
-            for: typingSuggestion.text,
-            mentionRange: typingSuggestion.locationRange
+            for: command.typingSuggestion.text,
+            mentionRange: command.typingSuggestion.locationRange
         )
     }
 
@@ -76,7 +85,7 @@ public struct MentionsSuggester: CommandHandler {
                 by: typingMention,
                 excludingId: currentUserId
             )
-            let suggestionInfo = SuggestionInfo(key: "mentions", value: users)
+            let suggestionInfo = SuggestionInfo(key: id, value: users)
             return resolve(with: suggestionInfo)
         }
     }
@@ -138,7 +147,7 @@ public struct MentionsSuggester: CommandHandler {
             let query = queryForMentionSuggestionsSearch(typingMention: typingMention)
             userSearchController.search(query: query) { _ in
                 let users = Array(userSearchController.users)
-                let suggestionInfo = SuggestionInfo(key: "mentions", value: users)
+                let suggestionInfo = SuggestionInfo(key: id, value: users)
                 promise(.success(suggestionInfo))
             }
         }