Use the visible chat list to choose an added pane

This commit is contained in:
2026-11-06 22:14:17 +00:00
parent af1c9eb98c
commit 778b368f03
11 changed files with 524 additions and 35 deletions
@@ -233,25 +233,13 @@ mixin _ChatScreenWorkspace on State<ChatScreen> {
},
);
void _addPane(BuildContext context) {
final opened = _workspace.panes.map((pane) => pane.sessionId).toSet();
final available = _sessionsForSidebar.sessions
.where((row) => !opened.contains('${row['id'] ?? ''}'))
.toList();
showChatPanePicker(
context,
title: available.isEmpty
? 'All available chats are already open'
: 'Add chat pane',
panes: [
for (final row in available)
(id: '${row['id']}', title: chatSessionTitle(row)),
],
activeId: null,
onSelected: (id) =>
_openBelow(available.firstWhere((row) => row['id'] == id)),
);
}
void _addPane(BuildContext context) => showAddChatPanePicker(
context,
controller: _sessionsForSidebar,
sidebarFolds: _foldsForSidebar,
excludedSessionIds: _workspace.panes.map((pane) => pane.sessionId).toSet(),
onSelected: _openBelow,
);
Widget _workspaceView() => ChatWorkspace(
key: _workspaceKey,
@@ -0,0 +1,192 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../../core/api_gateway.dart';
import '../domain/chat_cycle.dart';
import '../ui/sessions/chat_adaptive.dart';
import '../ui/sessions/chat_sessions_body.dart';
import '../ui/sessions/chat_sessions_controller.dart';
/// Pick from exactly the sidebar's visible rows, using its native list rows.
/// Local search only narrows this set; it cannot reveal a hidden/folded chat.
Future<void> showAddChatPanePicker(
BuildContext context, {
required ChatSessionsController controller,
required ChatSectionFolds sidebarFolds,
required Set<String> excludedSessionIds,
required ValueChanged<JsonMap> onSelected,
}) async {
final cupertino = chatControlsStyleOf(context) == ChatControlsStyle.cupertino;
Widget content(BuildContext context) => FractionallySizedBox(
heightFactor: 0.85,
child: _AddChatPanePicker(
controller: controller,
sidebarFolds: sidebarFolds,
excludedSessionIds: excludedSessionIds,
cupertino: cupertino,
),
);
final selected = cupertino
? await showCupertinoModalPopup<JsonMap>(
context: context,
builder: content,
)
: await showModalBottomSheet<JsonMap>(
context: context,
isScrollControlled: true,
useSafeArea: true,
showDragHandle: true,
constraints: const BoxConstraints(maxWidth: 720),
builder: content,
);
if (selected == null || !context.mounted) return;
final id = '${selected['id'] ?? ''}';
final current =
chatSessionsShown(
controller.sessions,
query: '',
isOpen: sidebarFolds.isOpen,
)
.where(
(row) =>
'${row['id'] ?? ''}' == id && !excludedSessionIds.contains(id),
)
.firstOrNull;
if (current != null) onSelected(current);
}
class _AddChatPanePicker extends StatefulWidget {
const _AddChatPanePicker({
required this.controller,
required this.sidebarFolds,
required this.excludedSessionIds,
required this.cupertino,
});
final ChatSessionsController controller;
final ChatSectionFolds sidebarFolds;
final Set<String> excludedSessionIds;
final bool cupertino;
@override
State<_AddChatPanePicker> createState() => _AddChatPanePickerState();
}
class _AddChatPanePickerState extends State<_AddChatPanePicker> {
final _search = TextEditingController();
final _pickerFolds = ChatSectionFolds()..set('Closed', true);
@override
void dispose() {
_search.dispose();
_pickerFolds.dispose();
super.dispose();
}
void _ignore(JsonMap _) {}
void _clear() {
_search.clear();
setState(() {});
}
@override
Widget build(BuildContext context) {
final list = Column(
children: [
if (!widget.cupertino)
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(24, 8, 8, 0),
child: Row(
children: [
Expanded(
child: Text(
'Add chat pane',
style: Theme.of(context).textTheme.titleLarge,
),
),
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('Cancel'),
),
],
),
),
ChatSearchField(controller: _search, onChanged: (_) => setState(() {})),
Expanded(
child: ListenableBuilder(
listenable: Listenable.merge([
widget.controller,
widget.sidebarFolds,
]),
builder: (context, _) {
final controller = widget.controller;
final available =
chatSessionsShown(
controller.sessions,
query: '',
isOpen: widget.sidebarFolds.isOpen,
)
.where(
(row) => !widget.excludedSessionIds.contains(
'${row['id'] ?? ''}',
),
)
.toList();
return Column(
children: [
if (controller.error != null)
ChatErrorNotice(
message: controller.error!,
onRetry: controller.refresh,
),
Expanded(
child: ChatSessionsBody(
sessions: available,
query: _search.text,
loading: controller.loading,
error: controller.error,
emptyMessageOverride:
available.isEmpty && controller.error == null
? 'No other visible chats to add.'
: null,
folds: _pickerFolds,
selectionOnly: true,
onOpen: (row) => Navigator.pop(context, row),
onRename: _ignore,
onClose: _ignore,
onReopen: _ignore,
onStar: _ignore,
onHide: _ignore,
onClearSearch: _clear,
isUnseen: controller.isUnseen,
errorFor: (_) => null,
),
),
],
);
},
),
),
],
);
return widget.cupertino
? CupertinoPageScaffold(
navigationBar: CupertinoNavigationBar(
middle: const Text('Add chat pane'),
trailing: CupertinoButton(
padding: EdgeInsets.zero,
onPressed: () => Navigator.pop(context),
child: const Text('Cancel'),
),
),
child: SafeArea(child: list),
)
: Material(
child: Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.viewInsetsOf(context).bottom,
),
child: SafeArea(top: false, child: list),
),
);
}
}
+1 -1
View File
@@ -17,6 +17,7 @@ import 'workspace/chat_workspace_snapshot.dart';
import 'workspace/chat_workspace_store.dart';
import 'conversation/chat_models.dart';
import 'conversation/chat_pane_picker.dart';
import 'conversation/chat_add_pane_picker.dart';
import 'conversation/chat_sidebar_controls.dart';
import 'ui/sessions/chat_compact_sidebar.dart';
import 'workspace/chat_workspace.dart';
@@ -30,7 +31,6 @@ import 'conversation/composer_selection_focus.dart';
import 'data/chat_repository.dart';
import 'domain/chat_commands.dart';
import 'domain/chat_cycle.dart';
import 'domain/chat_sessions.dart';
import 'ui/sessions/chat_sessions_body.dart';
import 'ui/sessions/chat_sessions_controller.dart';
import 'ui/sessions/chat_sessions_screen.dart';
@@ -46,8 +46,13 @@ class ChatSessionsBody extends StatelessWidget {
this.folds,
this.activeSessionId,
this.onDismissError,
this.selectionOnly = false,
this.emptyMessageOverride,
});
/// Reuse list presentation for a picker without mutation menus or gestures.
final bool selectionOnly;
final String? emptyMessageOverride;
final ChatSectionFolds? folds;
final List<JsonMap> sessions;
final String? activeSessionId;
@@ -72,17 +77,20 @@ class ChatSessionsBody extends StatelessWidget {
Widget build(BuildContext context) {
final visible = filterChatSessions(sessions, query);
final sections = chatSessionSections(visible);
final emptyMessage = sessions.isEmpty
? error == null
? 'No chat sessions on this server yet.'
: null
: 'No chats match "${query.trim()}".';
final emptyMessage =
emptyMessageOverride ??
(sessions.isEmpty
? error == null
? 'No chat sessions on this server yet.'
: null
: 'No chats match "${query.trim()}".');
if (loading && sessions.isEmpty) return const ChatLoadingIndicator();
final clearSearch = query.trim().isEmpty ? null : onClearSearch;
final duplicateTitles = duplicateChatTitles(visible);
if (chatControlsStyleOf(context) == ChatControlsStyle.cupertino) {
return CupertinoSessionList(
selectionOnly: selectionOnly,
sections: sections,
folds: folds,
activeSessionId: activeSessionId,
@@ -104,6 +112,7 @@ class ChatSessionsBody extends StatelessWidget {
);
}
return MaterialSessionList(
selectionOnly: selectionOnly,
sections: sections,
folds: folds,
activeSessionId: activeSessionId,
@@ -27,9 +27,11 @@ class CupertinoSessionList extends StatelessWidget {
this.folds,
this.activeSessionId,
this.onDismissError,
this.selectionOnly = false,
});
final List<ChatSessionSection> sections;
final bool selectionOnly;
final ChatSectionFolds? folds;
final String? activeSessionId;
final String? emptyMessage;
@@ -83,6 +85,7 @@ class CupertinoSessionList extends StatelessWidget {
directoryHeader: _DirectoryHeader.new,
row: (session, {required divider}) => chatSessionRowItem(
session,
selectionOnly: selectionOnly,
divider: divider,
activeSessionId: activeSessionId,
duplicateTitles: duplicateTitles,
@@ -94,12 +94,14 @@ SessionListItem chatSessionRowItem(
required ValueChanged<JsonMap> onClose,
required ValueChanged<JsonMap> onReopen,
required ValueChanged<JsonMap> onHide,
bool selectionOnly = false,
}) {
final id = '${session['id'] ?? ''}';
return (
key: ValueKey('chat-item-$id'),
build: (_) => memoChatSessionRow(
session: session,
selectionOnly: selectionOnly,
selected: id == activeSessionId,
duplicateTitles: duplicateTitles,
unseen: isUnseen(session),
@@ -26,9 +26,11 @@ class MaterialSessionList extends StatelessWidget {
this.folds,
this.activeSessionId,
this.onDismissError,
this.selectionOnly = false,
});
final List<ChatSessionSection> sections;
final bool selectionOnly;
final ChatSectionFolds? folds;
final String? activeSessionId;
final String? emptyMessage;
@@ -99,6 +101,7 @@ class MaterialSessionList extends StatelessWidget {
),
row: (session, {required divider}) => chatSessionRowItem(
session,
selectionOnly: selectionOnly,
divider: divider,
activeSessionId: activeSessionId,
duplicateTitles: duplicateTitles,
@@ -37,9 +37,12 @@ class ChatSessionRow extends StatelessWidget {
this.divider = true,
this.duplicateTitles = const {},
this.onLongPress,
this.selectionOnly = false,
});
final JsonMap session;
/// A choosing surface keeps the normal row content but offers only opening.
final bool selectionOnly;
final ValueChanged<JsonMap> onOpen;
final ValueChanged<JsonMap>? onOpenBeside;
final ValueChanged<JsonMap>? onOpenBelow;
@@ -69,7 +72,7 @@ class ChatSessionRow extends StatelessWidget {
emphasized: unread,
divider: divider,
onTap: () => onOpen(session),
onLongPress: onLongPress,
onLongPress: selectionOnly ? null : onLongPress,
accent: chatColorShade(context, chatSessionColor(session)),
leading: ChatSessionAvatar(
session: session,
@@ -121,14 +124,16 @@ class ChatSessionRow extends StatelessWidget {
size: 10,
)
: null,
menu: SessionActionsButton(
key: Key('chat-actions-$id'),
session: session,
duplicateTitles: duplicateTitles,
onSelected: onAction,
allowOpenBeside: onOpenBeside != null,
allowOpenBelow: onOpenBelow != null,
),
menu: selectionOnly
? null
: SessionActionsButton(
key: Key('chat-actions-$id'),
session: session,
duplicateTitles: duplicateTitles,
onSelected: onAction,
allowOpenBeside: onOpenBeside != null,
allowOpenBelow: onOpenBelow != null,
),
);
}
}
@@ -13,6 +13,7 @@ import 'session_row_content.dart';
/// methods, so they compare equal from one build to the next.
Widget memoChatSessionRow({
required JsonMap session,
bool selectionOnly = false,
required bool selected,
required Set<String> duplicateTitles,
required bool unseen,
@@ -30,6 +31,7 @@ Widget memoChatSessionRow({
key: ValueKey('chat-row-memo-${session['id'] ?? ''}'),
memo: (
MemoMap(session),
selectionOnly,
selected,
// The row reads the set only for its own title.
duplicateTitles.contains(chatSessionTitle(session)),
@@ -47,6 +49,7 @@ Widget memoChatSessionRow({
),
builder: (_) => ChatSessionRow(
session: session,
selectionOnly: selectionOnly,
selected: selected,
duplicateTitles: duplicateTitles,
unseen: unseen,
@@ -55,7 +58,9 @@ Widget memoChatSessionRow({
onOpenBeside: onOpenBeside,
onOpenBelow: onOpenBelow,
// A long-press is the touch way to the colour, the row's quick mark.
onLongPress: onColor == null ? null : () => onColor(session),
onLongPress: selectionOnly || onColor == null
? null
: () => onColor(session),
onAction: (action) => switch (action) {
SessionAction.openBeside => onOpenBeside?.call(session),
SessionAction.openBelow => onOpenBelow?.call(session),