Skip to content

armgit / ente

Public Imported from GitHub
0

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

Clear menu hover state during navigation

Neeraj Guptaa0a3d2da9616
diff --git a/mobile/packages/ente_components/lib/components/menu_component.dart b/mobile/packages/ente_components/lib/components/menu_component.dart
index 264cb97c11..a96eb76b6f 100644
--- a/mobile/packages/ente_components/lib/components/menu_component.dart
+++ b/mobile/packages/ente_components/lib/components/menu_component.dart
@@ -89,7 +89,7 @@ class _MenuComponentState extends State<MenuComponent> {
child: MouseRegion(
cursor: enabled ? SystemMouseCursors.click : SystemMouseCursors.basic,
onEnter: enabled ? (_) => _setHovered(true) : null,
- onExit: enabled ? (_) => _setHovered(false) : null,
+ onExit: (_) => _setHovered(false),
child: InkWell(
onTap: enabled && widget.onTap != null ? _handleTap : null,
onDoubleTap: enabled && widget.onDoubleTap != null
@@ -381,6 +381,7 @@ class _MenuComponentState extends State<MenuComponent> {
_loadingTimer?.cancel();
setState(() {
_executionState = ComponentExecutionState.inProgress;
+ _isHovered = false;
_loadingVisible = false;
});
_loadingTimer = Timer(_loadingDelay, () {
diff --git a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
index 33c18a8144..17f50fa56a 100644
--- a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
+++ b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
@@ -1,4 +1,5 @@
import 'dart:async';
+import 'dart:ui';
import 'package:ente_components/components/app_bar_component.dart';
import 'package:ente_components/components/menu_component.dart';
@@ -132,6 +133,47 @@ void main() {
},
);
+ testWidgets(
+ 'MenuComponent clears hover after returning from a pushed route',
+ (tester) async {
+ await pumpComponent(
+ tester,
+ Builder(
+ builder: (context) => MenuComponent(
+ title: 'Security',
+ onTap: () => Navigator.of(context).push<void>(
+ MaterialPageRoute<void>(
+ builder: (_) => const Scaffold(body: Text('Submenu')),
+ ),
+ ),
+ ),
+ ),
+ );
+
+ final mouse = await tester.createGesture(kind: PointerDeviceKind.mouse);
+ addTearDown(mouse.removePointer);
+ await mouse.addPointer(location: Offset.zero);
+ await mouse.moveTo(tester.getCenter(find.text('Security')));
+ await tester.pumpAndSettle();
+
+ await tester.tap(find.text('Security'));
+ await tester.pumpAndSettle();
+ await mouse.moveTo(const Offset(700, 500));
+ await tester.pump();
+
+ Navigator.of(tester.element(find.text('Submenu'))).pop();
+ await tester.pumpAndSettle();
+
+ final surface = tester.widget<AnimatedContainer>(
+ find.byKey(const ValueKey('menu-item-surface')),
+ );
+ expect(
+ (surface.decoration! as BoxDecoration).color,
+ ColorTokens.light.fillLight,
+ );
+ },
+ );
+
testWidgets('MenuComponent can show only loading without success', (
tester,
) async {