Add shrinkWrap property, fix small link-image issue and style alignment issue

Sub6Resources · Sub6Resources · commit 5be653d62e1b · 2019-12-18T09:05:16.000-07:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -13,8 +13,7 @@ class MyApp extends StatelessWidget {
     return new MaterialApp(
       title: 'Flutter Demo',
       theme: new ThemeData(
-        primarySwatch: Colors.blue,
-        brightness: Brightness.dark,
+        primarySwatch: Colors.deepPurple,
       ),
       home: new MyHomePage(title: 'flutter_html Example'),
     );
@@ -124,6 +123,7 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
+      appBar: AppBar(title: Text('flutter_html Example')),
       body: SafeArea(
         child: Row(
           children: <Widget>[
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -27,7 +27,7 @@ class Html extends StatelessWidget {
         decoration: TextDecoration.underline,
         color: Colors.blueAccent,
         decorationColor: Colors.blueAccent),
-    this.shrinkToFit = false,
+    this.shrinkWrap = false,
     @deprecated this.imageProperties,
     this.onImageTap,
     @deprecated this.showImages = true,
@@ -46,7 +46,7 @@ class Html extends StatelessWidget {
   final bool useRichText;
   final ImageErrorListener onImageError;
   final TextStyle linkStyle;
-  final bool shrinkToFit;
+  final bool shrinkWrap;
 
   /// Properties for the Image widget that gets rendered by the rich text parser
   final ImageProperties imageProperties;
@@ -67,7 +67,7 @@ class Html extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double width = shrinkToFit ? null : MediaQuery.of(context).size.width;
+    final double width = shrinkWrap ? null : MediaQuery.of(context).size.width;
 
     if (useRichText) {
       return Container(
@@ -77,7 +77,7 @@ class Html extends StatelessWidget {
         child: DefaultTextStyle.merge(
           style: defaultTextStyle ?? Theme.of(context).textTheme.body1,
           child: HtmlRichTextParser(
-            shrinkToFit: shrinkToFit,
+            shrinkToFit: shrinkWrap,
             onLinkTap: onLinkTap,
             renderNewlines: renderNewlines,
             customEdgeInsets: customEdgeInsets,
@@ -103,6 +103,7 @@ class Html extends StatelessWidget {
           onLinkTap: onLinkTap,
           onImageTap: onImageTap,
           onImageError: onImageError,
+          shrinkWrap: shrinkWrap,
           style: style,
           customRender: customRender,
           blacklistedElements: blacklistedElements,
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -22,6 +22,7 @@ class HtmlParser extends StatelessWidget {
   final OnTap onLinkTap;
   final OnTap onImageTap;
   final ImageErrorListener onImageError;
+  final bool shrinkWrap;
 
   final Map<String, Style> style;
   final Map<String, CustomRender> customRender;
@@ -33,6 +34,7 @@ class HtmlParser extends StatelessWidget {
     this.onLinkTap,
     this.onImageTap,
     this.onImageError,
+    this.shrinkWrap,
     this.style,
     this.customRender,
     this.blacklistedElements,
@@ -209,11 +211,13 @@ class HtmlParser extends StatelessWidget {
         child: ContainerSpan(
           newContext: newContext,
           style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
           child: customRender[tree.name].call(
             newContext,
             ContainerSpan(
               newContext: newContext,
               style: tree.style,
+              shrinkWrap: context.parser.shrinkWrap,
               children: tree.children?.map((tree) => parseTree(newContext, tree))?.toList() ?? [],
             ),
             tree.attributes,
@@ -228,6 +232,7 @@ class HtmlParser extends StatelessWidget {
         child: ContainerSpan(
           newContext: newContext,
           style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
           children: tree.children?.map((tree) => parseTree(newContext, tree))?.toList() ?? [],
         ),
       );
@@ -236,6 +241,7 @@ class HtmlParser extends StatelessWidget {
         child: ContainerSpan(
           newContext: newContext,
           style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
           child: Stack(
             children: <Widget>[
               PositionedDirectional(
@@ -599,12 +605,14 @@ class ContainerSpan extends StatelessWidget {
   final List<InlineSpan> children;
   final Style style;
   final RenderContext newContext;
+  final bool shrinkWrap;
 
   ContainerSpan({
     this.child,
     this.children,
     this.style,
     this.newContext,
+    this.shrinkWrap = false,
   });
 
   @override
@@ -618,7 +626,7 @@ class ContainerSpan extends StatelessWidget {
       width: style?.width,
       padding: style?.padding,
       margin: style?.margin,
-      alignment: style?.alignment,
+      alignment: shrinkWrap? null: style?.alignment,
       child: child ??
           RichText(
             text: TextSpan(
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -9,7 +9,7 @@ class Context<T> {
 // This class is a workaround so that both an image
 // and a link can detect taps at the same time.
 class MultipleTapGestureRecognizer extends TapGestureRecognizer {
-  bool _ready;
+  bool _ready = false;
 
   @override
   void addAllowedPointer(PointerDownEvent event) {
diff --git a/lib/style.dart b/lib/style.dart
@@ -80,9 +80,13 @@ class Style {
     this.after,
     this.textDirection,
     this.border,
-    this.alignment = Alignment.centerLeft, //TODO
+    this.alignment,
     this.markerContent,
-  });
+  }) {
+    if (this.alignment == null && (display == Display.BLOCK || display == Display.LIST_ITEM)) {
+      this.alignment = Alignment.centerLeft;
+    }
+  }
 
   //TODO: all attributes of TextStyle likely have a CSS attribute and should be supported.
   TextStyle generateTextStyle() {
