From 09cdebcf87592a647b2b559141c89ae093394f39 Mon Sep 17 00:00:00 2001 From: Rory Stephenson Date: Thu, 2 Mar 2023 19:10:49 +0100 Subject: [PATCH 1/2] Remove absorbPanEventsOnScrollables option The only reason this has been kept around is because some plugins which used drag gestures relied on it. It turns out if those plugins detect vertical/horizontal drag instead of pan this flag is not necessary. --- example/lib/pages/map_inside_listview.dart | 1 - lib/flutter_map.dart | 3 --- lib/src/map/flutter_map_state.dart | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/example/lib/pages/map_inside_listview.dart b/example/lib/pages/map_inside_listview.dart index 805867d7d..5eccb3c28 100644 --- a/example/lib/pages/map_inside_listview.dart +++ b/example/lib/pages/map_inside_listview.dart @@ -23,7 +23,6 @@ class MapInsideListViewPage extends StatelessWidget { height: 300, child: FlutterMap( options: MapOptions( - absorbPanEventsOnScrollables: true, center: LatLng(51.5, -0.09), zoom: 5, ), diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart index 420005cbf..4d4885903 100644 --- a/lib/flutter_map.dart +++ b/lib/flutter_map.dart @@ -251,8 +251,6 @@ class MapOptions { /// see [InteractiveFlag] for custom settings final int interactiveFlags; - final bool absorbPanEventsOnScrollables; - final TapCallback? onTap; final TapCallback? onSecondaryTap; final LongPressCallback? onLongPress; @@ -293,7 +291,6 @@ class MapOptions { final bool keepAlive; MapOptions({ - this.absorbPanEventsOnScrollables = true, this.crs = const Epsg3857(), LatLng? center, this.bounds, diff --git a/lib/src/map/flutter_map_state.dart b/lib/src/map/flutter_map_state.dart index b6039646f..9a2dab3d4 100644 --- a/lib/src/map/flutter_map_state.dart +++ b/lib/src/map/flutter_map_state.dart @@ -113,9 +113,8 @@ class FlutterMapState extends MapGestureMixin }, ); - if (options.absorbPanEventsOnScrollables && - InteractiveFlag.hasFlag( - options.interactiveFlags, InteractiveFlag.drag)) { + if (InteractiveFlag.hasFlag( + options.interactiveFlags, InteractiveFlag.drag)) { gestures[VerticalDragGestureRecognizer] = GestureRecognizerFactoryWithHandlers( () => VerticalDragGestureRecognizer(debugOwner: this), From 06b76dc104fecee7500eed65136629d2d34c24c0 Mon Sep 17 00:00:00 2001 From: Rory Stephenson Date: Thu, 2 Mar 2023 20:01:46 +0100 Subject: [PATCH 2/2] Remove unnecessary comments --- lib/src/map/flutter_map_state.dart | 41 ++++-------------------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/lib/src/map/flutter_map_state.dart b/lib/src/map/flutter_map_state.dart index 9a2dab3d4..b64b39e62 100644 --- a/lib/src/map/flutter_map_state.dart +++ b/lib/src/map/flutter_map_state.dart @@ -1,13 +1,14 @@ +import 'dart:math' as math; + import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_map/flutter_map.dart'; +import 'package:flutter_map/src/core/bounds.dart'; import 'package:flutter_map/src/gestures/gestures.dart'; import 'package:flutter_map/src/map/map.dart'; import 'package:flutter_map/src/map/map_state_widget.dart'; import 'package:latlong2/latlong.dart'; -import 'dart:math' as math; -import 'package:flutter_map/src/core/bounds.dart'; class FlutterMapState extends MapGestureMixin with AutomaticKeepAliveClientMixin { @@ -72,14 +73,6 @@ class FlutterMapState extends MapGestureMixin ..onTap = _positionedTapController.onTap ..onSecondaryTap = _positionedTapController.onSecondaryTap ..onSecondaryTapDown = _positionedTapController.onTapDown; - // ..onTapCancel = onTapCancel - // ..onSecondaryTapUp = onSecondaryTapUp - // ..onSecondaryTapCancel = onSecondaryTapCancel - // ..onTertiaryTapDown = onTertiaryTapDown - // ..onTertiaryTapUp = onTertiaryTapUp - // ..onTertiaryTapCancel = onTertiaryTapCancel - // ..gestureSettings = gestureSettings; - // instance.team = _team; }, ); @@ -88,28 +81,6 @@ class FlutterMapState extends MapGestureMixin () => LongPressGestureRecognizer(debugOwner: this), (LongPressGestureRecognizer instance) { instance.onLongPress = _positionedTapController.onLongPress; - // ..onLongPressDown = onLongPressDown - // ..onLongPressCancel = onLongPressCancel - // ..onLongPressStart = onLongPressStart - // ..onLongPressMoveUpdate = onLongPressMoveUpdate - // ..onLongPressUp = onLongPressUp - // ..onLongPressEnd = onLongPressEnd - // ..onSecondaryLongPressDown = onSecondaryLongPressDown - // ..onSecondaryLongPressCancel = onSecondaryLongPressCancel - // ..onSecondaryLongPress = onSecondaryLongPress - // ..onSecondaryLongPressStart = onSecondaryLongPressStart - // ..onSecondaryLongPressMoveUpdate = onSecondaryLongPressMoveUpdate - // ..onSecondaryLongPressUp = onSecondaryLongPressUp - // ..onSecondaryLongPressEnd = onSecondaryLongPressEnd - // ..onTertiaryLongPressDown = onTertiaryLongPressDown - // ..onTertiaryLongPressCancel = onTertiaryLongPressCancel - // ..onTertiaryLongPress = onTertiaryLongPress - // ..onTertiaryLongPressStart = onTertiaryLongPressStart - // ..onTertiaryLongPressMoveUpdate = onTertiaryLongPressMoveUpdate - // ..onTertiaryLongPressUp = onTertiaryLongPressUp - // ..onTertiaryLongPressEnd = onTertiaryLongPressEnd - // ..gestureSettings = gestureSettings; - // instance.team = _team; }, ); @@ -120,9 +91,8 @@ class FlutterMapState extends MapGestureMixin () => VerticalDragGestureRecognizer(debugOwner: this), (VerticalDragGestureRecognizer instance) { instance.onUpdate = (details) { - //Absorbing vertical drags + // Absorbing vertical drags }; - // ..dragStartBehavior = dragStartBehavior instance.gestureSettings = gestureSettings; instance.team ??= _team; }, @@ -132,9 +102,8 @@ class FlutterMapState extends MapGestureMixin () => HorizontalDragGestureRecognizer(debugOwner: this), (HorizontalDragGestureRecognizer instance) { instance.onUpdate = (details) { - //Absorbing horizontal drags + // Absorbing horizontal drags }; - // ..dragStartBehavior = dragStartBehavior instance.gestureSettings = gestureSettings; instance.team ??= _team; },