From fbaa7ba470de4d56cb3284d46f61b93b76ea5d95 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 15 Jan 2021 10:46:47 +0100
Subject: [PATCH 1/3] Support InlineSpan as customRender

Same as #298 but only the minimal required changes to make this work
---
 example/lib/main.dart |  6 ++++--
 lib/html_parser.dart  | 38 +++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index fd4c99c3e6..3ec4565ad0 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -81,7 +81,7 @@ const htmlData = """
       <tr><td>fData</td><td>fData</td><td>fData</td></tr>
       </tfoot>
       </table>
-      <h3>Custom Element Support:</h3>
+      <h3>Custom Element Support (inline: <bird></bird> and as block):</h3>
       <flutter></flutter>
       <flutter horizontal></flutter>
       <h3>SVG support:</h3>
@@ -122,7 +122,6 @@ const htmlData = """
       <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>
       <video controls>
@@ -173,6 +172,9 @@ class _MyHomePageState extends State<MyHomePage> {
             "var": Style(fontFamily: 'serif'),
           },
           customRender: {
+            "bird": (RenderContext context, Widget child, attributes, _) {
+              return TextSpan(text: "🐦");
+            },
             "flutter": (RenderContext context, Widget child, attributes, _) {
               return FlutterLogo(
                 style: (attributes['horizontal'] != null)
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
index 82618d6d3c..2b43f25db8 100644
--- a/lib/html_parser.dart
+++ b/lib/html_parser.dart
@@ -15,7 +15,7 @@ import 'package:html/parser.dart' as htmlparser;
 import 'package:webview_flutter/webview_flutter.dart';
 
 typedef OnTap = void Function(String url);
-typedef CustomRender = Widget Function(
+typedef CustomRender = dynamic Function(
   RenderContext context,
   Widget parsedChild,
   Map<String, String> attributes,
@@ -243,27 +243,31 @@ class HtmlParser extends StatelessWidget {
     );
 
     if (customRender?.containsKey(tree.name) ?? false) {
-      return WidgetSpan(
-        child: ContainerSpan(
+      final render = customRender[tree.name].call(
+        newContext,
+        ContainerSpan(
           newContext: newContext,
           style: tree.style,
           shrinkWrap: context.parser.shrinkWrap,
-          child: customRender[tree.name].call(
-            newContext,
-            ContainerSpan(
-              newContext: newContext,
-              style: tree.style,
-              shrinkWrap: context.parser.shrinkWrap,
-              children: tree.children
-                      ?.map((tree) => parseTree(newContext, tree))
-                      ?.toList() ??
-                  [],
-            ),
-            tree.attributes,
-            tree.element,
-          ),
+          children: tree.children
+                  ?.map((tree) => parseTree(newContext, tree))
+                  ?.toList() ??
+              [],
         ),
+        tree.attributes,
+        tree.element,
       );
+      assert(render is InlineSpan || render is Widget);
+      return render is InlineSpan
+          ? render
+          : WidgetSpan(
+              child: ContainerSpan(
+                newContext: newContext,
+                style: tree.style,
+                shrinkWrap: context.parser.shrinkWrap,
+                child: render,
+              ),
+            );
     }
 
     //Return the correct InlineSpan based on the element type.

From 1ca5f0dce7d349aa869d74c107d3dd213b4a422a Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 15 Jan 2021 10:55:42 +0100
Subject: [PATCH 2/3] Ensure a customRender that returns null falls back on the
 default behaviour

---
 lib/html_parser.dart | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/html_parser.dart b/lib/html_parser.dart
index 2b43f25db8..aa068c4cf1 100644
--- a/lib/html_parser.dart
+++ b/lib/html_parser.dart
@@ -258,16 +258,18 @@ class HtmlParser extends StatelessWidget {
         tree.element,
       );
       assert(render is InlineSpan || render is Widget);
-      return render is InlineSpan
-          ? render
-          : WidgetSpan(
-              child: ContainerSpan(
-                newContext: newContext,
-                style: tree.style,
-                shrinkWrap: context.parser.shrinkWrap,
-                child: render,
-              ),
-            );
+      if (render != null) {
+        return render is InlineSpan
+            ? render
+            : WidgetSpan(
+                child: ContainerSpan(
+                  newContext: newContext,
+                  style: tree.style,
+                  shrinkWrap: context.parser.shrinkWrap,
+                  child: render,
+                ),
+              );
+      }
     }
 
     //Return the correct InlineSpan based on the element type.

From 348da44a079681f1ba7b0fd510ac68ad07121755 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 15 Jan 2021 10:55:59 +0100
Subject: [PATCH 3/3] Ensure a customRender that returns null falls back on the
 default behaviour

---
 lib/html_parser.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/html_parser.dart b/lib/html_parser.dart
index aa068c4cf1..d665fa73be 100644
--- a/lib/html_parser.dart
+++ b/lib/html_parser.dart
@@ -257,8 +257,8 @@ class HtmlParser extends StatelessWidget {
         tree.attributes,
         tree.element,
       );
-      assert(render is InlineSpan || render is Widget);
       if (render != null) {
+        assert(render is InlineSpan || render is Widget);
         return render is InlineSpan
             ? render
             : WidgetSpan(