Only trap escape key for cancel reply if there is a reply (#11140)

fall through (to clear read marker) otherwise

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
pull/28217/head
Michael Telatynski 2023-06-28 11:10:45 +01:00 committed by GitHub
parent d404e0656a
commit 3ac9066e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions

View File

@ -351,13 +351,15 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
}
break;
case KeyBindingAction.CancelReplyOrEdit:
dis.dispatch({
action: "reply_to_event",
event: null,
context: this.context.timelineRenderingType,
});
event.preventDefault();
event.stopPropagation();
if (!!this.context.replyToEvent) {
dis.dispatch({
action: "reply_to_event",
event: null,
context: this.context.timelineRenderingType,
});
event.preventDefault();
event.stopPropagation();
}
break;
}
};