OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6965 from SimonBrandner/feature/end-of-line-emoji 

Convert emoticon to emoji at the end of a line on send even if the cursor isn't there
pull/21833/head
David Baker 2021-10-18 17:12:41 +01:00 committed by GitHub
parent 77e6e1c0ab 1935620e43
commit df5f4409ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/rooms/SendMessageComposer.tsx
View File

@ -57,6 +57,7 @@ import QuestionDialog from "../dialogs/QuestionDialog";
import { ActionPayload } from "../../../dispatcher/payloads"; import { ActionPayload } from "../../../dispatcher/payloads";
import { decorateStartSendingTime, sendRoundTripMetric } from "../../../sendTimePerformanceMetrics"; import { decorateStartSendingTime, sendRoundTripMetric } from "../../../sendTimePerformanceMetrics";
import RoomContext from '../../../contexts/RoomContext'; import RoomContext from '../../../contexts/RoomContext';
import DocumentPosition from "../../../editor/position";
function addReplyToMessageContent( function addReplyToMessageContent(
content: IContent, content: IContent,
@ -391,9 +392,12 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
// Replace emoticon at the end of the message // Replace emoticon at the end of the message
if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) { if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
const caret = this.editorRef.current?.getCaret(); const indexOfLastPart = model.parts.length - 1;
const position = model.positionForOffset(caret.offset, caret.atNodeEnd); const positionInLastPart = model.parts[indexOfLastPart].text.length;
this.editorRef.current?.replaceEmoticon(position, REGEX_EMOTICON); this.editorRef.current?.replaceEmoticon(
new DocumentPosition(indexOfLastPart, positionInLastPart),
REGEX_EMOTICON,
);
} }
const replyToEvent = this.props.replyToEvent; const replyToEvent = this.props.replyToEvent;