updates

Author: Renzo Olivares

packages/flutter/lib/src/gestures/selection_recognizers.dart

@@ -241,13 +241,16 @@ class TapAndDragGestureRecognizer extends OneSequenceGestureRecognizer with _Con
   void acceptGesture(int pointer) {
     assert(!_acceptedActivePointers.contains(pointer));
     if (pointer == _primaryPointer) {
+      _stopDeadlineTimer();
       print('is primary pointer');
       // _checkTapDown(event);
       if (_down != null) {
         _checkTapDown(_down!);
         // _checkTapUp(_up!);
       }
-      _stopDeadlineTimer();
+      if (_up != null) {
+        _checkTapUp(_up!);
+      }
     }
     _acceptedActivePointers.add(pointer);
     print('accept gesture $pointer');
@@ -256,6 +259,7 @@ class TapAndDragGestureRecognizer extends OneSequenceGestureRecognizer with _Con
   @override
   void didStopTrackingLastPointer(int pointer) {
     print('didStopTrackingLastPointer $_state $pointer');
+    _stopDeadlineTimer();
     switch (_state) {
       case _DragState.ready:
         resolve(GestureDisposition.rejected);
@@ -277,7 +281,6 @@ class TapAndDragGestureRecognizer extends OneSequenceGestureRecognizer with _Con
         _checkEnd();
         break;
     }
-    _stopDeadlineTimer();
     _up = null;
     _down = null;
     _initialButtons = null;
@@ -351,6 +354,9 @@ class TapAndDragGestureRecognizer extends OneSequenceGestureRecognizer with _Con
   void rejectGesture(int pointer) {
     print('reject gesture $pointer');
     print('cancel from reject');
+    if (pointer == _primaryPointer) {
+      _stopDeadlineTimer();
+    }
     _giveUpPointer(pointer);
   }