ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cancel message edit if content remains unchanged

Browse Source
This commit is contained in:
Ghazi Tozri
2026-09-15 22:52:04 +02:00
committed by Stefan Ceriu
parent de13fa5438
commit 5741290471
2 changed files with 150 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
+37 -7
View File
@@ -42,6 +42,21 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
private var currentLinkData: WysiwygLinkData?
private struct ComposerContent: Equatable {
let plain: String
let html: String?
}
private var originalEditContent: ComposerContent?
private var currentContent: ComposerContent {
if context.composerFormattingEnabled {
.init(plain: wysiwygViewModel.content.markdown, html: wysiwygViewModel.content.html)
} else {
.init(plain: plainComposerContent.text, html: nil)
}
}
private var replyLoadingTask: Task<Void, Never>?
init(initialText: String? = nil,
@@ -192,6 +207,12 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
case .recordVoiceMessage:
MXLog.warning("Ignoring send action while recording a voice message.")
default:
if state.composerMode.isEdit, currentContent == originalEditContent {
MXLog.info("Edit content is unchanged, cancelling the edit instead of sending it.")
cancelEdit()
return
}
if context.composerFormattingEnabled {
actionsSubject.send(.sendMessage(plain: wysiwygViewModel.content.markdown,
html: wysiwygViewModel.content.html,
@@ -206,13 +227,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
case .cancelReply:
set(mode: .default)
case .cancelEdit:
if let draft = draftService.loadVolatileDraft() {
handleLoadDraft(draft)
draftService.clearVolatileDraft()
} else {
set(text: "")
set(mode: .default)
}
cancelEdit()
case .attach(let attachment):
state.bindings.composerFocused = false
actionsSubject.send(.attach(attachment))
@@ -265,6 +280,10 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
} else {
set(text: plainText)
}
if state.composerMode.isEdit {
originalEditContent = currentContent
}
case .setFocus:
state.bindings.composerFocused = true
case .removeFocus:
@@ -453,6 +472,16 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
intentionalMentions: .init(userIDs: plainComposerContent.mentionedUserIDs, atRoom: plainComposerContent.containsAtRoomMention)))
}
private func cancelEdit() {
if let draft = draftService.loadVolatileDraft() {
handleLoadDraft(draft)
draftService.clearVolatileDraft()
} else {
set(text: "")
set(mode: .default)
}
}
private func processVoiceMessageAction(_ action: ComposerToolbarVoiceMessageAction) {
switch action {
case .startRecording:
@@ -576,6 +605,7 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
guard mode != state.composerMode else { return }
state.composerMode = mode
originalEditContent = nil
switch mode {
case .default:
break