Re-add support for onImageError and onImageTap and fix issues with images inside of links

Author: Sub6Resources

example/lib/main.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_html/html_parser.dart';
@@ -13,6 +14,7 @@ class MyApp extends StatelessWidget {
       title: 'Flutter Demo',
       theme: new ThemeData(
         primarySwatch: Colors.blue,
+        brightness: Brightness.dark,
       ),
       home: new MyHomePage(title: 'flutter_html Example'),
     );
@@ -35,15 +37,18 @@ const htmlData = """
 <h4>Header 4</h4>
 <h5>Header 5</h5>
 <h6>Header 6</h6>
+<h3>Ruby Support:</h3>
       <p>
         <ruby>
           漢<rt>かん</rt>
           字<rt>じ</rt>
         </ruby>
-        &nbsp;is Japanese Kanji
+        &nbsp;is Japanese Kanji.
       </p>
+      <h3>Support for <code>sub</code>/<code>sup</code></h3>
       Solve for <var>x<sub>n</sub></var>: log<sub>2</sub>(<var>x</var><sup>2</sup>+<var>n</var>) = 9<sup>3</sup>
-      <p>One of the most common equations in all of physics is <var>E</var>=<var>m</var><var>c</var><sup>2</sup>.<p>
+      <p>One of the most common equations in all of physics is <var>E</var>=<var>m</var><var>c</var><sup>2</sup>.</p>
+      <h3>Table support:</h3>
       <table>
       <colgroup>
         <col width="50%" />
@@ -65,12 +70,16 @@ const htmlData = """
       <tr><td>fData</td><td>fData</td><td>fData</td></tr>
       </tfoot>
       </table>
+      <h3>Custom Element Support:</h3>
       <flutter></flutter>
+      <flutter horizontal></flutter>
+      <h3>SVG support:</h3>
       <svg id='svg1' viewBox='0 0 100 100' xmlns='http://www.w3.org/2000/svg'>
             <circle r="32" cx="35" cy="65" fill="#F00" opacity="0.5"/>
             <circle r="32" cx="65" cy="65" fill="#0F0" opacity="0.5"/>
             <circle r="32" cx="50" cy="35" fill="#00F" opacity="0.5"/>
       </svg>
+      <h3>List support:</h3>
       <ol>
             <li>This</li>
             <li><p>is</p></li>
@@ -94,6 +103,21 @@ const htmlData = """
             <li><h2>Header 2</h2></li>
             <h2><li>Header 2</li></h2>
       </ol>
+      <h3>Link support:</h3>
+      <p>
+        Linking to <a href='https://github.com'>websites</a> has never been easier.
+      </p>
+      <h3>Image support:</h3>
+      <p>
+        <img alt='Google' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png' />
+        <a href='https://google.com'><img alt='Google' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png' /></a>
+        <img alt='Alt Text of an intentionally broken image' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30d' />
+      </p>
+      <h3>Video support:</h3>
+      <h3>Audio support:</h3>
+      <h3>IFrame support:</h3>
+      
+      
 """;
 
 class _MyHomePageState extends State<MyHomePage> {
@@ -113,21 +137,6 @@ class _MyHomePageState extends State<MyHomePage> {
                       backgroundColor: Colors.black,
                       color: Colors.white,
                     ),
-                    "a": Style(
-                      color: Colors.red,
-                    ),
-                    "li": Style(
-//              backgroundColor: Colors.red,
-//                fontSize: FontSize(20),
-//                margin: const EdgeInsets.only(top: 32),
-                        ),
-                    "h1, h3, h5": Style(
-//                backgroundColor: Colors.deepPurple,
-//                alignment: Alignment.center,
-                        ),
-                    "#whitespace": Style(
-                      backgroundColor: Colors.deepPurple,
-                    ),
                     "table": Style(
                       backgroundColor: Color.fromARGB(0x50, 0xee, 0xee, 0xee),
                     ),
@@ -140,7 +149,6 @@ class _MyHomePageState extends State<MyHomePage> {
                     ),
                     "td": Style(
                       padding: EdgeInsets.all(6),
-                      backgroundColor: Colors.transparent,
                     ),
                     "var": Style(fontFamily: 'serif'),
                   },
@@ -161,19 +169,12 @@ class _MyHomePageState extends State<MyHomePage> {
                   onImageTap: (src) {
                     print(src);
                   },
+                  onImageError: (exception, stackTrace) {
+                    print(exception);
+                  },
                 ),
               ),
             ),
-            Expanded(
-              child: SingleChildScrollView(
-                child: Text(
-                  HtmlParser.cleanTree(HtmlParser.applyCSS(
-                          HtmlParser.lexDomTree(HtmlParser.parseHTML(htmlData), [], []), null))
-                      .toString(),
-                  style: TextStyle(fontFamily: 'monospace'),
-                ),
-              ),
-            )
           ],
         ),
       ),

lib/flutter_html.dart

@@ -28,7 +28,7 @@ class Html extends StatelessWidget {
         color: Colors.blueAccent,
         decorationColor: Colors.blueAccent),
     this.shrinkToFit = false,
-    this.imageProperties,
+    @deprecated this.imageProperties,
     this.onImageTap,
     @deprecated this.showImages = true,
     this.blacklistedElements = const [],
@@ -40,7 +40,7 @@ class Html extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final Color backgroundColor;
   final TextStyle defaultTextStyle;
-  final OnLinkTap onLinkTap;
+  final OnTap onLinkTap;
   final bool renderNewlines;
   final double blockSpacing;
   final bool useRichText;
@@ -50,7 +50,7 @@ class Html extends StatelessWidget {
 
   /// Properties for the Image widget that gets rendered by the rich text parser
   final ImageProperties imageProperties;
-  final OnImageTap onImageTap;
+  final OnTap onImageTap;
   final bool showImages;
 
   final List<String> blacklistedElements;
@@ -101,6 +101,8 @@ class Html extends StatelessWidget {
           htmlData: data,
           cssData: css,
           onLinkTap: onLinkTap,
+          onImageTap: onImageTap,
+          onImageError: onImageError,
           style: style,
           customRender: customRender,
           blacklistedElements: blacklistedElements,