[iOS] Edit link with text + url

matrix-org · Oct 12, 2023 · 7c14c8a · 7c14c8a
1 parent 6c42f29
commit 7c14c8a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift b/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift
@@ -52,13 +52,13 @@ struct ComposerActionToolbar: View {
     func makeAlertConfig() -> AlertConfig {
         var actions: [AlertConfig.Action] = [.cancel(title: "Cancel")]
         let createLinkTitle = "Create Link"
-        let singleTextAction: ([String]) -> Void = { strings in
-            let urlString = strings[0]
-            viewModel.select(range: linkAttributedRange)
-            viewModel.applyLinkOperation(.setLink(urlString: urlString))
-        }
         switch linkAction {
         case .create:
+            let singleTextAction: ([String]) -> Void = { strings in
+                let urlString = strings[0]
+                viewModel.select(range: linkAttributedRange)
+                viewModel.applyLinkOperation(.setLink(urlString: urlString))
+            }
             actions.append(createAction(singleTextAction: singleTextAction))
             return AlertConfig(title: createLinkTitle, actions: actions)
         case .createWithText:
@@ -70,9 +70,15 @@ struct ComposerActionToolbar: View {
             }
             actions.append(createWithTextAction(doubleTextAction: doubleTextAction))
             return AlertConfig(title: createLinkTitle, actions: actions)
-        case let .edit(url):
+        case let .edit(url, text):
             let editLinktitle = "Edit Link URL"
-            actions.append(editTextAction(singleTextAction: singleTextAction, url: url))
+            let doubleTextAction: ([String]) -> Void = { strings in
+                let urlString = strings[0]
+                let text = strings[1]
+                viewModel.select(range: linkAttributedRange)
+                viewModel.applyLinkOperation(.editLink(urlString: urlString, text: text))
+            }
+            actions.append(editTextAction(doubleTextAction: doubleTextAction, url: url, text: text))
             let removeAction = {
                 viewModel.select(range: linkAttributedRange)
                 viewModel.applyLinkOperation(.removeLinks)
@@ -119,7 +125,7 @@ private extension ComposerActionToolbar {
         )
     }
 
-    private func editTextAction(singleTextAction: @escaping ([String]) -> Void, url: String) -> AlertConfig.Action {
+    private func editTextAction(doubleTextAction: @escaping ([String]) -> Void, url: String, text: String) -> AlertConfig.Action {
         .textAction(
             title: "Ok",
             textFieldsData: [
@@ -128,8 +134,13 @@ private extension ComposerActionToolbar {
                     placeholder: "URL",
                     defaultValue: url
                 ),
+                .init(
+                    accessibilityIdentifier: .linkTextTextField,
+                    placeholder: "Text",
+                    defaultValue: text
+                ),
             ],
-            action: singleTextAction
+            action: doubleTextAction
         )
     }
 }
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift
@@ -35,24 +35,27 @@ extension WysiwygUITests {
 
         // Edit
         button(.linkButton).tap()
-        XCTAssertFalse(textField(.linkTextTextField).exists)
+        XCTAssertTrue(textField(.linkUrlTextField).exists)
+        XCTAssertTrue(textField(.linkTextTextField).exists)
         textField(.linkUrlTextField).doubleTap()
         textField(.linkUrlTextField).typeTextCharByChar("new_url")
+        textField(.linkTextTextField).doubleTap()
+        textField(.linkTextTextField).typeTextCharByChar("new text")
         app.buttons["Ok"].tap()
         assertTreeEquals(
             """
             └>a "https://new_url"
-              └>"text"
+              └>"new text"
             """
         )
 
         // Remove
         button(.linkButton).tap()
-        XCTAssertFalse(textField(.linkTextTextField).exists)
+        XCTAssertTrue(textField(.linkTextTextField).exists)
         app.buttons["Remove"].tap()
         assertTreeEquals(
             """
-            └>"text"
+            └>"new text"
             """
         )
     }

diff --git a/...rms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift b/...rms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift
@@ -34,6 +34,7 @@ protocol ComposerModelWrapperProtocol {
     func enter() -> ComposerUpdate
     func setLink(url: String, attributes: [Attribute]) -> ComposerUpdate
     func setLinkWithText(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate
+    func editLinkWithText(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate
     func insertMention(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate
     func insertMentionAtSuggestion(url: String, text: String, suggestion: SuggestionPattern, attributes: [Attribute]) -> ComposerUpdate
     func removeLinks() -> ComposerUpdate
@@ -131,6 +132,10 @@ final class ComposerModelWrapper: ComposerModelWrapperProtocol {
     func setLinkWithText(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate {
         execute { try $0.setLinkWithText(url: url, text: text, attributes: attributes) }
     }
+
+    func editLinkWithText(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate {
+        execute { try $0.editLinkWithText(url: url, text: text, attributes: attributes) }
+    }
 
     func insertMention(url: String, text: String, attributes: [Attribute]) -> ComposerUpdate {
         execute { try $0.insertMention(url: url, text: text, attributes: attributes) }

diff --git a/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift b/...ser/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
@@ -362,6 +362,8 @@ public extension WysiwygComposerViewModel {
         switch linkOperation {
         case let .createLink(urlString, text):
             update = model.setLinkWithText(url: urlString, text: text, attributes: [])
+        case let .editLink(urlString, text):
+            update = model.editLinkWithText(url: urlString, text: text, attributes: [])
         case let .setLink(urlString):
             update = model.setLink(url: urlString, attributes: [])
         case .removeLinks:

diff --git a/...rms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift b/...rms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift
@@ -18,6 +18,7 @@ import Foundation
 
 public enum WysiwygLinkOperation: Equatable {
     case setLink(urlString: String)
+    case editLink(urlString: String, text: String)
     case createLink(urlString: String, text: String)
     case removeLinks
 }
diff --git a/...forms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift b/...forms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift
@@ -34,7 +34,7 @@ extension WysiwygComposerTests {
         let url = "test_url"
         ComposerModelWrapper()
             .action { $0.setLinkWithText(url: url, text: "test", attributes: []) }
-            .assertLinkAction(.edit(url: "https://\(url)"))
+            .assertLinkAction(.edit(url: "https://\(url)", text: "test"))
     }
 
     func testSetLinkWithText() {