[iOS] Fix for dictation not working properly (#875)

matrix-org · Nov 17, 2023 · 876f394 · 876f394
1 parent 628b612
commit 876f394
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/...Composer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift b/...Composer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift
@@ -88,7 +88,7 @@ public struct WysiwygComposerView: View {
 
     @ViewBuilder
     private var placeholderView: some View {
-        if viewModel.isContentEmpty {
+        if viewModel.isContentEmpty, !viewModel.textView.isDictationRunning {
             Text(placeholder)
                 .font(Font(UIFont.preferredFont(forTextStyle: .body)))
                 .foregroundColor(placeholderColor)

diff --git a/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift b/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
@@ -556,7 +556,8 @@ private extension WysiwygComposerViewModel {
     /// Reconciliate the content of the model with the content of the text view.
     func reconciliateIfNeeded() {
         do {
-            guard let replacement = try StringDiffer.replacement(from: attributedContent.text.htmlChars,
+            guard !textView.isDictationRunning,
+                  let replacement = try StringDiffer.replacement(from: attributedContent.text.htmlChars,
                                                                  to: textView.attributedText.htmlChars) else {
                 return
             }

diff --git a/...iwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift b/...iwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift
@@ -44,6 +44,8 @@ protocol WysiwygTextViewDelegate: AnyObject {
 public protocol MentionDisplayHelper { }
 
 public class WysiwygTextView: UITextView {
+    private(set) var isDictationRunning = false
+
     /// Internal delegate for the text view.
     weak var wysiwygDelegate: WysiwygTextViewDelegate?
 
@@ -53,12 +55,42 @@ public class WysiwygTextView: UITextView {
 
     override public init(frame: CGRect, textContainer: NSTextContainer?) {
         super.init(frame: frame, textContainer: textContainer)
-        contentMode = .redraw
+        commonInit()
     }
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
+        commonInit()
+    }
+
+    private func commonInit() {
         contentMode = .redraw
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(textInputCurrentInputModeDidChange),
+                                               name: UITextInputMode.currentInputModeDidChangeNotification,
+                                               object: nil)
+    }
+
+    @objc private func textInputCurrentInputModeDidChange(notification: Notification) {
+        // We don't care about the input mode if this is not the first responder
+        guard isFirstResponder else {
+            return
+        }
+
+        guard let inputMode = textInputMode?.primaryLanguage,
+              inputMode == "dictation" else {
+            isDictationRunning = false
+            return
+        }
+        isDictationRunning = true
+    }
+
+    override public func dictationRecordingDidEnd() {
+        isDictationRunning = false
+    }
+
+    override public func dictationRecognitionFailed() {
+        isDictationRunning = false
     }
 
     /// Register a pill view that has been added through `NSTextAttachmentViewProvider`.