From e5a563f88740310f841d42e20ef6050b02372b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 2 Apr 2021 08:17:05 +0200
Subject: [PATCH] Close ImageView after forward click
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/context_menus/MessageContextMenu.js | 4 ++++
 src/components/views/elements/ImageView.js               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 56f070ba36..cce628120c 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -52,6 +52,9 @@ export default class MessageContextMenu extends React.Component {
 
         /* callback called when the menu is dismissed */
         onFinished: PropTypes.func,
+
+        /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
+        onCloseDialog: PropTypes.func,
     };
 
     state = {
@@ -194,6 +197,7 @@ export default class MessageContextMenu extends React.Component {
             action: 'forward_event',
             event: this.props.mxEvent,
         });
+        this.props.onCloseDialog();
         this.closeMenu();
     };
 
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index d3be3c1d54..f39ac8ba19 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -224,6 +224,7 @@ export default class ImageView extends React.Component {
                         mxEvent={this.props.mxEvent}
                         permalinkCreator={this.props.permalinkCreator}
                         onFinished={this.onCloseContextMenu}
+                        onCloseDialog={this.props.onFinished}
                     />
                 </ContextMenu>
             );