ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 19:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: saving draft did not save the pill markdown content (#3003)

Browse Source
This commit is contained in:
Mauro
2024-07-08 15:55:13 +02:00
committed by GitHub
parent 74a078b871
commit b07d85cd06
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
+15 -4
View File
@@ -310,7 +310,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
} }
return return
} }
plainText = context.plainComposerText.string plainText = plainComposerContent.text
htmlText = nil htmlText = nil
} }
@@ -349,7 +349,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
} }
} }
private func sendPlainComposerText() { private var plainComposerContent: PlainComposerContent {
let attributedString = NSMutableAttributedString(attributedString: context.plainComposerText) let attributedString = NSMutableAttributedString(attributedString: context.plainComposerText)
var shouldMakeAnotherPass = false var shouldMakeAnotherPass = false
@@ -396,9 +396,14 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
} }
} while shouldMakeAnotherPass } while shouldMakeAnotherPass
actionsSubject.send(.sendMessage(plain: attributedString.string, html: nil, return .init(text: attributedString.string, mentionedUserIDs: userIDs, containsAtRoomMention: containsAtRoom)
}
private func sendPlainComposerText() {
let plainComposerContent = plainComposerContent
actionsSubject.send(.sendMessage(plain: plainComposerContent.text, html: nil,
mode: state.composerMode, mode: state.composerMode,
intentionalMentions: .init(userIDs: userIDs, atRoom: containsAtRoom))) intentionalMentions: .init(userIDs: plainComposerContent.mentionedUserIDs, atRoom: plainComposerContent.containsAtRoomMention)))
} }
private func processVoiceMessageAction(_ action: ComposerToolbarVoiceMessageAction) { private func processVoiceMessageAction(_ action: ComposerToolbarVoiceMessageAction) {
@@ -658,3 +663,9 @@ private final class ComposerMentionReplacer: MentionReplacer {
replacementForMentionClosure(url, text) replacementForMentionClosure(url, text)
} }
} }
private struct PlainComposerContent {
let text: String
let mentionedUserIDs: Set<String>
let containsAtRoomMention: Bool
}