diff --git a/app/lib/application/pipelines_app.dart b/app/lib/application/pipelines_app.dart index b5da416b..dc114320 100644 --- a/app/lib/application/pipelines_app.dart +++ b/app/lib/application/pipelines_app.dart @@ -807,7 +807,7 @@ class _PipelinesAppState extends State builder: (context, count, _) => _terminals.surround( _shellFor(route, count), onChat: route.kind == AppRouteKind.chat, - windows: WindowHost(manager: _windows), + windows: WindowHost(manager: _windows, reservesRail: true), ), ); diff --git a/app/lib/features/pipelines/screen.dart b/app/lib/features/pipelines/screen.dart index f6a1a810..fb0ea904 100644 --- a/app/lib/features/pipelines/screen.dart +++ b/app/lib/features/pipelines/screen.dart @@ -2,6 +2,7 @@ import '../../ui/adaptive/segmented_bar.dart'; import '../../shell/destination.dart'; import '../../shell/detail_page.dart'; import '../../shell/list_detail.dart'; +import '../../shell/shell_rail_scope.dart'; import 'package:flutter/material.dart'; import '../../core/api_gateway.dart'; @@ -288,7 +289,10 @@ class _PipelinesScreenState extends State { if (listShown && widget.onOpenSchedules != null) _schedulesButton(context), _refreshButton(context), - if (listShown && widget.onOpenSettings != null) + // A wide window's rail offers Settings; the gear stays on a phone. + if (listShown && + !ShellRailScope.isShown(context) && + widget.onOpenSettings != null) _settingsButton(context), ], child: body, diff --git a/app/lib/features/runs/ui/run_detail_tab_bodies.dart b/app/lib/features/runs/ui/run_detail_tab_bodies.dart index 134ba8a1..a6377a0a 100644 --- a/app/lib/features/runs/ui/run_detail_tab_bodies.dart +++ b/app/lib/features/runs/ui/run_detail_tab_bodies.dart @@ -107,7 +107,12 @@ Widget runDetailSummaryTab({ title: 'Output', controller: outputController, copyText: runFieldCopyText(run['output']), - body: RunFieldBody(value: run['output'], empty: visitEmptyOutput), + // Output starts open, so it is a sliver: a long one builds only the + // fields on screen. + sliverBody: RunFieldSliver( + value: run['output'], + empty: visitEmptyOutput, + ), ), const SliverToBoxAdapter(child: SizedBox(height: 16)), const SliverFloatingBarClearance(), @@ -115,19 +120,25 @@ Widget runDetailSummaryTab({ ); } -/// A summary section that starts closed, follows its [controller] (so a -/// search hit can open it), and offers a copy of its recorded text. +/// A summary section that follows its [controller] (its open state starts from +/// the controller's; a search hit can open it), and offers a copy of its +/// recorded text. class _StickyField extends StatefulWidget { const _StickyField({ super.key, required this.title, - required this.body, + this.body, + this.sliverBody, this.controller, this.copyText, - }); + }) : assert((body == null) != (sliverBody == null)); final String title; - final Widget body; + + /// The content as a box, or as [sliverBody] for a long one (see + /// [StickySection.sliverBody]); exactly one is given. + final Widget? body; + final Widget? sliverBody; final ExpansibleController? controller; final String? copyText; @@ -158,25 +169,31 @@ class _StickyFieldState extends State<_StickyField> { final copyText = widget.copyText; return ListenableBuilder( listenable: _controller, - builder: (context, _) => StickySection( - title: widget.title, - open: _controller.isExpanded, - onToggle: () => _controller.isExpanded - ? _controller.collapse() - : _controller.expand(), - trailing: [ - if (copyText != null && copyText.isNotEmpty) - IconButton( - tooltip: 'Copy ${widget.title}', - onPressed: _copy, - icon: Icon(_copied ? Icons.check : Icons.copy), - ), - ], - body: Padding( - padding: const EdgeInsets.fromLTRB(16, 0, 16, 16), - child: widget.body, - ), - ), + builder: (context, _) { + // The body's own padding, the same for the box and the sliver form. + const padding = EdgeInsets.fromLTRB(16, 0, 16, 16); + final box = widget.body; + final sliver = widget.sliverBody; + return StickySection( + title: widget.title, + open: _controller.isExpanded, + onToggle: () => _controller.isExpanded + ? _controller.collapse() + : _controller.expand(), + trailing: [ + if (copyText != null && copyText.isNotEmpty) + IconButton( + tooltip: 'Copy ${widget.title}', + onPressed: _copy, + icon: Icon(_copied ? Icons.check : Icons.copy), + ), + ], + body: box == null ? null : Padding(padding: padding, child: box), + sliverBody: sliver == null + ? null + : SliverPadding(padding: padding, sliver: sliver), + ); + }, ); } } diff --git a/app/lib/features/runs/ui/run_detail_tabs.dart b/app/lib/features/runs/ui/run_detail_tabs.dart index d303ba93..940078a6 100644 --- a/app/lib/features/runs/ui/run_detail_tabs.dart +++ b/app/lib/features/runs/ui/run_detail_tabs.dart @@ -98,12 +98,13 @@ class _RunDetailTabsState extends State { Route? _visitRoute; late final ValueNotifier _liveRun = ValueNotifier(widget.run); - /// The Summary's collapsible Input and Output sections. A search text hit - /// expands the one its recorded field names, exactly as the browser opens the - /// matching Summary section. The detail owns them so the tab body stays a - /// presentation widget. + /// The Summary's collapsible Input and Output sections. Output starts open + /// and Input starts closed; the operator may close either for this view. A + /// search text hit expands the one its recorded field names, exactly as the + /// browser opens the matching Summary section. The detail owns them so the + /// tab body stays a presentation widget. final _inputSection = ExpansibleController(); - final _outputSection = ExpansibleController(); + final _outputSection = ExpansibleController()..expand(); /// The search request last applied by this detail, so a rebuild of the same /// request never reopens a pane the operator closed in the meantime. @@ -124,6 +125,12 @@ class _RunDetailTabsState extends State { _applySearchSelection(); } + /// The Summary's default sections: Input closed, Output open. + void _resetSummarySections() { + _inputSection.collapse(); + _outputSection.expand(); + } + @override void dispose() { _inputSection.dispose(); @@ -146,8 +153,7 @@ class _RunDetailTabsState extends State { _tab = RunDetailTab.summary; _selectedStage = null; _selectedVisit = null; - _inputSection.collapse(); - _outputSection.collapse(); + _resetSummarySections(); _applyInitialVisit(); } else if (!sameTarget) { // A route that names another stage or visit is applied to the same run. @@ -231,10 +237,10 @@ class _RunDetailTabsState extends State { case RunSummarySection.output: _outputSection.expand(); case null: - // A hit that names no section must not leave a previously expanded - // one open; the Summary panel starts collapsed. - _inputSection.collapse(); - _outputSection.collapse(); + // A hit that names no section must not leave a previously toggled + // one in a state the operator did not open; the Summary returns to + // its default sections. + _resetSummarySections(); } case RunVisitTarget(:final stageKey, :final timelineIndex): if (detailVisitStepAt(widget.run, timelineIndex) == null) return; diff --git a/app/lib/features/runs/ui/run_detail_visit_sections.dart b/app/lib/features/runs/ui/run_detail_visit_sections.dart index df811ae2..27b364fd 100644 --- a/app/lib/features/runs/ui/run_detail_visit_sections.dart +++ b/app/lib/features/runs/ui/run_detail_visit_sections.dart @@ -111,7 +111,8 @@ Widget runVisitSectionBody({ ); switch (section) { case RunVisitSection.summary: - // Input then Output, each a sticky collapsible with a copy button. + // Input then Output, each a sticky collapsible with a copy button; Output + // starts open. return _VisitSummary( key: ValueKey('run-visit-summary-$visitIndex'), input: step['input'], @@ -181,7 +182,9 @@ class _VisitSummary extends StatefulWidget { } class _VisitSummaryState extends State<_VisitSummary> { - final Set _closed = {'Input', 'Output'}; + /// The sections the operator has closed. Input starts closed; Output starts + /// open, and this set is per visit view. + final Set _closed = {'Input'}; String? _copied; Future _copy(String name, dynamic value) async { @@ -189,7 +192,14 @@ class _VisitSummaryState extends State<_VisitSummary> { if (mounted) setState(() => _copied = name); } - Widget _section(String name, dynamic value, String empty) { + /// [lazy] builds the field as a sliver, for a section open by default (the + /// Output): a long one then lays out only the fields on screen. + Widget _section( + String name, + dynamic value, + String empty, { + bool lazy = false, + }) { final copy = IconButton( key: ValueKey('run-visit-copy-$name'), tooltip: 'Copy $name', @@ -197,6 +207,7 @@ class _VisitSummaryState extends State<_VisitSummary> { icon: Icon(_copied == name ? Icons.check : Icons.copy), ); final open = !_closed.contains(name); + const padding = EdgeInsets.fromLTRB(16, 0, 16, 16); return StickySection( key: ValueKey('run-visit-section-$name'), title: name, @@ -205,10 +216,18 @@ class _VisitSummaryState extends State<_VisitSummary> { if (!_closed.remove(name)) _closed.add(name); }), trailing: [copy], - body: Padding( - padding: const EdgeInsets.fromLTRB(16, 0, 16, 16), - child: RunFieldBody(value: value, empty: empty), - ), + body: lazy + ? null + : Padding( + padding: padding, + child: RunFieldBody(value: value, empty: empty), + ), + sliverBody: lazy + ? SliverPadding( + padding: padding, + sliver: RunFieldSliver(value: value, empty: empty), + ) + : null, ); } @@ -221,7 +240,7 @@ class _VisitSummaryState extends State<_VisitSummary> { const SliverTopBarClearance(), if (widget.facts case final facts?) SliverToBoxAdapter(child: facts), _section('Input', widget.input, visitEmptyInput), - _section('Output', widget.output, visitEmptyOutput), + _section('Output', widget.output, visitEmptyOutput, lazy: true), const SliverFloatingBarClearance(), ], ); diff --git a/app/lib/features/runs/ui/run_field_body.dart b/app/lib/features/runs/ui/run_field_body.dart index d1ce93ad..355539b0 100644 --- a/app/lib/features/runs/ui/run_field_body.dart +++ b/app/lib/features/runs/ui/run_field_body.dart @@ -55,40 +55,99 @@ class RunFieldBody extends StatelessWidget { @override Widget build(BuildContext context) { - final map = value is Map ? Map.from(value as Map) : null; - if (map == null || map.isEmpty) return _plain(empty); - if (map.length == 1 && map.keys.single.toLowerCase() == 'markdown') { - return _value(runFieldText(map.values.single)); + final map = _runFieldMap(value); + if (map == null || map.isEmpty) { + return _runFieldPlain(empty, textBuilder); + } + if (_isMarkdownDocument(map)) { + return _runFieldValue(runFieldText(map.values.single), textBuilder); } - final caption = Theme.of(context).textTheme.labelMedium?.copyWith( - fontWeight: FontWeight.w600, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ); return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ for (final (index, entry) in map.entries.indexed) - Padding( - padding: EdgeInsets.only(top: index == 0 ? 0 : 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - entry.key.trim().isEmpty ? 'value' : entry.key, - style: caption, - ), - const SizedBox(height: 2), - _value(runFieldText(entry.value)), - ], - ), - ), + _runFieldRow(context, index, entry, textBuilder), ], ); } - - Widget _value(String text) => runFieldLooksLikeMarkdown(text) - ? ChatMarkdownView(text: text) - : _plain(text); - - Widget _plain(String text) => textBuilder?.call(text) ?? SelectableText(text); } + +/// [RunFieldBody] as a sliver, for a section of a [CustomScrollView] that is +/// open by default. A field map builds and lays out only the fields on screen, +/// however many there are, so a long Output does not cost a full layout when +/// its section opens. Its rows take the full width the sliver gives them; the +/// host pads it. +class RunFieldSliver extends StatelessWidget { + const RunFieldSliver({ + super.key, + required this.value, + required this.empty, + this.textBuilder, + }); + + final dynamic value; + final String empty; + + /// Draws a plain value; the host's selectable text by default. + final Widget Function(String text)? textBuilder; + + @override + Widget build(BuildContext context) { + final map = _runFieldMap(value); + if (map == null || map.isEmpty || _isMarkdownDocument(map)) { + return SliverToBoxAdapter( + child: RunFieldBody( + value: value, + empty: empty, + textBuilder: textBuilder, + ), + ); + } + final entries = map.entries.toList(growable: false); + return SliverList.builder( + itemCount: entries.length, + itemBuilder: (context, index) => + _runFieldRow(context, index, entries[index], textBuilder), + ); + } +} + +Map? _runFieldMap(dynamic value) => + value is Map ? Map.from(value) : null; + +/// A lone `markdown` field, shown as the document itself. +bool _isMarkdownDocument(Map map) => + map.length == 1 && map.keys.single.toLowerCase() == 'markdown'; + +/// One recorded field: its name, then its value. +Widget _runFieldRow( + BuildContext context, + int index, + MapEntry entry, + Widget Function(String text)? textBuilder, +) { + final theme = Theme.of(context); + final caption = theme.textTheme.labelMedium?.copyWith( + fontWeight: FontWeight.w600, + color: theme.colorScheme.onSurfaceVariant, + ); + return Padding( + padding: EdgeInsets.only(top: index == 0 ? 0 : 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(entry.key.trim().isEmpty ? 'value' : entry.key, style: caption), + const SizedBox(height: 2), + _runFieldValue(runFieldText(entry.value), textBuilder), + ], + ), + ); +} + +Widget _runFieldValue(String text, Widget Function(String text)? textBuilder) => + runFieldLooksLikeMarkdown(text) + ? ChatMarkdownView(text: text) + : _runFieldPlain(text, textBuilder); + +Widget _runFieldPlain(String text, Widget Function(String text)? textBuilder) => + textBuilder?.call(text) ?? SelectableText(text); diff --git a/app/lib/features/settings/keyboard_shortcuts_registry.dart b/app/lib/features/settings/keyboard_shortcuts_registry.dart index 22f12a9d..85f3d2f0 100644 --- a/app/lib/features/settings/keyboard_shortcuts_registry.dart +++ b/app/lib/features/settings/keyboard_shortcuts_registry.dart @@ -5,6 +5,7 @@ import '../chat/workspace/chat_float_shortcut.dart'; import '../terminal/terminal_shortcuts.dart'; import '../../shell/windows/window_shortcuts.dart'; import '../../shell/shell_chat_shortcut.dart'; +import '../../shell/shell_runs_pipelines_shortcut.dart'; import '../../shell/shell_search_shortcut_labels.dart'; /// A shortcut entry shown in the in-app help. Keeping these entries together @@ -61,6 +62,12 @@ class KeyboardShortcutRegistry { ? 'Shows the open chat and focuses its message input. The browser may reserve Ctrl+K.' : 'Shows the open chat and focuses its message input. In the terminal Ctrl+K stays kill-line; Alt+K still opens Chat.', ), + const KeyboardShortcutEntry( + action: 'Switch between Runs and Pipelines', + keys: shellRunsPipelinesShortcutLabel, + caveat: + 'Goes to Runs from other destinations and to Pipelines from Runs. In a text field or the terminal Ctrl+A keeps its own meaning.', + ), KeyboardShortcutEntry( action: 'Toggle Center Stage', keys: diff --git a/app/lib/features/terminal/terminal_window.dart b/app/lib/features/terminal/terminal_window.dart index 1f47033f..de4a5f81 100644 --- a/app/lib/features/terminal/terminal_window.dart +++ b/app/lib/features/terminal/terminal_window.dart @@ -17,7 +17,7 @@ const _terminalContent = 'terminal'; /// /// [TerminalLayout] stays the terminal's own state (shown, panel or float): /// showing it in float mode opens or shows the window, hiding minimises it, -/// and the window's Minimise and Close hide the terminal. +/// and the window's X (minimise) hides the terminal. class TerminalWindows { TerminalWindows({ required this.manager, @@ -110,7 +110,7 @@ class TerminalWindows { if (legacy && layout.maximized) manager.setMaximized(entry.id, true); } - /// The window's Minimise or Close (or the windows' own show and hide) + /// The window's X or Minimise (or the windows' own show and hide) /// hides the terminal. void _windowsChanged() { if (!_started || !_ready || _syncing || !_wanted) return; diff --git a/app/lib/shell/adaptive_shell.dart b/app/lib/shell/adaptive_shell.dart index 60a97fa4..e37da7b4 100644 --- a/app/lib/shell/adaptive_shell.dart +++ b/app/lib/shell/adaptive_shell.dart @@ -7,10 +7,13 @@ import '../ui/adaptive/floating_destination_bar.dart'; import 'attention_badge.dart'; import 'destination.dart'; import 'list_detail.dart'; +import 'navigation_rail.dart'; +import 'shell_rail_scope.dart'; import 'list_pane_widths.dart'; import 'shell_bar.dart'; import 'shell_chat_shortcut.dart'; import 'shell_list_shortcuts.dart'; +import 'shell_runs_pipelines_shortcut.dart'; import 'shell_search_shortcut_labels.dart'; import 'tab_history.dart'; import '../ui/input/keyboard_owner.dart'; @@ -223,7 +226,8 @@ class _AdaptiveShellState extends State { ); // The scaffolds below swap the system insets for their bars' // heights; panes beside a list read the real ones from here. - final system = MediaQuery.paddingOf(context); + final media = MediaQuery.of(context); + final system = media.padding; // A page (Settings) closes to Pipelines on the system Back too; at a // tab's root Back returns to the tab opened before it. Only with neither // does Back reach the platform, so Android's (predictive) Back closes the @@ -237,15 +241,60 @@ class _AdaptiveShellState extends State { }, child: child, ); + // On a wide window the destinations sit in a rail at the left edge, and + // the floating bar is not built; the scaffold gets the rest of the window. + // The tree has the same shape at every width (an empty rail slot on a + // phone), so resizing across the rail's threshold never remounts a + // destination. + final rail = showsNavigationRail(context); + final scaffold = Scaffold( + extendBodyBehindAppBar: true, + appBar: topBar, + body: _destinationStack(contents), + extendBody: true, + bottomNavigationBar: rail ? null : bar, + ); return backable( ShellSystemInsets( padding: system, - child: Scaffold( - extendBodyBehindAppBar: true, - appBar: topBar, - body: _destinationStack(contents), - extendBody: true, - bottomNavigationBar: bar, + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + // Badges (running runs, unread chats) rebuild the rail alone. + ListenableBuilder( + listenable: _bar.badges, + builder: (context, _) => rail + ? ShellNavigationRail( + selected: _selected, + icon: (destination) => _icon( + destination, + destinationDetails(destination).icon, + ), + onSelected: _select, + padding: EdgeInsets.only( + top: system.top, + bottom: system.bottom, + ), + ) + : const SizedBox.shrink(), + ), + // Three children at every width, so the body keeps its slot. + rail + ? const VerticalDivider(width: 1, thickness: 1) + : const SizedBox.shrink(), + Expanded( + // Beside the rail the panes lay out in the width the rail leaves, + // which the window's width fixes here (not in a layout pass), so + // the panes and their pages rebuild with the window. + child: ShellRailScope( + shown: rail, + bodyWidth: rail + ? media.size.width - kNavigationRailSpace + : null, + child: scaffold, + ), + ), + ], ), ), ); @@ -274,8 +323,9 @@ class _AdaptiveShellState extends State { } /// App-wide search and conversation-list selection are handled before text - /// fields. Split-pane navigation belongs to the chat workspace; tab changes - /// have no global keyboard chord. + /// fields. Split-pane navigation belongs to the chat workspace. Ctrl+A + /// bounces between Runs and Pipelines, but leaves text fields and the + /// terminal their own Ctrl+A (select all, line start). bool _handleDestinationKeyEvent(KeyEvent event) { final keyboard = HardwareKeyboard.instance; // Ctrl+K is the terminal's kill-line while the terminal has the keyboard; @@ -285,6 +335,13 @@ class _AdaptiveShellState extends State { if (event is KeyDownEvent) _openChat(); return true; } + if (shellRunsPipelinesShortcut(event, keyboard)) { + if (primaryFocusTakesTyping()) return false; + if (event is KeyDownEvent) { + _select(shellRunsPipelinesTarget(_selected)); + } + return true; + } // A terminal keeps its keys (Escape, Ctrl+/, Ctrl+digits). if (primaryFocusIsTypingSurface()) return false; if (_selected == AppDestination.search && diff --git a/app/lib/shell/destination.dart b/app/lib/shell/destination.dart index a62eb13e..9fe91835 100644 --- a/app/lib/shell/destination.dart +++ b/app/lib/shell/destination.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; enum AppDestination { pipelines, runs, chat, search, settings } -/// The destinations the shell's tab bar offers, in order. Settings is a -/// destination the shell can show (its route is `/settings`), but it opens -/// as a page from the Pipelines bar's gear instead of being a tab. +/// The destinations the shell's tab bar (or, on a wide window, its rail) offers, +/// in order. Settings is a destination the shell can show (its route is +/// `/settings`), but it opens as a page, from the rail's foot on a wide window +/// or the Pipelines bar's gear on a phone, instead of being a tab. const List shellTabDestinations = [ AppDestination.pipelines, AppDestination.runs, diff --git a/app/lib/shell/list_detail.dart b/app/lib/shell/list_detail.dart index 13a0a3cd..ce992640 100644 --- a/app/lib/shell/list_detail.dart +++ b/app/lib/shell/list_detail.dart @@ -7,6 +7,7 @@ import 'detail_pane_navigator.dart'; import 'list_detail_policy.dart'; import 'list_pane_divider.dart'; import 'list_pane_widths.dart'; +import 'shell_rail_scope.dart'; import 'shell_bar.dart'; export 'list_detail_policy.dart'; @@ -64,7 +65,7 @@ class ListPaneWidth extends StatelessWidget { builder: (context, constraints) { final width = split ? listDetailListWidth( - MediaQuery.sizeOf(context).width, + ShellRailScope.windowWidth(context), constraints.maxWidth, preferredWidth, ) @@ -143,7 +144,7 @@ class _ListDetailPanesState extends State { listenable: widths, builder: (context, _) => LayoutBuilder( builder: (context, constraints) { - final window = media.size.width; + final window = ShellRailScope.windowWidth(context); final available = constraints.maxWidth; final preferred = widths.widthFor(key); final resizable = diff --git a/app/lib/shell/list_detail_policy.dart b/app/lib/shell/list_detail_policy.dart index ffb1589f..fa760f25 100644 --- a/app/lib/shell/list_detail_policy.dart +++ b/app/lib/shell/list_detail_policy.dart @@ -2,6 +2,8 @@ import 'dart:math' as math; import 'package:flutter/widgets.dart'; +import 'shell_rail_scope.dart'; + /// At least this wide, a destination keeps its list beside the open item /// (with the destination rail) instead of pushing the item as its own page. const double kListDetailMinWidth = 600; @@ -15,7 +17,7 @@ const double kListPaneMaxWidth = 440; /// Whether the window at [context] shows list and detail side by side. bool showsListBesideDetail(BuildContext context) => - MediaQuery.sizeOf(context).width >= kListDetailMinWidth; + ShellRailScope.windowWidth(context) >= kListDetailMinWidth; /// The narrowest list pane a drag leaves. const double kListPaneMinWidth = 240; diff --git a/app/lib/shell/navigation_rail.dart b/app/lib/shell/navigation_rail.dart new file mode 100644 index 00000000..93f6deec --- /dev/null +++ b/app/lib/shell/navigation_rail.dart @@ -0,0 +1,145 @@ +import 'package:flutter/material.dart'; + +import 'destination.dart'; +import 'list_detail_policy.dart'; + +/// The width of the destination rail on a wide window. +const double kNavigationRailWidth = 96; + +/// The rail with its divider: what the rail takes from a wide window's width. +const double kNavigationRailSpace = kNavigationRailWidth + 1; + +/// The narrowest window that shows the destination rail: the list-detail +/// minimum for the body beside it, plus the rail and its divider (the space the +/// shell takes from the window). Narrower windows keep the floating destination +/// bar, unchanged. +const double kNavigationRailMinWindowWidth = + kListDetailMinWidth + kNavigationRailSpace; + +/// Whether the window at [context] shows the destination rail. Read from the +/// window's own [MediaQuery], so the shell and the floating windows layer +/// (which sits above the shell) agree. +bool showsNavigationRail(BuildContext context) => + MediaQuery.sizeOf(context).width >= kNavigationRailMinWindowWidth; + +/// The wide layout's left-edge navigation: a Material [NavigationRail] with +/// an icon and a label per tab, the selected tab marked by the rail's +/// indicator, and Settings pinned to its bottom. +/// +/// [icon] builds each tab's icon (its running or unread badge included), so +/// the rail shows the same counts the floating bar did. [selected] is the +/// shell's destination: Settings (a page, not a tab) selects no tab but its +/// own item. +class ShellNavigationRail extends StatelessWidget { + const ShellNavigationRail({ + super.key, + required this.selected, + required this.icon, + required this.onSelected, + this.padding = EdgeInsets.zero, + }); + + final AppDestination selected; + final Widget Function(AppDestination destination) icon; + final ValueChanged onSelected; + + /// The system insets the rail keeps clear of: the status bar above and the + /// navigation bar below. + final EdgeInsets padding; + + @override + Widget build(BuildContext context) { + final index = shellTabDestinations.indexOf(selected); + return Padding( + padding: padding, + child: SizedBox( + width: kNavigationRailWidth, + child: NavigationRail( + key: const ValueKey('shell.navigation-rail'), + minWidth: kNavigationRailWidth, + labelType: NavigationRailLabelType.all, + selectedIndex: index < 0 ? null : index, + onDestinationSelected: (value) => + onSelected(shellTabDestinations[value]), + destinations: [ + for (final destination in shellTabDestinations) + NavigationRailDestination( + icon: KeyedSubtree( + key: ValueKey('shell.destination.${destination.name}'), + // The bar it replaces named each tab in a tooltip too. + child: Tooltip( + message: destinationDetails(destination).label, + child: icon(destination), + ), + ), + label: Text(destinationDetails(destination).label), + ), + ], + trailingAtBottom: true, + trailing: _SettingsRailItem( + selected: selected == AppDestination.settings, + onTap: () => onSelected(AppDestination.settings), + ), + ), + ), + ); + } +} + +/// Settings at the rail's foot, drawn as a [NavigationRailDestination] is: an +/// icon on a stadium indicator with its label under it, and the same colours. +/// It is not a [NavigationRailDestination] itself because the rail's +/// destination list is the tabs, and `trailing` is what the rail pins. +class _SettingsRailItem extends StatelessWidget { + const _SettingsRailItem({required this.selected, required this.onTap}); + + final bool selected; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + final scheme = Theme.of(context).colorScheme; + final item = destinationDetails(AppDestination.settings); + final foreground = selected + ? scheme.onSecondaryContainer + : scheme.onSurfaceVariant; + final textStyle = Theme.of(context).textTheme.labelMedium?.copyWith( + color: foreground, + fontWeight: selected ? FontWeight.w600 : FontWeight.w500, + ); + return Semantics( + button: true, + selected: selected, + label: item.label, + child: ExcludeSemantics( + child: InkWell( + key: const ValueKey('shell.destination.settings'), + onTap: onTap, + child: SizedBox( + width: kNavigationRailWidth, + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + width: 56, + height: 32, + alignment: Alignment.center, + decoration: ShapeDecoration( + shape: const StadiumBorder(), + color: selected ? scheme.secondaryContainer : null, + ), + child: Icon(item.icon, color: foreground), + ), + const SizedBox(height: 4), + Text(item.label, style: textStyle), + ], + ), + ), + ), + ), + ), + ); + } +} diff --git a/app/lib/shell/shell_rail_scope.dart b/app/lib/shell/shell_rail_scope.dart new file mode 100644 index 00000000..024f0a28 --- /dev/null +++ b/app/lib/shell/shell_rail_scope.dart @@ -0,0 +1,35 @@ +import 'package:flutter/widgets.dart'; + +/// Marks the content beside the destination rail. A wide window's content +/// lays out in the width left beside the rail, so list and detail panes read +/// that width ([windowWidth]) instead of the window's. Outside the scope (a +/// phone, a route pushed over the shell) the window's own width applies. +class ShellRailScope extends InheritedWidget { + const ShellRailScope({ + super.key, + required this.shown, + required this.bodyWidth, + required super.child, + }); + + /// Whether the rail is shown beside this content. + final bool shown; + + /// The width beside the rail; null when no rail is shown. + final double? bodyWidth; + + /// Whether the rail is shown beside [context]'s content. + static bool isShown(BuildContext context) => + context.dependOnInheritedWidgetOfExactType()?.shown ?? + false; + + /// The width the panes of [context] lay out in: the body beside the rail, + /// or else the window. + static double windowWidth(BuildContext context) => + context.dependOnInheritedWidgetOfExactType()?.bodyWidth ?? + MediaQuery.sizeOf(context).width; + + @override + bool updateShouldNotify(ShellRailScope oldWidget) => + shown != oldWidget.shown || bodyWidth != oldWidget.bodyWidth; +} diff --git a/app/lib/shell/shell_runs_pipelines_shortcut.dart b/app/lib/shell/shell_runs_pipelines_shortcut.dart new file mode 100644 index 00000000..ad25a0eb --- /dev/null +++ b/app/lib/shell/shell_runs_pipelines_shortcut.dart @@ -0,0 +1,28 @@ +import 'package:flutter/services.dart'; + +import 'destination.dart'; + +/// The chord that bounces between Runs and Pipelines, as the help page reads +/// it. It is the same on every platform. +const shellRunsPipelinesShortcutLabel = 'Ctrl+A'; + +/// Whether [event] is Ctrl+A. Only Ctrl counts: Alt, Shift, Cmd and chords +/// with both Ctrl and Alt are not the shortcut. Repeats of a held chord match +/// as well, so the caller can swallow them; only its first press acts. +bool shellRunsPipelinesShortcut(KeyEvent event, HardwareKeyboard keyboard) { + if (event is KeyUpEvent || + keyboard.isAltPressed || + keyboard.isShiftPressed || + keyboard.isMetaPressed || + !keyboard.isControlPressed) { + return false; + } + return event.logicalKey == LogicalKeyboardKey.keyA; +} + +/// The destination Ctrl+A goes to from [current]: Pipelines from Runs, and +/// Runs from every other destination (Pipelines included). +AppDestination shellRunsPipelinesTarget(AppDestination current) => + current == AppDestination.runs + ? AppDestination.pipelines + : AppDestination.runs; diff --git a/app/lib/shell/windows/window_entry.dart b/app/lib/shell/windows/window_entry.dart index 83fe7afe..1d36b154 100644 --- a/app/lib/shell/windows/window_entry.dart +++ b/app/lib/shell/windows/window_entry.dart @@ -37,7 +37,7 @@ class WindowEntry { /// The saved frame; it is drawn fitted inside the window area. final Rect frame; - /// Hidden by its minimise button; still listed and shown again with its + /// Hidden by the title bar's X; still listed and shown again with its /// group. final bool minimized; final bool maximized; diff --git a/app/lib/shell/windows/window_frame.dart b/app/lib/shell/windows/window_frame.dart index 61240ef6..bce9e305 100644 --- a/app/lib/shell/windows/window_frame.dart +++ b/app/lib/shell/windows/window_frame.dart @@ -11,8 +11,9 @@ double windowTitleBarHeight(BuildContext context) => MediaQuery.textScalerOf(context).scale(40).clamp(40.0, 64.0); /// A floating window's card and title bar: the title (drag to move, double -/// click to maximise), the kind's actions, then Minimise, Maximise and -/// Close. The content is drawn over the card's body by the window's +/// click to maximise), the kind's actions, then Maximise and the X. The X +/// minimises: it hides the window and keeps its state, like the chord does +/// in reverse. The content is drawn over the card's body by the window's /// navigator. class WindowFrame extends StatelessWidget { const WindowFrame({ @@ -25,7 +26,6 @@ class WindowFrame extends StatelessWidget { required this.onMoveEnd, required this.onMinimize, required this.onToggleMaximized, - required this.onClose, }); final String title; @@ -36,9 +36,10 @@ class WindowFrame extends StatelessWidget { /// The drag's delta and the pointer's global position. final void Function(Offset delta, Offset globalPosition) onMove; final VoidCallback onMoveEnd; + + /// The X: hides the window, keeping it listed and its state. final VoidCallback onMinimize; final VoidCallback onToggleMaximized; - final VoidCallback onClose; @override Widget build(BuildContext context) { @@ -69,11 +70,6 @@ class WindowFrame extends StatelessWidget { onPressed: action.onPressed, icon: Icon(action.icon), ), - IconButton( - tooltip: 'Minimise', - onPressed: onMinimize, - icon: const Icon(Icons.minimize), - ), IconButton( tooltip: maximized ? 'Restore size' : 'Maximise', onPressed: onToggleMaximized, @@ -82,8 +78,8 @@ class WindowFrame extends StatelessWidget { ), ), IconButton( - tooltip: 'Close', - onPressed: onClose, + tooltip: 'Minimise', + onPressed: onMinimize, icon: const Icon(Icons.close), ), const SizedBox(width: 4), diff --git a/app/lib/shell/windows/window_host.dart b/app/lib/shell/windows/window_host.dart index f4fc1f84..682d9b4b 100644 --- a/app/lib/shell/windows/window_host.dart +++ b/app/lib/shell/windows/window_host.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import '../navigation_rail.dart'; import 'window_focus.dart'; import 'window_layer.dart'; import 'window_manager.dart'; @@ -18,7 +19,16 @@ import 'window_shortcuts.dart'; /// /// The host fills its parent and takes no input between windows. class WindowHost extends StatefulWidget { - const WindowHost({super.key, required this.manager}); + const WindowHost({ + super.key, + required this.manager, + this.reservesRail = false, + }); + + /// Whether the shell beside this host shows the destination rail on the + /// window's left edge; the windows then keep to the right of it while the + /// window is wide enough for the rail (see [showsNavigationRail]). + final bool reservesRail; final WindowManager manager; @@ -119,24 +129,36 @@ class _WindowHostState extends State { ]), builder: (context, _) => LayoutBuilder( builder: (context, constraints) { - final bounds = constraints.biggest; - return Stack( - fit: StackFit.expand, - children: [ - for (final entry in windows) - if (manager.kinds[entry.kind] case final kind?) - WindowLayer( - key: ValueKey(entry.id), - manager: manager, - kind: kind, - entry: entry, - visible: - manager.isVisible(entry) && - bounds.width >= kind.minHostWidth, - bounds: bounds, - focus: _focus, - ), - ], + // Beside the destination rail the windows keep to the page's + // right, so they never sit under the rail. + // The shell takes the rail and its divider (kNavigationRailSpace). + final leading = widget.reservesRail && showsNavigationRail(context) + ? kNavigationRailSpace + : 0.0; + final bounds = Size( + constraints.maxWidth - leading, + constraints.maxHeight, + ); + return Padding( + padding: EdgeInsetsDirectional.only(start: leading), + child: Stack( + fit: StackFit.expand, + children: [ + for (final entry in windows) + if (manager.kinds[entry.kind] case final kind?) + WindowLayer( + key: ValueKey(entry.id), + manager: manager, + kind: kind, + entry: entry, + visible: + manager.isVisible(entry) && + bounds.width >= kind.minHostWidth, + bounds: bounds, + focus: _focus, + ), + ], + ), ); }, ), diff --git a/app/lib/shell/windows/window_kind.dart b/app/lib/shell/windows/window_kind.dart index 3a98499d..2f287885 100644 --- a/app/lib/shell/windows/window_kind.dart +++ b/app/lib/shell/windows/window_kind.dart @@ -2,7 +2,7 @@ import 'package:flutter/widgets.dart'; import 'window_entry.dart'; -/// One action in a window's title bar, before Minimise and Close (Dock on a +/// One action in a window's title bar, before Maximise and the X (Dock on a /// chat, a kind's own menu). class WindowAction { const WindowAction({ @@ -42,7 +42,7 @@ abstract class WindowKind { /// The window's content, below the title bar. Widget build(BuildContext context, WindowEntry entry); - /// Title-bar actions before Minimise and Close. + /// Title-bar actions before Maximise and the X. List actions(BuildContext context, WindowEntry entry) => const []; @@ -57,7 +57,7 @@ abstract class WindowKind { /// as its window takes focus. The default leaves it on the window. void focusContent(WindowEntry entry) {} - /// Called after the user closes the window (the X). + /// Called after the window is closed (Dock, Close all, a chat's /close). void closed(WindowEntry entry) {} /// Validates a saved window's [WindowEntry.data]; null drops the window. diff --git a/app/lib/shell/windows/window_layer.dart b/app/lib/shell/windows/window_layer.dart index efaffc28..427e2847 100644 --- a/app/lib/shell/windows/window_layer.dart +++ b/app/lib/shell/windows/window_layer.dart @@ -259,7 +259,6 @@ class _WindowLayerState extends State onMinimize: () => manager.setMinimized(_id, true), onToggleMaximized: () => manager.setMaximized(_id, !entry.maximized), - onClose: () => manager.close(_id), ), ), ), diff --git a/app/lib/ui/motion/container_transform_flight.dart b/app/lib/ui/motion/container_transform_flight.dart index f8a1b377..6dbead2e 100644 --- a/app/lib/ui/motion/container_transform_flight.dart +++ b/app/lib/ui/motion/container_transform_flight.dart @@ -229,11 +229,14 @@ class _Frame { required bool tracking, }) { const curve = Curves.fastOutSlowIn; - // Played backwards in time, the same easing reads as the item settling. + // Closing reads `t` from 1 to 0, so easeIn of `t` is a shrink that + // decelerates in time and starts on the first frame. The time-reversed + // fastOutSlowIn barely moved for its first ~60 ms, which read as Back + // doing nothing. final grown = tracking ? t : closing - ? curve.flipped.transform(t) + ? Curves.easeInCubic.transform(t) : curve.transform(t); // Opening covers the item first and shows the page late; closing hides // the page first and uncovers the item late. diff --git a/app/notes/chat-back-start.md b/app/notes/chat-back-start.md new file mode 100644 index 00000000..5a6d17be --- /dev/null +++ b/app/notes/chat-back-start.md @@ -0,0 +1,54 @@ +# Chat Back starts immediately (phone) + +## Finding + +Static reading of the phone chat path (`DetailPageHost`, `ContainerTransformPageRoute`, +`ContainerTransformFlight`, the chat screen's `_back`, the shell's back handling) found no +awaited work before the pop. Draft, scroll and transcript saves run fire-and-forget or in +`dispose`, after the reverse animation. `DetailPageHost`'s `onClosed` runs when the route is +disposed, so it cannot delay the pop. + +The delay the user sees is the close curve. Closing used `Curves.fastOutSlowIn.flipped` +against the animation value, which barely moves for its first ~60 ms. The page sat still +after Back, then began to shrink. + +## Change + +`lib/ui/motion/container_transform_flight.dart`: the closing shrink uses +`Curves.easeInCubic.transform(t)` on the reverse animation value. That is a shrink that starts +on the first frame and decelerates into the row. Opening is unchanged. The reverse duration +stays at `Motion.containerTransformReverse` = 250 ms (≤300 ms). + +## Measured (widget test, fake frame clock, 390x844, 16 ms per frame) + +Share of the page's shrink travel completed after each frame following the system Back +(`handlePopRoute` then `pump`). The first frame after the pop only starts the ticker, so it +reads 0 in both builds. + +| Elapsed after pop | Before | After | +| --- | ---: | ---: | +| 16 ms | 0.0% | 0.0% | +| 32 ms | 1.0% | 15.7% | +| 48 ms | 4.6% | 30.7% | +| 64 ms | 12.1% | 44.1% | +| 80 ms | 25.2% | 56.4% | + +The Back route is no longer current, and its animation is `reverse`, after the first pump +in both builds. Route change was already synchronous. + +## Focused tests + +Command: `tool/memwatch/full.sh 'test/ui/motion/container_transform_back_start_test.dart test/ui/motion/container_transform_route_test.dart test/shell/detail_page_test.dart test/features/chat/chat_open_transition_test.dart'` +Result: 15 passed, 0 failed (peak 1284 MB, 11 s). + +- New regression `container_transform_back_start_test.dart`: system Back changes the route + in one pump, and the page is more than 10% shrunk 16 ms later. The owner's close work + awaits a future that never completes, and Back still starts. Against the old curve this + test fails (shrink 0.99%). +- `tool/analyze.sh`: clean. + +## Not verified + +- `tool/chat_back_latency_probe.mjs` (browser) was not run; UI capture belongs to ui-review. +- Phone device timing was not measured (no device test ran). +- Leaving the chat list (tab-root Back) was read, not measured: it calls `_select` synchronously. diff --git a/app/notes/chat-floating-pane.md b/app/notes/chat-floating-pane.md index e17dcb38..9f982383 100644 --- a/app/notes/chat-floating-pane.md +++ b/app/notes/chat-floating-pane.md @@ -15,13 +15,14 @@ every destination and come back at app start without Chat being opened. chat's window last was, else at the default frame stepped 32 px per chat window already open. - **Window**: drag the title bar to move, the lower right corner to resize, - double click the title to maximise. The title bar has Dock, Minimise, - Maximise and Close. + double click the title to maximise. The title bar has Dock, Maximise and + the X. - **Dock** puts the chat back into the tiling, right of the active pane. When the Chat destination is not built it opens the chat there instead. - - **Minimise** hides that window; the chord brings it back. - - **Close (X)** closes the window and returns nothing to the tiling. The chat - itself is not closed on the server. + - **X** (tooltip and semantics: Minimise) hides that window, keeping its state; + it stays listed in the Windows menu and the chord brings it back. It never + closes the window, the chat or the tiling: nothing returns to the tiling. + The chat itself is not closed on the server. - **Chord**: Alt+Y, Ctrl+Y, and Cmd+Y on Apple platforms (`chatFloatShortcut`). With chat windows open it hides or shows all of them. With none it floats the active tiled pane, when that pane can float and Chat has the keyboard; diff --git a/app/notes/ctrl-a-runs-pipelines.md b/app/notes/ctrl-a-runs-pipelines.md new file mode 100644 index 00000000..6a6ae0dd --- /dev/null +++ b/app/notes/ctrl-a-runs-pipelines.md @@ -0,0 +1,37 @@ +# Ctrl+A toggles Runs and Pipelines + +Stage 01-implement (artifact 401). Not committed. + +## Behaviour +- Ctrl+A (the same chord on every platform) moves the shell between destinations: + - from Runs, to Pipelines; + - from Pipelines, to Runs; + - from any other destination (Chat, Search, Settings), to Runs. +- It is matched like Ctrl+K in `shell/adaptive_shell.dart`: logical key A with Ctrl alone. Alt, Shift, Cmd, Ctrl+Alt, and key-up events do not match. Repeats of a held chord are swallowed; only the first key-down acts. +- It does not act while a text field (`primaryFocusTakesTyping`) or a `TypingSurface` such as the terminal has focus. The handler returns false, so the field or terminal keeps Ctrl+A (select all, line start). +- The switch goes through the shell's normal `_select`, so a controlled shell (`onDestinationSelected`) receives the destination. + +## Changed paths +- `app/lib/shell/shell_runs_pipelines_shortcut.dart` (new): `shellRunsPipelinesShortcut` (matcher), `shellRunsPipelinesTarget` (destination rule), `shellRunsPipelinesShortcutLabel` (`'Ctrl+A'`). +- `app/lib/shell/adaptive_shell.dart`: one branch in `_handleDestinationKeyEvent`, after the Ctrl+K branch and before the typing-surface check; updated doc comment. +- `app/lib/features/settings/keyboard_shortcuts_registry.dart`: "Switch between Runs and Pipelines" help entry, `Ctrl+A` on every platform, with a caveat about text fields and the terminal. +- `app/test/shell/runs_pipelines_shortcut_test.dart` (new): matcher, destination rule, Chat→Runs→Pipelines→Runs sequence, text-field exception, terminal exception. +- `app/test/features/settings/keyboard_shortcuts_help_test.dart`: help entry test over every `TargetPlatform` value. + +## Focused results +- `tool/memwatch/full.sh 'test/shell/runs_pipelines_shortcut_test.dart test/features/settings/keyboard_shortcuts_help_test.dart test/shell/shell_chat_shortcut_test.dart test/shell/destination_shortcuts_test.dart'`: PASS, 19 passed, 0 failed, peak 1151 MB, 13s, exit 0. +- Mutation check: with the `primaryFocusTakesTyping()` guard removed, `runs_pipelines_shortcut_test.dart` fails (2 failed, including the text-field case). The guard was restored; the file matches the pre-mutation backup. +- `tool/analyze.sh` on the changed files: clean, exit 0. Run after the focused tests, sequentially. +- No existing test sends Ctrl+A. The `keyA` uses in `chat_shell_terminal_test.dart` and `chat_transcript_selection_test.dart` are plain or Cmd+A, so they are unaffected. + +## Affected states +- Shell tabs: Pipelines, Runs, Chat, Search, and Settings (a page of Pipelines). +- Text field focused: Ctrl+A goes to the field. +- Terminal focused: Ctrl+A goes to the terminal. +- Help page: new "Switch between Runs and Pipelines" row. + +## Not covered +- No UI capture or device run (ui-review owns that). +- The text-field test pins the platform to Android so that Ctrl+A means select all. On Apple platforms Ctrl+A is line start in the field; the field still keeps it, but that case is not tested. +- The chat composer is not tested directly; it is a text field, so the same guard applies. +- On web, the browser may keep Ctrl+A; the registry caveat does not mention this. diff --git a/app/notes/floating-windows.md b/app/notes/floating-windows.md index f02bd8c5..fe6370be 100644 --- a/app/notes/floating-windows.md +++ b/app/notes/floating-windows.md @@ -15,7 +15,8 @@ mode (below). `FloatingLayer`, the overlay the old windows used, is gone. - `WindowHost`: the windows as plain children of the terminal stage's stack, in the shell page (not an overlay above it), outside every destination. - `WindowLayer` / `WindowFrame`: one window's card, title bar (drag, double - click to maximise, kind actions, Minimise, Maximise, Close) and resize corner. + click to maximise, kind actions, Maximise, the X = minimise) and resize corner. + There is no separate Minimise button; the X hides the window and keeps it. - `WindowNavigator`: each window's own page stack. - `WindowFocus`: a focus scope per window; the keyboard follows the top window and returns to what had it when the last one hides. @@ -73,8 +74,8 @@ the device, not a server) and `TerminalWindows`, which keeps it in step with float, panel height); the bottom panel is still a shell panel. - Showing the terminal in float mode opens or shows the window; hiding it - (Alt+T, Ctrl+`, the options menu) minimises it. The window's Minimise and - Close both hide the terminal. Its shells and tabs live in `TerminalHub`, so + (Alt+T, Ctrl+`, the options menu) minimises it. The window's X (minimise) + hides the terminal. Its shells and tabs live in `TerminalHub`, so nothing is lost either way, and the window comes back where it was. - The frame and maximised state are the window system's. The first window takes the ones `pipelines.terminal-layout.v1` saved before; that record is diff --git a/app/notes/navigation-rail.md b/app/notes/navigation-rail.md new file mode 100644 index 00000000..544302a5 --- /dev/null +++ b/app/notes/navigation-rail.md @@ -0,0 +1,124 @@ +# Wide destination rail with Settings + +On a wide window the shell's four destinations (Pipelines, Runs, Chat, Search) +move from the floating bottom-left pill to a Material `NavigationRail` at the +left edge, with Settings pinned to its foot. The rail keeps the running and +unread badges. The Pipelines toolbar's Settings gear is removed where the rail +shows. Phone and narrow layouts are unchanged. + +## Design + +- **Threshold.** The rail shows at window width >= 697 + (`kNavigationRailMinWindowWidth` = `kListDetailMinWidth` 600 + + `kNavigationRailSpace` 97, the rail plus its divider). The body beside the + rail therefore still meets the list/detail split threshold at 697 px. Between + 600 and 696 px the floating bar and split layout stay as before. +- **Layout.** `AdaptiveShell.build` returns the same tree at every width: + `Row[rail slot, divider slot, Expanded(ShellRailScope(Scaffold))]`. On a + phone the first two slots are empty. Resizing across the threshold does not + remount a destination, and pages pushed over a tab keep their state. +- **Body width.** `ShellRailScope.bodyWidth` is the window width less the rail + and its divider (`kNavigationRailSpace` = 97), computed in `build`. The + list/detail policy reads it through `ShellRailScope.windowWidth` + (`list_detail.dart`, `list_detail_policy.dart`), so `showsListBesideDetail` + and the pane widths follow the body. Outside the scope the window width still + applies. +- **Rail items** (`navigation_rail.dart`). Four `NavigationRailDestination`s + with `labelType: all`, `trailingAtBottom: true`. Each tab's icon keeps its + badge (`_icon`), a `Tooltip` with its label, and the `shell.destination.` + key the floating bar used. Settings is a custom `_SettingsRailItem` in + `trailing`, styled like a rail destination (stadium indicator, same colours). + A `NavigationRailDestination` cannot be pinned, so it is not one. +- **Window host.** Floating windows overlay the whole app, so `WindowHost` takes + `reservesRail` (set by `pipelines_app.dart`) and starts its bounds after the + rail and divider (`kNavigationRailSpace`, 97 px, the same inset the shell + uses) when the window is wide enough. Tests that mount the host without a + shell keep the full width. +- **Pipelines gear.** `ShellRailScope.isShown` hides `pipelines-open-settings` + in the shell's toolbar while the rail shows. On a phone it stays. + +## Changed paths + +- `app/lib/shell/navigation_rail.dart` (new): rail widget, Settings item, + threshold constants. +- `app/lib/shell/shell_rail_scope.dart` (new): body-width scope. +- `app/lib/shell/adaptive_shell.dart`: rail layout and constant tree shape. +- `app/lib/shell/list_detail.dart`, `app/lib/shell/list_detail_policy.dart`: + read the body width through the scope. +- `app/lib/shell/windows/window_host.dart`: `reservesRail` inset (97 px). +- `app/lib/shell/destination.dart`: comment only. +- `app/lib/features/pipelines/screen.dart`: gear hidden beside the rail. +- `app/lib/application/pipelines_app.dart`: `WindowHost(reservesRail: true)`. + +## Focused results + +Review fix (off-by-one at the threshold): the rail threshold and the +`WindowHost` inset both use `kNavigationRailSpace` (97). Re-run from `app/` +with `tool/memwatch/full.sh`: + +- Rail and window-host files (`navigation_rail_test`, `windows/window_host_test`, + `windows/window_layering_test`): `PASS: 21 passed` earlier, then covered by the + run below. +- All 18 changed test files plus the rail and window-host tests + (`application/`, `features/chat/`, `shell/`, `shell/windows/`): + `memwatch: PASS: 108 passed, 0 failed, 0 skipped; exit 0`. The verdict names + only the intended paths. +- `tool/analyze.sh` (whole app, run after the focused tests): `analyze: clean`. + +New tests (`test/shell/navigation_rail_test.dart`): + +- Wide: labelled rail, full height, left edge, Settings pinned below the tabs. +- Selection marks the tab and one tap selects another. +- Settings opens as a page from the rail foot; no tab is selected meanwhile; + Back returns to Pipelines. +- Running count on the Runs item of the rail. +- A list and its open item lay out to the right of the rail. +- The rail appears at 697 and not at 696; at 697 the list and detail sit side by + side (list starts at 97, detail ends at 697); phone and 640 keep the floating bar. +- Floating windows start after the rail (97) with `reservesRail`, and at 500 px + they use the full width. +- Crossing the threshold keeps a destination mounted with its state. + +Updated expectations (each one is a consequence of the rail, not a behaviour +change the task did not ask for): + +- Wide-window floating-bar tests moved to 640 px, where the bar still sits + beside the list (`floating_tab_bar_test`, `split_destination_bar_test`, + `split_detail_pages_test`, `split_status_bar_test`, `pane_bar_row_test`, + `chat_sidebar_clearance_test`). The width-driven policy numbers + (`list_pane_resize_test`) now use the body width. +- `settings_page_test`: the gear case runs on a phone; a wide case opens + Settings from the rail. `tab_location_navigation_test` uses the rail's + Settings item at 1100 px. +- `chat_registration_test`, `chat_list_detail_test`, `attention_badge_test`: + the rail replaces the bottom bar at wide widths. +- `list_pane_resize_test` (grip): one `pumpAndSettle` instead of one `pump`. + The focus emphasis reaches the grip one frame later beside the rail. The + expectation (emphasised on focus) is unchanged. +- `chat_sidebar_clearance_test`: the scroll offset is kept up to the new + maximum extent. At 640 px the list is narrower than beside the rail, so its + rows re-wrap and the content is shorter. +- `chat_split_integration_test`: the compact menu's "Runs" is picked by + element, not by text, because the rail also labels Runs. The rail's tooltips + keep `byTooltip('Chat')` working. +- Floating-window expectation (`navigation_rail_test`): the probe window starts at + `100 + kNavigationRailSpace` (97), not 96. + +## Affected states + +- Wide, rail shown (>= 697 px): rail with badges, Settings pinned, lists beside + the rail, floating windows beside it, no Pipelines gear, Settings page with + Back. +- 600-696 px: floating bar and split layout as before (no rail). +- Phone: unchanged, including the Pipelines gear. + +## Limitations + +- Not verified in a browser or on a device. `ui-review` owns captures. The + visual match of the rail and the Settings item is by reading the Material + sources, not by a capture. +- The terminal panel is laid over the app's bottom edge (`TerminalStage`), not + inside the shell. When it is open on a wide window it may cover the rail's + foot and Settings. This follows from the stack layout; it was not captured. +- The compact list's "Menu" sheet (`ShellDestinationMenu`) still offers the + destinations beside the rail. It is a duplicate, not a removed feature. diff --git a/app/notes/run-detail-output-expanded.md b/app/notes/run-detail-output-expanded.md new file mode 100644 index 00000000..aa1806ca --- /dev/null +++ b/app/notes/run-detail-output-expanded.md @@ -0,0 +1,39 @@ +# Run detail: Output section starts expanded + +## Change +- The run Summary's Output section (`run-detail-summary-output`) now starts open. + Input still starts closed. The Summary's default is restored on a different run + and when a search hit names no section (`RunDetailTabs._resetSummarySections`). +- A visit's Summary Output (`run-visit-section-Output`) starts open; Input starts + closed (`_VisitSummaryState._closed = {'Input'}`). +- Both stay collapsible by tapping the title. The open/closed state lives in the + controller or State for that view only; it is not persisted. +- Long outputs: Output is a sliver. `RunFieldSliver` (in `run_field_body.dart`) + builds one `SliverList` row per recorded + field, so a map with hundreds of fields lays out only the rows on screen. It + is used for the run Summary Output (`_StickyField.sliverBody`) and the visit + Summary Output (`_section(..., lazy: true)`), both through `StickySection`'s + sliver path. A closed `SliverReveal` builds nothing. +- Input stays on the box path (`RunFieldBody`); it starts closed, so its cost is + paid only when the operator opens it. The box and sliver forms share the row + builder, so they render the same fields. + +## Tests (run through `tool/memwatch/full.sh`, one quoted path list) +- Command: `tool/memwatch/full.sh 'test/features/runs/ui/run_detail_visit_sections_test.dart test/features/runs/ui/run_detail_summary_fields_test.dart test/features/runs/ui/run_detail_widget_test.dart test/features/runs/ui/run_search_selection_test.dart test/features/runs/ui/run_detail_tabs_test.dart test/features/runs/ui/run_detail_visit_test.dart'` +- Verdict (final code): `PASS: 49 passed, 0 failed, 0 skipped; peak 1884 MB; 32s; exit 0` +- New: visit Output starts expanded and collapses/reopens; run Output starts + expanded and collapses for the view; a 500-field visit Output opens with only + its first field built and the page scrolls to the last one (lazy regression). +- Updated (the old expectation was that Output started closed): visit tab/empty-state + tests, run Summary empty-wording and recorded-input tests, search-selection tests + for input, retired field and replacing a visit with the Summary. +- Not changed: Input's closed default and every Input expectation. + +## Analyze +- `tool/analyze.sh`: `analyze: clean; 10s; exit 0` +- `dart format --set-exit-if-changed` on the changed files: formatted one widget + test file (whitespace only). + +## Limitations +- No widget capture or browser/device check was run here; ui-review owns that. +- Very long Output is laid out when the section opens. Not measured for jank. diff --git a/app/notes/window-x-minimises.md b/app/notes/window-x-minimises.md new file mode 100644 index 00000000..d933b110 --- /dev/null +++ b/app/notes/window-x-minimises.md @@ -0,0 +1,55 @@ +# Window X minimises (no separate Minimise button) + +## Change + +- The title bar of a floating window is now: kind actions (Dock on a chat), + Maximise / Restore size, then the X. +- The X hides the window and keeps its state, exactly as Minimise did. Its + tooltip and semantics are `Minimise`. It keeps the X glyph (`Icons.close`). +- The X never calls the kind's `closed` hook, so a chat window keeps its chat + open on the server and returns nothing to the tiling. +- `WindowFrame` no longer takes `onClose`; `WindowLayer` wires the X to + `manager.setMinimized(id, true)`. +- Unchanged: the chord (Alt+Y) shows hidden chat windows; the Windows menu + still lists minimised windows with a minimise mark and shows them on choice; + Show all, Minimise all and Close all stay in that menu. Terminal windows + still hide the terminal when their window is hidden by the X. + +Changed paths (under `app/`): + +- `lib/shell/windows/window_frame.dart`, `window_layer.dart`, `window_kind.dart`, + `window_entry.dart` (comments and the frame's parameters) +- `lib/features/terminal/terminal_window.dart` (comment only) +- `test/shell/windows/window_host_test.dart`, `window_layering_test.dart` +- `test/features/chat/chat_floating_pane_test.dart` +- `test/features/terminal/terminal_surface_test.dart` +- `notes/floating-windows.md`, `notes/chat-floating-pane.md` + +## Focused results + +- `tool/memwatch/full.sh 'test/shell/windows/window_host_test.dart + test/shell/windows/window_layering_test.dart + test/shell/windows/window_conveniences_test.dart + test/features/chat/chat_floating_pane_test.dart + test/features/terminal/terminal_surface_test.dart'`: + PASS, 72 passed, 0 failed, 0 skipped, exit 0. +- `tool/analyze.sh`: clean, exit 0. +- Not run: the full suite (the land gate runs it). No Cupertino code or tests + touched. + +## Affected states (widget-test coverage only) + +- Window title bar: no `Close` tooltip; `Minimise` on the X; `Maximise` / + `Restore size` unchanged. +- Chat window: X hides it; the chat stays open, is not docked and sends no + `chat_close`; the chord shows it again with the same frame and composer. +- Probe window: X keeps the entry (minimised), the content state survives, and + the group toggle brings it back. +- Terminal float window: X hides the terminal and keeps its tabs; the chord + shows it again at the same frame. + +## Limitations + +- No browser or device capture here; `ui-review` owns the title-bar captures. +- The X glyph with a Minimise tooltip is a deliberate choice; a minimise glyph + would be a one-line change in `window_frame.dart` if preferred. diff --git a/app/test/application/chat_registration_test.dart b/app/test/application/chat_registration_test.dart index 07901af5..e29fe066 100644 --- a/app/test/application/chat_registration_test.dart +++ b/app/test/application/chat_registration_test.dart @@ -285,12 +285,12 @@ void main() { expect(find.byKey(const Key('chat-turn-activity')), findsOneWidget); expect(find.text('Kept behind a native disclosure.'), findsNothing); - // The shell bar stays over the list and tabs; the open chat draws its - // own floating bar in its pane, with no Back: the list beside it is the - // way out. + // The destination rail sits at the left edge; the shell bar stays over + // the list, and the open chat draws its own floating bar in its pane, + // with no Back: the list beside it is the way out. expect(find.byType(ChatSessionsScreen), findsOneWidget); - expect(find.byType(NavigationRail), findsNothing); - expect(find.byType(FloatingDestinationBar), findsOneWidget); + expect(find.byType(NavigationRail), findsOneWidget); + expect(find.byType(FloatingDestinationBar), findsNothing); // The shell's bar and the conversation's own header. expect(find.byType(SegmentedBar), findsNWidgets(2)); expect(find.byType(AppBar), findsNothing); diff --git a/app/test/application/settings_page_test.dart b/app/test/application/settings_page_test.dart index 73606176..e27df3ca 100644 --- a/app/test/application/settings_page_test.dart +++ b/app/test/application/settings_page_test.dart @@ -13,9 +13,9 @@ import '../features/pipelines/fixtures.dart'; import 'pipelines_app_test.dart' show webServer; import 'pipelines_replies.dart'; -/// Settings is not a tab: it opens as a page from the gear in the Pipelines -/// bar, keeps its `/settings` route (and deep link), and closes back to -/// Pipelines. The tab bar keeps Pipelines selected meanwhile. +/// Settings is not a tab: it opens as a page (from the gear in the Pipelines +/// bar on a phone, from the rail's foot on a wide window), keeps its +/// `/settings` route (and deep link), and closes back to Pipelines. The tab bar keeps Pipelines selected meanwhile. void main() { Future pumpApp( WidgetTester tester, { @@ -50,7 +50,9 @@ void main() { .widget(find.byType(FloatingDestinationBar)) .currentIndex; - for (final size in [const Size(390, 844), const Size(1200, 800)]) { + // A phone's Pipelines bar keeps the gear; a wide window's rail offers + // Settings instead (see the wide test below). + for (final size in [const Size(390, 844)]) { testWidgets('${size.width}: the Pipelines bar gear opens Settings ' 'as a page and Back returns', (tester) async { final provider = await pumpApp( @@ -101,6 +103,57 @@ void main() { }); } + testWidgets('1200: the rail offers Settings at its foot and no gear is ' + 'left in the Pipelines toolbar; Settings is a page and Back returns', ( + tester, + ) async { + final provider = await pumpApp( + tester, + location: '/pipelines', + size: const Size(1200, 800), + ); + expect(find.byType(NavigationRail), findsOneWidget); + expect(find.byKey(const Key('pipelines-open-settings')), findsNothing); + expect(find.byType(FloatingDestinationBar), findsNothing); + final rail = tester.widget(find.byType(NavigationRail)); + expect(rail.selectedIndex, 0); + for (final label in ['Pipelines', 'Runs', 'Chat', 'Search', 'Settings']) { + expect( + find.descendant( + of: find.byType(NavigationRail), + matching: find.text(label), + ), + findsOneWidget, + reason: label, + ); + } + + await tester.tap(find.byKey(const ValueKey('shell.destination.settings'))); + await tester.pump(); + await tester.pump(); + expect(provider.value.uri.path, '/settings'); + expect(find.byType(SettingsScreen), findsOneWidget); + // Settings is a page of Pipelines: the rail marks Settings, not a tab. + expect( + tester.widget(find.byType(NavigationRail)).selectedIndex, + isNull, + ); + expect(find.byKey(const ValueKey('shell.back')), findsOneWidget); + expect(tester.takeException(), isNull); + + await tester.tap(find.byKey(const ValueKey('shell.back'))); + await tester.pump(); + await tester.pump(); + expect(provider.value.uri.path, '/pipelines'); + expect(find.byKey(const Key('pipelines-open-settings')), findsNothing); + expect( + tester.widget(find.byType(NavigationRail)).selectedIndex, + 0, + ); + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pump(); + }); + testWidgets('the /settings deep link opens the Settings page and ' 'the system Back closes it to Pipelines', (tester) async { final provider = await pumpApp( diff --git a/app/test/application/tab_location_navigation_test.dart b/app/test/application/tab_location_navigation_test.dart index 1197cd27..55de9dbf 100644 --- a/app/test/application/tab_location_navigation_test.dart +++ b/app/test/application/tab_location_navigation_test.dart @@ -179,11 +179,9 @@ void main() { final before = tester.widget(find.byType(PipelinesScreen)); expect(before.initialPipelineId, 1); final pipelineState = tester.state(find.byType(PipelinesScreen)); - await tapBarAction( - tester, - find.byKey(const Key('pipelines-open-settings')), - 'Settings', - ); + // Wide: the rail offers Settings (the toolbar gear is gone). + expect(find.byKey(const Key('pipelines-open-settings')), findsNothing); + await tester.tap(find.byKey(const ValueKey('shell.destination.settings'))); await tester.pumpAndSettle(); expect(app.provider.value.uri.path, '/settings'); final hidden = find.byType(PipelinesScreen, skipOffstage: false); diff --git a/app/test/features/chat/chat_floating_pane_test.dart b/app/test/features/chat/chat_floating_pane_test.dart index ceb1a11e..75a77e7d 100644 --- a/app/test/features/chat/chat_floating_pane_test.dart +++ b/app/test/features/chat/chat_floating_pane_test.dart @@ -390,19 +390,24 @@ void main() { await app.stop(tester); }); - testWidgets('X closes the window and returns nothing to the tiling', ( - tester, - ) async { + testWidgets('X minimises the window: the chat stays open, returns nothing ' + 'to the tiling, and the chord brings the window back', (tester) async { await _saved('a', 'b'); final app = _App(_Store()); await app.start(tester); await _menu(tester, 'b', 'Float (Alt+Y)'); - await tester.tap(find.byTooltip('Close')); + await tester.tap(find.byTooltip('Minimise')); await tester.pumpAndSettle(); - expect(app.floating, isEmpty); + // Still a window, hidden; not closed and not docked. + expect(app.floating, ['b']); + expect(app.windows.windows.single.minimized, isTrue); + expect(_shown('Chat b'), findsNothing); expect(_workspace(tester).panes.map((p) => p.sessionId), ['a']); - expect(_thread('b'), findsNothing); expect(app.gateway.calls.where((c) => c.type == 'chat_close'), isEmpty); + await _chord(tester); + expect(_shown('Chat b'), findsOneWidget); + expect(_thread('b').hitTestable(), findsOneWidget); + expect(app.floating, ['b']); await app.stop(tester); }); diff --git a/app/test/features/chat/chat_list_detail_test.dart b/app/test/features/chat/chat_list_detail_test.dart index 9e3703b3..a96c93ee 100644 --- a/app/test/features/chat/chat_list_detail_test.dart +++ b/app/test/features/chat/chat_list_detail_test.dart @@ -50,7 +50,7 @@ Future _pumpShell(WidgetTester tester, Size size) async { void main() { for (final size in [const Size(1280, 800), const Size(800, 830)]) { - testWidgets('a wide window keeps the tab bar and list beside the open chat ' + testWidgets('a wide window keeps the rail and list beside the open chat ' 'at $size', (tester) async { await _pumpShell(tester, size); expect( @@ -68,8 +68,10 @@ void main() { find.byType(Navigator).first, ); expect(navigator.canPop(), isFalse, reason: 'No page covers the shell'); - expect(find.byType(NavigationRail), findsNothing); - expect(find.byType(FloatingDestinationBar), findsOneWidget); + // Both sizes are wide enough for the rail (the shell's own bar and list + // beside the open chat sit to its right). + expect(find.byType(NavigationRail), findsOneWidget); + expect(find.byType(FloatingDestinationBar), findsNothing); expect(find.byKey(const ValueKey('chat-thread-a')), findsOneWidget); expect(find.text('Second chat'), findsOneWidget); expect( diff --git a/app/test/features/chat/chat_sidebar_clearance_test.dart b/app/test/features/chat/chat_sidebar_clearance_test.dart index 2ed3b3be..c9f9c624 100644 --- a/app/test/features/chat/chat_sidebar_clearance_test.dart +++ b/app/test/features/chat/chat_sidebar_clearance_test.dart @@ -11,7 +11,7 @@ void main() { testWidgets('chat list stays above labeled navigation ($scale)', ( tester, ) async { - tester.view.physicalSize = const Size(1200, 900); + tester.view.physicalSize = const Size(640, 900); tester.view.devicePixelRatio = 1; tester.platformDispatcher.textScaleFactorTestValue = scale; addTearDown(tester.view.reset); @@ -87,7 +87,13 @@ void main() { ), same(scrollable), ); - expect(scrollable.position.pixels, closeTo(retainedOffset, .5)); + // The list is narrower at 640 (no rail) than beside the rail, so its + // rows re-wrap into a shorter scroll extent: the offset is kept up to + // that extent, and no further. + final kept = retainedOffset < scrollable.position.maxScrollExtent + ? retainedOffset + : scrollable.position.maxScrollExtent; + expect(scrollable.position.pixels, closeTo(kept, .5)); expect(tester.takeException(), isNull); }); } diff --git a/app/test/features/chat/chat_split_integration_test.dart b/app/test/features/chat/chat_split_integration_test.dart index 4d3eb558..c10ea315 100644 --- a/app/test/features/chat/chat_split_integration_test.dart +++ b/app/test/features/chat/chat_split_integration_test.dart @@ -106,7 +106,16 @@ void main() { expect(find.text('Menu'), findsOneWidget); await tester.tap(find.text('Menu')); await tester.pumpAndSettle(); - await tester.tap(find.text('Runs')); + // The menu's own row: the rail labels Runs too, so take the text that + // is not in the rail. + await tester.tap( + find.byElementPredicate( + (element) => + element.widget is Text && + (element.widget as Text).data == 'Runs' && + element.findAncestorWidgetOfExactType() == null, + ), + ); await tester.pumpAndSettle(); expect(find.text('Runs destination'), findsOneWidget); await tester.tap(find.byTooltip('Chat')); diff --git a/app/test/features/runs/ui/run_detail_summary_fields_test.dart b/app/test/features/runs/ui/run_detail_summary_fields_test.dart index 019607b6..b156bfc6 100644 --- a/app/test/features/runs/ui/run_detail_summary_fields_test.dart +++ b/app/test/features/runs/ui/run_detail_summary_fields_test.dart @@ -244,10 +244,9 @@ void main() { await tester.pumpAndSettle(); expect(find.text('No input recorded.'), findsOneWidget); + // Output starts open, so its empty sentence shows without a tap. await tester.ensureVisible(find.text('Output')); await tester.pumpAndSettle(); - await tester.tap(find.text('Output')); - await tester.pumpAndSettle(); expect(find.text('No output recorded.'), findsOneWidget); }); @@ -266,5 +265,35 @@ void main() { await tester.pumpAndSettle(); expect(find.text('ship it'), findsOneWidget); }); + + testWidgets('${platform.name} summary output starts expanded and ' + 'collapses for this view', (tester) async { + await pumpRunDetail( + tester, + platform, + run: recordedRunFixture(), + size: const Size(900, 1600), + ); + + final output = find.byKey(const ValueKey('run-detail-summary-output')); + final outputTitle = find.descendant( + of: output, + matching: find.text('Output'), + ); + final outputBody = find.descendant(of: output, matching: find.text('ok')); + // Output opens with its recorded value; Input stays closed. + expect(outputBody, findsOneWidget); + expect(find.text('ship it'), findsNothing); + + await tester.ensureVisible(outputTitle.first); + await tester.pumpAndSettle(); + await tester.tap(outputTitle.first); + await tester.pumpAndSettle(); + expect(outputBody, findsNothing); + + await tester.tap(outputTitle.first); + await tester.pumpAndSettle(); + expect(outputBody, findsOneWidget); + }); } } diff --git a/app/test/features/runs/ui/run_detail_visit_sections_test.dart b/app/test/features/runs/ui/run_detail_visit_sections_test.dart index 9baebc24..c7c13adb 100644 --- a/app/test/features/runs/ui/run_detail_visit_sections_test.dart +++ b/app/test/features/runs/ui/run_detail_visit_sections_test.dart @@ -49,21 +49,77 @@ void main() { } }); + testWidgets('${platform.name} visit Output starts expanded and collapses', ( + tester, + ) async { + await openVisit(tester, platform); + final output = find.byKey(const ValueKey('run-visit-section-Output')); + final outputTitle = find.descendant( + of: output, + matching: find.text('Output'), + ); + final outputBody = find.descendant(of: output, matching: find.text('ok')); + final input = find.byKey(const ValueKey('run-visit-section-Input')); + + // Output opens expanded; Input stays closed. + expect(find.text('result'), findsOneWidget); + expect(outputBody, findsOneWidget); + expect(find.text('Ship it.'), findsNothing); + + // The operator can collapse Output, and open it again. + await tester.ensureVisible(outputTitle.first); + await tester.tap(outputTitle.first); + await tester.pumpAndSettle(); + expect(outputBody, findsNothing); + expect(find.text('result'), findsNothing); + await tester.tap(outputTitle.first); + await tester.pumpAndSettle(); + expect(outputBody, findsOneWidget); + expect(input, findsOneWidget); + }); + + testWidgets('${platform.name} long visit Output opens lazily and still ' + 'scrolls to its last field', (tester) async { + final run = visitRunFixture(); + firstVisitStep(run)['output'] = { + for (var i = 0; i < 500; i++) 'field$i': 'value $i', + }; + await openVisit(tester, platform, run: run); + + // Open by default, yet only the fields on screen are built. + expect(find.text('value 0'), findsOneWidget); + expect(find.text('value 499'), findsNothing); + + // Scrolling the page reaches the rest of the Output. + await tester.scrollUntilVisible( + find.text('value 499'), + 500, + // The page's own scroll view is the outermost of its scrollables. + scrollable: find + .descendant( + of: find.byKey(const Key('run-visit-body-summary')), + matching: find.byType(Scrollable), + ) + .first, + ); + expect(find.text('value 499'), findsOneWidget); + }); + testWidgets('${platform.name} tabs show recorded values and exact empty ' 'wording', (tester) async { await openVisit(tester, platform); - // Each field by name with its value, never raw JSON. + // Each field by name with its value, never raw JSON. Output is open at + // once; Input's value shows only after its tap. expect(find.text('Ship it.'), findsNothing); - expect(find.text('ok'), findsNothing); + expect(find.text('ok'), findsOneWidget); await tester.tap(find.text('Input')); await tester.pumpAndSettle(); expect(find.text('prompt'), findsOneWidget); expect(find.text('Ship it.'), findsOneWidget); expect(find.textContaining('"prompt"'), findsNothing); + // Output is open as the visit opens; no tap is needed to read it. await openVisitTab(tester, RunVisitSection.output); - await tester.tap(find.text('Output')); - await tester.pumpAndSettle(); expect(find.text('result'), findsOneWidget); expect(find.text('ok'), findsOneWidget); @@ -127,13 +183,12 @@ void main() { await openVisit(tester, platform, run: run); expect(find.text(visitEmptyInput), findsNothing); - expect(find.text(visitEmptyOutput), findsNothing); + // Output is open, so its empty sentence is already there. + expect(find.text(visitEmptyOutput), findsOneWidget); await tester.tap(find.text('Input')); await tester.pumpAndSettle(); expect(find.text(visitEmptyInput), findsOneWidget); await openVisitTab(tester, RunVisitSection.output); - await tester.tap(find.text('Output')); - await tester.pumpAndSettle(); expect(find.text(visitEmptyOutput), findsOneWidget); await openVisitTab(tester, RunVisitSection.artifacts); expect( diff --git a/app/test/features/runs/ui/run_detail_widget_test.dart b/app/test/features/runs/ui/run_detail_widget_test.dart index 9767fb58..a8a81d03 100644 --- a/app/test/features/runs/ui/run_detail_widget_test.dart +++ b/app/test/features/runs/ui/run_detail_widget_test.dart @@ -172,7 +172,17 @@ void main() { expect(find.text('alpha=1, items=1, 2'), findsOneWidget); expect(find.textContaining('"alpha"'), findsNothing); - await openSummarySection('Output'); + // Output starts open: its value is there to scroll to, without a tap. + await tester.scrollUntilVisible( + find.text('ok=true'), + 200, + scrollable: find + .descendant( + of: find.byKey(const Key('run-detail-tab-body-summary')), + matching: find.byType(Scrollable), + ) + .first, + ); expect(find.text('ok=true'), findsOneWidget); await tapTab('Timeline'); diff --git a/app/test/features/runs/ui/run_search_selection_test.dart b/app/test/features/runs/ui/run_search_selection_test.dart index 88711f80..b2d21c4a 100644 --- a/app/test/features/runs/ui/run_search_selection_test.dart +++ b/app/test/features/runs/ui/run_search_selection_test.dart @@ -263,7 +263,7 @@ void main() { }); for (final platform in RunDetailTestPlatform.values) { - testWidgets('${platform.name} input field expands only the input section', ( + testWidgets('${platform.name} input field expands the input section', ( tester, ) async { await pumpSelection( @@ -277,7 +277,8 @@ void main() { findsOneWidget, ); expect(find.text('ship it'), findsOneWidget); - expect(find.text('ok'), findsNothing); + // Output keeps its default: open, as every Summary opens. + expect(find.text('ok'), findsOneWidget); }); testWidgets( @@ -310,8 +311,9 @@ void main() { find.byKey(const Key('run-detail-tab-body-summary')), findsOneWidget, ); + // The plain Summary shows its default sections: Output open, Input closed. expect(find.text('ship it'), findsNothing); - expect(find.text('ok'), findsNothing); + expect(find.text('ok'), findsOneWidget); }); for (final platform in RunDetailTestPlatform.values) { @@ -337,8 +339,9 @@ void main() { find.byKey(const Key('run-detail-tab-body-summary')), findsOneWidget, ); + // The Summary's default sections: Output open, Input closed. expect(find.text('ship it'), findsNothing); - expect(find.text('ok'), findsNothing); + expect(find.text('ok'), findsOneWidget); }, ); } diff --git a/app/test/features/settings/keyboard_shortcuts_help_test.dart b/app/test/features/settings/keyboard_shortcuts_help_test.dart index f070d2e7..1d6bd78a 100644 --- a/app/test/features/settings/keyboard_shortcuts_help_test.dart +++ b/app/test/features/settings/keyboard_shortcuts_help_test.dart @@ -40,6 +40,19 @@ void main() { }, ); + test('Runs and Pipelines switch is Ctrl+A on every platform', () { + for (final platform in TargetPlatform.values) { + final entry = KeyboardShortcutRegistry(platform: platform, web: false) + .entries + .firstWhere( + (entry) => entry.action == 'Switch between Runs and Pipelines', + ); + expect(entry.keys, 'Ctrl+A', reason: platform.name); + expect(entry.caveat, contains('Pipelines')); + expect(entry.caveat, contains('text field')); + } + }); + test('uses the shell primary modifier rule on iOS', () { final entries = const KeyboardShortcutRegistry( platform: TargetPlatform.iOS, diff --git a/app/test/features/terminal/terminal_surface_test.dart b/app/test/features/terminal/terminal_surface_test.dart index fff954a5..f029887d 100644 --- a/app/test/features/terminal/terminal_surface_test.dart +++ b/app/test/features/terminal/terminal_surface_test.dart @@ -167,10 +167,12 @@ void main() { expect(floatFinder, findsOneWidget); expect(frame().size, start.size + const Offset(80, 50)); - await tester.tap(find.byTooltip('Close')); + // The X minimises too: the window stays listed, hidden, with its shells. + await tester.tap(find.byTooltip('Minimise')); await tester.pumpAndSettle(); expect(layout.visible, isFalse); - expect(manager.windows, isEmpty); + expect(manager.windows.single.minimized, isTrue); + expect(floatFinder, findsNothing); expect(hub.tabs, hasLength(2)); await ctrlBacktick(tester); expect(floatFinder, findsOneWidget); diff --git a/app/test/shell/attention_badge_test.dart b/app/test/shell/attention_badge_test.dart index 66348283..fd70c6d0 100644 --- a/app/test/shell/attention_badge_test.dart +++ b/app/test/shell/attention_badge_test.dart @@ -22,13 +22,16 @@ void main() { } for (final width in [390.0, 1000.0]) { - final mount = width < 600 ? 'bottom bar' : 'wide bar'; + final mount = width < 600 ? 'bottom bar' : 'rail'; + // The rail (wide) or the floating bar (phone) carries the same counts. + final navigation = width < 600 + ? find.byType(FloatingDestinationBar) + : find.byType(NavigationRail); testWidgets('$mount shows the count on the Runs tab', (tester) async { final semantics = tester.ensureSemantics(); await pumpShell(tester, width: width, count: 3); - expect(find.byType(FloatingDestinationBar), findsOneWidget); - expect(find.byType(NavigationRail), findsNothing); + expect(navigation, findsOneWidget); final badge = find.byKey(const ValueKey('shell.badge.runs.running')); expect(badge, findsOneWidget); expect( diff --git a/app/test/shell/floating_tab_bar_test.dart b/app/test/shell/floating_tab_bar_test.dart index ff55d732..6a0a8dfc 100644 --- a/app/test/shell/floating_tab_bar_test.dart +++ b/app/test/shell/floating_tab_bar_test.dart @@ -110,22 +110,23 @@ void main() { testWidgets('wide leading bar under the list, content ' 'keeps the width and taps beside the bar reach it', (tester) async { taps = 0; - await setSize(tester, const Size(1200, 800)); + await setSize(tester, const Size(640, 800)); await tester.pumpWidget(shell()); final rect = tester.getRect(pill()); // With no item open the bar still sits under the list column, where it // sits beside an open item, so it never jumps sides. expect(rect.left, moreOrLessEquals(kFloatingBarMargin, epsilon: 0.5)); expect(rect.bottom, 800 - 16); - expect(rect.width, lessThan(1200 * 0.6)); + expect(rect.width, lessThan(640 * 0.6)); // Captions participate in the bar's content-driven width. await expectLabeledTargets(tester, rect); await expectNoSharedBackdrop(tester); expect( rect.width, - lessThanOrEqualTo(listDetailListWidth(1200, 1200, null) - 2 * 16), + lessThanOrEqualTo(listDetailListWidth(640, 640, null) - 2 * 16), ); - // No rail or sidebar: the content starts at the left edge. + // Below the rail's window width (see kNavigationRailMinWindowWidth) the + // floating bar still sits under the list: no rail, content at the left edge. expect(find.byType(NavigationRail), findsNothing); expect(tester.getRect(find.byKey(const Key('content'))).left, 0); // Beside the bar, at the bar's height, the content takes the tap. @@ -141,7 +142,7 @@ void main() { testWidgets('content learns the bar height as bottom padding', ( tester, ) async { - for (final size in const [Size(390, 844), Size(1200, 800)]) { + for (final size in const [Size(390, 844), Size(640, 800)]) { await setSize(tester, size); await tester.pumpWidget(shell()); await tester.pump(); @@ -166,13 +167,13 @@ void main() { expect(find.text('taps 1'), findsOneWidget); final state = tester.state(find.byType(StatefulBuilder)); - tester.view.physicalSize = const Size(1200, 800); + tester.view.physicalSize = const Size(640, 800); await tester.pump(); expect( tester.getRect(pill()).left, moreOrLessEquals(kFloatingBarMargin, epsilon: 0.5), ); - expect(tester.getRect(pill()).width, lessThan(1200 * 0.6)); + expect(tester.getRect(pill()).width, lessThan(640 * 0.6)); expect(tester.state(find.byType(StatefulBuilder)), same(state)); tester.view.physicalSize = const Size(390, 844); diff --git a/app/test/shell/list_pane_resize_test.dart b/app/test/shell/list_pane_resize_test.dart index 1e961bfb..a43c516b 100644 --- a/app/test/shell/list_pane_resize_test.dart +++ b/app/test/shell/list_pane_resize_test.dart @@ -8,6 +8,7 @@ import 'package:pipelines_app/shell/destination.dart'; import 'package:pipelines_app/shell/list_detail.dart'; import 'package:pipelines_app/shell/list_pane_divider.dart'; import 'package:pipelines_app/shell/list_pane_widths.dart'; +import 'package:pipelines_app/shell/navigation_rail.dart'; import 'package:pipelines_app/shell/shell_bar.dart'; import 'package:pipelines_app/ui/adaptive/resize_grip.dart'; @@ -66,6 +67,7 @@ void main() { testWidgets('dragging resizes the list live, the shell bar ' 'follows, and the width clamps', (tester) async { await setSize(tester, const Size(1200, 800)); + const body = 1200 - kNavigationRailSpace; final store = MemoryListPaneWidthStore(); await tester.pumpWidget(shell(store: store)); await settle(tester); @@ -79,7 +81,7 @@ void main() { // Live, before the drag ends; nothing saved yet. expect(listWidth(tester), closeTo(340, 0.5)); expect(shellBarWidth(tester), closeTo(340, 0.5)); - expect(bodyWidth(tester), closeTo(1200 - 1 - 340, 0.5)); + expect(bodyWidth(tester), closeTo(body - 1 - 340, 0.5)); expect(store.values, isEmpty); await gesture.up(); await tester.pump(); @@ -92,9 +94,10 @@ void main() { // ...nor wider than leaves the open item half the window. await tester.drag(divider, const Offset(900, 0)); await settle(tester); - expect(listWidth(tester), closeTo(1200 - 1 - 600, 0.5)); - expect(shellBarWidth(tester), closeTo(599, 0.5)); - expect(store.values['runs'], closeTo(599, 0.5)); + // Half of the body for the open item, the list the rest. + expect(listWidth(tester), closeTo(body - 1 - body * 0.5, 0.5)); + expect(shellBarWidth(tester), closeTo(body - 1 - body * 0.5, 0.5)); + expect(store.values['runs'], closeTo(body - 1 - body * 0.5, 0.5)); }); testWidgets('a double tap returns to the default policy', (tester) async { @@ -143,8 +146,11 @@ void main() { final store = MemoryListPaneWidthStore({'runs': 600}); await tester.pumpWidget(shell(store: store)); await settle(tester); - expect(listWidth(tester), closeTo(1000 - 1 - 500, 0.5)); - expect(shellBarWidth(tester), closeTo(499, 0.5)); + // Beside the destination rail the panes lay out in the window's width + // less the rail, so the clamp is the body's: half of it for the open item. + const body = 1000 - kNavigationRailSpace; + expect(listWidth(tester), closeTo(body - 1 - body * 0.5, 0.5)); + expect(shellBarWidth(tester), closeTo(body - 1 - body * 0.5, 0.5)); expect(store.values['runs'], 600); await setSize(tester, const Size(1600, 800)); @@ -212,7 +218,8 @@ void main() { expect(grip().emphasized, isFalse); Focus.of(tester.element(divider)).requestFocus(); - await tester.pump(); + // The focus change reaches the grip one frame later beside the rail. + await tester.pumpAndSettle(); expect(grip().emphasized, isTrue); }); diff --git a/app/test/shell/navigation_rail_test.dart b/app/test/shell/navigation_rail_test.dart new file mode 100644 index 00000000..3b6030f7 --- /dev/null +++ b/app/test/shell/navigation_rail_test.dart @@ -0,0 +1,283 @@ +import 'dart:ui' show Tristate; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.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/shell/navigation_rail.dart'; +import 'package:pipelines_app/shell/shell_bar.dart'; +import 'package:pipelines_app/shell/windows/window_host.dart'; +import 'package:pipelines_app/ui/adaptive/floating_destination_bar.dart'; + +import 'windows/window_test_harness.dart'; + +/// On a wide window the destinations sit in a Material navigation rail at the +/// left edge (Settings pinned to its foot); narrower windows keep the floating +/// bar. The rail keeps the badges and the keys of the bar it replaces. +void main() { + Future pumpShell( + WidgetTester tester, { + required double width, + double height = 800, + int runningRunCount = 0, + bool withPanes = false, + }) async { + tester.view.physicalSize = Size(width, height); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + final shell = AdaptiveShell( + destination: withPanes ? AppDestination.runs : AppDestination.pipelines, + runningRunCount: runningRunCount, + destinationBodies: { + AppDestination.pipelines: (_) => const Text('pipelines body'), + AppDestination.runs: (_) => withPanes + ? ListDetailPanes( + list: const ShellBar(child: Text('runs list')), + detail: const Center(child: Text('runs detail')), + ) + : const Text('runs body'), + AppDestination.chat: (_) => const Text('chat body'), + AppDestination.search: (_) => const Text('search body'), + AppDestination.settings: (_) => const Text('settings body'), + }, + ); + await tester.pumpWidget(MaterialApp(home: shell)); + await tester.pumpAndSettle(); + } + + Finder rail() => find.byType(NavigationRail); + + Finder inRail(Finder finder) => find.descendant(of: rail(), matching: finder); + + testWidgets('a wide window shows a labelled rail at the left edge, full ' + 'height, with Settings pinned to its foot', (tester) async { + await pumpShell(tester, width: 1000); + + expect(rail(), findsOneWidget); + expect(find.byType(FloatingDestinationBar), findsNothing); + for (final label in ['Pipelines', 'Runs', 'Chat', 'Search', 'Settings']) { + expect(inRail(find.text(label)), findsOneWidget, reason: label); + } + final railRect = tester.getRect(rail()); + expect(railRect.left, 0); + expect(railRect.top, 0); + expect(railRect.height, 800); + expect(railRect.width, kNavigationRailWidth); + + // Settings sits below every tab, at the bottom of the rail. + final settings = tester.getRect( + find.byKey(const ValueKey('shell.destination.settings')), + ); + final runs = tester.getRect( + find.byKey(const ValueKey('shell.destination.runs')), + ); + expect(settings.top, greaterThan(runs.bottom)); + expect(settings.bottom, closeTo(railRect.bottom, 1)); + }); + + testWidgets('the rail marks the selected tab and one tap selects another', ( + tester, + ) async { + await pumpShell(tester, width: 1000); + expect(tester.widget(rail()).selectedIndex, 0); + expect(find.text('pipelines body'), findsOneWidget); + + await tester.tap(find.byKey(const ValueKey('shell.destination.runs'))); + await tester.pumpAndSettle(); + expect(tester.widget(rail()).selectedIndex, 1); + expect(find.text('runs body'), findsOneWidget); + }); + + testWidgets('Settings opens from the rail foot as a page and no tab is ' + 'selected meanwhile', (tester) async { + final semantics = tester.ensureSemantics(); + await pumpShell(tester, width: 1000); + + await tester.tap(find.byKey(const ValueKey('shell.destination.settings'))); + await tester.pumpAndSettle(); + expect(find.text('settings body'), findsOneWidget); + expect(tester.widget(rail()).selectedIndex, isNull); + expect( + tester + .getSemantics(inRail(find.bySemanticsLabel('Settings'))) + .flagsCollection + .isSelected, + Tristate.isTrue, + ); + // The page's own Back returns to Pipelines, the tab it belongs to. + await tester.tap(find.byKey(const ValueKey('shell.back'))); + await tester.pumpAndSettle(); + expect(tester.widget(rail()).selectedIndex, 0); + semantics.dispose(); + }); + + testWidgets('the running count stays on the Runs item of the rail', ( + tester, + ) async { + await pumpShell(tester, width: 1000, runningRunCount: 3); + final badge = find.byKey(const ValueKey('shell.badge.runs.running')); + expect( + find.descendant(of: badge, matching: find.text('3')), + findsOneWidget, + ); + expect( + find.descendant( + of: find.byKey(const ValueKey('shell.destination.runs')), + matching: badge, + ), + findsOneWidget, + ); + }); + + testWidgets('a list and its open item lay out to the right of the rail', ( + tester, + ) async { + await pumpShell(tester, width: 1000, withPanes: true); + final list = tester.getRect(find.byKey(const ValueKey('list-detail-list'))); + final body = tester.getRect(find.byKey(const ValueKey('list-detail-body'))); + expect(list.left, closeTo(kNavigationRailSpace, 0.5)); + expect(body.right, closeTo(1000, 0.5)); + expect(body.left, greaterThan(list.right)); + }); + + testWidgets('the rail appears from the threshold width, and below it the ' + 'floating bar stays', (tester) async { + expect( + kNavigationRailMinWindowWidth, + kListDetailMinWidth + kNavigationRailSpace, + ); + + await pumpShell(tester, width: kNavigationRailMinWindowWidth - 1); + expect(rail(), findsNothing); + expect(find.byType(FloatingDestinationBar), findsOneWidget); + + await pumpShell(tester, width: kNavigationRailMinWindowWidth); + expect(rail(), findsOneWidget); + expect(find.byType(FloatingDestinationBar), findsNothing); + }); + + testWidgets('at the threshold the body beside the rail meets the list-detail ' + 'minimum, so the list sits beside its detail', (tester) async { + await pumpShell( + tester, + width: kNavigationRailMinWindowWidth, + withPanes: true, + ); + final list = tester.getRect(find.byKey(const ValueKey('list-detail-list'))); + final body = tester.getRect(find.byKey(const ValueKey('list-detail-body'))); + // The list and detail fill the window beside the rail, at the split + // threshold: the list starts after the rail and the detail ends at the + // window's right edge, with the detail to the right of the list. + expect(list.left, closeTo(kNavigationRailSpace, 0.5)); + expect(body.right, closeTo(kNavigationRailMinWindowWidth, 0.5)); + expect(body.left, greaterThan(list.right)); + }); + + testWidgets('phone and narrow windows keep the floating bar and no rail', ( + tester, + ) async { + for (final width in [390.0, 640.0]) { + await pumpShell(tester, width: width); + expect(rail(), findsNothing, reason: '$width'); + expect( + find.byKey(const ValueKey('shell.destination.settings')), + findsNothing, + reason: '$width', + ); + expect( + find.byType(FloatingDestinationBar), + findsOneWidget, + reason: '$width', + ); + } + }); + + testWidgets('floating windows keep to the right of the rail on a wide ' + 'window, and use the whole window without one', (tester) async { + final manager = probeManager(); + manager.open('probe', 'a'); + Future pumpWindows(double width) async { + tester.view.physicalSize = Size(width, 800); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.reset); + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: Stack( + fit: StackFit.expand, + children: [ + const SizedBox.expand(), + Positioned.fill( + child: WindowHost(manager: manager, reservesRail: true), + ), + ], + ), + ), + ), + ); + await tester.pumpAndSettle(); + } + + await pumpWindows(1280); + // The probe window opens at x=100; beside the rail it starts after it. + expect( + windowRect(tester, 'Probe a').left, + closeTo(100 + kNavigationRailSpace, 0.5), + ); + await pumpWindows(500); + expect(windowRect(tester, 'Probe a').left, closeTo(100, 0.5)); + }); + + testWidgets('crossing the rail threshold keeps the destination mounted and ' + 'its state', (tester) async { + tester.view.physicalSize = Size(kNavigationRailMinWindowWidth - 1, 800); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destination: AppDestination.runs, + destinationBodies: {AppDestination.runs: (_) => const _Counter()}, + ), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.byKey(const ValueKey('counter.increment'))); + await tester.pump(); + final state = tester.state(find.byType(_Counter)); + + for (final width in [kNavigationRailMinWindowWidth, 390.0]) { + tester.view.physicalSize = Size(width, 800); + await tester.pumpAndSettle(); + expect( + tester.state(find.byType(_Counter)), + same(state), + reason: '$width', + ); + expect(find.text('count 1'), findsOneWidget, reason: '$width'); + } + }); +} + +class _Counter extends StatefulWidget { + const _Counter(); + + @override + State<_Counter> createState() => _CounterState(); +} + +class _CounterState extends State<_Counter> { + int _count = 0; + + @override + Widget build(BuildContext context) => Center( + child: TextButton( + key: const ValueKey('counter.increment'), + onPressed: () => setState(() => _count += 1), + child: Text('count $_count'), + ), + ); +} diff --git a/app/test/shell/pane_bar_row_test.dart b/app/test/shell/pane_bar_row_test.dart index 35955a87..f1387469 100644 --- a/app/test/shell/pane_bar_row_test.dart +++ b/app/test/shell/pane_bar_row_test.dart @@ -140,9 +140,9 @@ void main() { expect(find.text('Its context'), findsOneWidget); }); - testWidgets('1200: the item\'s tabs float at the bottom of its ' + testWidgets('640: the item\'s tabs float at the bottom of its ' 'pane, the shell\'s tab bar under the list', (tester) async { - await setSize(tester, const Size(1200, 800)); + await setSize(tester, const Size(640, 800)); await tester.pumpWidget(shell()); await tester.pump(); await tester.pump(); @@ -168,7 +168,7 @@ void main() { expect(shellTabs.bottom, closeTo(800 - kFloatingBarMargin, 0.5)); expect(shellTabs.right, lessThanOrEqualTo(list.right)); expect(itemTabs.bottom, closeTo(800 - kFloatingBarMargin, 0.5)); - expect(itemTabs.right, closeTo(1200 - kFloatingBarMargin, 0.5)); + expect(itemTabs.right, closeTo(640 - kFloatingBarMargin, 0.5)); expect(itemTabs.left, greaterThanOrEqualTo(body.left)); expect(itemTabs.overlaps(shellTabs), isFalse); // The item's list starts below its bar and clears its tabs at rest. diff --git a/app/test/shell/runs_pipelines_shortcut_test.dart b/app/test/shell/runs_pipelines_shortcut_test.dart new file mode 100644 index 00000000..3bf2a038 --- /dev/null +++ b/app/test/shell/runs_pipelines_shortcut_test.dart @@ -0,0 +1,208 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/shell/adaptive_shell.dart'; +import 'package:pipelines_app/shell/destination.dart'; +import 'package:pipelines_app/shell/shell_runs_pipelines_shortcut.dart'; +import 'package:pipelines_app/ui/input/keyboard_owner.dart'; + +const _a = KeyDownEvent( + physicalKey: PhysicalKeyboardKey.keyA, + logicalKey: LogicalKeyboardKey.keyA, + timeStamp: Duration.zero, +); + +void main() { + test('Ctrl+A matches only with Ctrl alone', () { + bool chord(Set held, [KeyEvent event = _a]) => + shellRunsPipelinesShortcut(event, _FakeKeyboard(held)); + expect(chord({}), isFalse); + expect(chord({LogicalKeyboardKey.controlLeft}), isTrue); + expect(chord({LogicalKeyboardKey.controlRight}), isTrue); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.altLeft}), + isFalse, + ); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.shiftLeft}), + isFalse, + ); + expect( + chord({LogicalKeyboardKey.controlLeft, LogicalKeyboardKey.metaLeft}), + isFalse, + ); + expect(chord({LogicalKeyboardKey.altLeft}), isFalse); + expect(chord({LogicalKeyboardKey.metaLeft}), isFalse); + expect( + shellRunsPipelinesShortcut( + const KeyUpEvent( + physicalKey: PhysicalKeyboardKey.keyA, + logicalKey: LogicalKeyboardKey.keyA, + timeStamp: Duration.zero, + ), + _FakeKeyboard({LogicalKeyboardKey.controlLeft}), + ), + isFalse, + ); + }); + + test('Runs goes to Pipelines; every other destination goes to Runs', () { + expect( + shellRunsPipelinesTarget(AppDestination.runs), + AppDestination.pipelines, + ); + expect( + shellRunsPipelinesTarget(AppDestination.pipelines), + AppDestination.runs, + ); + expect(shellRunsPipelinesTarget(AppDestination.chat), AppDestination.runs); + expect( + shellRunsPipelinesTarget(AppDestination.search), + AppDestination.runs, + ); + expect( + shellRunsPipelinesTarget(AppDestination.settings), + AppDestination.runs, + ); + }); + + testWidgets('Ctrl+A bounces Chat, Runs, Pipelines, Runs', (tester) async { + await _onAndroid(() async { + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destinationBodies: { + for (final destination in shellTabDestinations) + destination: (_) => Text('${destination.name} body'), + }, + ), + ), + ); + expect(find.text('pipelines body'), isOnstage); + + Future pressCtrl(LogicalKeyboardKey key) async { + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + await tester.sendKeyEvent(key); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pumpAndSettle(); + } + + // Reach Chat first with Ctrl+K, then start the Ctrl+A sequence. + await pressCtrl(LogicalKeyboardKey.keyK); + expect(find.text('chat body'), isOnstage); + expect(find.text('pipelines body'), findsNothing); + + await pressCtrl(LogicalKeyboardKey.keyA); + expect(find.text('runs body'), isOnstage); + expect(find.text('chat body'), findsNothing); + + await pressCtrl(LogicalKeyboardKey.keyA); + expect(find.text('pipelines body'), isOnstage); + expect(find.text('runs body'), findsNothing); + + await pressCtrl(LogicalKeyboardKey.keyA); + expect(find.text('runs body'), isOnstage); + expect(find.text('pipelines body'), findsNothing); + expect(tester.takeException(), isNull); + }); + }); + + testWidgets('Ctrl+A is left to a focused text field', (tester) async { + await _onAndroid(() async { + final field = TextEditingController(text: 'draft message'); + final focus = FocusNode(); + addTearDown(field.dispose); + addTearDown(focus.dispose); + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destinationBodies: { + AppDestination.pipelines: (_) => + TextField(controller: field, focusNode: focus), + AppDestination.runs: (_) => const Text('runs body'), + }, + ), + ), + ); + focus.requestFocus(); + await tester.pump(); + expect(focus.hasPrimaryFocus, isTrue); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyA); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pumpAndSettle(); + + // Destination unchanged; the field took the chord (select all on this + // platform), so the text is still there and fully selected. + expect(find.text('runs body'), findsNothing); + expect(field.text, 'draft message'); + expect(field.selection.baseOffset, 0); + expect(field.selection.extentOffset, field.text.length); + expect(tester.takeException(), isNull); + }); + }); + + testWidgets('Ctrl+A is left to the terminal while it has focus', ( + tester, + ) async { + await _onAndroid(() async { + final terminal = FocusNode(); + addTearDown(terminal.dispose); + final received = []; + await tester.pumpWidget( + MaterialApp( + home: AdaptiveShell( + destinationBodies: { + AppDestination.pipelines: (_) => TypingSurface( + child: Focus( + focusNode: terminal, + onKeyEvent: (node, event) { + if (event.logicalKey == LogicalKeyboardKey.keyA) { + received.add(event); + } + return KeyEventResult.ignored; + }, + child: const Text('terminal'), + ), + ), + AppDestination.runs: (_) => const Text('runs body'), + }, + ), + ), + ); + terminal.requestFocus(); + await tester.pump(); + + await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft); + await tester.sendKeyEvent(LogicalKeyboardKey.keyA); + await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft); + await tester.pumpAndSettle(); + + expect(find.text('runs body'), findsNothing); + expect(find.text('terminal'), isOnstage); + expect(received.whereType(), hasLength(1)); + expect(tester.takeException(), isNull); + }); + }); +} + +/// Runs [body] with the platform pinned to Android, so Ctrl+A in a text field +/// means select all everywhere. flutter_test requires the debug override to be +/// cleared before the test body returns, hence the `finally`. +Future _onAndroid(Future Function() body) async { + debugDefaultTargetPlatformOverride = TargetPlatform.android; + try { + await body(); + } finally { + debugDefaultTargetPlatformOverride = null; + } +} + +class _FakeKeyboard extends HardwareKeyboard { + _FakeKeyboard(this.pressed); + final Set pressed; + @override + bool isLogicalKeyPressed(LogicalKeyboardKey key) => pressed.contains(key); +} diff --git a/app/test/shell/split_destination_bar_test.dart b/app/test/shell/split_destination_bar_test.dart index 5da220a7..c0e7c2e9 100644 --- a/app/test/shell/split_destination_bar_test.dart +++ b/app/test/shell/split_destination_bar_test.dart @@ -106,7 +106,7 @@ void main() { .first, ); - for (final width in [1200.0, 1600.0]) { + for (final width in [600.0, 640.0]) { testWidgets('$width split: the destination bar sits under the ' 'list and the composer at the detail\'s bottom edge', (tester) async { await setSize(tester, Size(width, 800)); @@ -211,11 +211,12 @@ void main() { }); } - testWidgets('1200 split: the bar follows a dragged list width', ( + testWidgets('640 split: the bar follows a dragged list width', ( tester, ) async { - await setSize(tester, const Size(1200, 800)); - for (final width in [300.0, 520.0]) { + await setSize(tester, const Size(640, 800)); + // Within a 640 window's list bounds (at most 0.6 of it, less the body). + for (final width in [260.0, 300.0]) { final store = MemoryListPaneWidthStore({'chat': width}); await tester.pumpWidget( KeyedSubtree( @@ -235,26 +236,26 @@ void main() { } }); - testWidgets('1200 Settings: a page without a list keeps the bar ' + testWidgets('640 Settings: a page without a list keeps the bar ' 'at the right edge', (tester) async { - await setSize(tester, const Size(1200, 800)); + await setSize(tester, const Size(640, 800)); await tester.pumpWidget(shell(destination: AppDestination.settings)); await tester.pump(); final pill = destinationPill(tester); - expect(pill.right, closeTo(1200 - kFloatingBarMargin, 0.5)); + expect(pill.right, closeTo(640 - kFloatingBarMargin, 0.5)); }); - testWidgets('1200 unsplit: the bar stays under the list column', ( + testWidgets('640 unsplit: the bar stays under the list column', ( tester, ) async { - await setSize(tester, const Size(1200, 800)); + await setSize(tester, const Size(640, 800)); await tester.pumpWidget(shell(split: false)); await tester.pump(); final pill = destinationPill(tester); // Same place as beside an open item (Search has no split), so opening // or closing an item never moves the bar across the window. expect(pill.left, closeTo(kFloatingBarMargin, 0.5)); - expect(pill.width, lessThan(1200 * 0.6)); + expect(pill.width, lessThan(640 * 0.6)); }); testWidgets('390: the bar hugs its tabs at the phone\'s bottom ' @@ -277,7 +278,7 @@ void main() { expect(pill.right, closeTo(390 - kFloatingBarMargin, 0.5)); }); - for (final width in [600.0, 840.0]) { + for (final width in [600.0, 640.0]) { testWidgets('$width split at 2x: the bar fits the list pane and ' 'the item tabs the detail, without overflow', (tester) async { await setSize(tester, Size(width, 800)); diff --git a/app/test/shell/split_detail_pages_test.dart b/app/test/shell/split_detail_pages_test.dart index cef81444..5ed854c6 100644 --- a/app/test/shell/split_detail_pages_test.dart +++ b/app/test/shell/split_detail_pages_test.dart @@ -36,7 +36,7 @@ void main() { ); Future pumpSplitRun(WidgetTester tester) async { - tester.view.physicalSize = const Size(1200, 800); + tester.view.physicalSize = const Size(640, 800); tester.view.devicePixelRatio = 1; addTearDown(tester.view.reset); final gateway = RunDetailFakeGateway(visitRunFixture()); @@ -71,7 +71,7 @@ void main() { await tester.pumpAndSettle(); } - testWidgets('1200: run tabs float at the pane\'s bottom beside the ' + testWidgets('640: run tabs float at the pane\'s bottom beside the ' 'shell bar under the list, and the stage page opens in the pane', ( tester, ) async { @@ -84,7 +84,7 @@ void main() { final runTabs = pillOf(tester, find.byKey(const Key('run-detail-tabs'))); expect(runTabs.left, greaterThanOrEqualTo(body.left)); - expect(runTabs.right, closeTo(1200 - kFloatingBarMargin, 0.5)); + expect(runTabs.right, closeTo(640 - kFloatingBarMargin, 0.5)); expect(runTabs.overlaps(main), isFalse); expect(runTabs.bottom, closeTo(800 - kFloatingBarMargin, 0.5)); diff --git a/app/test/shell/split_status_bar_test.dart b/app/test/shell/split_status_bar_test.dart index 382b4fc5..40432fd3 100644 --- a/app/test/shell/split_status_bar_test.dart +++ b/app/test/shell/split_status_bar_test.dart @@ -158,7 +158,7 @@ void main() { testWidgets('split: the item tabs sit at the bottom right of the ' 'detail pane, the shell tab bar under the list', (tester) async { // A gesture-navigation inset as on the unfolded foldable. - await setUp(tester, const Size(1200, 800), bottom: 24); + await setUp(tester, const Size(640, 800), bottom: 24); await tester.pumpWidget(shell(tabbedItem())); await tester.pump(); await tester.pump(); @@ -188,7 +188,7 @@ void main() { expect(shellTabs.bottom, closeTo(800 - 24, 0.5)); expect(shellTabs.right, lessThanOrEqualTo(listPane.right)); expect(tabs.bottom, closeTo(800 - 24, 0.5)); - expect(tabs.right, closeTo(1200 - kFloatingBarMargin, 0.5)); + expect(tabs.right, closeTo(640 - kFloatingBarMargin, 0.5)); expect(shellTabs.overlaps(tabs), isFalse); // The item's list clears its tabs at rest. final list = tester.element(find.byKey(const Key('item-list'))); diff --git a/app/test/shell/windows/window_host_test.dart b/app/test/shell/windows/window_host_test.dart index 75e5574e..a16c6902 100644 --- a/app/test/shell/windows/window_host_test.dart +++ b/app/test/shell/windows/window_host_test.dart @@ -25,9 +25,11 @@ void main() { const Rect.fromLTWH(100, 80, 360, 420), ); expect(find.byTooltip('Probe action'), findsOneWidget); - for (final tip in ['Minimise', 'Maximise', 'Close']) { + for (final tip in ['Minimise', 'Maximise']) { expect(find.byTooltip(tip), findsOneWidget); } + // There is no separate Minimise button: the X is the one minimise. + expect(find.byTooltip('Close'), findsNothing); expect(find.text('sheet').hitTestable(), findsOneWidget); // The title bar, the content and the app behind all keep their // semantics (a page route's barrier hides what is behind it). @@ -172,14 +174,30 @@ void main() { expect(find.text('typed'), findsOneWidget); }); - testWidgets('X closes the window', (tester) async { + testWidgets('X minimises the window and never closes it', (tester) async { final entry = manager.open('probe', 'a'); await pumpProbe(tester, manager); - await tester.tap(find.byTooltip('Close')); + await tester.enterText(find.byKey(const ValueKey('a-field')), 'kept'); + final state = tester.state(find.byType(ProbeContent)); + await tester.tap(find.byTooltip('Minimise')); await tester.pumpAndSettle(); - expect(manager.windows, isEmpty); - expect(find.byType(ProbeContent, skipOffstage: false), findsNothing); - expect((manager.kinds['probe']! as ProbeWindowKind).closed_, [entry.id]); + expect(manager.windows.single.id, entry.id); + expect(manager.byId(entry.id)!.minimized, isTrue); + expect(find.text('Probe a').hitTestable(), findsNothing); + // Not a close: the kind's closed hook does not run, and the content + // stays alive with its state. + expect((manager.kinds['probe']! as ProbeWindowKind).closed_, isEmpty); + expect( + tester.state( + find.byType(ProbeContent, skipOffstage: false), + ), + same(state), + ); + // Listed and brought back by the group, as Minimise always was. + manager.toggleGroup('probe'); + await tester.pumpAndSettle(); + expect(find.text('Probe a').hitTestable(), findsOneWidget); + expect(find.text('kept'), findsOneWidget); }); testWidgets('pressing a window brings it to the top and keeps both alive', ( diff --git a/app/test/shell/windows/window_layering_test.dart b/app/test/shell/windows/window_layering_test.dart index ff2dbac5..a60d21e6 100644 --- a/app/test/shell/windows/window_layering_test.dart +++ b/app/test/shell/windows/window_layering_test.dart @@ -209,14 +209,17 @@ void main() { probeTooltipColor, ); - await mouse.moveTo(tester.getCenter(find.byTooltip('Close').last)); + await mouse.moveTo(tester.getCenter(find.byTooltip('Minimise').last)); await tester.pumpAndSettle(const Duration(seconds: 1)); - expect(find.text('Close'), findsOneWidget); + expect(find.text('Minimise'), findsOneWidget); // Not clipped to the window: tooltips paint in an overlay as large // as the app. final overlay = tester.renderObject( find - .ancestor(of: find.text('Close'), matching: find.byType(Overlay)) + .ancestor( + of: find.text('Minimise'), + matching: find.byType(Overlay), + ) .first, ); expect(overlay.size, const Size(1280, 800)); diff --git a/app/test/ui/motion/container_transform_back_start_test.dart b/app/test/ui/motion/container_transform_back_start_test.dart new file mode 100644 index 00000000..455c8c41 --- /dev/null +++ b/app/test/ui/motion/container_transform_back_start_test.dart @@ -0,0 +1,141 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:pipelines_app/shell/destination.dart'; +import 'package:pipelines_app/shell/detail_page.dart'; +import 'package:pipelines_app/shell/shell_bar.dart'; +import 'package:pipelines_app/ui/motion/container_transform_flight.dart'; +import 'package:pipelines_app/ui/motion/container_transform_source.dart'; +import 'package:pipelines_app/ui/motion/motion.dart'; + +const _screen = Size(390, 844); + +/// A phone-style owner: its selected row opens a detail page that grows from +/// the row, as the chat screen's page does. +class _Owner extends StatefulWidget { + const _Owner({required this.selection, required this.sources}); + + final ValueNotifier selection; + final ContainerTransformSources sources; + + @override + State<_Owner> createState() => _OwnerState(); +} + +class _OwnerState extends State<_Owner> { + final DetailPageHost page = DetailPageHost(); + + /// Stands in for work the owner might await when the page closes (a draft + /// or scroll save). It never completes, so any pop that waited on it would + /// never start. + final Completer neverSaved = Completer(); + int closed = 0; + + @override + void dispose() { + page.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) => ValueListenableBuilder( + valueListenable: widget.selection, + builder: (context, selected, _) { + page.sync( + context, + selected: selected != null, + destination: AppDestination.chat, + growFrom: widget.sources.link(() => widget.selection.value), + onClosed: () { + closed++; + unawaited(_save()); + widget.selection.value = null; + }, + builder: (context) => + ShellBar(title: 'Chat', child: const Text('chat body')), + ); + return ContainerTransformScope( + sources: widget.sources, + child: const Column( + children: [ + SizedBox(height: 200), + ContainerTransformSource( + id: '7', + color: Color(0xFFE3F2FD), + child: SizedBox( + key: Key('row-7'), + height: 72, + child: Text('row 7'), + ), + ), + ], + ), + ); + }, + ); + + Future _save() => neverSaved.future; +} + +Future _pumpOwner( + WidgetTester tester, + ValueNotifier selection, + ContainerTransformSources sources, +) async { + tester.view.physicalSize = _screen; + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.reset); + await tester.pumpWidget( + MaterialApp( + home: _Owner(selection: selection, sources: sources), + ), + ); +} + +void main() { + testWidgets( + 'system Back changes the route in one frame and shrinks the page at once', + (tester) async { + final selection = ValueNotifier(null); + final sources = ContainerTransformSources(); + await _pumpOwner(tester, selection, sources); + selection.value = '7'; + await tester.pumpAndSettle(); + + final row = tester.getRect( + find.byKey(const Key('row-7'), skipOffstage: false), + ); + final route = ModalRoute.of( + tester.element(find.byKey(containerTransformSurfaceKey)), + )!; + expect(route.isCurrent, isTrue); + + // The owner's close work never completes, yet Back starts at once. + await tester.binding.handlePopRoute(); + await tester.pump(); + expect(route.isCurrent, isFalse); + expect(route.animation!.status, AnimationStatus.reverse); + + // Two frames after the pop the page is visibly shrinking toward the row. + await tester.pump(const Duration(milliseconds: 16)); + final height = tester + .getRect(find.byKey(containerTransformSurfaceKey)) + .height; + final travel = _screen.height - row.height; + final shrunk = (_screen.height - height) / travel; + expect(shrunk, greaterThan(0.1)); + expect(shrunk, lessThan(1)); + + // The reverse stays within the standard Material container transform. + expect( + Motion.containerTransformReverse, + lessThanOrEqualTo(const Duration(milliseconds: 300)), + ); + await tester.pumpAndSettle(); + expect(find.text('chat body'), findsNothing); + expect(selection.value, isNull); + expect(tester.state<_OwnerState>(find.byType(_Owner)).closed, 1); + }, + ); +}