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 <[email protected]>
matrix-org · Jun 28, 2023 · 3ac9066 · 3ac9066
1 parent d404e06
commit 3ac9066
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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;
         }
     };