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

Merge branch 'feature/5854_foss_merge' into 'develop'

Browse Source 
5854 foss merge

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!335
This commit is contained in:
JanNiklas Grabowski
2024-03-18 12:59:15 +00:00
parent 01e3255631 39d8f63c13
commit 1d83b8ac16
34 changed files with 130 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ struct Composer: View {
placeholder: viewModel.viewState.placeholder ?? "",
viewModel: wysiwygViewModel,
itemProviderHelper: nil,
keyCommandHandler: handleKeyCommand,
keyCommands: keyCommands,
pasteHandler: nil
)
.clipped()
@@ -228,15 +228,13 @@ struct Composer: View {
}
}
func handleKeyCommand(_ keyCommand: WysiwygKeyCommand) -> Bool {
switch keyCommand {
case .enter:
sendMessageAction(wysiwygViewModel.content)
wysiwygViewModel.clearContent()
return true
case .shiftEnter:
return false
}
var keyCommands: [WysiwygKeyCommand] {
[
.enter {
sendMessageAction(wysiwygViewModel.content)
wysiwygViewModel.clearContent()
}
]
}
/// Computes the total height of the composer (excluding the RTE formatting bar).