From 98e5ecf5012c3bc354de646a243f3cf0d8606d77 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Mon, 9 Nov 2026 23:34:27 +0000 Subject: [PATCH] Escape closes the full-screen diff page The file diff page (from a turn's files-changed chip or run Changes) now closes on Escape, like its back button. --- .../changes/widgets/file_diff_viewer.dart | 4 +++- .../changes/diff_presentation_test.dart | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/lib/features/changes/widgets/file_diff_viewer.dart b/app/lib/features/changes/widgets/file_diff_viewer.dart index 2f049ea8..5f9425da 100644 --- a/app/lib/features/changes/widgets/file_diff_viewer.dart +++ b/app/lib/features/changes/widgets/file_diff_viewer.dart @@ -306,10 +306,12 @@ class _FileDiffPageState extends State { onPrevious: _index > 0 ? () => _step(-1) : null, onNext: _index < count - 1 ? () => _step(1) : null, ); - // Left/right arrows step between changed files, like the chevrons. + // Left/right arrows step between changed files, like the chevrons; + // Escape closes the page, like its back button. final body = ArrowKeyPager( onPrevious: _index > 0 ? () => _step(-1) : null, onNext: _index < count - 1 ? () => _step(1) : null, + onEscape: () => Navigator.of(context).maybePop(), child: FloatingBarOverlay( bar: pager == null ? const SizedBox.shrink() diff --git a/app/test/features/changes/diff_presentation_test.dart b/app/test/features/changes/diff_presentation_test.dart index 2b9604cb..be4b7c85 100644 --- a/app/test/features/changes/diff_presentation_test.dart +++ b/app/test/features/changes/diff_presentation_test.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/changes/changes.dart'; import 'package:pipelines_app/features/changes/widgets/change_style.dart'; @@ -439,4 +440,26 @@ void main() { }, ); } + + for (final cupertino in [false, true]) { + testWidgets('Escape closes the full-screen diff ' + '(${cupertino ? 'cupertino' : 'material'})', (tester) async { + final file = FileChange( + path: 'lib/first.dart', + kind: ChangeKind.modified, + patch: _raggedPatch, + ); + final opener = _diffDialogOpener(file); + await tester.pumpWidget( + cupertino ? cupertinoHost(opener) : materialHost(opener), + ); + await tester.tap(find.text('Open diff')); + await tester.pumpAndSettle(); + expect(find.byType(FileDiffPage), findsOneWidget); + await tester.sendKeyEvent(LogicalKeyboardKey.escape); + await tester.pumpAndSettle(); + expect(find.byType(FileDiffPage), findsNothing); + expect(find.text('Open diff'), findsOneWidget); + }); + } }