diff --git a/.github/workflows/pr_validation.yaml b/.github/workflows/pr_validation.yaml index d5948a41c..70747d1ae 100644 --- a/.github/workflows/pr_validation.yaml +++ b/.github/workflows/pr_validation.yaml @@ -94,7 +94,7 @@ jobs: - run: flutter test test_goldens # Archive golden failures - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: golden-failures @@ -184,7 +184,6 @@ jobs: # Run all tests - run: flutter test - analyze_super_text_layout: runs-on: ubuntu-latest defaults: @@ -248,7 +247,7 @@ jobs: - run: flutter test test_goldens # Archive golden failures - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: golden-failures @@ -288,4 +287,4 @@ jobs: - run: dart pub get # Run all tests - - run: dart test \ No newline at end of file + - run: dart test diff --git a/super_editor/lib/src/default_editor/document_scrollable.dart b/super_editor/lib/src/default_editor/document_scrollable.dart index 347564016..47ef0d332 100644 --- a/super_editor/lib/src/default_editor/document_scrollable.dart +++ b/super_editor/lib/src/default_editor/document_scrollable.dart @@ -7,7 +7,6 @@ import 'package:super_editor/src/infrastructure/_logging.dart'; import 'package:super_editor/src/infrastructure/documents/document_scroller.dart'; import 'package:super_editor/src/infrastructure/flutter/build_context.dart'; import 'package:super_editor/src/infrastructure/flutter/flutter_scheduler.dart'; -import 'package:super_editor/src/infrastructure/flutter/material_scrollbar.dart'; import 'package:super_editor/src/infrastructure/scrolling_diagnostics/_scrolling_minimap.dart'; import '../infrastructure/document_gestures.dart'; @@ -240,17 +239,8 @@ class _DocumentScrollableState extends State with SingleTick return child; } - // As we handle the scrolling gestures ourselves, - // we use NeverScrollableScrollPhysics to prevent SingleChildScrollView - // from scrolling. This also prevents the user from interacting - // with the scrollbar. - // We use a modified version of Flutter's Scrollbar that allows - // configuring it with a different scroll physics. - // - // See https://github.com/superlistapp/super_editor/issues/1628 for more details. - return ScrollbarWithCustomPhysics( + return Scrollbar( controller: _scrollController, - physics: behavior.getScrollPhysics(context), child: child, ); } diff --git a/super_editor/pubspec.yaml b/super_editor/pubspec.yaml index 9c8f93038..321d237fd 100644 --- a/super_editor/pubspec.yaml +++ b/super_editor/pubspec.yaml @@ -48,9 +48,16 @@ dependencies: flutter_test_robots: ^0.0.24 clock: ^1.1.1 -#dependency_overrides: - # Override to local mono-repo path so devs can test this repo - # against changes that they're making to other mono-repo packages +dependency_overrides: + # IMPORTANT! This is a temporary override to use the new scrollbar extension. + # + # Release a new flutter_test_robots version and remove this override before landing the PR. + flutter_test_robots: + git: + url: https://github.com/angelosilvestre/flutter_test_robots.git + ref: 22_scrollbar_extension +# Override to local mono-repo path so devs can test this repo +# against changes that they're making to other mono-repo packages # attributed_text: # path: ../attributed_text # super_text_layout: diff --git a/super_editor/test/super_editor/supereditor_gestures_test.dart b/super_editor/test/super_editor/supereditor_gestures_test.dart index 3d5314a10..07c1ec955 100644 --- a/super_editor/test/super_editor/supereditor_gestures_test.dart +++ b/super_editor/test/super_editor/supereditor_gestures_test.dart @@ -1,9 +1,8 @@ -import 'dart:ui'; - import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:flutter_test_robots/flutter_test_robots.dart'; import 'package:flutter_test_runners/flutter_test_runners.dart'; import 'package:super_editor/src/infrastructure/links.dart'; import 'package:super_editor/src/infrastructure/platforms/android/selection_handles.dart'; @@ -520,26 +519,7 @@ spans multiple lines.''', )), ); - // Find the approximate position of the scrollbar thumb. - final thumbLocation = tester.getTopRight(find.byType(SuperEditor)) + const Offset(-10, 10); - - // Hover to make the thumb visible with a duration long enough to run the fade in animation. - final testPointer = TestPointer(1, PointerDeviceKind.mouse); - - await tester.sendEventToBinding(testPointer.hover(thumbLocation, timeStamp: const Duration(seconds: 1))); - await tester.pumpAndSettle(); - - // Press the thumb. - await tester.sendEventToBinding(testPointer.down(thumbLocation)); - await tester.pump(kTapMinTime); - - // Move the thumb down. - await tester.sendEventToBinding(testPointer.move(thumbLocation + const Offset(0, 300))); - await tester.pump(); - - // Release the pointer. - await tester.sendEventToBinding(testPointer.up()); - await tester.pump(); + await tester.dragScrollbarDown(300); // Ensure the content scrolled to the end of the document. expect(scrollController.position.pixels, moreOrLessEquals(770.0)); @@ -578,26 +558,7 @@ spans multiple lines.''', scrollController.jumpTo(scrollController.position.maxScrollExtent); await tester.pump(); - // Find the approximate position of the scrollbar thumb. - final thumbLocation = tester.getBottomRight(find.byType(SuperEditor)) - const Offset(10, 10); - - // Hover to make the thumb visible with a duration long enough to run the fade in animation. - final testPointer = TestPointer(1, PointerDeviceKind.mouse); - - await tester.sendEventToBinding(testPointer.hover(thumbLocation, timeStamp: const Duration(seconds: 1))); - await tester.pumpAndSettle(); - - // Press the thumb. - await tester.sendEventToBinding(testPointer.down(thumbLocation)); - await tester.pump(kTapMinTime); - - // Move the thumb up. - await tester.sendEventToBinding(testPointer.move(thumbLocation - const Offset(0, 300))); - await tester.pump(); - - // Release the pointer. - await tester.sendEventToBinding(testPointer.up()); - await tester.pump(); + await tester.dragScrollbarUp(300); // Ensure the content scrolled to the beginning of the document. expect(scrollController.position.pixels, 0); diff --git a/super_editor/test/super_editor/supereditor_scrolling_test.dart b/super_editor/test/super_editor/supereditor_scrolling_test.dart index 6ecf50699..4afc7ac52 100644 --- a/super_editor/test/super_editor/supereditor_scrolling_test.dart +++ b/super_editor/test/super_editor/supereditor_scrolling_test.dart @@ -1455,7 +1455,7 @@ void main() { expect( find.descendant( of: find.byType(SuperEditor), - matching: find.byType(ScrollbarWithCustomPhysics), + matching: find.byType(Scrollbar), ), findsOneWidget, ); @@ -1487,7 +1487,7 @@ void main() { expect( find.descendant( of: find.byType(SuperEditor), - matching: find.byType(ScrollbarWithCustomPhysics), + matching: find.byType(Scrollbar), ), findsNothing, );