Skip to content

Commit c25895d

Browse files
klopez4212Princess Donut
authored andcommitted
Keep message actions above keyboard
Co-authored-by: Kenny Lopez <[email protected]> Signed-off-by: Kenny Lopez <[email protected]>
1 parent b99b297 commit c25895d

11 files changed

Lines changed: 289 additions & 33 deletions

File tree

‎mobile/lib/features/channels/channel_detail_page.dart‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ class ChannelDetailPage extends HookConsumerWidget {
137137
@override
138138
Widget build(BuildContext context, WidgetRef ref) {
139139
final composerDockHeight = useState(0.0);
140+
final composerFocusNode = useFocusNode();
141+
final restoreComposerFocus = useRef<VoidCallback?>(null);
140142
final sendMessage = ref.read(sendMessageProvider);
141143
final detailsAsync = ref.watch(channelDetailsProvider(channel.id));
142144
final channelsAsync = ref.watch(channelsProvider);
@@ -472,6 +474,12 @@ class ChannelDetailPage extends HookConsumerWidget {
472474
composerBottomInset: showsComposer
473475
? composerDockHeight.value
474476
: 0,
477+
composerFocusNode: showsComposer
478+
? composerFocusNode
479+
: null,
480+
restoreComposerFocus: showsComposer
481+
? () => restoreComposerFocus.value?.call()
482+
: null,
475483
);
476484
},
477485
),
@@ -520,6 +528,9 @@ class ChannelDetailPage extends HookConsumerWidget {
520528
),
521529
ComposeBar(
522530
channelId: channel.id,
531+
focusNode: composerFocusNode,
532+
onFocusRestorerChanged: (restoreFocus) =>
533+
restoreComposerFocus.value = restoreFocus,
523534
channelName: resolvedChannel.isDm
524535
? ''
525536
: resolvedChannel.name,

‎mobile/lib/features/channels/channel_detail_page/message_bubble.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class _MessageBubble extends HookConsumerWidget {
99
final List<TimelineMessage>? allMessages;
1010
final bool isMember;
1111
final bool isArchived;
12+
final FocusNode? composerFocusNode;
13+
final VoidCallback? restoreComposerFocus;
1214

1315
const _MessageBubble({
1416
required this.message,
@@ -19,6 +21,8 @@ class _MessageBubble extends HookConsumerWidget {
1921
this.allMessages,
2022
this.isMember = false,
2123
this.isArchived = false,
24+
this.composerFocusNode,
25+
this.restoreComposerFocus,
2226
});
2327

2428
@override
@@ -88,6 +92,8 @@ class _MessageBubble extends HookConsumerWidget {
8892
captureAnchorSnapshot: details.captureSnapshot,
8993
onPopoverPresented: () => details.setSourceHidden(true),
9094
onPopoverDismissed: () => details.setSourceHidden(false),
95+
composerFocusNode: composerFocusNode,
96+
restoreComposerFocus: restoreComposerFocus,
9197
);
9298
}
9399

‎mobile/lib/features/channels/channel_detail_page/message_list.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class _MessageList extends HookConsumerWidget {
1515
final bool isArchived;
1616
final double appBarTitleContentHeight;
1717
final double composerBottomInset;
18+
final FocusNode? composerFocusNode;
19+
final VoidCallback? restoreComposerFocus;
1820

1921
const _MessageList({
2022
required this.entries,
@@ -31,6 +33,8 @@ class _MessageList extends HookConsumerWidget {
3133
required this.isArchived,
3234
required this.appBarTitleContentHeight,
3335
required this.composerBottomInset,
36+
this.composerFocusNode,
37+
this.restoreComposerFocus,
3438
});
3539

3640
@override
@@ -553,6 +557,8 @@ class _MessageList extends HookConsumerWidget {
553557
allMessages: allMessages,
554558
isMember: isMember,
555559
isArchived: isArchived,
560+
composerFocusNode: composerFocusNode,
561+
restoreComposerFocus: restoreComposerFocus,
556562
),
557563
if (entry.summary != null)
558564
_ThreadSummaryRow(

‎mobile/lib/features/channels/compose_bar/compose_bar_widget.dart‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class ComposeBar extends HookConsumerWidget {
99
/// Runs immediately before the editor requests focus, allowing a parent to
1010
/// prepare focus-dependent layout (for example, following a thread tail).
1111
final VoidCallback? onFocusRequested;
12+
final FocusNode? focusNode;
13+
final ValueChanged<VoidCallback>? onFocusRestorerChanged;
1214

1315
/// Optional thread IDs for thread-scoped typing indicators.
1416
final String? threadHeadId;
@@ -20,6 +22,8 @@ class ComposeBar extends HookConsumerWidget {
2022
this.hintText,
2123
this.threadHeadId,
2224
this.rootId,
25+
this.focusNode,
26+
this.onFocusRestorerChanged,
2327
this.onFocusRequested,
2428
required this.onSend,
2529
});
@@ -50,15 +54,12 @@ class ComposeBar extends HookConsumerWidget {
5054
defaultTargetPlatform != TargetPlatform.android,
5155
);
5256
final androidImeFallbackTimer = useRef<Timer?>(null);
53-
final focusNode = useFocusNode();
57+
final focusNode = this.focusNode ?? useFocusNode();
5458
useEffect(
55-
() =>
56-
() => androidImeFallbackTimer.value?.cancel(),
57-
[androidImeFallbackTimer],
58-
);
59-
useEffect(
60-
() =>
61-
() => _dismissComposerKeyboard(focusNode),
59+
() => () {
60+
androidImeFallbackTimer.value?.cancel();
61+
_dismissComposerKeyboard(focusNode);
62+
},
6263
[focusNode],
6364
);
6465
final isEmojiPickerOpen = useState(false);
@@ -863,6 +864,13 @@ class ComposeBar extends HookConsumerWidget {
863864
androidImeFallbackTimer: androidImeFallbackTimer,
864865
);
865866

867+
_useComposerFocusRestorer(
868+
onChanged: onFocusRestorerChanged,
869+
isExpanded: isComposerExpanded,
870+
focusNode: focusNode,
871+
expand: expandComposer,
872+
);
873+
866874
final suggestionPanel = _composerSuggestionPanel(
867875
channelSuggestions: channelSuggestions,
868876
mentionSuggestions: suggestions,

‎mobile/lib/features/channels/compose_bar/helpers.dart‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
part of '../compose_bar.dart';
22

3+
void _useComposerFocusRestorer({
4+
required ValueChanged<VoidCallback>? onChanged,
5+
required ValueNotifier<bool> isExpanded,
6+
required FocusNode focusNode,
7+
required VoidCallback expand,
8+
}) {
9+
useEffect(() {
10+
onChanged?.call(() {
11+
if (isExpanded.value) {
12+
focusNode.requestFocus();
13+
} else {
14+
expand();
15+
}
16+
});
17+
return null;
18+
}, [onChanged, focusNode]);
19+
}
20+
321
void _useComposerChannelNames(
422
_MarkdownEditingController controller,
523
AsyncValue<List<Channel>> channelsAsync,

‎mobile/lib/features/channels/message_actions.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ void showMessageActions({
5454
List<TimelineMessage>? allMessages,
5555
String? currentPubkey,
5656
bool isMember = false,
57-
bool isArchived = false,
5857
Rect? anchorRect,
5958
Future<ui.Image> Function()? captureAnchorSnapshot,
6059
VoidCallback? onPopoverPresented,
6160
VoidCallback? onPopoverDismissed,
61+
FocusNode? composerFocusNode,
62+
VoidCallback? restoreComposerFocus,
63+
bool isArchived = false,
6264
EdgeInsets popoverSpotlightPadding = const EdgeInsets.all(Grid.xxs),
6365
}) {
6466
final hasReactionOnlyActions = message.isSystem && !canManageMessage;
@@ -87,6 +89,8 @@ void showMessageActions({
8789
captureAnchorSnapshot: captureAnchorSnapshot,
8890
onPopoverPresented: onPopoverPresented,
8991
onPopoverDismissed: onPopoverDismissed,
92+
composerFocusNode: composerFocusNode,
93+
restoreComposerFocus: restoreComposerFocus,
9094
)) {
9195
return;
9296
}
@@ -509,9 +513,6 @@ class _FollowThreadTile extends ConsumerWidget {
509513
}
510514
}
511515

512-
/// Promoted actions for the three dominant mobile jobs: respond now (Reply),
513-
/// hand off context (Copy link — the `buzz://message` link is the workspace's
514-
/// context-transfer primitive), and defer (Remind me).
515516
class _FastActionsRow extends ConsumerWidget {
516517
final TimelineMessage message;
517518
final String channelId;

‎mobile/lib/features/channels/message_actions/message_action_popover.dart‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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);

‎mobile/lib/features/channels/thread_detail_page.dart‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class ThreadDetailPage extends HookConsumerWidget {
7373
Widget build(BuildContext context, WidgetRef ref) {
7474
final appView = View.of(context);
7575
final composerDockHeight = useState(0.0);
76+
final composerFocusNode = useFocusNode();
77+
final restoreComposerFocus = useRef<VoidCallback?>(null);
7678
final settledImeBottomInset = useState(
7779
usesFixedAndroidImeViewport
7880
? appView.viewInsets.bottom / appView.devicePixelRatio
@@ -636,6 +638,9 @@ class ThreadDetailPage extends HookConsumerWidget {
636638
isMember: isMember,
637639
isArchived: isArchived,
638640
isThreadHead: true,
641+
composerFocusNode: composerFocusNode,
642+
restoreComposerFocus: () =>
643+
restoreComposerFocus.value?.call(),
639644
),
640645
Padding(
641646
padding: const EdgeInsets.symmetric(
@@ -715,6 +720,9 @@ class ThreadDetailPage extends HookConsumerWidget {
715720
allMessages: allMsgs,
716721
isMember: isMember,
717722
isArchived: isArchived,
723+
composerFocusNode: composerFocusNode,
724+
restoreComposerFocus: () =>
725+
restoreComposerFocus.value?.call(),
718726
),
719727
if (nestedSummary != null)
720728
_NestedThreadSummaryRow(
@@ -751,6 +759,9 @@ class ThreadDetailPage extends HookConsumerWidget {
751759
_ThreadTypingIndicator(entries: threadTyping),
752760
ComposeBar(
753761
channelId: channelId,
762+
focusNode: composerFocusNode,
763+
onFocusRestorerChanged: (restoreFocus) =>
764+
restoreComposerFocus.value = restoreFocus,
754765
hintText: 'Reply in thread\u2026',
755766
threadHeadId: threadHead.id,
756767
rootId: effectiveRootId,

‎mobile/lib/features/channels/thread_detail_page/thread_message.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class _ThreadMessage extends HookConsumerWidget {
1010
final List<TimelineMessage>? allMessages;
1111
final bool isMember;
1212
final bool isArchived;
13+
final FocusNode? composerFocusNode;
14+
final VoidCallback? restoreComposerFocus;
1315

1416
/// Whether this is the message the thread hangs off, which keeps a standing
1517
/// "+" where replies only get one once they carry a reaction.
@@ -26,6 +28,8 @@ class _ThreadMessage extends HookConsumerWidget {
2628
this.isMember = false,
2729
this.isArchived = false,
2830
this.isThreadHead = false,
31+
this.composerFocusNode,
32+
this.restoreComposerFocus,
2933
});
3034

3135
@override
@@ -83,6 +87,8 @@ class _ThreadMessage extends HookConsumerWidget {
8387
captureAnchorSnapshot: details.captureSnapshot,
8488
onPopoverPresented: () => details.setSourceHidden(true),
8589
onPopoverDismissed: () => details.setSourceHidden(false),
90+
composerFocusNode: composerFocusNode,
91+
restoreComposerFocus: restoreComposerFocus,
8692
);
8793
}
8894

0 commit comments

Comments
 (0)