Merge branch 'master' of https://github.com/Sub6Resources/flutter_html into feature/modularization

� Conflicts:
�	lib/flutter_html.dart
�	lib/html_parser.dart
�	lib/src/html_elements.dart

Author: tneotia

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Something isn't working as intended
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+<!--- 
+
+Please do not delete this issue template as it helps us organize and easily work on issues!!
+
+NOTE: Before posting, please make sure you have
+ 1. Searched the README
+ 2. Searched the Issues tab for similar bugs
+ 3. Please provide the required information in the template - HTML code and Html widget configuration
+ --->
+
+**Describe the bug:**
+<!--- Please provide a clear and concise description of the bug --->
+
+**HTML to reproduce the issue:**
+<!--- Please provide your HTML code below. If it contains sensitive information please post a minimal reproducible HTML snippet. --->
+
+**`Html` widget configuration:**
+<!--- Please provide your HTML widget configuration below --->
+
+**Expected behavior:**
+<!--- Expected behavior, if applicable, otherwise please delete --->
+
+**Screenshots:**
+<!--- Screenshots can be helpful to analyze your issue. Please delete this section if you don't provide any. --->
+
+**Device details and Flutter/Dart/`flutter_html` versions:**
+<!--- These details can be helpful to analyze your issue. Please delete this section if you don't provide any.  --->
+
+**Stacktrace/Logcat**
+<!--- The error stacktrace if applicable, otherwise please delete --->
+
+**Additional info:**
+<!--- Any other info relevant to the bug, otherwise please delete --->
+
+**A picture of a cute animal (not mandatory but encouraged)**
+<!--- A picture of a cute animal that would nicely complement this bug report. 
+If you don't have one, please delete, just know we will be a little disappointed ;) --->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for flutter_html
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!--- 
+
+Please do not delete this issue template as it helps us organize and easily work on issues!!
+
+NOTE: Before posting, please make sure you have
+ 1. Searched the README
+ 2. Searched the Issues tab for similar feature requests
+ --->
+ 
+**Describe your feature request**
+<!--- Please provide a clear and concise description of the feature request --->
+
+**Additional context**
+<!--- Any other info relevant to the feature request, otherwise please delete --->
+
+**A picture of a cute animal (not mandatory but encouraged)**
+<!--- A picture of a cute animal that would nicely complement this feature request. 
+If you don't have one, please delete, just know we will be a little disappointed ;) --->

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,20 @@
+---
+name: Question
+about: Ask a question about flutter_html
+title: "[QUESTION]"
+labels: question
+assignees: ''
+
+---
+
+<!--- 
+NOTE: Before posting, please make sure you have
+ 1. Searched the README
+ 2. Searched the Issues tab for similar questions
+ --->
+
+Type question here.
+
+**A picture of a cute animal (not mandatory but encouraged)**
+<!--- A picture of a cute animal that would nicely complement this question. 
+If you don't have one, please delete, just know we will be a little disappointed ;) --->

example/lib/main.dart

@@ -325,6 +325,13 @@ class _MyHomePageState extends State<MyHomePage> {
           onImageError: (exception, stackTrace) {
             print(exception);
           },
+          onCssParseError: (css, messages) {
+            print("css that errored: $css");
+            print("error messages:");
+            messages.forEach((element) {
+              print(element);
+            });
+          },
         ),
       ),
     );

lib/flutter_html.dart

@@ -53,6 +53,7 @@ class Html extends StatelessWidget {
     required this.data,
     this.onLinkTap,
     this.customRenders = const {},
+    this.onCssParseError,
     this.onImageError,
     this.shrinkWrap = false,
     this.onImageTap,
@@ -68,6 +69,7 @@ class Html extends StatelessWidget {
     @required this.document,
     this.onLinkTap,
     this.customRenders = const {},
+    this.onCssParseError,
     this.onImageError,
     this.shrinkWrap = false,
     this.onImageTap,
@@ -90,6 +92,9 @@ class Html extends StatelessWidget {
   /// A function that defines what to do when a link is tapped
   final OnTap? onLinkTap;
 
+  /// A function that defines what to do when CSS fails to parse
+  final OnCssParseError? onCssParseError;
+
   /// A function that defines what to do when an image errors
   final ImageErrorListener? onImageError;
 
@@ -130,6 +135,7 @@ class Html extends StatelessWidget {
         htmlData: doc,
         onLinkTap: onLinkTap,
         onImageTap: onImageTap,
+        onCssParseError: onCssParseError,
         onImageError: onImageError,
         shrinkWrap: shrinkWrap,
         style: style,

lib/html_parser.dart

@@ -20,12 +20,17 @@ typedef OnTap = void Function(
     Map<String, String> attributes,
     dom.Element? element,
 );
+typedef OnCssParseError = String? Function(
+  String css,
+  List<cssparser.Message> errors,
+);
 
 class HtmlParser extends StatelessWidget {
   final Key? key;
   final dom.Document htmlData;
   final OnTap? onLinkTap;
   final OnTap? onImageTap;
+  final OnCssParseError? onCssParseError;
   final ImageErrorListener? onImageError;
   final bool shrinkWrap;
 
@@ -39,6 +44,7 @@ class HtmlParser extends StatelessWidget {
     required this.htmlData,
     required this.onLinkTap,
     required this.onImageTap,
+    required this.onCssParseError,
     required this.onImageError,
     required this.shrinkWrap,
     required this.style,
@@ -48,16 +54,21 @@ class HtmlParser extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    Map<String, Map<String, List<css.Expression>>> declarations = _getExternalCssDeclarations(htmlData.getElementsByTagName("style"), onCssParseError);
     StyledElement lexedTree = lexDomTree(
       htmlData,
       customRenders.keys.toList(),
       tagsList,
       context,
       this,
     );
-    StyledElement inlineStyledTree = applyInlineStyles(lexedTree);
-    StyledElement customStyledTree = _applyCustomStyles(inlineStyledTree);
-    StyledElement cascadedStyledTree = _cascadeStyles(customStyledTree);
+    StyledElement? externalCssStyledTree;
+    if (declarations.isNotEmpty) {
+      externalCssStyledTree = _applyExternalCss(declarations, lexedTree);
+    }
+    StyledElement inlineStyledTree = _applyInlineStyles(externalCssStyledTree ?? lexedTree, onCssParseError);
+    StyledElement customStyledTree = _applyCustomStyles(style, inlineStyledTree);
+    StyledElement cascadedStyledTree = _cascadeStyles(style, customStyledTree);
     StyledElement cleanedTree = cleanTree(cascadedStyledTree);
     InlineSpan parsedTree = parseTree(
       RenderContext(
@@ -91,8 +102,8 @@ class HtmlParser extends StatelessWidget {
     return htmlparser.parse(data);
   }
 
-  /// [parseCSS] converts a string of CSS to a CSS stylesheet using the dart `csslib` library.
-  static css.StyleSheet parseCSS(String data) {
+  /// [parseCss] converts a string of CSS to a CSS stylesheet using the dart `csslib` library.
+  static css.StyleSheet parseCss(String data) {
     return cssparser.parse(data);
   }
 
@@ -187,34 +198,62 @@ class HtmlParser extends StatelessWidget {
     }
   }
 
-  static StyledElement applyInlineStyles(StyledElement tree) {
+  static Map<String, Map<String, List<css.Expression>>> _getExternalCssDeclarations(List<dom.Element> styles, OnCssParseError? errorHandler) {
+    String fullCss = "";
+    for (final e in styles) {
+      fullCss = fullCss + e.innerHtml;
+    }
+    if (fullCss.isNotEmpty) {
+      final declarations = parseExternalCss(fullCss, errorHandler);
+      return declarations;
+    } else {
+      return {};
+    }
+  }
+
+  static StyledElement _applyExternalCss(Map<String, Map<String, List<css.Expression>>> declarations, StyledElement tree) {
+    declarations.forEach((key, style) {
+      if (tree.matchesSelector(key)) {
+        tree.style = tree.style.merge(declarationsToStyle(style));
+      }
+    });
+
+    tree.children.forEach((e) => _applyExternalCss(declarations, e));
+
+    return tree;
+  }
+
+  static StyledElement _applyInlineStyles(StyledElement tree, OnCssParseError? errorHandler) {
     if (tree.attributes.containsKey("style")) {
-      tree.style = tree.style.merge(inlineCSSToStyle(tree.attributes['style']));
+      final newStyle = inlineCssToStyle(tree.attributes['style'], errorHandler);
+      if (newStyle != null) {
+        tree.style = tree.style.merge(newStyle);
+      }
     }
 
-    tree.children.forEach(applyInlineStyles);
+    tree.children.forEach((e) => _applyInlineStyles(e, errorHandler));
     return tree;
   }
 
   /// [applyCustomStyles] applies the [Style] objects passed into the [Html]
   /// widget onto the [StyledElement] tree, no cascading of styles is done at this point.
-  StyledElement _applyCustomStyles(StyledElement tree) {
+  static StyledElement _applyCustomStyles(Map<String, Style> style, StyledElement tree) {
     style.forEach((key, style) {
       if (tree.matchesSelector(key)) {
         tree.style = tree.style.merge(style);
       }
     });
-    tree.children.forEach(_applyCustomStyles);
+    tree.children.forEach((e) => _applyCustomStyles(style, e));
 
     return tree;
   }
 
   /// [_cascadeStyles] cascades all of the inherited styles down the tree, applying them to each
   /// child that doesn't specify a different style.
-  StyledElement _cascadeStyles(StyledElement tree) {
+  static StyledElement _cascadeStyles(Map<String, Style> style, StyledElement tree) {
     tree.children.forEach((child) {
       child.style = tree.style.copyOnlyInherited(child.style);
-      _cascadeStyles(child);
+      _cascadeStyles(style, child);
     });
 
     return tree;
@@ -526,7 +565,7 @@ class HtmlParser extends StatelessWidget {
     tree.children.forEach((child) {
       if (child is EmptyContentElement || child is EmptyLayoutElement) {
         toRemove.add(child);
-      } else if (child is TextContentElement && (child.text!.isEmpty)) {
+      } else if (child is TextContentElement && (child.text!.trim().isEmpty)) {
         toRemove.add(child);
       } else if (child is TextContentElement &&
           child.style.whiteSpace != WhiteSpace.PRE &&

lib/src/css_parser.dart

@@ -5,10 +5,11 @@ import 'package:csslib/visitor.dart' as css;
 import 'package:csslib/parser.dart' as cssparser;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_html/src/utils.dart';
 import 'package:flutter_html/style.dart';
 
-Style declarationsToStyle(Map<String?, List<css.Expression>> declarations) {
+Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
   Style style = new Style();
   declarations.forEach((property, value) {
     if (value.isNotEmpty) {
@@ -298,34 +299,73 @@ Style declarationsToStyle(Map<String?, List<css.Expression>> declarations) {
   return style;
 }
 
-Style inlineCSSToStyle(String? inlineStyle) {
-  final sheet = cssparser.parse("*{$inlineStyle}");
-  final declarations = DeclarationVisitor().getDeclarations(sheet)!;
-  return declarationsToStyle(declarations);
+Style? inlineCssToStyle(String? inlineStyle, OnCssParseError? errorHandler) {
+  var errors = <cssparser.Message>[];
+  final sheet = cssparser.parse("*{$inlineStyle}", errors: errors);
+  if (errors.isEmpty) {
+    final declarations = DeclarationVisitor().getDeclarations(sheet);
+    return declarationsToStyle(declarations["*"]!);
+  } else if (errorHandler != null) {
+    String? newCss = errorHandler.call(inlineStyle ?? "", errors);
+    if (newCss != null) {
+      return inlineCssToStyle(newCss, errorHandler);
+    }
+  }
+  return null;
+}
+
+Map<String, Map<String, List<css.Expression>>> parseExternalCss(String css, OnCssParseError? errorHandler) {
+  var errors = <cssparser.Message>[];
+  final sheet = cssparser.parse(css, errors: errors);
+  if (errors.isEmpty) {
+    return DeclarationVisitor().getDeclarations(sheet);
+  } else if (errorHandler != null) {
+    String? newCss = errorHandler.call(css, errors);
+    if (newCss != null) {
+      return parseExternalCss(newCss, errorHandler);
+    }
+  }
+  return {};
 }
 
 class DeclarationVisitor extends css.Visitor {
-  Map<String?, List<css.Expression>>? _result;
-  String? _currentProperty;
+  Map<String, Map<String, List<css.Expression>>> _result = {};
+  Map<String, List<css.Expression>> _properties = {};
+  late String _selector;
+  late String _currentProperty;
 
-  Map<String?, List<css.Expression>>? getDeclarations(css.StyleSheet sheet) {
-    _result = new Map<String?, List<css.Expression>>();
-    sheet.visit(this);
+  Map<String, Map<String, List<css.Expression>>> getDeclarations(css.StyleSheet sheet) {
+    sheet.topLevels.forEach((element) {
+      if (element.span != null) {
+        _selector = element.span!.text;
+        element.visit(this);
+        if (_result[_selector] != null) {
+          _properties.forEach((key, value) {
+            if (_result[_selector]![key] != null) {
+              _result[_selector]![key]!.addAll(new List<css.Expression>.from(value));
+            } else {
+              _result[_selector]![key] = new List<css.Expression>.from(value);
+            }
+          });
+        } else {
+          _result[_selector] = new Map<String, List<css.Expression>>.from(_properties);
+        }
+        _properties.clear();
+      }
+    });
     return _result;
   }
 
   @override
   void visitDeclaration(css.Declaration node) {
     _currentProperty = node.property;
-    _result![_currentProperty] = <css.Expression>[];
+    _properties[_currentProperty] = <css.Expression>[];
     node.expression!.visit(this);
   }
 
   @override
   void visitExpressions(css.Expressions node) {
-    node.expressions.forEach((expression) {
-      _result![_currentProperty]!.add(expression);
-    });
+    _properties[_currentProperty]!.addAll(node.expressions);
   }
 }