Merge changes with new fixes (nested links & shrinkwrap)

Author: tneotia

lib/custom_render.dart

@@ -1,4 +1,4 @@
-
+import 'package:collection/collection.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
@@ -8,7 +8,8 @@ import 'package:flutter_html/src/utils.dart';
 typedef CustomRenderMatcher = bool Function(RenderContext context);
 
 CustomRenderMatcher blockElementMatcher() => (context) {
-  return context.tree.style.display == Display.BLOCK;
+  return context.tree.style.display == Display.BLOCK
+      && context.tree.children.isNotEmpty;
 };
 
 CustomRenderMatcher listElementMatcher() => (context) {
@@ -64,8 +65,22 @@ CustomRender blockElementRender({
             newContext: context,
             style: style ?? context.tree.style,
             shrinkWrap: context.parser.shrinkWrap,
-            child: child,
-            children: children ?? buildChildren.call(),
+            children: children ?? context.tree.children
+                .expandIndexed((i, childTree) => [
+              if (context.parser.shrinkWrap &&
+                  childTree.style.display == Display.BLOCK &&
+                  i > 0 &&
+                  context.tree.children[i - 1] is ReplacedElement)
+                TextSpan(text: "\n"),
+              context.parser.parseTree(context, childTree),
+              if (context.parser.shrinkWrap &&
+                  i != context.tree.children.length - 1 &&
+                  childTree.style.display == Display.BLOCK &&
+                  childTree.element?.localName != "html" &&
+                  childTree.element?.localName != "body")
+                TextSpan(text: "\n"),
+            ])
+                .toList(),
           ),
 ));
 
@@ -168,8 +183,16 @@ CustomRender verticalAlignRender({
 
 CustomRender fallbackRender({Style? style, List<InlineSpan>? children}) =>
     CustomRender.fromInlineSpan(inlineSpan: (context, buildChildren) => TextSpan(
-  style: style?.generateTextStyle() ?? context.style.generateTextStyle(),
-  children: children ?? buildChildren.call(),
+      style: style?.generateTextStyle() ?? context.style.generateTextStyle(),
+      children: context.tree.children
+          .expand((tree) => [
+        context.parser.parseTree(context, tree),
+        if (tree.style.display == Display.BLOCK &&
+            tree.element?.localName != "html" &&
+            tree.element?.localName != "body")
+          TextSpan(text: "\n"),
+      ])
+          .toList(),
 ));
 
 final Map<CustomRenderMatcher, CustomRender> defaultRenders = {
@@ -212,21 +235,17 @@ InlineSpan _getInteractableChildren(RenderContext context, InteractableElement t
     );
   } else {
     return WidgetSpan(
-      child: RawGestureDetector(
-        key: context.key,
-        gestures: {
-          MultipleTapGestureRecognizer:
-          GestureRecognizerFactoryWithHandlers<MultipleTapGestureRecognizer>(
-                () => MultipleTapGestureRecognizer(),
-                (instance) {
-                  instance
-                    ..onTap = context.parser.onAnchorTap != null
-                        ? () => context.parser.onAnchorTap!(tree.href, context, tree.attributes, tree.element)
-                        : null;
-            },
-          ),
-        },
-        child: (childSpan as WidgetSpan).child,
+      child: MultipleTapGestureDetector(
+        onTap: context.parser.onAnchorTap != null
+            ? () => context.parser.onAnchorTap!(tree.href, context, tree.attributes, tree.element)
+            : null,
+        child: GestureDetector(
+          key: context.key,
+          onTap: context.parser.onAnchorTap != null
+              ? () => context.parser.onAnchorTap!(tree.href, context, tree.attributes, tree.element)
+              : null,
+          child: (childSpan as WidgetSpan).child,
+        ),
       ),
     );
   }

lib/flutter_html.dart

@@ -28,6 +28,7 @@ export 'package:flutter_html/html_parser.dart';
 export 'package:flutter_html/html_parser.dart';
 //export image render api
 export 'package:flutter_html/image_render.dart';
+export 'package:flutter_html/custom_render.dart';
 //export image render api
 export 'package:flutter_html/image_render.dart';
 export 'package:flutter_html/src/anchor.dart';

lib/html_parser.dart

@@ -1,7 +1,6 @@
 import 'dart:collection';
 import 'dart:math';
 
-import 'package:collection/collection.dart';
 import 'package:csslib/parser.dart' as cssparser;
 import 'package:csslib/visitor.dart' as css;
 import 'package:flutter/material.dart';