Add shrinkToFit option to shrink Html to its natural content width

amake · amake · commit 4ee864053da0 · 2019-08-27T07:04:31.000+09:00
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/rich_text_parser.dart b/lib/rich_text_parser.dart
@@ -84,9 +84,11 @@ class BlockText extends StatelessWidget {
   final EdgeInsets padding;
   final EdgeInsets margin;
   final Decoration decoration;
+  final bool shrinkToFit;
 
   BlockText({
     @required this.child,
+    @required this.shrinkToFit,
     this.padding,
     this.margin,
     this.decoration,
@@ -95,7 +97,7 @@ class BlockText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: double.infinity,
+      width: shrinkToFit ? null : double.infinity,
       padding: this.padding,
       margin: this.margin,
       decoration: this.decoration,
@@ -147,7 +149,7 @@ class ParseContext {
 
 class HtmlRichTextParser extends StatelessWidget {
   HtmlRichTextParser({
-    @required this.width,
+    this.shrinkToFit,
     this.onLinkTap,
     this.renderNewlines = false,
     this.html,
@@ -167,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;
@@ -417,6 +419,7 @@ class HtmlRichTextParser extends StatelessWidget {
             ));
           }
           BlockText blockText = BlockText(
+            shrinkToFit: shrinkToFit,
             margin: EdgeInsets.only(
                 top: 8.0,
                 bottom: 8.0,
@@ -430,8 +433,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
@@ -591,6 +596,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),
@@ -813,6 +819,7 @@ class HtmlRichTextParser extends StatelessWidget {
                 }
                 if (node.attributes['alt'] != null) {
                   parseContext.rootWidgetList.add(BlockText(
+                      shrinkToFit: shrinkToFit,
                       margin:
                           EdgeInsets.symmetric(horizontal: 0.0, vertical: 10.0),
                       padding: EdgeInsets.all(0.0),
@@ -836,6 +843,7 @@ 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(
@@ -907,6 +915,7 @@ class HtmlRichTextParser extends StatelessWidget {
               ));
             }
             BlockText blockText = BlockText(
+              shrinkToFit: shrinkToFit,
               margin: node.localName != 'body'
                   ? _customEdgeInsets ??
                       EdgeInsets.only(
