fixed got stuck in loop problem, due to dispatching OnTouchEnd infinitely

imaNNeo · imaNNeo · commit 82fcd4768d86 · 2019-08-20T13:48:13.000+04:30
diff --git a/lib/src/chart/bar_chart/bar_chart_painter.dart b/lib/src/chart/bar_chart/bar_chart_painter.dart
@@ -40,8 +40,11 @@ class BarChartPainter extends AxisChartPainter {
 
     super.drawTouchTooltip(canvas, size, data.barTouchData.touchTooltipData, [touchedSpot]);
 
-    if (touchedResponseSink != null) {
+    if (touchedResponseSink != null && touchInputNotifier != null
+      && touchInputNotifier.value != null
+      && !(touchInputNotifier.value.runtimeType is NonTouch)) {
       touchedResponseSink.add(BarTouchResponse(touchedSpot, touchInputNotifier.value));
+      releaseIfEndTouch();
     }
   }
 
@@ -342,6 +345,7 @@ class BarChartPainter extends AxisChartPainter {
       return null;
     }
 
+
     final touch = touchInputNotifier.value;
 
     if (touch.getOffset() == null) {
diff --git a/lib/src/chart/base/base_chart/base_chart_painter.dart b/lib/src/chart/base/base_chart/base_chart_painter.dart
@@ -104,7 +104,9 @@ abstract class BaseChartPainter<D extends BaseChartData> extends CustomPainter {
   /// checks that the touchInput is eligible to draw,
   /// and child painters can use this function to check then draw their default touch behaviors.
   bool shouldDrawTouch() {
-    if (touchInputNotifier == null || shouldDrawTouch == null) {
+    if (touchInputNotifier == null
+      || touchInputNotifier.value == null
+      || shouldDrawTouch == null) {
       return false;
     }
 
@@ -118,4 +120,11 @@ abstract class BaseChartPainter<D extends BaseChartData> extends CustomPainter {
 
     return true;
   }
+
+  /// if the event was ended, we should release our touchInputNotifier
+  void releaseIfEndTouch() {
+    if (touchInputNotifier.value is FlLongPressEnd || touchInputNotifier.value is FlPanEnd) {
+      touchInputNotifier.value = NonTouch();
+    }
+  }
 }
diff --git a/lib/src/chart/base/base_chart/touch_input.dart b/lib/src/chart/base/base_chart/touch_input.dart
@@ -90,4 +90,12 @@ class FlPanEnd extends FlTouchNormapInput {
     return localPosition;
   }
 
+}
+
+
+class NonTouch extends FlTouchInput {
+  @override
+  Offset getOffset() {
+    return null;
+  }
 }
diff --git a/lib/src/chart/line_chart/line_chart_painter.dart b/lib/src/chart/line_chart/line_chart_painter.dart
@@ -97,8 +97,11 @@ class LineChartPainter extends AxisChartPainter {
     // Draw touch tooltip on most top spot
     super.drawTouchTooltip(canvas, viewSize, data.lineTouchData.touchTooltipData, touchedSpots);
 
-    if (touchedResponseSink != null) {
+    if (touchedResponseSink != null && touchInputNotifier != null
+      && touchInputNotifier.value != null
+      && !(touchInputNotifier.value.runtimeType is NonTouch)) {
       touchedResponseSink.add(LineTouchResponse(touchedSpots, touchInputNotifier.value));
+      releaseIfEndTouch();
     }
   }
 
diff --git a/lib/src/chart/pie_chart/pie_chart_painter.dart b/lib/src/chart/pie_chart/pie_chart_painter.dart
@@ -53,8 +53,11 @@ class PieChartPainter extends BaseChartPainter {
     drawTexts(canvas, size);
 
     final touched = _getTouchedDetails(canvas, size, sectionsAngle);
-    if (touchedResponseSink != null) {
+    if (touchedResponseSink != null && touchInputNotifier != null
+      && touchInputNotifier.value != null
+      && !(touchInputNotifier.value.runtimeType is NonTouch)) {
       touchedResponseSink.add(touched);
+      releaseIfEndTouch();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,11 @@ class BarChartPainter extends AxisChartPainter {`
`40`	`40`
`41`	`41`	`super.drawTouchTooltip(canvas, size, data.barTouchData.touchTooltipData, [touchedSpot]);`
`42`	`42`
`43`		`- if (touchedResponseSink != null) {`
	`43`	`+ if (touchedResponseSink != null && touchInputNotifier != null`
	`44`	`+ && touchInputNotifier.value != null`
	`45`	`+ && !(touchInputNotifier.value.runtimeType is NonTouch)) {`
`44`	`46`	`touchedResponseSink.add(BarTouchResponse(touchedSpot, touchInputNotifier.value));`
	`47`	`+ releaseIfEndTouch();`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`
`@@ -342,6 +345,7 @@ class BarChartPainter extends AxisChartPainter {`
`342`	`345`	`return null;`
`343`	`346`	`}`
`344`	`347`
	`348`	`+`
`345`	`349`	`final touch = touchInputNotifier.value;`
`346`	`350`
`347`	`351`	`if (touch.getOffset() == null) {`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,12 @@ class FlPanEnd extends FlTouchNormapInput {`
`90`	`90`	`return localPosition;`
`91`	`91`	`}`
`92`	`92`
	`93`	`+}`
	`94`	`+`
	`95`	`+`
	`96`	`+class NonTouch extends FlTouchInput {`
	`97`	`+ @override`
	`98`	`+ Offset getOffset() {`
	`99`	`+ return null;`
	`100`	`+ }`
`93`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,11 @@ class LineChartPainter extends AxisChartPainter {`
`97`	`97`	`// Draw touch tooltip on most top spot`
`98`	`98`	`super.drawTouchTooltip(canvas, viewSize, data.lineTouchData.touchTooltipData, touchedSpots);`
`99`	`99`
`100`		`- if (touchedResponseSink != null) {`
	`100`	`+ if (touchedResponseSink != null && touchInputNotifier != null`
	`101`	`+ && touchInputNotifier.value != null`
	`102`	`+ && !(touchInputNotifier.value.runtimeType is NonTouch)) {`
`101`	`103`	`touchedResponseSink.add(LineTouchResponse(touchedSpots, touchInputNotifier.value));`
	`104`	`+ releaseIfEndTouch();`
`102`	`105`	`}`
`103`	`106`	`}`
`104`	`107`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,11 @@ class PieChartPainter extends BaseChartPainter {`
`53`	`53`	`drawTexts(canvas, size);`
`54`	`54`
`55`	`55`	`final touched = _getTouchedDetails(canvas, size, sectionsAngle);`
`56`		`- if (touchedResponseSink != null) {`
	`56`	`+ if (touchedResponseSink != null && touchInputNotifier != null`
	`57`	`+ && touchInputNotifier.value != null`
	`58`	`+ && !(touchInputNotifier.value.runtimeType is NonTouch)) {`
`57`	`59`	`touchedResponseSink.add(touched);`
	`60`	`+ releaseIfEndTouch();`
`58`	`61`	`}`
`59`	`62`	`}`
`60`	`63`