Merge branch 'master' of https://github.com/Sub6Resources/flutter_html into feature/style-tag-support

tneotia · tneotia · commit 9661568d70c5 · 2021-05-03T12:23:31.000-04:00
� Conflicts:
�	lib/style.dart
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -42,6 +42,8 @@ const htmlData = r"""
         </ruby>
         &nbsp;is Japanese Kanji.
       </p>
+      <h3>Support for maxLines:</h3>
+      <h5>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vestibulum sapien feugiat lorem tempor, id porta orci elementum. Fusce sed justo id arcu egestas congue. Fusce tincidunt lacus ipsum, in imperdiet felis ultricies eu. In ullamcorper risus felis, ac maximus dui bibendum vel. Integer ligula tortor, facilisis eu mauris ut, ultrices hendrerit ex. Donec scelerisque massa consequat, eleifend mauris eu, mollis dui. Donec placerat augue tortor, et tincidunt quam tempus non. Quisque sagittis enim nisi, eu condimentum lacus egestas ac. Nam facilisis luctus ipsum, at aliquam urna fermentum a. Quisque tortor dui, faucibus in ante eget, pellentesque mattis nibh. In augue dolor, euismod vitae eleifend nec, tempus vel urna. Donec vitae augue accumsan ligula fringilla ultrices et vel ex.</h5>
       <h3>Support for <code>sub</code>/<code>sup</code></h3>
       Solve for <var>x<sub>n</sub></var>: log<sub>2</sub>(<var>x</var><sup>2</sup>+<var>n</var>) = 9<sup>3</sup>
       <p>One of the most <span>common</span> equations in all of physics is <br /><var>E</var>=<var>m</var><var>c</var><sup>2</sup>.</p>
@@ -261,30 +263,36 @@ class _MyHomePageState extends State<MyHomePage> {
               padding: EdgeInsets.all(6),
               alignment: Alignment.topLeft,
             ),
+            'h5': Style(maxLines: 2, textOverflow: TextOverflow.ellipsis),
           },
           customRender: {
             "table": (context, child) {
               return SingleChildScrollView(
                 scrollDirection: Axis.horizontal,
-                child: (context.tree as TableLayoutElement).toWidget(context),
+                child:
+                    (context.tree as TableLayoutElement).toWidget(context),
               );
             }
           },
           customImageRenders: {
-            networkSourceMatcher(domains: ["flutter.dev"]): (context, attributes, element) {
+            networkSourceMatcher(domains: ["flutter.dev"]):
+                (context, attributes, element) {
               return FlutterLogo(size: 36);
             },
-            networkSourceMatcher(domains: ["mydomain.com"]): networkImageRender(
+            networkSourceMatcher(domains: ["mydomain.com"]):
+                networkImageRender(
               headers: {"Custom-Header": "some-value"},
               altWidget: (alt) => Text(alt ?? ""),
               loadingWidget: () => Text("Loading..."),
             ),
             // On relative paths starting with /wiki, prefix with a base url
-            (attr, _) => attr["src"] != null && attr["src"]!.startsWith("/wiki"):
+            (attr, _) =>
+                    attr["src"] != null && attr["src"]!.startsWith("/wiki"):
                 networkImageRender(
                     mapUrl: (url) => "https://upload.wikimedia.org" + url!),
             // Custom placeholder image for broken links
-            networkSourceMatcher(): networkImageRender(altWidget: (_) => FlutterLogo()),
+            networkSourceMatcher():
+                networkImageRender(altWidget: (_) => FlutterLogo()),
           },
           onLinkTap: (url, _, __, ___) {
             print("Opening $url...");
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -616,14 +616,15 @@ class HtmlParser extends StatelessWidget {
   static StyledElement _processBeforesAndAfters(StyledElement tree) {
     if (tree.style.before != null) {
       tree.children.insert(
-          0, TextContentElement(text: tree.style.before, style: tree.style));
+          0, TextContentElement(text: tree.style.before, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));
     }
     if (tree.style.after != null) {
       tree.children
-          .add(TextContentElement(text: tree.style.after, style: tree.style));
-    } else {
-      tree.children.forEach(_processBeforesAndAfters);
+          .add(TextContentElement(text: tree.style.after, style: tree.style.copyWith(beforeAfterNull: true, display: Display.INLINE)));
     }
+
+    tree.children.forEach(_processBeforesAndAfters);
+
     return tree;
   }
 
@@ -872,6 +873,8 @@ class StyledText extends StatelessWidget {
         textAlign: style.textAlign,
         textDirection: style.direction,
         textScaleFactor: textScaleFactor,
+        maxLines: style.maxLines,
+        overflow: style.textOverflow,
       ),
     );
   }
diff --git a/lib/src/widgets/iframe_web.dart b/lib/src/widgets/iframe_web.dart
@@ -37,14 +37,14 @@ class IframeContentElement extends ReplacedElement {
     //not actually an error
     ui.platformViewRegistry.registerViewFactory(createdViewId, (int viewId) => iframe);
     return Container(
-      width: width ?? (height ?? 150) * 2,
-      height: height ?? (width ?? 300) / 2,
-      child: Directionality(
-          textDirection: TextDirection.ltr,
-          child: HtmlElementView(
-            viewType: createdViewId,
-          )
-      )
+        width: width ?? (height ?? 150) * 2,
+        height: height ?? (width ?? 300) / 2,
+        child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: HtmlElementView(
+              viewType: createdViewId,
+            )
+        )
     );
   }
 }
diff --git a/lib/style.dart b/lib/style.dart
@@ -177,6 +177,20 @@ class Style {
   Alignment? alignment;
   String? markerContent;
 
+  /// MaxLine
+  ///
+  ///
+  ///
+  ///
+  int? maxLines;
+
+  /// TextOverflow
+  ///
+  ///
+  ///
+  ///
+  TextOverflow? textOverflow;
+
   Style({
     this.backgroundColor = Colors.transparent,
     this.color,
@@ -209,13 +223,25 @@ class Style {
     this.border,
     this.alignment,
     this.markerContent,
+    this.maxLines,
+    this.textOverflow,
   }) {
     if (this.alignment == null &&
         (display == Display.BLOCK || display == Display.LIST_ITEM)) {
       this.alignment = Alignment.centerLeft;
     }
   }
 
+  static Map<String, Style> fromThemeData(ThemeData theme) => {
+    'h1': Style.fromTextStyle(theme.textTheme.headline1!),
+    'h2': Style.fromTextStyle(theme.textTheme.headline2!),
+    'h3': Style.fromTextStyle(theme.textTheme.headline3!),
+    'h4': Style.fromTextStyle(theme.textTheme.headline4!),
+    'h5': Style.fromTextStyle(theme.textTheme.headline5!),
+    'h6': Style.fromTextStyle(theme.textTheme.headline6!),
+    'body': Style.fromTextStyle(theme.textTheme.bodyText2!),
+  };
+
   static Map<String, Style> fromCSS(String css, OnCSSParseError? onCSSParseError) {
     final declarations = parseExternalCSS(css, onCSSParseError);
     Map<String, Style> styleMap = {};
@@ -289,6 +315,8 @@ class Style {
       //TODO merge border
       alignment: other.alignment,
       markerContent: other.markerContent,
+      maxLines: other.maxLines,
+      textOverflow: other.textOverflow,
     );
   }
 
@@ -324,6 +352,8 @@ class Style {
       textShadow: child.textShadow ?? textShadow,
       whiteSpace: child.whiteSpace ?? whiteSpace,
       wordSpacing: child.wordSpacing ?? wordSpacing,
+      maxLines: child.maxLines ?? maxLines,
+      textOverflow: child.textOverflow ?? textOverflow,
     );
   }
 
@@ -359,6 +389,9 @@ class Style {
     Border? border,
     Alignment? alignment,
     String? markerContent,
+    int? maxLines,
+    TextOverflow? textOverflow,
+    bool? beforeAfterNull,
   }) {
     return Style(
       backgroundColor: backgroundColor ?? this.backgroundColor,
@@ -388,11 +421,13 @@ class Style {
       whiteSpace: whiteSpace ?? this.whiteSpace,
       width: width ?? this.width,
       wordSpacing: wordSpacing ?? this.wordSpacing,
-      before: before ?? this.before,
-      after: after ?? this.after,
+      before: beforeAfterNull == true ? null : before ?? this.before,
+      after: beforeAfterNull == true ? null : after ?? this.after,
       border: border ?? this.border,
       alignment: alignment ?? this.alignment,
       markerContent: markerContent ?? this.markerContent,
+      maxLines: maxLines ?? this.maxLines,
+      textOverflow: textOverflow ?? this.textOverflow,
     );
   }
 
