Merge pull request #37 from jeffmikels/jeffmikels

Added support for rendering as RichText Widgets
Sub6Resources · Feb 1, 2019 · c4220df · c4220df
2 parents 4b8b108 + 5a26bc7
commit c4220df
Show file tree

Hide file tree

Showing 3 changed files with 778 additions and 16 deletions.
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -9,10 +9,11 @@ class Html extends StatelessWidget {
     @required this.data,
     this.padding,
     this.backgroundColor,
-    this.defaultTextStyle = const TextStyle(color: Colors.black),
+    this.defaultTextStyle,
     this.onLinkTap,
     this.renderNewlines = false,
     this.customRender,
+    this.useRichText = false,
   }) : super(key: key);
 
   final String data;
@@ -21,6 +22,7 @@ class Html extends StatelessWidget {
   final TextStyle defaultTextStyle;
   final OnLinkTap onLinkTap;
   final bool renderNewlines;
+  final bool useRichText;
 
   /// Either return a custom widget for specific node types or return null to
   /// fallback to the default rendering.
@@ -35,15 +37,20 @@ class Html extends StatelessWidget {
       color: backgroundColor,
       width: width,
       child: DefaultTextStyle.merge(
-        style: defaultTextStyle,
-        child: Wrap(
-          alignment: WrapAlignment.start,
-          children: HtmlParser(
-            width: width,
-            onLinkTap: onLinkTap,
-            renderNewlines: renderNewlines,
-            customRender: customRender,
-          ).parse(data),
+        style: defaultTextStyle ?? DefaultTextStyle.of(context).style,
+        child: (useRichText)
+        ? HtmlRichTextParser(
+          width: width,
+          onLinkTap: onLinkTap,
+          renderNewlines: renderNewlines,
+          html: data,
+        )
+        : HtmlOldParser(
+          width: width,
+          onLinkTap: onLinkTap,
+          renderNewlines: renderNewlines,
+          customRender: customRender,
+          html: data,
         ),
       ),
     );