Update changelong and some last minute fixes

Sub6Resources · Sub6Resources · commit a34d3bf394a1 · 2019-12-27T12:49:37.000-07:00
diff --git a/PRE_CHANGELOG.md b/PRE_CHANGELOG.md
@@ -2,25 +2,28 @@ This changelog highlights changes as we work to implement version 1.0.0.
 
 
 # [1.0.0-pre.1]
-* BREAKING CHANGES (most of these are temporary):
+* BREAKING CHANGES (see the [Migration Guide](https://github.com/Sub6Resources/flutter_html/wiki/1.0.0-Migration-Guide) for a full overview of breaking changes.):
+  * The default parser has been completely rewritten and the RichText parser has been deprecated.
   * `useRichText` now defaults to `false` (the new parser uses RichText, though)
-  * `customRender` no longer does anything (just for now). 
-  * `img` `alt` tags are no longer rendered.
-  * `table` is no longer supported.
-  * `sub` and `sup` are no longer correctly rendered.
-* `HtmlParser` has been entirely rewritten. (It now uses `RichText` extensively)
+  * `customRender` now works for the default parser.
+* Adds support for `<audio>`, `<video>`, `<iframe>`, `<svg>`, `<ruby>`, `<rt>`, `<rp>`, `<sub>`, and `<sup>`
+* Adds support for over 20 CSS attributes.
+* Fixes 22 issues (see the list at [#122](https://github.com/Sub6Resources/flutter_html/pull/122))
 * The following parameters of `Html` have been deprecated and should no longer be used:
   * `useRichText`
   * `padding`
   * `backgroundColor`
   * `defaultTextStyle`
+  * `renderNewlines`
   * `customEdgeInsets`
   * `customTextStyle`
   * `blockSpacing`
+  * `customTextAlign`
   * `linkStyle`
+  * `imageProperties`
+  * `showImages`
 * The default text style now matches the app's Material `TextTheme.body1` (Fixes [#18](https://github.com/Sub6Resources/flutter_html/issues/18)).
 * Fixed quite a few issues with `img`
 * Added a fancy new `style` attribute (this should be used in place of the deprecated styling parameters).
-* Added an even fancier new `css` attribute that takes a CSS string and applies those styles to your widgets.
  
 
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -595,9 +595,11 @@ class HtmlParser extends StatelessWidget {
   /// [removeEmptyElements] recursively removes empty elements.
   ///
   /// An empty element is any [EmptyContentElement], any empty [TextContentElement],
-  /// or any block-level [TextContentElement] that contains only whitespace.
+  /// or any block-level [TextContentElement] that contains only whitespace and doesn't follow
+  /// a block element or a line break.
   static StyledElement _removeEmptyElements(StyledElement tree) {
     List<StyledElement> toRemove = new List<StyledElement>();
+    bool lastChildBlock = true;
     tree.children?.forEach((child) {
       if (child is EmptyContentElement) {
         toRemove.add(child);
@@ -606,11 +608,17 @@ class HtmlParser extends StatelessWidget {
       } else if (child is TextContentElement &&
           child.style.whiteSpace != WhiteSpace.PRE &&
           tree.style.display == Display.BLOCK &&
-          child.text.trim().isEmpty) {
+          child.text.trim().isEmpty &&
+          lastChildBlock) {
         toRemove.add(child);
       } else {
         _removeEmptyElements(child);
       }
+
+      // This is used above to check if the previous element is a block element or a line break.
+      lastChildBlock = (child.style.display == Display.BLOCK ||
+          child.style.display == Display.LIST_ITEM ||
+          (child is TextContentElement && child.text == '\n'));
     });
     tree.children?.removeWhere((element) => toRemove.contains(element));
 
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
@@ -133,19 +133,23 @@ class ImageContentElement extends ReplacedElement {
       );
     }
 
-    return RawGestureDetector(
-      child: imageWidget,
-      gestures: {
-        MultipleTapGestureRecognizer:
-            GestureRecognizerFactoryWithHandlers<MultipleTapGestureRecognizer>(
-          () => MultipleTapGestureRecognizer(),
-          (instance) {
-            instance..onTap = () => context.parser.onImageTap?.call(src);
-          },
-        ),
-      },
+    return ContainerSpan(
+      style: style,
+      newContext: context,
+      shrinkWrap: context.parser.shrinkWrap,
+      child: RawGestureDetector(
+        child: imageWidget,
+        gestures: {
+          MultipleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers<
+              MultipleTapGestureRecognizer>(
+            () => MultipleTapGestureRecognizer(),
+            (instance) {
+              instance..onTap = () => context.parser.onImageTap?.call(src);
+            },
+          ),
+        },
+      ),
     );
-    return imageWidget;
   }
 }
 
@@ -303,7 +307,7 @@ class RubyElement extends ReplacedElement {
 
   @override
   Widget toWidget(RenderContext context) {
-    dom.Node textNode = null;
+    dom.Node textNode;
     List<Widget> widgets = List<Widget>();
     //TODO calculate based off of parent font size.
     final rubySize = max(9.0, context.style.fontSize.size / 2);
diff --git a/lib/src/styled_element.dart b/lib/src/styled_element.dart
@@ -349,6 +349,8 @@ StyledElement parseStyledElement(
         verticalAlign: VerticalAlign.SUPER,
       );
       break;
+    case "th":
+      continue bold;
     case "tt":
       continue monospace;
     underline:
