Unify chat selector menus

Use the permission selector's shared popup and choice-row primitives for model and thinking controls while preserving catalog, search, and next-turn behavior. Remove the obsolete Cupertino model chooser parameter and cover current-model dismissal.
This commit is contained in:
2026-11-11 19:40:26 +00:00
parent 3da71c3053
commit 2d0e33dd67
7 changed files with 227 additions and 137 deletions
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import '../../../core/api_gateway.dart';
import '../../../core/error_reason.dart';
import '../../../ui/adaptive/app_menu_anchor.dart';
import '../../../ui/adaptive/app_popups.dart';
import 'chat_bar_control_style.dart';
import 'chat_efforts.dart';
import 'chat_models.dart';
@@ -92,9 +92,13 @@ class _ChatEffortControlState extends State<ChatEffortControl> {
}
Future<void> _chooseFromMenu(ChatEffortLevel level) async {
if (level.id == _state.effort) return;
if (level.id == _state.effort || level.id == _state.current) {
Navigator.of(context).pop();
return;
}
try {
await _choose(level);
if (mounted) Navigator.of(context).pop();
} catch (error) {
if (!mounted) return;
ScaffoldMessenger.maybeOf(context)?.showSnackBar(
@@ -128,57 +132,62 @@ class _ChatEffortControlState extends State<ChatEffortControl> {
],
);
const key = Key('chat-effort');
return AppMenuAnchor(
menuChildren: [
Padding(
padding: const EdgeInsets.fromLTRB(12, 8, 12, 4),
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 280),
return Semantics(
container: true,
button: true,
label: 'Change thinking level, currently ${_state.currentName}',
onTap: _open,
child: ExcludeSemantics(
child: Tooltip(
message: 'Change thinking level (currently ${_state.currentName})',
child: TextButton(
key: key,
style: chatBarTextButtonStyle(context, compact: iconOnly),
onPressed: _open,
child: content,
),
),
),
);
}
Future<void> _open() async {
await showAppChoiceMenu<void>(
context,
width: 320,
semanticLabel: 'Change thinking level',
builder: (_) => ListView(
key: const Key('chat-effort-menu'),
shrinkWrap: true,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
child: Text(
chatEffortNote(running: widget.running),
key: const Key('chat-effort-note'),
style: Theme.of(context).textTheme.bodySmall,
),
),
),
for (final level in _state.levels)
MenuItemButton(
key: ValueKey<String>('chat-effort-option-${level.id}'),
trailingIcon: level.id == _state.current
? const Icon(Icons.check)
: null,
onPressed: () => unawaited(_chooseFromMenu(level)),
child: level.description.isEmpty
? Text(level.name)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(level.name),
Text(
level.description,
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
],
builder: (context, menu, _) => Semantics(
container: true,
button: true,
label: 'Change thinking level, currently ${_state.currentName}',
onTap: () => menu.isOpen ? menu.close() : menu.open(),
child: ExcludeSemantics(
child: Tooltip(
message: 'Change thinking level (currently ${_state.currentName})',
child: TextButton(
key: key,
style: chatBarTextButtonStyle(context),
onPressed: () => menu.isOpen ? menu.close() : menu.open(),
child: content,
for (final level in _state.levels)
AppChoiceMenuItem(
key: ValueKey<String>('chat-effort-option-${level.id}'),
selected: level.id == _state.current,
onTap: () => unawaited(_chooseFromMenu(level)),
child: level.description.isEmpty
? Text(level.name)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(level.name),
Text(
level.description,
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
),
),
],
),
);
}
@@ -249,17 +249,23 @@ class _ChatModePickerState extends State<_ChatModePicker> {
)
else
for (final mode in modes)
ListTile(
AppChoiceMenuItem(
key: ValueKey<String>('chat-mode-option-${mode.id}'),
enabled: !_busy,
title: Text(mode.name),
subtitle: mode.description.isEmpty
? null
: Text(mode.description),
trailing: mode.id == _current
? Icon(Icons.check, color: theme.colorScheme.primary)
: null,
onTap: () => _choose(mode),
selected: mode.id == _current,
onTap: _busy ? null : () => _choose(mode),
child: mode.description.isEmpty
? Text(mode.name)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(mode.name),
Text(
mode.description,
style: theme.textTheme.bodySmall,
),
],
),
),
],
),
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import '../../../core/api_gateway.dart';
import '../../../core/error_reason.dart';
import '../../../ui/adaptive/app_popups.dart';
import '../data/chat_repository.dart';
import 'chat_models.dart';
@@ -22,7 +23,6 @@ class ChatModelChooser extends StatefulWidget {
required this.backend,
required this.currentProvider,
required this.currentModel,
required this.cupertino,
required this.onAccepted,
});
@@ -31,7 +31,6 @@ class ChatModelChooser extends StatefulWidget {
final String backend;
final String currentProvider;
final String currentModel;
final bool cupertino;
final ValueChanged<ChatModelSelection> onAccepted;
@override
@@ -92,6 +91,10 @@ class _ChatModelChooserState extends State<ChatModelChooser> {
Future<void> _choose(JsonMap model) async {
if (_busy) return;
if (_isCurrent(model)) {
Navigator.of(context).pop();
return;
}
setState(() {
_busy = true;
_error = null;
@@ -147,95 +150,105 @@ class _ChatModelChooserState extends State<ChatModelChooser> {
final secondary = theme.colorScheme.onSurfaceVariant;
final matches = filterChatModels(_models, _search.text);
final needle = _search.text.trim();
return SimpleDialog(
key: const Key('chat-model-chooser'),
title: const Text('Change model'),
children: [
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 0, 24, 8),
child: Text(
chatModelSelectionNote(widget.backend),
style: theme.textTheme.bodySmall?.copyWith(color: secondary),
),
),
if (_loading)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 8, 24, 8),
child: Row(
children: [
const CircularProgressIndicator(),
const SizedBox(width: 12),
const Expanded(child: Text('Loading models…')),
],
return SafeArea(
child: SingleChildScrollView(
key: const Key('chat-model-chooser'),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Padding(
padding: EdgeInsets.fromLTRB(16, 0, 16, 8),
child: Text('Change model'),
),
)
else if (_error != null)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 0, 24, 8),
child: Text(
_error!,
key: const Key('chat-model-error'),
style: theme.textTheme.bodyMedium?.copyWith(
color: theme.colorScheme.error,
),
),
)
else if (_models.isEmpty)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 0, 24, 8),
child: Text(
'No models are available for this chat.',
style: theme.textTheme.bodyMedium?.copyWith(color: secondary),
),
)
else ...[
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 0, 24, 8),
child: TextField(
key: const Key('chat-model-search'),
controller: _search,
onChanged: (_) => setState(() {}),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.search),
hintText: 'Search models',
),
),
),
for (final model in matches)
SimpleDialogOption(
key: _optionKey(model),
onPressed: _busy ? null : () => _choose(model),
child: _optionRow(context, model),
),
if (matches.isEmpty && needle.isNotEmpty)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 0, 24, 8),
padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 8),
child: Text(
'No models match "$needle".',
key: const Key('chat-model-no-match'),
style: theme.textTheme.bodyMedium?.copyWith(color: secondary),
chatModelSelectionNote(widget.backend),
style: theme.textTheme.bodySmall?.copyWith(color: secondary),
),
),
],
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 4, 16, 8),
child: Align(
alignment: AlignmentDirectional.centerEnd,
child: TextButton(
key: const Key('chat-model-cancel'),
onPressed: () => Navigator.of(context).pop(),
child: const Text('Cancel'),
if (_loading)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 8, 16, 8),
child: Row(
children: [
const CircularProgressIndicator(),
const SizedBox(width: 12),
const Expanded(child: Text('Loading models…')),
],
),
)
else if (_error != null)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 8),
child: Text(
_error!,
key: const Key('chat-model-error'),
style: theme.textTheme.bodyMedium?.copyWith(
color: theme.colorScheme.error,
),
),
)
else if (_models.isEmpty)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 8),
child: Text(
'No models are available for this chat.',
style: theme.textTheme.bodyMedium?.copyWith(color: secondary),
),
)
else ...[
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 8),
child: TextField(
key: const Key('chat-model-search'),
controller: _search,
onChanged: (_) => setState(() {}),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.search),
hintText: 'Search models',
),
),
),
for (final model in matches)
AppChoiceMenuItem(
key: _optionKey(model),
selected: _isCurrent(model),
onTap: _busy ? null : () => _choose(model),
child: _optionRow(context, model),
),
if (matches.isEmpty && needle.isNotEmpty)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 8),
child: Text(
'No models match "$needle".',
key: const Key('chat-model-no-match'),
style: theme.textTheme.bodyMedium?.copyWith(
color: secondary,
),
),
),
],
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(16, 4, 16, 8),
child: Align(
alignment: AlignmentDirectional.centerEnd,
child: TextButton(
key: const Key('chat-model-cancel'),
onPressed: () => Navigator.of(context).pop(),
child: const Text('Cancel'),
),
),
),
),
],
),
],
),
);
}
Widget _optionRow(BuildContext context, JsonMap model) {
final selected = _isCurrent(model);
final secondary = Theme.of(context).colorScheme.onSurfaceVariant;
final accent = Theme.of(context).colorScheme.primary;
final provider = '${model['provider'] ?? ''}'.trim();
return Semantics(
selected: selected,
@@ -252,7 +265,7 @@ class _ChatModelChooserState extends State<ChatModelChooser> {
],
),
),
if (selected) Icon(Icons.check, color: accent),
// The shared menu row supplies the check mark.
],
),
);
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import '../../../core/api_gateway.dart';
import '../../../ui/adaptive/app_popups.dart';
import 'chat_bar_control_style.dart';
import 'chat_model_chooser.dart';
import 'chat_models.dart';
@@ -79,10 +80,14 @@ class _ChatModelControlState extends State<ChatModelControl> {
backend: '${widget.session['backend'] ?? ''}'.trim(),
currentProvider: _provider,
currentModel: _model,
cupertino: false,
onAccepted: _accept,
);
await showDialog<void>(context: context, builder: (_) => chooser);
await showAppChoiceMenu<void>(
context,
width: 420,
semanticLabel: 'Change model',
builder: (_) => chooser,
);
}
void _accept(ChatModelSelection applied) {
+25
View File
@@ -57,6 +57,31 @@ Future<T?> showAppChoiceMenu<T>(
);
}
/// A choice row shared by the app's anchored choice menus. Keeping the row
/// here makes checked state and tap affordances consistent across selectors.
class AppChoiceMenuItem extends StatelessWidget {
const AppChoiceMenuItem({
super.key,
required this.child,
required this.selected,
required this.onTap,
});
final Widget child;
final bool selected;
final VoidCallback? onTap;
@override
Widget build(BuildContext context) => ListTile(
enabled: onTap != null,
title: child,
trailing: selected
? Icon(Icons.check, color: Theme.of(context).colorScheme.primary)
: null,
onTap: onTap,
);
}
/// Shows richer content (a chat's details, a file's details) built by
/// [builder]: a dialog on a wide app, a bottom sheet on a phone, on the root
/// navigator either way. The content sizes itself (a `Column` with
@@ -0,0 +1,18 @@
# Chat selector menu unification
## Change
Model and thinking-level controls now use the same `showAppChoiceMenu` root
popup/bottom-sheet primitive and shared `AppChoiceMenuItem` rows as the
permission-mode selector. Their catalog/search, loading, next-turn, server
echo, refusal, retry and dismissal behavior remain in their respective
controls. The model chooser's obsolete Cupertino parameter was removed.
## Checks
- `tool/memwatch/full.sh 'test/features/chat/conversation/chat_mode_control_test.dart test/features/chat/conversation/chat_model_picker_test.dart test/features/chat/conversation/chat_effort_control_test.dart test/features/chat/conversation/chat_effort_header_test.dart'`
— 29 passed, 0 failed, including the current-model dismissal regression.
- `tool/analyze.sh` — clean.
Browser captures were not performed in this implementation stage; UI review
owns the requested full-app captures.
@@ -135,6 +135,20 @@ void main() {
expect(find.text('model-b'), findsOneWidget);
});
testWidgets('choosing the current model only dismisses the chooser', (
tester,
) async {
final gateway = _ModelGateway()..modelsReply = _catalog;
await _openThread(tester, gateway);
await _openChooser(tester);
await tester.tap(find.text('Model Alpha'));
await tester.pumpAndSettle();
expect(find.byKey(const Key('chat-model-chooser')), findsNothing);
expect(gateway.lastFields('chat_model'), isNull);
});
testWidgets('a refusal keeps the previous model and shows the reason', (
tester,
) async {