Rich-text editor: enable translations between Markdown and HTML when toggling text formatting

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,7 +23,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "3cafc52d257411e06d4be4d0e2cdeeb4bd4b7099"
+        "revision" : "74bfffeaa56e9d98bbeedf0a5f2c46125fc522e1"
       }
     },
     {

Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift

@@ -137,8 +137,7 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
     }
     
     private func sendWysiwygMessage(content: WysiwygComposerContent) {
-        let html = content.html.isEmpty ? content.plainText : content.html
-        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: html, withRawText: content.plainText)
+        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: content.html, withRawText: content.markdown)
     }
     
     private func showSendMediaActions() {

RiotSwiftUI/Modules/Room/Composer/MockComposerScreenState.swift

@@ -37,7 +37,7 @@ enum MockComposerScreenState: MockScreenState, CaseIterable {
         case .reply: viewModel = ComposerViewModel(initialViewState: ComposerViewState(eventSenderDisplayName: "TestUser", sendMode: .reply, bindings: bindings))
         }
         
-        let wysiwygviewModel = WysiwygComposerViewModel(minHeight: 20, maxHeight: 360)
+        let wysiwygviewModel = WysiwygComposerViewModel(minHeight: 20, maxCompressedHeight: 360)
         
         viewModel.callback = { [weak viewModel, weak wysiwygviewModel] result in
             guard let viewModel = viewModel else { return }

RiotSwiftUI/Modules/Room/Composer/View/Composer.swift

@@ -158,11 +158,7 @@ struct Composer: View {
 
     private var sendButton: some View {
         return Button {
-            if wysiwygViewModel.plainTextMode {
-                sendMessageAction(wysiwygViewModel.plainTextModeContent)
-            } else {
-                sendMessageAction(wysiwygViewModel.content)
-            }
+            sendMessageAction(wysiwygViewModel.content)
             wysiwygViewModel.clearContent()
         } label: {
             if viewModel.viewState.sendMode == .edit {

changelog.d/7061.feature

@@ -0,0 +1 @@
+Labs: Rich-text editor: enable translations between Markdown and HTML when toggling text formatting

project.yml

@@ -53,7 +53,7 @@ packages:
     branch: main
   WysiwygComposer:
     url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift
-    revision: 3cafc52d257411e06d4be4d0e2cdeeb4bd4b7099
+    revision: 74bfffeaa56e9d98bbeedf0a5f2c46125fc522e1
   DeviceKit:
     url: https://github.com/devicekit/DeviceKit
     majorVersion: 4.7.0