Merge branch 'master' into master

Sub6Resources · web-flow · commit 9c056cbf2eda · 2019-06-20T07:41:13.000-06:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: flutter_html
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
+## [0.10.2] - June 19, 2019:
+
+* Add `customTextAlign` property ([#112](https://github.com/Sub6Resources/flutter_html/pull/112))
+* Use `tryParse` instead of `parse` for image width and height attributes so that `%` values are ignored safely. Fixes [#98](https://github.com/Sub6Resources/flutter_html/issues/98)
+
 ## [0.10.1] - May 20, 2019:
 
 * Image properties and onImageTap for the richTextParser, plus some fixes ([#90](https://github.com/Sub6Resources/flutter_html/pull/90))
+* Hotfix 1 (June 6, 2019): Fixes [#100](https://github.com/Sub6Resources/flutter_html/issues/100)
 
 ## [0.10.0] - May 18, 2019:
 
diff --git a/README.md b/README.md
@@ -4,12 +4,15 @@
 
 A Flutter widget for rendering static html tags as Flutter widgets. (Will render over 70 different html tags!)
 
+## Roadmap
+[View the development roadmap in the wiki](https://github.com/Sub6Resources/flutter_html/wiki/Roadmap)
+
 ## Installing:
 
 Add the following to your `pubspec.yaml` file:
 
     dependencies:
-      flutter_html: ^0.10.1
+      flutter_html: ^0.10.2
 
 ## Currently Supported HTML Tags:
 `a`, `abbr`, `acronym`, `address`, `article`, `aside`, `b`, `bdi`, `bdo`, `big`, `blockquote`, `body`, `br`, `caption`, `cite`, `code`, `data`, `dd`, `del`, `dfn`, `div`, `dl`, `dt`, `em`, `figcaption`, `figure`, `footer`, `h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `header`, `hr`, `i`, `img`, `ins`, `kbd`, `li`, `main`, `mark`, `nav`, `noscript`, `ol`, `p`, `pre`, `q`, `rp`, `rt`, `ruby`, `s`, `samp`, `section`, `small`, `span`, `strike`, `strong`, `sub`, `sup`, `table`, `tbody`, `td`, `template`, `tfoot`, `th`, `thead`, `time`, `tr`, `tt`, `u`, `ul`, `var`
@@ -82,6 +85,14 @@ Check out the official Flutter WebView package here: https://pub.dartlang.org/pa
           }
         }
       },
+      customTextAlign: (dom.Node node) {
+          if (node is dom.Element) {
+            switch (node.localName) {
+              case "p":
+                return TextAlign.justify;
+            }
+          }
+        },
     )
 
 ## `useRichText` parameter
diff --git a/example/main.dart b/example/main.dart
@@ -137,6 +137,14 @@ class _MyHomePageState extends State<MyHomePage> {
                 }
               }
             },
+            customTextAlign: (dom.Node node) {
+              if (node is dom.Element) {
+                switch (node.localName) {
+                  case "p":
+                    return TextAlign.justify;
+                }
+              }
+            },
           ),
         ),
       ),
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -16,6 +16,7 @@ class Html extends StatelessWidget {
     this.customRender,
     this.customEdgeInsets,
     this.customTextStyle,
+    this.customTextAlign,
     this.blockSpacing = 14.0,
     this.useRichText = true,
     this.onImageError,
@@ -49,6 +50,7 @@ class Html extends StatelessWidget {
   final CustomRender customRender;
   final CustomEdgeInsets customEdgeInsets;
   final CustomTextStyle customTextStyle;
+  final CustomTextAlign customTextAlign;
 
   @override
   Widget build(BuildContext context) {
@@ -67,6 +69,7 @@ class Html extends StatelessWidget {
                 renderNewlines: renderNewlines,
                 customEdgeInsets: customEdgeInsets,
                 customTextStyle: customTextStyle,
+                customTextAlign: customTextAlign,
                 html: data,
                 onImageError: onImageError,
                 linkStyle: linkStyle,
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -10,6 +10,7 @@ typedef CustomTextStyle = TextStyle Function(
   dom.Node node,
   TextStyle baseStyle,
 );
+typedef CustomTextAlign = TextAlign Function(dom.Element elem);
 typedef CustomEdgeInsets = EdgeInsets Function(dom.Node node);
 typedef OnLinkTap = void Function(String url);
 typedef OnImageTap = void Function(String source);
@@ -142,8 +143,9 @@ class HtmlRichTextParser extends StatelessWidget {
     this.onLinkTap,
     this.renderNewlines = false,
     this.html,
-    this.customTextStyle,
     this.customEdgeInsets,
+    this.customTextStyle,
+    this.customTextAlign,
     this.onImageError,
     this.linkStyle = const TextStyle(
       decoration: TextDecoration.underline,
@@ -161,8 +163,9 @@ class HtmlRichTextParser extends StatelessWidget {
   final onLinkTap;
   final bool renderNewlines;
   final String html;
-  final CustomTextStyle customTextStyle;
   final CustomEdgeInsets customEdgeInsets;
+  final CustomTextStyle customTextStyle;
+  final CustomTextAlign customTextAlign;
   final ImageErrorListener onImageError;
   final TextStyle linkStyle;
   final ImageProperties imageProperties;
@@ -305,8 +308,10 @@ class HtmlRichTextParser extends StatelessWidget {
     widgetList.forEach((dynamic w) {
       if (w is BlockText) {
         if (w.child.text == null) return;
-        if ((w.child.text.text == null || w.child.text.text.isEmpty) &&
-            (w.child.text.children == null || w.child.text.children.isEmpty)) return;
+        TextSpan childTextSpan = w.child.text;
+        if ((childTextSpan.text == null || childTextSpan.text.isEmpty) &&
+            (childTextSpan.children == null || childTextSpan.children.isEmpty))
+          return;
       } else if (w is LinkBlock) {
         if (w.children.isEmpty) return;
       } else if (w is LinkTextSpan) {
@@ -661,6 +666,9 @@ class HtmlRichTextParser extends StatelessWidget {
         // so if we have a block element, reset the parentElement to null
         parseContext.parentElement = null;
         TextAlign textAlign = TextAlign.left;
+        if (customTextAlign != null) {
+          textAlign = customTextAlign(node) ?? textAlign;
+        }
 
         EdgeInsets _customEdgeInsets;
         if (customEdgeInsets != null) {
@@ -690,11 +698,11 @@ class HtmlRichTextParser extends StatelessWidget {
                       base64.decode(node.attributes['src'].split("base64,")[1].trim()),
                       width: imageProperties?.width ??
                           ((node.attributes['width'] != null)
-                              ? double.parse(node.attributes['width'])
+                              ? double.tryParse(node.attributes['width'])
                               : null),
                       height: imageProperties?.height ??
                           ((node.attributes['height'] != null)
-                              ? double.parse(node.attributes['height'])
+                              ? double.tryParse(node.attributes['height'])
                               : null),
                       scale: imageProperties?.scale ?? 1.0,
                       matchTextDirection: imageProperties?.matchTextDirection ?? false,
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_html
 description: A Flutter widget for rendering static html tags as Flutter widgets. (Will render over 70 different html tags!)
-version: 0.10.1
+version: 0.10.2
 author: Matthew Whitaker <sub6resources@gmail.com>
 homepage: https://github.com/Sub6Resources/flutter_html
 
