onPanEnd and onPanCancel callbacks added

analysis_options.yaml

@@ -19,9 +19,6 @@
 # Android Studio, and the `flutter analyze` command.
 
 analyzer:
-  strong-mode:
-    implicit-casts: true
-    implicit-dynamic: true
   errors:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: error
@@ -41,12 +38,14 @@ analyzer:
     - lib/src/http/**
     - lib/proto_build/**
     - lib/common_widgets/platform_widgets/**
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 
 linter:
   rules:
     - always_declare_return_types
-    - always_require_non_null_named_parameters
     - annotate_overrides
     - avoid_empty_else
     - avoid_init_to_null

example/pubspec.lock

@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: caac504f942f41dfadcf45229ce8c47065b93919a12739f20d6173a883c5ec73
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -67,27 +67,46 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.15"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -97,64 +116,64 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
   touchable:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "1.0.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"

lib/src/canvas_touch_detector.dart

@@ -25,7 +25,7 @@ class CanvasTouchDetector extends StatefulWidget {
 class _CanvasTouchDetectorState extends State<CanvasTouchDetector> {
   final StreamController<Gesture> touchController =
       StreamController.broadcast();
-  StreamSubscription? streamSubscription;
+  StreamSubscription<Gesture>? streamSubscription;
 
   Future<void> addStreamListener(Function(Gesture) callBack) async {
     await streamSubscription?.cancel();
@@ -168,31 +168,35 @@ class _CanvasTouchDetectorState extends State<CanvasTouchDetector> {
           onPanUpdate:
               !widget.gesturesToOverride.contains(GestureType.onPanUpdate)
                   ? null
-                  : (tapDetail) {
-                      touchController
-                          .add(Gesture(GestureType.onPanUpdate, tapDetail));
-                    },
+              : (tapDetail) {
+                  touchController.add(Gesture(GestureType.onPanUpdate, tapDetail));
+                },
           onPanDown: !widget.gesturesToOverride.contains(GestureType.onPanDown)
               ? null
               : (tapDetail) {
-                  touchController
-                      .add(Gesture(GestureType.onPanDown, tapDetail));
+                  touchController.add(Gesture(GestureType.onPanDown, tapDetail));
                 },
-          onSecondaryTapDown: !widget.gesturesToOverride
-                  .contains(GestureType.onSecondaryTapDown)
+          onPanEnd: !widget.gesturesToOverride.contains(GestureType.onPanEnd)
               ? null
               : (tapDetail) {
-                  touchController
-                      .add(Gesture(GestureType.onSecondaryTapDown, tapDetail));
+                  touchController.add(Gesture(GestureType.onPanEnd, tapDetail));
                 },
-          onSecondaryTapUp: !widget.gesturesToOverride
-                  .contains(GestureType.onSecondaryTapUp)
+          onPanCancel: !widget.gesturesToOverride.contains(GestureType.onPanCancel)
+              ? null
+              : () {
+                  touchController.add(Gesture(GestureType.onPanCancel, null));
+                },
+          onSecondaryTapDown: !widget.gesturesToOverride.contains(GestureType.onSecondaryTapDown)
+              ? null
+              : (tapDetail) {
+                  touchController.add(Gesture(GestureType.onSecondaryTapDown, tapDetail));
+                },
+          onSecondaryTapUp: !widget.gesturesToOverride.contains(GestureType.onSecondaryTapUp)
               ? null
               : (tapDetail) {
                   touchController
                       .add(Gesture(GestureType.onSecondaryTapUp, tapDetail));
-                },
-        ));
+                }));
   }
 
   @override

lib/src/shape_handler.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/clip.dart';
 import 'package:touchable/src/shapes/shape.dart';
@@ -10,6 +8,9 @@ class ShapeHandler {
   final List<Shape> _shapeStack = [];
   final List<ClipShapeItem> clipItems = [];
   final Set<GestureType> _registeredGestures = {};
+  Object? panningShapeId;
+
+  ShapeHandler(this.panningShapeId);
 
   Set<GestureType> get registeredGestures => _registeredGestures;
 
@@ -42,8 +43,7 @@ class ShapeHandler {
     return true;
   }
 
-  Offset _getActualOffsetFromScrollController(
-      Offset touchPoint, ScrollController? controller, AxisDirection direction) {
+  Offset _getActualOffsetFromScrollController(Offset touchPoint, ScrollController? controller, AxisDirection direction) {
     if (controller == null) {
       return touchPoint;
     }
@@ -60,8 +60,11 @@ class ShapeHandler {
     }
   }
 
+  Shape? _getShapeById(Object? shapeId) =>
+      shapeId == null ? null : _shapeStack.firstWhereOrNull((shape) => shape.id == shapeId);
+
   List<Shape> _getTouchedShapes(Offset point) {
-    var selectedShapes = <Shape>[];
+    final selectedShapes = <Shape>[];
     for (int i = _shapeStack.length - 1; i >= 0; i--) {
       var shape = _shapeStack[i];
       if (shape.hitTestBehavior == HitTestBehavior.deferToChild) {
@@ -84,20 +87,33 @@ class ShapeHandler {
   }
 
   Future<void> handleGestureEvent(
-    Gesture gesture, {
-    ScrollController? scrollController,
-    AxisDirection direction = AxisDirection.down,
-  }) async {
-    var touchPoint = _getActualOffsetFromScrollController(
-        TouchCanvasUtil.getPointFromGestureDetail(gesture.gestureDetail), scrollController, direction);
+      Gesture gesture, {
+        ScrollController? scrollController,
+        AxisDirection direction = AxisDirection.down,
+      }) async {
     if (!_registeredGestures.contains(gesture.gestureType)) return;
+    final panningShapeIdLocal = panningShapeId;
+    if (gesture.gestureType == GestureType.onPanUpdate) {
+      if (panningShapeIdLocal != null) {
+        final panningShape = _getShapeById(panningShapeIdLocal);
+        if (panningShape != null && panningShape.registeredGestures.contains(gesture.gestureType)) {
+          panningShape.getCallbackFromGesture(gesture)();
+        }
+      }
+    } else {
+      final pointFromGestureDetail = TouchCanvasUtil.getPointFromGestureDetail(gesture.gestureDetail);
+      final touchPoint = _getActualOffsetFromScrollController(
+          pointFromGestureDetail, scrollController, direction);
 
-    var touchedShapes = _getTouchedShapes(touchPoint);
-    if (touchedShapes.isEmpty) return;
-    for (var touchedShape in touchedShapes) {
-      if (touchedShape.registeredGestures.contains(gesture.gestureType)) {
-        var callback = touchedShape.getCallbackFromGesture(gesture);
-        callback();
+      final touchedShapes = _getTouchedShapes(touchPoint);
+      if (touchedShapes.isEmpty) return;
+      for (var touchedShape in touchedShapes) {
+        if (touchedShape.registeredGestures.contains(gesture.gestureType)) {
+          if (gesture.gestureType == GestureType.onPanStart || gesture.gestureType == GestureType.onPanDown)  {
+            panningShapeId = touchedShape.id;
+          }
+          touchedShape.getCallbackFromGesture(gesture)();
+        }
       }
     }
   }

lib/src/shapes/arc.dart

@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:touchable/src/shapes/constant.dart';