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

Close ImageView after forward click 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-04-02 08:17:05 +02:00
parent 9606297f7c
commit e5a563f887
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/context_menus/MessageContextMenu.js
View File

@ -52,6 +52,9 @@ export default class MessageContextMenu extends React.Component {
/* callback called when the menu is dismissed */ /* callback called when the menu is dismissed */
onFinished: PropTypes.func, onFinished: PropTypes.func,
/* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
onCloseDialog: PropTypes.func,
}; };
state = { state = {
@ -194,6 +197,7 @@ export default class MessageContextMenu extends React.Component {
action: 'forward_event', action: 'forward_event',
event: this.props.mxEvent, event: this.props.mxEvent,
}); });
this.props.onCloseDialog();
this.closeMenu(); this.closeMenu();
}; };

1
src/components/views/elements/ImageView.js
View File

@ -224,6 +224,7 @@ export default class ImageView extends React.Component {
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
permalinkCreator={this.props.permalinkCreator} permalinkCreator={this.props.permalinkCreator}
onFinished={this.onCloseContextMenu} onFinished={this.onCloseContextMenu}
onCloseDialog={this.props.onFinished}
/> />
</ContextMenu> </ContextMenu>
); );