Merge pull request #7547 from vector-im/aringenbach/disable_removing_trigger_text_in_rte_mode

Disable removing mention/command text trigger with RTE enabled
This commit is contained in:
aringenbach
2023-05-15 08:03:33 +02:00
committed by GitHub
+8
View File
@@ -8147,6 +8147,14 @@ static CGSize kThreadListBarButtonItemImageSize;
- (void)removeTriggerTextFromComposer:(NSString *)textTrigger
{
RoomInputToolbarView *toolbar = (RoomInputToolbarView *)self.inputToolbarView;
Class roomInputToolbarViewClass = [RoomViewController mainToolbarClass];
// RTE handles removing the text trigger by itself.
if (roomInputToolbarViewClass == WysiwygInputToolbarView.class && RiotSettings.shared.enableWysiwygTextFormatting)
{
return;
}
if (toolbar && textTrigger.length) {
NSMutableAttributedString *attributedTextMessage = [[NSMutableAttributedString alloc] initWithAttributedString:toolbar.attributedTextMessage];
[[attributedTextMessage mutableString] replaceOccurrencesOfString:textTrigger