Merge remote-tracking branch 'upstream/master' into feature/200

erickok · erickok · commit 2b8e1d1f4ac5 · 2021-04-28T18:19:20.000+02:00
diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
@@ -1,5 +1,6 @@
 import 'dart:ui';
 
+import 'package:collection/collection.dart';
 import 'package:csslib/visitor.dart' as css;
 import 'package:csslib/parser.dart' as cssparser;
 import 'package:flutter/cupertino.dart';
@@ -70,14 +71,8 @@ Style declarationsToStyle(Map<String?, List<css.Expression>> declarations) {
               && element.text != "overline" && element.text != "underline" && element.text != "line-through");
           List<css.Expression?>? nullableList = value;
           css.Expression? textDecorationColor;
-          /// orElse: will not allow me to return null (even if the compiler says its okay, it errors on runtime).
-          /// try/catch is a workaround for this.
-          try {
-            textDecorationColor = nullableList.firstWhere(
-                    (css.Expression? element) => element is css.HexColorTerm || element is css.FunctionTerm);
-          } catch (e) {
-            textDecorationColor = null;
-          }
+          textDecorationColor = nullableList.firstWhereOrNull(
+                  (element) => element is css.HexColorTerm || element is css.FunctionTerm);
           List<css.LiteralTerm?>? potentialStyles = value.whereType<css.LiteralTerm>().toList();
           /// List<css.LiteralTerm> might include other values than the ones we want for [textDecorationStyle], so make sure to remove those before passing it to [ExpressionMapping]
           potentialStyles.removeWhere((element) => element != null && element.text != "solid"
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -49,38 +49,9 @@ class Context<T> {
 // This class is a workaround so that both an image
 // and a link can detect taps at the same time.
 class MultipleTapGestureRecognizer extends TapGestureRecognizer {
-  bool _ready = false;
-
-  @override
-  void addAllowedPointer(PointerDownEvent event) {
-    if (state == GestureRecognizerState.ready) {
-      _ready = true;
-    }
-    super.addAllowedPointer(event);
-  }
-
-  @override
-  void handlePrimaryPointer(PointerEvent event) {
-    if (event is PointerCancelEvent) {
-      _ready = false;
-    }
-    super.handlePrimaryPointer(event);
-  }
-
-  @override
-  void resolve(GestureDisposition disposition) {
-    if (_ready && disposition == GestureDisposition.rejected) {
-      _ready = false;
-    }
-    super.resolve(disposition);
-  }
-
   @override
   void rejectGesture(int pointer) {
-    if (_ready) {
-      acceptGesture(pointer);
-      _ready = false;
-    }
+    acceptGesture(pointer);
   }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -34,6 +34,9 @@ dependencies:
   # Plugin for rendering MathML
   flutter_math_fork: ^0.3.0+2
 
+  # plugin for firstWhereOrNull extension on lists
+  collection: ^1.15.0
+
   flutter:
     sdk: flutter
 
