Merge pull request Sub6Resources#541 from tneotia/feature/upgrade-link-functions

erickok · web-flow · commit b5c5ea051995 · 2021-02-24T22:04:58.000+01:00
Upgrade link functions
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -16,7 +16,12 @@ import 'package:html/dom.dart' as dom;
 import 'package:html/parser.dart' as htmlparser;
 import 'package:webview_flutter/webview_flutter.dart';
 
-typedef OnTap = void Function(String url);
+typedef OnTap = void Function(
+    String url,
+    RenderContext context,
+    Map<String, String> attributes,
+    dom.Element element,
+);
 typedef CustomRender = dynamic Function(
   RenderContext context,
   Widget parsedChild,
@@ -371,7 +376,7 @@ class HtmlParser extends StatelessWidget {
                     : childStyle.merge(childSpan.style)),
             semanticsLabel: childSpan.semanticsLabel,
             recognizer: TapGestureRecognizer()
-              ..onTap = () => onLinkTap?.call(tree.href),
+              ..onTap = () => onLinkTap?.call(tree.href, context, tree.attributes, tree.element),
           );
         } else {
           return WidgetSpan(
@@ -382,7 +387,7 @@ class HtmlParser extends StatelessWidget {
                         MultipleTapGestureRecognizer>(
                   () => MultipleTapGestureRecognizer(),
                   (instance) {
-                    instance..onTap = () => onLinkTap?.call(tree.href);
+                    instance..onTap = () => onLinkTap?.call(tree.href, context, tree.attributes, tree.element);
                   },
                 ),
               },
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_html/html_parser.dart';
 import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/src/utils.dart';
 import 'package:flutter_html/style.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:html/dom.dart' as dom;
@@ -82,7 +83,16 @@ class ImageContentElement extends ReplacedElement {
       if (entry.key.call(attributes, element)) {
         final widget = entry.value.call(context, attributes, element);
         if (widget != null) {
-          return widget;
+          return RawGestureDetector(
+            child: widget,
+            gestures: {
+              MultipleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers<MultipleTapGestureRecognizer>(
+                    () => MultipleTapGestureRecognizer(), (instance) {
+                  instance..onTap = () => context.parser.onImageTap?.call(src, context, attributes, element);
+                },
+              ),
+            },
+          );
         }
       }
     }
