Merge pull request #148 from amake/shrink-to-fit

New option: shrinkToFit
Sub6Resources · Sep 10, 2019 · 52c8927 · 52c8927
2 parents f38b56f + 059bfe0
commit 52c8927
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/example/main.dart b/example/main.dart
@@ -109,7 +109,7 @@ class _MyHomePageState extends State<MyHomePage> {
             <br />
             Second nested div<br />
             <figure>
-            <img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" />
+            <img src="https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" />
             <figcaption>Available on GitHub</figcaption>
             </figure>
             </div>

diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -3,6 +3,7 @@ library flutter_html;
 import 'package:flutter/material.dart';
 import 'package:flutter_html/html_parser.dart';
 import 'package:flutter_html/rich_text_parser.dart';
+
 import 'image_properties.dart';
 
 class Html extends StatelessWidget {
@@ -25,6 +26,7 @@ class Html extends StatelessWidget {
         decoration: TextDecoration.underline,
         color: Colors.blueAccent,
         decorationColor: Colors.blueAccent),
+    this.shrinkToFit = false,
     this.imageProperties,
     this.onImageTap,
     this.showImages = true,
@@ -40,6 +42,7 @@ class Html extends StatelessWidget {
   final bool useRichText;
   final ImageErrorListener onImageError;
   final TextStyle linkStyle;
+  final bool shrinkToFit;
 
   /// Properties for the Image widget that gets rendered by the rich text parser
   final ImageProperties imageProperties;
@@ -55,7 +58,7 @@ class Html extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double width = MediaQuery.of(context).size.width;
+    final double width = shrinkToFit ? null : MediaQuery.of(context).size.width;
 
     return Container(
       padding: padding,
@@ -65,7 +68,7 @@ class Html extends StatelessWidget {
         style: defaultTextStyle ?? DefaultTextStyle.of(context).style,
         child: (useRichText)
             ? HtmlRichTextParser(
-                width: width,
+                shrinkToFit: shrinkToFit,
                 onLinkTap: onLinkTap,
                 renderNewlines: renderNewlines,
                 customEdgeInsets: customEdgeInsets,

diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -1,9 +1,7 @@
 import 'dart:convert';
-import 'package:flutter_html/rich_text_parser.dart';
 
-import 'image_properties.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_html/rich_text_parser.dart';
 import 'package:html/dom.dart' as dom;
 import 'package:html/parser.dart' as parser;
 

diff --git a/lib/rich_text_parser.dart b/lib/rich_text_parser.dart
@@ -83,31 +83,25 @@ class BlockText extends StatelessWidget {
   final RichText child;
   final EdgeInsets padding;
   final EdgeInsets margin;
-  final String leadingChar;
   final Decoration decoration;
+  final bool shrinkToFit;
 
   BlockText({
     @required this.child,
+    @required this.shrinkToFit,
     this.padding,
     this.margin,
-    this.leadingChar = '',
     this.decoration,
   });
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: double.infinity,
+      width: shrinkToFit ? null : double.infinity,
       padding: this.padding,
       margin: this.margin,
       decoration: this.decoration,
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          leadingChar.isNotEmpty ? Text(leadingChar) : Container(),
-          Expanded(child: child),
-        ],
-      ),
+      child: child,
     );
   }
 }
@@ -155,7 +149,7 @@ class ParseContext {
 
 class HtmlRichTextParser extends StatelessWidget {
   HtmlRichTextParser({
-    @required this.width,
+    this.shrinkToFit,
     this.onLinkTap,
     this.renderNewlines = false,
     this.html,
@@ -175,7 +169,7 @@ class HtmlRichTextParser extends StatelessWidget {
 
   final double indentSize = 10.0;
 
-  final double width;
+  final bool shrinkToFit;
   final onLinkTap;
   final bool renderNewlines;
   final String html;
@@ -426,6 +420,7 @@ class HtmlRichTextParser extends StatelessWidget {
             ));
           }
           BlockText blockText = BlockText(
+            shrinkToFit: shrinkToFit,
             margin: EdgeInsets.only(
                 top: 8.0,
                 bottom: 8.0,
@@ -439,8 +434,10 @@ class HtmlRichTextParser extends StatelessWidget {
           );
           parseContext.rootWidgetList.add(blockText);
         } else {
-          parseContext.rootWidgetList
-              .add(BlockText(child: RichText(text: span)));
+          parseContext.rootWidgetList.add(BlockText(
+            child: RichText(text: span),
+            shrinkToFit: shrinkToFit,
+          ));
         }
 
         // this allows future items to be added as children of this item
@@ -607,6 +604,7 @@ class HtmlRichTextParser extends StatelessWidget {
               } else {
                 // start a new block element for this link and its text
                 BlockText blockElement = BlockText(
+                  shrinkToFit: shrinkToFit,
                   margin: EdgeInsets.only(
                       left: parseContext.indentLevel * indentSize, top: 10.0),
                   child: RichText(text: span),
@@ -856,16 +854,18 @@ class HtmlRichTextParser extends StatelessWidget {
               leadingChar = parseContext.listCount.toString() + '.';
             }
             BlockText blockText = BlockText(
+              shrinkToFit: shrinkToFit,
               margin: EdgeInsets.only(
                   left: parseContext.indentLevel * indentSize, top: 3.0),
               child: RichText(
                 text: TextSpan(
-                  text: '',
-                  style: nextContext.childStyle,
-                  children: <TextSpan>[],
+                  text: '$leadingChar  ',
+                  style: DefaultTextStyle.of(buildContext).style,
+                  children: <TextSpan>[
+                    TextSpan(text: '', style: nextContext.childStyle)
+                  ],
                 ),
               ),
-              leadingChar: '$leadingChar  ',
             );
             parseContext.rootWidgetList.add(blockText);
             nextContext.parentElement = blockText.child.text;
@@ -926,6 +926,7 @@ class HtmlRichTextParser extends StatelessWidget {
               ));
             }
             BlockText blockText = BlockText(
+              shrinkToFit: shrinkToFit,
               margin: node.localName != 'body'
                   ? _customEdgeInsets ??
                       EdgeInsets.only(