Merge pull request #942 from matrix-org/mauroromito/disable_autocorre…

…ction [iOS] Disabling auto correction
matrix-org · Mar 8, 2024 · 0b6fd00 · 0b6fd00
2 parents e77f777 + 707730b
commit 0b6fd00
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift
@@ -17,7 +17,7 @@
 import XCTest
 
 extension WysiwygUITests {
-    func testRichTextModeAutocorrection() throws {
+    func disable_testRichTextModeAutocorrection() throws {
         textView.typeTextCharByChar("/")
         XCTAssertFalse(image(.autocorrectionIndicator).exists)
         textView.typeText(XCUIKeyboardKey.delete.rawValue)
@@ -29,7 +29,7 @@ extension WysiwygUITests {
         XCTAssertTrue(image(.autocorrectionIndicator).exists)
     }
 
-    func testPlainTextModeAutocorrection() throws {
+    func disable_testPlainTextModeAutocorrection() throws {
         waitForButtonToExistAndTap(.plainRichButton)
         textView.typeTextCharByChar("/")
         XCTAssertFalse(image(.autocorrectionIndicator).exists)
@@ -42,12 +42,12 @@ extension WysiwygUITests {
         XCTAssertTrue(image(.autocorrectionIndicator).exists)
     }
 
-    func testRichTextModeNonLeadingCommand() throws {
+    func disable_testRichTextModeNonLeadingCommand() throws {
         textView.typeTextCharByChar("text /not_a_command")
         XCTAssertTrue(image(.autocorrectionIndicator).exists)
     }
 
-    func testPlainTextModeNonLeadingCommand() throws {
+    func disable_testPlainTextModeNonLeadingCommand() throws {
         waitForButtonToExistAndTap(.plainRichButton)
         textView.typeTextCharByChar("text /not_a_command")
         XCTAssertTrue(image(.autocorrectionIndicator).exists)

diff --git a/...Composer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift b/...Composer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift
@@ -203,7 +203,8 @@ struct UITextViewWrapper: UIViewRepresentable {
                 functionName: #function
             )
             didUpdateText()
-            textView.toggleAutocorrectionIfNeeded()
+            // Disabled always until we fix the predictive text issue
+//            textView.toggleAutocorrectionIfNeeded()
             textView.invalidateIntrinsicContentSize()
         }
 

diff --git a/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift b/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
@@ -29,12 +29,16 @@ public class WysiwygComposerViewModel: WysiwygComposerViewModelProtocol, Observa
     /// The textView that the model currently manages, a default text view is provided, but you should always inject it from the UIWrapper
     public lazy var textView = {
         let textView = WysiwygTextView()
+        // Disabled until we fix the issue with the predictive text
+        textView.autocorrectionType = .no
         textView.linkTextAttributes[.foregroundColor] = parserStyle.linkColor
         textView.mentionDisplayHelper = mentionDisplayHelper
         textView.apply(attributedContent)
         return textView
     }() {
         didSet {
+            // Disabled until we fix the issue with the predictive text
+            textView.autocorrectionType = .no
             textView.linkTextAttributes[.foregroundColor] = parserStyle.linkColor
             textView.mentionDisplayHelper = mentionDisplayHelper
             textView.apply(attributedContent)

diff --git a/...iwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift b/...iwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift
@@ -136,7 +136,8 @@ public class WysiwygTextView: UITextView {
             flusher.flush()
         }
         didSet {
-            toggleAutocorrectionIfNeeded()
+            // Disabled until we fix the predictive text issue
+            // toggleAutocorrectionIfNeeded()
             delegate?.textViewDidChange?(self)
         }
     }

diff --git a/...erTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift b/...erTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift
@@ -17,8 +17,9 @@
 @testable import WysiwygComposer
 import XCTest
 
+// THESE TESTS ARE DISABLED UNTIL WE FIX THE PREDICTIVE TEXT ISSUE
 extension WysiwygComposerViewModelTests {
-    func testAutocorrectionIsDisabled() throws {
+    func disabled_testAutocorrectionIsDisabled() throws {
         mockTrailingTyping("/")
         assertAutocorrectDisabled()
 
@@ -29,20 +30,20 @@ extension WysiwygComposerViewModelTests {
         assertAutocorrectDisabled()
     }
 
-    func testAutocorrectionIsEnabled() throws {
+    func disabled_testAutocorrectionIsEnabled() throws {
         mockTrailingTyping("Just some text")
         assertAutoCorrectEnabled()
 
         mockTrailingTyping(" /not_a_command")
         assertAutoCorrectEnabled()
     }
 
-    func testDoubleSlashKeepAutocorrectionEnabled() throws {
+    func disabled_testDoubleSlashKeepAutocorrectionEnabled() throws {
         mockTrailingTyping("//")
         assertAutoCorrectEnabled()
     }
 
-    func testAutocorrectionIsReEnabled() throws {
+    func disabled_testAutocorrectionIsReEnabled() throws {
         mockTrailingTyping("/")
         assertAutocorrectDisabled()
 
@@ -58,7 +59,7 @@ extension WysiwygComposerViewModelTests {
         assertAutoCorrectEnabled()
     }
 
-    func testAutocorrectionAfterSetHtmlContent() {
+    func disabled_testAutocorrectionAfterSetHtmlContent() {
         viewModel.setHtmlContent("/join #some_room:matrix.org")
         assertAutocorrectDisabled()
 
@@ -79,7 +80,7 @@ extension WysiwygComposerViewModelTests {
 //        assertAutoCorrectEnabled()
 //    }
 
-    func testAutocorrectionAfterSetMarkdownContent() {
+    func disabled_testAutocorrectionAfterSetMarkdownContent() {
         viewModel.setMarkdownContent("/join #some_room:matrix.org")
         assertAutocorrectDisabled()