From 3ac9066e460c28ee9d1e931b3742e541501fd37d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Jun 2023 11:10:45 +0100
Subject: [PATCH] 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>
---
.../views/rooms/SendMessageComposer.tsx | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index ed2e022b38..d7326ee913 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -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;
}
};