felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-24 02:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7062 from vector-im/aringenbach/7061_enable_markdown

Browse Source 
Rich-text editor: enable translations between Markdown and HTML when toggling text formatting
This commit is contained in:
aringenbach
2022-11-10 10:25:43 +01:00
committed by GitHub
parent 74813f1352 8c54a918ff
commit 7bbfcf530d
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/Composer/MockComposerScreenState.swift
+1 -1
View File
@@ -37,7 +37,7 @@ enum MockComposerScreenState: MockScreenState, CaseIterable {
case .reply: viewModel = ComposerViewModel(initialViewState: ComposerViewState(eventSenderDisplayName: "TestUser", sendMode: .reply, textFormattingEnabled: true, 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
+1 -5
View File
@@ -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 {