From 7a38bf5674580e353627c46b067e98120244bc08 Mon Sep 17 00:00:00 2001 From: manuroe Date: Fri, 14 Jun 2019 16:15:27 +0200 Subject: [PATCH 1/2] Reactions menu: leave the menu once the user tapped a reaction --- Riot/Modules/Room/RoomViewController.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 28435b73a..66a61219b 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -5270,6 +5270,8 @@ [self.errorPresenter presentErrorFromViewController:self forError:error animated:YES handler:nil]; }]; + + [self hideContextualMenuAnimated:YES]; } - (void)reactionsMenuViewModel:(ReactionsMenuViewModel *)viewModel didRemoveReaction:(NSString *)reaction forEventId:(NSString *)eventId @@ -5283,6 +5285,8 @@ [self.errorPresenter presentErrorFromViewController:self forError:error animated:YES handler:nil]; }]; + + [self hideContextualMenuAnimated:YES]; } @end From 0a8c46120bfefa5067cc0d3234b83e367eed1daa Mon Sep 17 00:00:00 2001 From: manuroe Date: Fri, 14 Jun 2019 16:28:21 +0200 Subject: [PATCH 2/2] Menu actions: Display the keyboard once the users tap on reply or edit This also fixes the local echo issues we had when this screen stayed displayed --- Riot/Modules/Room/RoomViewController.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 66a61219b..590f8360f 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -5112,6 +5112,9 @@ [self hideContextualMenuAnimated:YES cancelEventSelection:NO completion:nil]; [self selectEventWithId:eventId inputToolBarSendMode:RoomInputToolbarViewSendModeReply showTimestamp:NO]; + + // And display the keyboard + [self.inputToolbarView becomeFirstResponder]; }; // Edit action @@ -5121,6 +5124,9 @@ MXStrongifyAndReturnIfNil(self); [self hideContextualMenuAnimated:YES cancelEventSelection:NO completion:nil]; [self editEventContentWithId:eventId]; + + // And display the keyboard + [self.inputToolbarView becomeFirstResponder]; }; editMenuItem.isEnabled = [self.roomDataSource canEditEventWithId:eventId];