Send html in plain text mode (#2246)

ElementX/Sources/Screens/CallScreen/CallScreenViewModel.swift

@@ -93,8 +93,6 @@ class CallScreenViewModel: CallScreenViewModelType, CallScreenViewModelProtocol
                 switch action {
                 case .callEnded:
                     actionsSubject.send(.dismiss)
-                default:
-                    break
                 }
             }
             .store(in: &cancellables)

ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarModels.swift

@@ -31,7 +31,7 @@ enum ComposerToolbarVoiceMessageAction {
 }
 
 enum ComposerToolbarViewModelAction {
-    case sendMessage(plain: String, html: String?, mode: RoomScreenComposerMode, intentionalMentions: IntentionalMentions)
+    case sendMessage(plain: String, html: String, mode: RoomScreenComposerMode, intentionalMentions: IntentionalMentions)
     case attach(ComposerAttachmentType)
 
     case handlePasteOrDrop(provider: NSItemProvider)

ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift

@@ -87,6 +87,10 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
             }
             .store(in: &cancellables)
         
+        appSettings.$richTextEditorEnabled
+            .map { !$0 }
+            .assign(to: &wysiwygViewModel.$plainTextMode)
+        
         completionSuggestionService.suggestionsPublisher
             .weakAssign(to: \.state.suggestions, on: self)
             .store(in: &cancellables)
@@ -107,9 +111,8 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
             case .previewVoiceMessage:
                 actionsSubject.send(.voiceMessage(.send))
             default:
-                let sendHTML = ServiceLocator.shared.settings.richTextEditorEnabled
                 actionsSubject.send(.sendMessage(plain: wysiwygViewModel.content.markdown,
-                                                 html: sendHTML ? wysiwygViewModel.content.html : nil,
+                                                 html: wysiwygViewModel.content.html,
                                                  mode: state.composerMode,
                                                  intentionalMentions: wysiwygViewModel
                                                      .getMentionsState()
@@ -154,15 +157,13 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
             set(text: "")
         }
     }
-
-    func handleKeyCommand(_ keyCommand: WysiwygKeyCommand) -> Bool {
-        switch keyCommand {
-        case .enter:
-            process(viewAction: .sendMessage)
-            return true
-        case .shiftEnter:
-            return false
-        }
+    
+    var keyCommands: [WysiwygKeyCommand] {
+        [
+            .enter { [weak self] in
+                self?.process(viewAction: .sendMessage)
+            }
+        ]
     }
 
     // MARK: - Private

ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift

@@ -24,7 +24,7 @@ struct ComposerToolbar: View {
     // Needs to be observable or the placeholder and the dictation state are not managed correctly.
     @ObservedObject var wysiwygViewModel: WysiwygComposerViewModel
     
-    let keyCommandHandler: KeyCommandHandler
+    let keyCommands: [WysiwygKeyCommand]
     
     @FocusState private var composerFocused: Bool
     @State private var frame: CGRect = .zero
@@ -201,7 +201,7 @@ struct ComposerToolbar: View {
                             placeholderColor: .compound.textSecondary,
                             viewModel: wysiwygViewModel,
                             itemProviderHelper: ItemProviderHelper(),
-                            keyCommandHandler: keyCommandHandler) { provider in
+                            keyCommands: keyCommands) { provider in
             context.send(viewAction: .handlePasteOrDrop(provider: provider))
         }
     }
@@ -306,7 +306,7 @@ struct ComposerToolbar_Previews: PreviewProvider, TestablePreview {
             // The mock functon can't be used in this context because it does not hold a reference to the view model, losing the combine subscriptions
             ComposerToolbar(context: composerViewModel.context,
                             wysiwygViewModel: wysiwygViewModel,
-                            keyCommandHandler: { _ in false })
+                            keyCommands: [])
         }
         .previewDisplayName("With Suggestions")
         
@@ -336,7 +336,7 @@ extension ComposerToolbar {
         }
         return ComposerToolbar(context: composerViewModel.context,
                                wysiwygViewModel: wysiwygViewModel,
-                               keyCommandHandler: { _ in false })
+                               keyCommands: [])
     }
     
     static func textWithVoiceMessage(focused: Bool = true) -> ComposerToolbar {
@@ -352,7 +352,7 @@ extension ComposerToolbar {
         }
         return ComposerToolbar(context: composerViewModel.context,
                                wysiwygViewModel: wysiwygViewModel,
-                               keyCommandHandler: { _ in false })
+                               keyCommands: [])
     }
     
     static func voiceMessageRecordingMock() -> ComposerToolbar {
@@ -368,7 +368,7 @@ extension ComposerToolbar {
         }
         return ComposerToolbar(context: composerViewModel.context,
                                wysiwygViewModel: wysiwygViewModel,
-                               keyCommandHandler: { _ in false })
+                               keyCommands: [])
     }
     
     static func voiceMessagePreviewMock(uploading: Bool) -> ComposerToolbar {
@@ -385,6 +385,6 @@ extension ComposerToolbar {
         }
         return ComposerToolbar(context: composerViewModel.context,
                                wysiwygViewModel: wysiwygViewModel,
-                               keyCommandHandler: { _ in false })
+                               keyCommands: [])
     }
 }

ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift

@@ -212,7 +212,7 @@ struct MessageComposer_Previews: PreviewProvider, TestablePreview {
         let composerView = WysiwygComposerView(placeholder: L10n.richTextEditorComposerPlaceholder,
                                                viewModel: viewModel,
                                                itemProviderHelper: nil,
-                                               keyCommandHandler: nil,
+                                               keyCommands: nil,
                                                pasteHandler: nil)
         
         return MessageComposer(composerView: composerView,

ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift

@@ -138,7 +138,7 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
     func toPresentable() -> AnyView {
         let composerToolbar = ComposerToolbar(context: composerViewModel.context,
                                               wysiwygViewModel: wysiwygViewModel,
-                                              keyCommandHandler: composerViewModel.handleKeyCommand)
+                                              keyCommands: composerViewModel.keyCommands)
 
         return AnyView(RoomScreen(context: viewModel.context, composerToolbar: composerToolbar))
     }

ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift

@@ -461,7 +461,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
         state.showLoading = false
     }
 
-    private func sendCurrentMessage(_ message: String, html: String?, mode: RoomScreenComposerMode, intentionalMentions: IntentionalMentions) async {
+    private func sendCurrentMessage(_ message: String, html: String, mode: RoomScreenComposerMode, intentionalMentions: IntentionalMentions) async {
         guard !message.isEmpty else {
             fatalError("This message should never be empty")
         }