Merge remote-tracking branch 'upstream/master' into feature/200

erickok · erickok · commit 0192cefa40fd · 2021-04-10T16:19:05.000+02:00
# Conflicts:
#	example/lib/main.dart
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_html/html_parser.dart';
-import 'package:flutter_html/image_render.dart';
-import 'package:flutter_html/src/layout_element.dart';
-import 'package:flutter_html/style.dart';
 
 void main() => runApp(new MyApp());
 
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -1,5 +1,17 @@
 library flutter_html;
 
+//export image render api
+export 'package:flutter_html/image_render.dart';
+//export style api
+export 'package:flutter_html/style.dart';
+//export render context api
+export 'package:flutter_html/html_parser.dart';
+//export src for advanced custom render uses (e.g. casting context.tree)
+export 'package:flutter_html/src/layout_element.dart';
+export 'package:flutter_html/src/replaced_element.dart';
+export 'package:flutter_html/src/styled_element.dart';
+export 'package:flutter_html/src/interactable_element.dart';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_html/html_parser.dart';
 import 'package:flutter_html/image_render.dart';
diff --git a/lib/style.dart b/lib/style.dart
@@ -307,6 +307,9 @@ class Style {
       listStyleType: child.listStyleType ?? listStyleType,
       listStylePosition: child.listStylePosition ?? listStylePosition,
       textAlign: child.textAlign ?? textAlign,
+      textDecoration: TextDecoration.combine(
+          [child.textDecoration ?? TextDecoration.none,
+            textDecoration ?? TextDecoration.none]),
       textShadow: child.textShadow ?? textShadow,
       whiteSpace: child.whiteSpace ?? whiteSpace,
       wordSpacing: child.wordSpacing ?? wordSpacing,
