Don't auto replace if not enabled

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
matrix-org · Sep 11, 2021 · f4ca073 · f4ca073
1 parent fd02231
commit f4ca073
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
@@ -354,9 +354,11 @@ export default class SendMessageComposer extends React.Component<IProps> {
         }
 
         // Replace emoticon at the end of the message
-        const caret = this.editorRef.current?.getCaret();
-        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
-        this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON);
+        if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
+            const caret = this.editorRef.current?.getCaret();
+            const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+            this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON);
+        }
 
         const replyToEvent = this.props.replyToEvent;
         let shouldSend = true;