refactor: use timer instead of future<void> (#374)

* change future to Timer * Update pressable_widget.dart
conceptadev · Jul 11, 2024 · e09255f · e09255f
1 parent 2e88dc9
commit e09255f
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 6 deletions.
diff --git a/packages/mix/lib/src/widgets/widget_state/pressable_widget.dart b/packages/mix/lib/src/widgets/widget_state/pressable_widget.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
@@ -277,15 +279,30 @@ abstract class _MixStateWidgetBuilderState<T extends _MixStateWidgetBuilder>
     setState(fn);
   }
 
-  Future<void> unpressAfterDelay(int initialPressCount) async {
-    final delay = widget.unpressDelay;
+  Timer? _timer;
 
-    if (delay != Duration.zero) {
-      await Future.delayed(delay);
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
+  void unpressAfterDelay(int initialPressCount) {
+    void unpressCallback() {
+      if (_isPressed && _pressCount == initialPressCount) {
+        updateState(() => _isPressed = false);
+      }
     }
 
-    if (_isPressed && _pressCount == initialPressCount) {
-      updateState(() => _isPressed = false);
+    _timer?.cancel();
+    _timer = null;
+
+    final delay = widget.unpressDelay;
+
+    if (delay != Duration.zero) {
+      _timer = Timer(delay, unpressCallback);
+    } else {
+      unpressCallback();
     }
   }
 

diff --git a/packages/mix/test/src/widgets/pressable/pressable_widget_test.dart b/packages/mix/test/src/widgets/pressable/pressable_widget_test.dart
@@ -131,6 +131,31 @@ void main() {
     });
   });
 
+  testWidgets('Pressable cancel timer on dispose', (WidgetTester tester) async {
+    var wasPressed = false;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: Pressable(
+            autofocus: true,
+            unpressDelay: const Duration(minutes: 1),
+            onPress: () {
+              wasPressed = !wasPressed;
+            },
+            child: const Text('Tap me'),
+          ),
+        ),
+      ),
+    );
+
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    expect(wasPressed, isTrue);
+
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    expect(wasPressed, isFalse);
+  });
+
   group('PressableBox', () {
     testWidgets(
       'must be clickable when enable is setted to true',