diff --git a/app/lib/features/chat/ui/sessions/chat_compact_sidebar.dart b/app/lib/features/chat/ui/sessions/chat_compact_sidebar.dart index 38d5e4e9..8e256d45 100644 --- a/app/lib/features/chat/ui/sessions/chat_compact_sidebar.dart +++ b/app/lib/features/chat/ui/sessions/chat_compact_sidebar.dart @@ -45,7 +45,11 @@ class ChatCompactSidebar extends StatelessWidget { final cupertino = chatControlsStyleOf(context) == ChatControlsStyle.cupertino; return Semantics( + label: title, + button: true, selected: selected, + onTap: onPressed, + excludeSemantics: true, child: cupertino ? Tooltip( message: title, diff --git a/app/lib/features/chat/ui/sessions/chat_list_viewport.dart b/app/lib/features/chat/ui/sessions/chat_list_viewport.dart new file mode 100644 index 00000000..1b8f3cc6 --- /dev/null +++ b/app/lib/features/chat/ui/sessions/chat_list_viewport.dart @@ -0,0 +1,17 @@ +import 'package:flutter/widgets.dart'; + +/// The shell publishes its measured destination bar as bottom media padding. +/// Reserve that area instead of letting rows paint beneath its opaque captions. +/// SafeArea removes the consumed inset so the list cannot count it twice. +class ChatListViewport extends StatelessWidget { + const ChatListViewport({super.key, required this.builder}); + final WidgetBuilder builder; + + @override + Widget build(BuildContext context) => SafeArea( + top: false, + left: false, + right: false, + child: ClipRect(child: Builder(builder: builder)), + ); +} diff --git a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart index 6dc5ae68..26ed74a7 100644 --- a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart +++ b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart @@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart'; import '../../../../core/api_gateway.dart'; import 'chat_adaptive.dart'; import 'chat_sessions_body.dart'; +import 'chat_list_viewport.dart'; import 'session_list_items.dart'; import '../../../../ui/adaptive/floating_bar_layout.dart'; @@ -53,33 +54,40 @@ class CupertinoSessionList extends StatelessWidget { final ValueChanged? onDismissError; @override - Widget build(BuildContext context) { - return CustomScrollView( - slivers: [ - SliverPadding( - // Starts below a floating top bar (its height arrives as media top - // padding) and ends clear of a floating bottom bar. - padding: withFloatingBarClearance( - context, - EdgeInsets.only(top: MediaQuery.paddingOf(context).top, bottom: 24), - ), - sliver: SliverMainAxisGroup( - slivers: [ - for (final section in sections) _section(section), - if (emptyMessage != null) - SliverToBoxAdapter( - child: ChatCupertinoMessage( - message: emptyMessage!, - actionLabel: onClearSearch == null ? null : 'Clear search', - onAction: onClearSearch, + Widget build(BuildContext context) => ChatListViewport( + builder: (context) { + return CustomScrollView( + slivers: [ + SliverPadding( + // Starts below a floating top bar (its height arrives as media top + // padding) and ends clear of a floating bottom bar. + padding: withFloatingBarClearance( + context, + EdgeInsets.only( + top: MediaQuery.paddingOf(context).top, + bottom: 24, + ), + ), + sliver: SliverMainAxisGroup( + slivers: [ + for (final section in sections) _section(section), + if (emptyMessage != null) + SliverToBoxAdapter( + child: ChatCupertinoMessage( + message: emptyMessage!, + actionLabel: onClearSearch == null + ? null + : 'Clear search', + onAction: onClearSearch, + ), ), - ), - ], + ], + ), ), - ), - ], - ); - } + ], + ); + }, + ); Widget _section(ChatSessionSection section) => chatSessionSection( section: section, diff --git a/app/lib/features/chat/ui/sessions/session_list_material.dart b/app/lib/features/chat/ui/sessions/session_list_material.dart index c5369399..f86fd746 100644 --- a/app/lib/features/chat/ui/sessions/session_list_material.dart +++ b/app/lib/features/chat/ui/sessions/session_list_material.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import '../../../../core/api_gateway.dart'; import 'chat_sessions_body.dart'; +import 'chat_list_viewport.dart'; import 'session_list_items.dart'; class MaterialSessionList extends StatelessWidget { @@ -52,41 +53,42 @@ class MaterialSessionList extends StatelessWidget { final ValueChanged? onDismissError; @override - Widget build(BuildContext context) { - // Clears the media padding above and below (a floating top bar's height - // arrives as top padding) and leaves only the side padding to the rows, - // as a ListView does. - final media = MediaQuery.of(context); - return CustomScrollView( - slivers: [ - SliverPadding( - padding: media.padding.copyWith(left: 0, right: 0), - sliver: MediaQuery( - data: media.copyWith( - padding: media.padding.copyWith(top: 0, bottom: 0), - ), - child: SliverMainAxisGroup( - slivers: [ - for (final section in sections) _section(context, section), - if (emptyMessage != null) - SliverToBoxAdapter( - child: ListTile( - title: Text(emptyMessage!), - trailing: onClearSearch == null - ? null - : TextButton( - onPressed: onClearSearch, - child: const Text('Clear search'), - ), + Widget build(BuildContext context) => ChatListViewport( + builder: (context) { + // The viewport has already consumed the bottom bar. Pad the list's + // start below its floating top bar, leaving side insets to the rows. + final media = MediaQuery.of(context); + return CustomScrollView( + slivers: [ + SliverPadding( + padding: media.padding.copyWith(left: 0, right: 0), + sliver: MediaQuery( + data: media.copyWith( + padding: media.padding.copyWith(top: 0, bottom: 0), + ), + child: SliverMainAxisGroup( + slivers: [ + for (final section in sections) _section(context, section), + if (emptyMessage != null) + SliverToBoxAdapter( + child: ListTile( + title: Text(emptyMessage!), + trailing: onClearSearch == null + ? null + : TextButton( + onPressed: onClearSearch, + child: const Text('Clear search'), + ), + ), ), - ), - ], + ], + ), ), ), - ), - ], - ); - } + ], + ); + }, + ); Widget _section(BuildContext context, ChatSessionSection section) { final heading = SectionHeadingStyle.of(context); diff --git a/app/notes/chat-state-navigation.md b/app/notes/chat-state-navigation.md index ffd7ab41..89c4dd9d 100644 --- a/app/notes/chat-state-navigation.md +++ b/app/notes/chat-state-navigation.md @@ -24,3 +24,15 @@ Tests: 132 session tests passed (/tmp/memwatch/out.CVA6FK); six final state, compact-facts and native palette tests passed (/tmp/memwatch/out.iFGOhB). Analyzer clean (flutter-analyze.WdYBd8). Parent owns integrated browser captures and shell launcher testing. No server or device operations performed. + +Follow-up: expanded chat lists now consume the shell's measured bottom media +inset as a real clipped viewport through ChatListViewport/SafeArea, rather +than allowing rows to paint beneath opaque navigation and merely appending +scroll padding. The consumed inset is removed for the inner list, avoiding a +double footer. Existing top/side behavior and resting scroll position remain. +The last row and its metadata can scroll fully clear and remain tappable; +resizing preserves the Scrollable state and offset. Compact rail controls +also publish their full Active/Visible/Working labels and tap action explicitly, +so the shape indicators are not their sole accessible meaning. +139 focused list/session tests pass (/tmp/memwatch/out.VxtAN0), including both +hosts at normal and enlarged text. Analyzer clean (flutter-analyze.bYWSTe). diff --git a/app/test/features/chat/chat_sidebar_clearance_test.dart b/app/test/features/chat/chat_sidebar_clearance_test.dart new file mode 100644 index 00000000..c9a4f8ef --- /dev/null +++ b/app/test/features/chat/chat_sidebar_clearance_test.dart @@ -0,0 +1,122 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/features/chat/ui/sessions/session_list_cupertino.dart'; +import 'package:pipelines_app/features/chat/ui/sessions/session_list_material.dart'; +import 'package:pipelines_app/shell/adaptive_shell.dart'; +import 'package:pipelines_app/shell/destination.dart'; +import 'package:pipelines_app/shell/list_detail.dart'; +import 'package:pipelines_app/ui/adaptive/floating_destination_bar.dart'; + +void main() { + for (final cupertino in [false, true]) { + for (final scale in [1.0, 2.0]) { + testWidgets( + 'chat list stays above labeled navigation ($cupertino, $scale)', + (tester) async { + tester.view.physicalSize = const Size(1200, 900); + tester.view.devicePixelRatio = 1; + tester.platformDispatcher.textScaleFactorTestValue = scale; + addTearDown(tester.view.reset); + addTearDown(tester.platformDispatcher.clearTextScaleFactorTestValue); + String? opened; + final sessions = [ + for (var i = 0; i < 14; i++) + { + 'id': 's$i', + 'title': 'Chat item $i', + 'model': 'model', + 'directory': '/work/project-$i', + }, + ]; + Widget list() => cupertino + ? CupertinoSessionList( + sections: [(title: 'Chats', sessions: sessions)], + emptyMessage: null, + duplicateTitles: const {}, + onOpen: (row) => opened = row['id'] as String, + onRename: (_) {}, + onClose: (_) {}, + onReopen: (_) {}, + onStar: (_) {}, + onHide: (_) {}, + onClearSearch: null, + isUnseen: (_) => false, + errorFor: (_) => null, + ) + : MaterialSessionList( + sections: [(title: 'Chats', sessions: sessions)], + emptyMessage: null, + duplicateTitles: const {}, + onOpen: (row) => opened = row['id'] as String, + onRename: (_) {}, + onClose: (_) {}, + onReopen: (_) {}, + onStar: (_) {}, + onHide: (_) {}, + onClearSearch: null, + isUnseen: (_) => false, + errorFor: (_) => null, + ); + final shell = AdaptiveShell( + cupertino: cupertino, + destination: AppDestination.chat, + destinationBodies: { + AppDestination.chat: (_) => ListDetailPanes( + list: list(), + detail: const SizedBox.expand(), + ), + }, + ); + await tester.pumpWidget( + cupertino ? CupertinoApp(home: shell) : MaterialApp(home: shell), + ); + await tester.pumpAndSettle(); + final navigation = tester.getRect( + find.byKey(FloatingDestinationBar.rowKey), + ); + final scrollView = find.byType(CustomScrollView); + final viewport = tester.getRect(scrollView); + expect(viewport.bottom, lessThanOrEqualTo(navigation.top + .5)); + expect(viewport.width, greaterThan(0)); + final scrollable = tester.state( + find.descendant(of: scrollView, matching: find.byType(Scrollable)), + ); + scrollable.position.jumpTo(scrollable.position.maxScrollExtent); + await tester.pumpAndSettle(); + final last = find.byKey(const Key('chat-row-s13')); + expect( + tester.getRect(last).bottom, + lessThanOrEqualTo(navigation.top + .5), + ); + final metadata = find.descendant( + of: last, + matching: find.text('model ยท /work/project-13'), + ); + expect(metadata, findsOneWidget); + expect( + tester.getRect(metadata).bottom, + lessThanOrEqualTo(navigation.top + .5), + ); + await tester.tap(find.text('Chat item 13')); + await tester.pump(); + expect(opened, 's13'); + final retainedOffset = scrollable.position.pixels; + tester.view.physicalSize = const Size(1440, 900); + await tester.pumpAndSettle(); + expect( + tester.state( + find.descendant( + of: scrollView, + matching: find.byType(Scrollable), + ), + ), + same(scrollable), + ); + expect(scrollable.position.pixels, closeTo(retainedOffset, .5)); + expect(tester.takeException(), isNull); + }, + ); + } + } +} diff --git a/app/test/features/chat/ui/sessions/chat_state_legibility_test.dart b/app/test/features/chat/ui/sessions/chat_state_legibility_test.dart index cc8141af..e7c5c950 100644 --- a/app/test/features/chat/ui/sessions/chat_state_legibility_test.dart +++ b/app/test/features/chat/ui/sessions/chat_state_legibility_test.dart @@ -107,6 +107,60 @@ void main() { }, ); + testWidgets('compact focus and execution labels are explicit beyond shapes', ( + tester, + ) async { + final semantics = tester.ensureSemantics(); + final gateway = FakeChatGateway() + ..sessionsReply = { + 'chat_sessions': [ + { + 'id': 'a', + 'title': 'Active title', + 'activity': {'turn_running': true, 'seq': 1}, + }, + {'id': 'b', 'title': 'Visible title'}, + ], + }; + final controller = ChatSessionsController( + ChatRepository(gateway), + localStore: MemoryChatSessionLocalStore(), + ); + final folds = ChatSectionFolds(); + addTearDown(controller.dispose); + addTearDown(folds.dispose); + addTearDown(gateway.pushed.close); + await controller.refresh(); + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: ChatCompactSidebar( + controller: controller, + folds: folds, + activeSessionId: 'a', + visibleSessionIds: const {'a', 'b'}, + onOpen: (_) {}, + onExpand: () {}, + ), + ), + ), + ); + await tester.pump(); + final tips = tester.widgetList(find.byType(Tooltip)); + final active = tips + .firstWhere((t) => t.message!.startsWith('Active title')) + .message!; + final visible = tips + .firstWhere((t) => t.message!.startsWith('Visible title')) + .message!; + expect(active, contains('Active chat')); + expect(active, contains('Working')); + expect(visible, contains('Visible chat')); + expect(find.bySemanticsLabel(RegExp('Working')), findsWidgets); + expect(find.bySemanticsLabel(RegExp('Visible chat')), findsWidgets); + semantics.dispose(); + }); + for (final cupertino in [false, true]) { for (final brightness in Brightness.values) { testWidgets(