Merge branch 'master' into master

Author: Sub6Resources

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.10.0] - May 18, 2019:
+
+* **BREAKING:** `useRichText` now defaults to `true`
+* Support for `aside`, `bdi`, `big`, `cite`, `data`, `ins`, `kbd`, `mark`, `nav`, `noscript`, `q`, `rp`, `rt`, `ruby`, `s`, `samp`, `strike`, `template`, `time`, `tt`, and `var` added to `RichText` parser.
+
+## [0.9.9] - May 17, 2019:
+
+* Fixes extra padding issue ([#87](https://github.com/Sub6Resources/flutter_html/issues/87))
+
 ## [0.9.8] - May 14, 2019:
 
 * Add support for `address` tag in `RichText` parser.
@@ -7,7 +16,7 @@
 * Added onImageError callback
 * Added custom textstyle and edgeinsets callback ([#72](https://github.com/Sub6Resources/flutter_html/pull/72))
 * Update dependency versions ([#84](https://github.com/Sub6Resources/flutter_html/issues/84))
-* Fixes #82 and #86
+* Fixes [#82](https://github.com/Sub6Resources/flutter_html/issues/82) and [#86](https://github.com/Sub6Resources/flutter_html/issues/86)
 
 ## [0.9.6] - March 11, 2019:
 

README.md

@@ -9,7 +9,7 @@ A Flutter widget for rendering static html tags as Flutter widgets. (Will render
 Add the following to your `pubspec.yaml` file:
 
     dependencies:
-      flutter_html: ^0.9.8
+      flutter_html: ^0.10.0
 
 ## 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`

lib/flutter_html.dart

@@ -17,7 +17,7 @@ class Html extends StatelessWidget {
     this.customEdgeInsets,
     this.customTextStyle,
     this.blockSpacing = 14.0,
-    this.useRichText = false,
+    this.useRichText = true,
     this.onImageError,
     this.linkStyle = const TextStyle(
         decoration: TextDecoration.underline,

lib/html_parser.dart

@@ -175,17 +175,34 @@ class HtmlRichTextParser extends StatelessWidget {
     "b",
     "i",
     "address",
+    "cite",
+    "var",
     "em",
     "strong",
+    "kbd",
+    "samp",
+    "tt",
     "code",
+    "ins",
     "u",
     "small",
     "abbr",
     "acronym",
+    "mark",
     "ol",
     "ul",
     "blockquote",
+    "del",
+    "s",
+    "strike",
+    "ruby",
+    "rp",
+    "rt",
+    "bdi",
+    "data",
+    "time",
     "span",
+    "big",
   ];
 
   // specialty elements require unique handling
@@ -203,6 +220,7 @@ class HtmlRichTextParser extends StatelessWidget {
     "th",
     "thead",
     "tr",
+    "q",
   ];
 
   // block elements are always rendered with a new
@@ -211,6 +229,7 @@ class HtmlRichTextParser extends StatelessWidget {
   // we simply treat it as a new block level element
   static const _supportedBlockElements = [
     "article",
+    "aside",
     "body",
     "center",
     "dd",
@@ -232,6 +251,8 @@ class HtmlRichTextParser extends StatelessWidget {
     "img",
     "li",
     "main",
+    "nav",
+    "noscript",
     "p",
     "pre",
     "section",
@@ -434,12 +455,18 @@ class HtmlRichTextParser extends StatelessWidget {
             break;
           case "i":
           case "address":
+          case "cite":
+          case "var":
           case "em":
             childStyle = childStyle.merge(TextStyle(fontStyle: FontStyle.italic));
             break;
+          case "kbd":
+          case "samp":
+          case "tt":
           case "code":
             childStyle = childStyle.merge(TextStyle(fontFamily: 'monospace'));
             break;
+          case "ins":
           case "u":
             childStyle = childStyle.merge(TextStyle(decoration: TextDecoration.underline));
             break;
@@ -450,8 +477,21 @@ class HtmlRichTextParser extends StatelessWidget {
               decorationStyle: TextDecorationStyle.dotted,
             ));
             break;
+          case "big":
+            childStyle = childStyle.merge(TextStyle(fontSize: 20.0));
+            break;
           case "small":
-            childStyle = childStyle.merge(TextStyle(fontSize: 12.0));
+            childStyle = childStyle.merge(TextStyle(fontSize: 10.0));
+            break;
+          case "mark":
+            childStyle = childStyle.merge(
+                TextStyle(backgroundColor: Colors.yellow, color: Colors.black));
+            break;
+          case "del":
+          case "s":
+          case "strike":
+            childStyle = childStyle
+                .merge(TextStyle(decoration: TextDecoration.lineThrough));
             break;
           case "ol":
             nextContext.indentLevel += 1;
@@ -469,6 +509,12 @@ class HtmlRichTextParser extends StatelessWidget {
             nextContext.indentLevel += 1;
             nextContext.blockType = 'blockquote';
             break;
+          case "ruby":
+          case "rt":
+          case "rp":
+          case "bdi":
+          case "data":
+          case "time":
           case "span":
             //No additional styles
             break;
@@ -597,6 +643,18 @@ class HtmlRichTextParser extends StatelessWidget {
             nextContext.parentElement.children.add(row);
             nextContext.parentElement = text.text;
             break;
+          case "q":
+            if (parseContext.parentElement != null &&
+                parseContext.parentElement is TextSpan) {
+              parseContext.parentElement.children
+                  .add(TextSpan(text: '"', children: []));
+              TextSpan content = TextSpan(text: '', children: []);
+              parseContext.parentElement.children.add(content);
+              parseContext.parentElement.children
+                  .add(TextSpan(text: '"', children: []));
+              nextContext.parentElement = content;
+            }
+            break;
         }
       }
 
@@ -779,9 +837,14 @@ class HtmlRichTextParser extends StatelessWidget {
               ));
             }
             BlockText blockText = BlockText(
-              margin: _customEdgeInsets ??
-                  EdgeInsets.only(
-                      top: 8.0, bottom: 8.0, left: parseContext.indentLevel * indentSize),
+
+              margin: node.localName != 'body'
+                  ? _customEdgeInsets ??
+                      EdgeInsets.only(
+                          top: 8.0,
+                          bottom: 8.0,
+                          left: parseContext.indentLevel * indentSize)
+                  : EdgeInsets.zero,
               padding: EdgeInsets.all(2.0),
               decoration: decoration,
               child: RichText(
@@ -806,30 +869,6 @@ class HtmlRichTextParser extends StatelessWidget {
     }
   }
 
-  // List<dynamic> _parseNodeList({
-  //   @required List<dom.Node> nodeList,
-  //   @required List<BlockText> rootWidgetList,  // the widgetList accumulator
-  //   int parentIndex,         // the parent spans list accumulator
-  //   int indentLevel = 0,
-  //   int listCount = 0,
-  //   String listChar = '•',
-  //   String blockType,          // blockType can be 'p', 'div', 'ul', 'ol', 'blockquote'
-  //   bool condenseWhitespace = true,
-  //   }) {
-  //   return nodeList.map((node) {
-  //     return _parseNode(
-  //       node: node,
-  //       rootWidgetList: rootWidgetList,
-  //       parentIndex: parentIndex,
-  //       indentLevel: indentLevel,
-  //       listCount: listCount,
-  //       listChar: listChar,
-  //       blockType: blockType,
-  //       condenseWhitespace: condenseWhitespace,
-  //     );
-  //   }).toList();
-  // }
-
   Paint _getPaint(Color color) {
     Paint paint = new Paint();
     paint.color = color;

pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -101,7 +101,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -148,7 +148,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.4"
   typed_data:
     dependency: transitive
     description:

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.9.8
+version: 0.10.0
 author: Matthew Whitaker <[email protected]>
 homepage: https://github.com/Sub6Resources/flutter_html