Merge latest changes

tneotia · tneotia · commit ccde72ade6fd · 2021-12-10T15:45:25.000-05:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -251,7 +251,6 @@ class _MyHomePageState extends State<MyHomePage> {
       body: SingleChildScrollView(
         child: Html(
           data: htmlData,
-          tagsList: Html.tags..addAll(["bird", "flutter"]),
           style: {
             "table": Style(
               backgroundColor: Color.fromARGB(0x50, 0xee, 0xee, 0xee),
diff --git a/lib/custom_render.dart b/lib/custom_render.dart
@@ -2,7 +2,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_html/html_parser.dart';
 import 'package:flutter_html/src/utils.dart';
 
 typedef CustomRenderMatcher = bool Function(RenderContext context);
@@ -133,7 +132,7 @@ CustomRender listElementRender({
               children: [
                 (style?.listStylePosition ?? context.tree.style.listStylePosition) == ListStylePosition.OUTSIDE ?
                 Padding(
-                  padding: style?.padding ?? context.tree.style.padding
+                  padding: style?.padding?.nonNegative ?? context.tree.style.padding?.nonNegative
                       ?? EdgeInsets.only(left: (style?.direction ?? context.tree.style.direction) != TextDirection.rtl ? 10.0 : 0.0,
                           right: (style?.direction ?? context.tree.style.direction) == TextDirection.rtl ? 10.0 : 0.0),
                   child: Text(
@@ -142,7 +141,7 @@ CustomRender listElementRender({
                       style: style?.generateTextStyle() ?? context.style.generateTextStyle()
                   ),
                 ) : Container(height: 0, width: 0),
-                Text("\t", textAlign: TextAlign.right),
+                Text("\t", textAlign: TextAlign.right, style: TextStyle(fontWeight: FontWeight.w400)),
                 Expanded(
                     child: Padding(
                         padding: (style?.listStylePosition ?? context.tree.style.listStylePosition) == ListStylePosition.INSIDE ?
@@ -176,7 +175,7 @@ CustomRender replacedElementRender({PlaceholderAlignment? alignment, TextBaselin
 
 CustomRender textContentElementRender({String? text}) =>
     CustomRender.inlineSpan(inlineSpan: (context, buildChildren) =>
-      TextSpan(text: text ?? (context.tree as TextContentElement).text));
+      TextSpan(text: (text ?? (context.tree as TextContentElement).text).transformed(context.tree.style.textTransform)));
 
 CustomRender interactableElementRender({List<InlineSpan>? children}) =>
     CustomRender.inlineSpan(inlineSpan: (context, buildChildren) => TextSpan(
@@ -238,9 +237,11 @@ final Map<CustomRenderMatcher, CustomRender> defaultRenders = {
 };
 
 List<InlineSpan> _getListElementChildren(ListStylePosition? position, Function() buildChildren) {
-  InlineSpan tabSpan = WidgetSpan(child: Text("\t", textAlign: TextAlign.right));
   List<InlineSpan> children = buildChildren.call();
   if (position == ListStylePosition.INSIDE) {
+    final tabSpan = WidgetSpan(
+      child: Text("\t", textAlign: TextAlign.right, style: TextStyle(fontWeight: FontWeight.w400)),
+    );
     children.insert(0, tabSpan);
   }
   return children;
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -344,9 +344,9 @@ class HtmlParser extends StatelessWidget {
 
     for (final entry in customRenders.keys) {
       if (entry.call(newContext)) {
-        final buildChildren = () => tree.children.map((tree) => parseTree(context, tree)).toList();
+        final buildChildren = () => tree.children.map((tree) => parseTree(newContext, tree)).toList();
         if (newContext.parser.selectable && customRenders[entry] is SelectableCustomRender) {
-          final selectableBuildChildren = () => tree.children.map((tree) => parseTree(context, tree) as TextSpan).toList();
+          final selectableBuildChildren = () => tree.children.map((tree) => parseTree(newContext, tree) as TextSpan).toList();
           return (customRenders[entry] as SelectableCustomRender).textSpan.call(newContext, selectableBuildChildren);
         }
         if (newContext.parser.selectable) {
