@@ -52,8 +52,11 @@ bool _tryShowMessageActionsPopover({
5252 required Future <ui.Image > Function ()? captureAnchorSnapshot,
5353 required VoidCallback ? onPopoverPresented,
5454 required VoidCallback ? onPopoverDismissed,
55+ required FocusNode ? composerFocusNode,
56+ required VoidCallback ? restoreComposerFocus,
5557}) {
5658 if (anchorRect == null || captureAnchorSnapshot == null ) return false ;
59+ final shouldRestoreComposerFocus = composerFocusNode? .hasFocus ?? false ;
5760 unawaited (
5861 _showMessageActionsPopover (
5962 context: context,
@@ -69,6 +72,9 @@ bool _tryShowMessageActionsPopover({
6972 captureAnchorSnapshot: captureAnchorSnapshot,
7073 onPopoverPresented: onPopoverPresented,
7174 onPopoverDismissed: onPopoverDismissed,
75+ composerFocusNode: composerFocusNode,
76+ restoreComposerFocus: restoreComposerFocus,
77+ shouldRestoreComposerFocus: shouldRestoreComposerFocus,
7278 ).then ((shown) {
7379 if (shown || ! context.mounted) return ;
7480 showMessageActions (
@@ -101,6 +107,9 @@ Future<bool> _showMessageActionsPopover({
101107 required Future <ui.Image > Function () captureAnchorSnapshot,
102108 required VoidCallback ? onPopoverPresented,
103109 required VoidCallback ? onPopoverDismissed,
110+ required FocusNode ? composerFocusNode,
111+ required VoidCallback ? restoreComposerFocus,
112+ required bool shouldRestoreComposerFocus,
104113}) async {
105114 if (_messageActionsPresentationInFlight) return true ;
106115 _messageActionsPresentationInFlight = true ;
@@ -141,6 +150,7 @@ Future<bool> _showMessageActionsPopover({
141150
142151 final reduceMotion = MediaQuery .disableAnimationsOf (context);
143152 onPopoverPresented? .call ();
153+ if (shouldRestoreComposerFocus) composerFocusNode! .unfocus ();
144154
145155 String ? selectedActionId;
146156 try {
@@ -178,6 +188,11 @@ Future<bool> _showMessageActionsPopover({
178188 await Future <void >.sync (action.onSelected);
179189 break ;
180190 }
191+ if (selectedActionId == null &&
192+ shouldRestoreComposerFocus &&
193+ context.mounted) {
194+ restoreComposerFocus? .call ();
195+ }
181196 return true ;
182197 } finally {
183198 _messageActionsPresentationInFlight = false ;
@@ -500,7 +515,10 @@ class _MessageActionsPopover extends StatelessWidget {
500515 constraints.maxWidth - mediaQuery.padding.right - Grid .xxs;
501516 final safeTop = mediaQuery.padding.top + Grid .xxs;
502517 final safeBottom =
503- constraints.maxHeight - mediaQuery.padding.bottom - Grid .xxs;
518+ constraints.maxHeight -
519+ mediaQuery.padding.bottom -
520+ mediaQuery.viewInsets.bottom -
521+ Grid .xxs;
504522 final availableWidth = math.max (1.0 , safeRight - safeLeft);
505523 final availableHeight = math.max (1.0 , safeBottom - safeTop);
506524 final trayWidth = math.min (_reactionTrayMaxWidth, availableWidth);
0 commit comments