Bug Fix: tapping on content causes tilt when enableRevert or enableSe…

…nsorRevert is false
fluttercandies · Sep 20, 2023 · f6366c7 · f6366c7
1 parent 7af516c
commit f6366c7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 See the [Migration Guide](guides/migration_guide.md) for the details of breaking changes between versions.
 
+## Unreleased
+
+### Fixes
+
+- Fix tapping on content causes tilt when `enableRevert` or `enableSensorRevert` is false.
+
 ## 2.0.3
 
 ### Fixes

diff --git a/lib/src/tilt.dart b/lib/src/tilt.dart
@@ -223,7 +223,7 @@ class _TiltState extends State<Tilt> {
     /// 是否还原的取值
     final Offset position = _tiltConfig.enableRevert
         ? progressPosition(width, height, _initAreaProgress)
-        : offset;
+        : currentPosition;
     currentPosition = position;
     areaProgress = p2cAreaProgress(
       width,

diff --git a/lib/src/tilt_stream_builder.dart b/lib/src/tilt_stream_builder.dart
@@ -55,7 +55,7 @@ class _TiltStreamBuilderState extends State<TiltStreamBuilder> {
   bool get enableStream => !disable;
 
   /// 传感器平台支持
-  final bool canSensorsPlatformSupport = sensorsPlatformSupport();
+  bool canSensorsPlatformSupport = sensorsPlatformSupport();
 
   /// Touch, Hover 的 Stream
   late Stream<TiltStream> currentTiltStream;
@@ -84,7 +84,7 @@ class _TiltStreamBuilderState extends State<TiltStreamBuilder> {
       gyroscopeEvents
           .listen(
             null,
-            onError: (_) => enableSensors = false,
+            onError: (_) => canSensorsPlatformSupport = false,
             cancelOnError: true,
           )
           .cancel();
@@ -121,7 +121,7 @@ class _TiltStreamBuilderState extends State<TiltStreamBuilder> {
     return StreamBuilder<TiltStream>(
       stream: enableStream
           ? currentTiltStream.mergeAll([
-              if (canSensorsPlatformSupport && enableSensors)
+              if (canSensorsPlatformSupport && tiltConfig.enableGestureSensors)
                 currentGyroscopeStream,
             ]).map(filterTiltStream)
           : null,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -8,7 +8,7 @@ description: Easily apply tilt parallax hover effects for Flutter, which support
 # https://semver.org/spec/v2.0.0-rc.1.html
 # https://dart.dev/tools/pub/versioning#semantic-versions
 # https://dart.dev/tools/pub/dependencies#version-constraints
-version: 2.0.3
+version: 2.0.4
 homepage: https://amoshuke.github.io/flutter_tilt_book
 repository: https://github.com/AmosHuKe/flutter_tilt
 issue_tracker: https://github.com/AmosHuKe/flutter_tilt/issues