Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Disable gallery scrollbar track paging

ashil-pilotf20c737646cc
diff --git a/mobile/apps/photos/changes/gallery-scrollbar-thumb-only.md b/mobile/apps/photos/changes/gallery-scrollbar-thumb-only.md
new file mode 100644
index 0000000000..818d36573c
--- /dev/null
+++ b/mobile/apps/photos/changes/gallery-scrollbar-thumb-only.md
@@ -0,0 +1 @@
+- Prevent accidental scrolling when tapping above or below the gallery scrollbar handle.
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/scroll_bar_with_use_notifier.dart b/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/scroll_bar_with_use_notifier.dart
index 6a6f6f14a7..cfada8dc85 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/scroll_bar_with_use_notifier.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/scroll_bar_with_use_notifier.dart
@@ -298,6 +298,11 @@ class _MaterialScrollbarState extends RawScrollbarState<_MaterialScrollbar> {
..ignorePointer = !enableGestures;
}
+ @override
+ // Track taps must not page the gallery; thumb dragging remains enabled.
+ // ignore: must_call_super
+ void handleTrackTapDown(TapDownDetails details) {}
+
@override
void handleThumbPressStart(Offset localPosition) {
super.handleThumbPressStart(localPosition);
diff --git a/mobile/apps/photos/test/ui/viewer/gallery/scroll_bar_with_use_notifier_test.dart b/mobile/apps/photos/test/ui/viewer/gallery/scroll_bar_with_use_notifier_test.dart
new file mode 100644
index 0000000000..d1892dc3ee
--- /dev/null
+++ b/mobile/apps/photos/test/ui/viewer/gallery/scroll_bar_with_use_notifier_test.dart
@@ -0,0 +1,117 @@
+import "package:flutter/material.dart";
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/ui/viewer/gallery/scrollbar/scroll_bar_with_use_notifier.dart";
+
+void main() {
+ for (final platform in [TargetPlatform.android, TargetPlatform.iOS]) {
+ group(platform.name, () {
+ late ScrollController controller;
+ late ValueNotifier<bool> inUseNotifier;
+
+ setUp(() {
+ controller = ScrollController();
+ inUseNotifier = ValueNotifier(false);
+ });
+
+ tearDown(() {
+ controller.dispose();
+ inUseNotifier.dispose();
+ });
+
+ Future<void> pumpScrollbar(
+ WidgetTester tester, {
+ VoidCallback? onPhotoTap,
+ }) async {
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: ThemeData(platform: platform),
+ home: Align(
+ alignment: Alignment.topLeft,
+ child: SizedBox(
+ width: 400,
+ height: 600,
+ child: ScrollbarWithUseNotifer(
+ controller: controller,
+ inUseNotifier: inUseNotifier,
+ interactive: true,
+ thumbVisibility: true,
+ minScrollbarLength: 36,
+ thickness: 8,
+ scrollbarPadding: const EdgeInsets.only(right: 3),
+ child: SingleChildScrollView(
+ controller: controller,
+ child: GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: onPhotoTap,
+ child: const SizedBox(height: 12000, width: 400),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ }
+
+ testWidgets("track taps above and below the thumb do not scroll", (
+ tester,
+ ) async {
+ await pumpScrollbar(tester);
+ controller.jumpTo(2000);
+ await tester.pumpAndSettle();
+
+ for (final position in [
+ const Offset(392, 50),
+ const Offset(392, 500),
+ ]) {
+ await tester.tapAt(position);
+ await tester.pumpAndSettle();
+ expect(controller.offset, 2000);
+ expect(inUseNotifier.value, isFalse);
+ }
+ });
+
+ testWidgets("visible and padded thumb targets still drag the gallery", (
+ tester,
+ ) async {
+ await pumpScrollbar(tester);
+
+ for (final position in [const Offset(392, 18), const Offset(372, 40)]) {
+ controller.jumpTo(0);
+ await tester.pumpAndSettle();
+ final gesture = await tester.startGesture(position);
+ await tester.pumpAndSettle();
+ await gesture.moveBy(const Offset(0, 10));
+ await tester.pump();
+ expect(inUseNotifier.value, isTrue, reason: "drag from $position");
+ await gesture.moveBy(const Offset(0, 100));
+ await tester.pump();
+ expect(controller.offset, greaterThan(0));
+
+ await gesture.up();
+ await tester.pumpAndSettle();
+ expect(inUseNotifier.value, isFalse);
+ }
+ });
+
+ testWidgets("gallery swipes and photo taps beside the track still work", (
+ tester,
+ ) async {
+ var photoTaps = 0;
+ await pumpScrollbar(tester, onPhotoTap: () => photoTaps++);
+
+ await tester.tapAt(const Offset(370, 450));
+ await tester.pumpAndSettle();
+ expect(photoTaps, 1);
+ expect(controller.offset, 0);
+
+ await tester.dragFrom(const Offset(370, 450), const Offset(0, -150));
+ await tester.pumpAndSettle();
+ expect(controller.offset, greaterThan(0));
+ expect(inUseNotifier.value, isFalse);
+ expect(photoTaps, 1);
+ });
+ });
+ }
+}