Merge branch 'master' of https://github.com/Sub6Resources/flutter_html into feature/selectable-text

tneotia · tneotia · commit cdcd018d9feb · 2021-05-26T17:26:19.000-04:00
� Conflicts:
�	lib/html_parser.dart
diff --git a/README.md b/README.md
@@ -105,13 +105,13 @@ Add the following to your `pubspec.yaml` file:
 |------------|-----------|-------|-------------|---------|---------|-------|------|--------|--------|--------|
 |`a`         | `abbr`    | `acronym`| `address`   | `article`| `aside` | `audio`| `b`  | `bdi`  | `bdo`  | `big`  |
 |`blockquote`| `body`    | `br`  | `caption`   | `cite`  | `code`  | `data`| `dd` | `del`  | `details`  | `dfn`  |
-| `div` | `dl`        | `dt`      | `em`  | `figcaption`| `figure`| `footer`| `h1`  | `h2` | `h3`   | `h4`   |
-| `h5` |`h6`        | `header`  | `hr`  | `i`         | `iframe`| `img`   | `ins` | `kbd`| `li`   | `main` | 
-| `mark` | `nav`       | `noscript`|`ol`   | `p`         | `pre`   | `q`     | `rp`  | `rt` | `ruby` | `s`  |
-| `samp` | `section`   | `small`   | `span`| `strike`    | `strong`| `sub`   | `sup` | `summary` | `svg`| `table`| 
-| `tbody` | `td` | `template` | `tfoot`   | `th`  | `thead`     |`time`   | `tr`    | `tt`  | `u`  | `ul` |
-| `var` | `video` |  `math`:  |  `mrow`  |  `msup`    | `msub`  |  `mover`   | `munder`  | `msubsup`  | `moverunder`   | `mfrac`  | 
-| `mlongdiv` | `msqrt` |  `mroot`  |  `mi`  |  `mn`    | `mo`  |  |   |   |    |   | 
+| `div` | `dl`        | `dt`      | `em`  | `figcaption`| `figure`| `footer`| `font` | `h1`  | `h2` | `h3`   |
+| `h4` | `h5` |`h6`        | `header`  | `hr`  | `i`         | `iframe`| `img`   | `ins` | `kbd`| `li`   |
+| `main` | `mark` | `nav`       | `noscript`|`ol`   | `p`         | `pre`   | `q`     | `rp`  | `rt` | `ruby` |
+| `s` | `samp` | `section`   | `small`   | `span`| `strike`    | `strong`| `sub`   | `sup` | `summary` | `svg`|
+| `table` | `tbody` | `td` | `template` | `tfoot`   | `th`  | `thead`     |`time`   | `tr`    | `tt`  | `u`  |
+| `ul` | `var` | `video` |  `math`:  |  `mrow`  |  `msup`    | `msub`  |  `mover`   | `munder`  | `msubsup`  | `moverunder` |
+| `mfrac` | `mlongdiv` | `msqrt` |  `mroot`  |  `mi`  |  `mn`    | `mo`  |  |   |   |    | 
 
  
 ## Currently Supported CSS Attributes:
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -32,9 +32,8 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -43,8 +42,6 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
     }
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -304,28 +304,7 @@ class HtmlParser extends StatelessWidget {
       tree: tree,
       style: context.style.copyOnlyInherited(tree.style),
     );
-    List<int> lineEndingIndices = [];
-    tree.children.forEachIndexed((index, element) {
-      //we want the element to be a block element, but we don't want to add
-      //new-lines before/after the html and body
-      if (element.style.display == Display.BLOCK
-          && element.element?.localName != "html"
-          && element.element?.localName != "body"
-      ) {
-        //if the parent element is body and the element is first, we don't want
-        //to add a new-line before
-        if (index == 0 && element.element?.parent?.localName == "body") {
-          lineEndingIndices.add(index + 1);
-        } else {
-          lineEndingIndices.addAll([index, index + 1]);
-        }
-      }
-    });
-    //we don't need a new-line at the end
-    if (lineEndingIndices.isNotEmpty && lineEndingIndices.last == tree.children.length) {
-      lineEndingIndices.removeLast();
-    }
-    lineEndingIndices = lineEndingIndices.toSet().toList();
+
     if (customRender.containsKey(tree.name)) {
       final render = customRender[tree.name]!.call(
         newContext,
@@ -354,17 +333,26 @@ class HtmlParser extends StatelessWidget {
     }
 
     //Return the correct InlineSpan based on the element type.
-    if (tree.style.display == Display.BLOCK) {
+    if (tree.style.display == Display.BLOCK && tree.children.isNotEmpty) {
       if (newContext.parser.selectable) {
-        final children = tree.children.map((tree) => parseTree(newContext, tree)).toList();
-        //use provided indices to insert new-lines at those locations
-        //makes sure to account for list size changes with "+ i"
-        lineEndingIndices.forEachIndexed((i, element) {
-          children.insert(element + i, TextSpan(text: "\n"));
-        });
         return TextSpan(
           style: newContext.style.generateTextStyle(),
-          children: children,
+          children: tree.children
+              .expandIndexed((i, childTree) => [
+            if (shrinkWrap &&
+                childTree.style.display == Display.BLOCK &&
+                i > 0 &&
+                tree.children[i - 1] is ReplacedElement)
+              TextSpan(text: "\n"),
+            parseTree(newContext, childTree),
+            if (shrinkWrap &&
+                i != tree.children.length - 1 &&
+                childTree.style.display == Display.BLOCK &&
+                childTree.element?.localName != "html" &&
+                childTree.element?.localName != "body")
+              TextSpan(text: "\n"),
+          ])
+              .toList(),
         );
       }
       return WidgetSpan(
@@ -373,7 +361,22 @@ class HtmlParser extends StatelessWidget {
           newContext: newContext,
           style: tree.style,
           shrinkWrap: context.parser.shrinkWrap,
-          children: tree.children.map((tree) => parseTree(newContext, tree)).toList(),
+          children: tree.children
+              .expandIndexed((i, childTree) => [
+                    if (shrinkWrap &&
+                        childTree.style.display == Display.BLOCK &&
+                        i > 0 &&
+                        tree.children[i - 1] is ReplacedElement)
+                      TextSpan(text: "\n"),
+                    parseTree(newContext, childTree),
+                    if (shrinkWrap &&
+                        i != tree.children.length - 1 &&
+                        childTree.style.display == Display.BLOCK &&
+                        childTree.element?.localName != "html" &&
+                        childTree.element?.localName != "body")
+                      TextSpan(text: "\n"),
+                  ])
+              .toList(),
         ),
       );
     } else if (tree.style.display == Display.LIST_ITEM) {
@@ -458,22 +461,17 @@ class HtmlParser extends StatelessWidget {
           );
         } else {
           return WidgetSpan(
-            child: RawGestureDetector(
-              key: AnchorKey.of(key, tree),
-              gestures: {
-                MultipleTapGestureRecognizer:
-                    GestureRecognizerFactoryWithHandlers<
-                        MultipleTapGestureRecognizer>(
-                  () => MultipleTapGestureRecognizer(),
-                  (instance) {
-                    instance
-                      ..onTap = _onAnchorTap != null
-                          ? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
-                          : null;
-                  },
-                ),
-              },
-              child: (childSpan as WidgetSpan).child,
+            child: MultipleTapGestureDetector(
+              onTap: _onAnchorTap != null
+                  ? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
+                  : null,
+              child: GestureDetector(
+                key: AnchorKey.of(key, tree),
+                onTap: _onAnchorTap != null
+                    ? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
+                    : null,
+                child: (childSpan as WidgetSpan).child,
+              ),
             ),
           );
         }
@@ -512,21 +510,26 @@ class HtmlParser extends StatelessWidget {
           child: StyledText(
             textSpan: TextSpan(
               style: newContext.style.generateTextStyle(),
-              children: tree.children
-                      .map((tree) => parseTree(newContext, tree))
-                      .toList(),
+              children: tree.children.map((tree) => parseTree(newContext, tree)).toList(),
             ),
             style: newContext.style,
-            renderContext: context,
+            renderContext: newContext,
           ),
         ),
       );
     } else {
       ///[tree] is an inline element.
       return TextSpan(
         style: newContext.style.generateTextStyle(),
-        children:
-        tree.children.map((tree) => parseTree(newContext, tree)).toList(),
+        children: tree.children
+            .expand((tree) => [
+                  parseTree(newContext, tree),
+                  if (tree.style.display == Display.BLOCK &&
+                      tree.element?.localName != "html" &&
+                      tree.element?.localName != "body")
+                    TextSpan(text: "\n"),
+                ])
+            .toList(),
       );
     }
   }
@@ -937,7 +940,7 @@ class StyledText extends StatelessWidget {
       );
     }
     return SizedBox(
-      width: calculateWidth(style.display, renderContext),
+      width: consumeExpandedBlock(style.display, renderContext),
       child: Text.rich(
         textSpan,
         style: style.generateTextStyle(),
@@ -950,13 +953,10 @@ class StyledText extends StatelessWidget {
     );
   }
 
-  double? calculateWidth(Display? display, RenderContext context) {
+  double? consumeExpandedBlock(Display? display, RenderContext context) {
     if ((display == Display.BLOCK || display == Display.LIST_ITEM) && !renderContext.parser.shrinkWrap) {
       return double.infinity;
     }
-    if (renderContext.parser.shrinkWrap) {
-      return MediaQuery.of(context.buildContext).size.width;
-    }
     return null;
   }
 }
diff --git a/lib/src/anchor.dart b/lib/src/anchor.dart
@@ -3,19 +3,28 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_html/src/styled_element.dart';
 
 class AnchorKey extends GlobalKey {
+  static final Set<AnchorKey> _registry = <AnchorKey>{};
+
   final Key parentKey;
   final String id;
 
   const AnchorKey._(this.parentKey, this.id) : super.constructor();
 
   static AnchorKey? of(Key? parentKey, StyledElement? id) {
-    return forId(parentKey, id?.elementId);
+    final key = forId(parentKey, id?.elementId);
+    if (key == null || _registry.contains(key)) {
+      // Invalid id or already created a key with this id: silently ignore
+      return null;
+    }
+    _registry.add(key);
+    return key;
   }
 
   static AnchorKey? forId(Key? parentKey, String? id) {
     if (parentKey == null || id == null || id.isEmpty || id == "[[No ID]]") {
       return null;
     }
+
     return AnchorKey._(parentKey, id);
   }
 
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
@@ -83,16 +83,19 @@ class ImageContentElement extends ReplacedElement {
     for (final entry in context.parser.imageRenders.entries) {
       if (entry.key.call(attributes, element)) {
         final widget = entry.value.call(context, attributes, element);
-        return RawGestureDetector(
-            key: AnchorKey.of(context.parser.key, this),
-          child: widget,
-          gestures: {
-            MultipleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers<MultipleTapGestureRecognizer>(
-                  () => MultipleTapGestureRecognizer(), (instance) {
-                instance..onTap = () => context.parser.onImageTap?.call(src, context, attributes, element);
+        return Builder(
+          builder: (buildContext) {
+            return GestureDetector(
+              key: AnchorKey.of(context.parser.key, this),
+              child: widget,
+              onTap: () {
+                if (MultipleTapGestureDetector.of(buildContext) != null) {
+                  MultipleTapGestureDetector.of(buildContext)!.onTap?.call();
+                }
+                context.parser.onImageTap?.call(src, context, attributes, element);
               },
-            ),
-          },
+            );
+          }
         );
       }
     }
@@ -283,13 +286,13 @@ class MathElement extends ReplacedElement {
     required this.element,
     this.texStr,
     String name = "math",
-  }) : super(name: name, alignment: PlaceholderAlignment.middle, style: Style(), elementId: element.id);
+  }) : super(name: name, alignment: PlaceholderAlignment.middle, style: Style(display: Display.BLOCK), elementId: element.id);
 
   @override
   Widget toWidget(RenderContext context) {
     texStr = parseMathRecursive(element, r'');
     return Container(
-      width: MediaQuery.of(context.buildContext).size.width,
+      width: context.parser.shrinkWrap ? null : MediaQuery.of(context.buildContext).size.width,
       child: Math.tex(
         texStr ?? '',
         mathStyle: MathStyle.display,
diff --git a/lib/src/styled_element.dart b/lib/src/styled_element.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_html/src/css_parser.dart';
 import 'package:flutter_html/style.dart';
 import 'package:html/dom.dart' as dom;
 //TODO(Sub6Resources): don't use the internal code of the html package as it may change unexpectedly.
@@ -179,6 +180,17 @@ StyledElement parseStyledElement(
         display: Display.BLOCK,
       );
       break;
+    case "font":
+      styledElement.style = Style(
+        color: element.attributes['color'] != null ?
+          element.attributes['color']!.startsWith("#") ?
+            ExpressionMapping.stringToColor(element.attributes['color']!) :
+            ExpressionMapping.namedColorToColor(element.attributes['color']!) :
+          null,
+        fontFamily: element.attributes['face']?.split(",").first,
+        fontSize: numberToFontSize(element.attributes['size'] ?? ''),
+      );
+      break;
     case "h1":
       styledElement.style = Style(
         fontSize: FontSize.xxLarge,
@@ -368,3 +380,31 @@ StyledElement parseStyledElement(
 }
 
 typedef ListCharacter = String Function(int i);
+
+FontSize numberToFontSize(String num) {
+  switch (num) {
+    case "1":
+      return FontSize.xxSmall;
+    case "2":
+      return FontSize.xSmall;
+    case "3":
+      return FontSize.small;
+    case "4":
+      return FontSize.medium;
+    case "5":
+      return FontSize.large;
+    case "6":
+      return FontSize.xLarge;
+    case "7":
+      return FontSize.xxLarge;
+  }
+  if (num.startsWith("+")) {
+    final relativeNum = double.tryParse(num.substring(1)) ?? 0;
+    return numberToFontSize((3 + relativeNum).toString());
+  }
+  if (num.startsWith("-")) {
+    final relativeNum = double.tryParse(num.substring(1)) ?? 0;
+    return numberToFontSize((3 - relativeNum).toString());
+  }
+  return FontSize.medium;
+}
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -48,11 +48,21 @@ 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 {
-  @override
-  void rejectGesture(int pointer) {
-    acceptGesture(pointer);
+class MultipleTapGestureDetector extends InheritedWidget {
+  final void Function()? onTap;
+
+  const MultipleTapGestureDetector({
+    Key? key,
+    required Widget child,
+    required this.onTap,
+  }) : super(key: key, child: child);
+
+  static MultipleTapGestureDetector? of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<MultipleTapGestureDetector>();
   }
+
+  @override
+  bool updateShouldNotify(MultipleTapGestureDetector oldWidget) => false;
 }
 
 class CustomBorderSide {
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_html
 description: A Flutter widget rendering static HTML and CSS as Flutter widgets.
-version: 2.0.0-nullsafety.1
+version: 2.0.0
 homepage: https://github.com/Sub6Resources/flutter_html
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`defaultConfig {`
`35`		`- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).`
`36`	`35`	`applicationId "com.example.example"`
`37`		`- minSdkVersion 16`
	`36`	`+ minSdkVersion 19`
`38`	`37`	`targetSdkVersion 28`
`39`	`38`	`versionCode flutterVersionCode.toInteger()`
`40`	`39`	`versionName flutterVersionName`
`@@ -43,8 +42,6 @@ android {`
`43`	`42`
`44`	`43`	`buildTypes {`
`45`	`44`	`release {`
`46`		`- // TODO: Add your own signing config for the release build.`
`47`		- // Signing with the debug keys for now, so `flutter run --release` works.
`48`	`45`	`signingConfig signingConfigs.debug`
`49`	`46`	`}`
`50`	`47`	`}`