Merge branch 'master' of https://github.com/Sub6Resources/flutter_html into feature/upgrade-custom-render

� Conflicts:
�	README.md
�	lib/flutter_html.dart
�	lib/html_parser.dart

Author: tneotia

CHANGELOG.md

@@ -1,4 +1,46 @@
-## [2.1.1] - July 27, 2021:
+## [2.2.1] - December 8, 2021:
+* Allow styling on ruby tags
+* Allow width/height/alignment styling on table/tr/td tags
+* Prevent images causing rebuilding and leaking memory
+* Fixes display of list items on iOS with font weights below 400
+* Prevent crash on negative margins or paddings
+
+## [2.2.0] - November 29, 2021:
+* Explicitly declare multiplatform support
+* Extended and fixed list-style (marker) support
+* Basic support for height/width css properties
+* Support changing scroll physics of SelectableText.rich
+* Support text transform css property
+* Bumped minimum flutter_math_fork version for Flutter 2.5 compatibility
+* Fix styling of iframes
+* Fix nested font tag application
+* Fix whitespace rendering between list items
+* Prevent crash on empty <table> tag and tables with both colspan/rowspan
+* Prevent crash on use of negative margins in css
+
+## [2.1.5] - October 7, 2021:
+* Ignore unsupported custom style selectors when using fromCss
+* Fix SVG tag usage inside tables
+* Properly fix regression in usage of line breaks
+
+## [2.1.4] - October 3, 2021:
+* Fix regression in usage of line breaks in body being stripped
+
+## [2.1.3] - October 1, 2021:
+* Update minimum versions of dependencies for Flutter 2.5 compatibility
+* Extended and fixed support for css shadow
+* Fix block tags with explicit whitespace from being stripped
+
+## [2.1.2] - September 2, 2021:
+* Allow setting selectionControls with SelectableHtml
+* Fix onLinkTap not working with SelectableHtml
+* Don't crash when parsing unsupported :hover
+* Prevent endless loading when using animated images
+
+## [2.1.1] - July 28, 2021:
+* Stable release with all 2.1.1-preview.X changes
+
+## [2.1.1-preview.0] - July 27, 2021:
 * Improves hr tag support
 * Fixes a leading whitespace issue
 * Fixes some crashes with CSS parsing

README.md

@@ -98,7 +98,7 @@ A Flutter widget for rendering HTML and CSS as Flutter widgets.
 Add the following to your `pubspec.yaml` file:
 
     dependencies:
-      flutter_html: ^2.1.1
+      flutter_html: ^2.2.1
 
 ## Currently Supported HTML Tags:
 |            |           |       |             |         |         |       |      |        |        |        |
@@ -185,6 +185,7 @@ Once the above issue is resolved, the aforementioned compromises will go away. C
 | `style` | A powerful API that allows you to customize the style that should be used when rendering a specific HTMl tag. |
 | `navigationDelegateForIframe` | Allows you to set the `NavigationDelegate` for the `WebView`s of all the iframes rendered by the `Html` widget. |
 | `customImageRender` | A powerful API that allows you to fully customize how images are loaded. |
+| `selectionControls` |  A custom text selection controls that allow you to override default toolbar and build toolbar with custom text selection options. See an [example](https://github.com/justinmc/flutter-text-selection-menu-examples/blob/master/lib/custom_menu_page.dart). |
 
 ### Getters:
 
@@ -268,13 +269,13 @@ Inner links (such as `<a href="#top">Back to the top</a>` will work out of the b
 
 A powerful API that allows you to customize everything when rendering a specific HTML tag. This means you can change the default behaviour or add support for HTML elements that aren't supported natively. You can also make up your own custom tags in your HTML!
 
-`customRender` accepts a `Map<CustomRenderMatcher, CustomRender>`. 
+`customRender` accepts a `Map<CustomRenderMatcher, CustomRender>`.
 
 `CustomRenderMatcher` is a function that requires a `bool` to be returned. It exposes the `RenderContext` which provides `BuildContext` and access to the HTML tree.
 
 The `CustomRender` class has two constructors: `CustomRender.widget()` and `CustomRender.inlineSpan()`. Both require a `<Widget/InlineSpan> Function(RenderContext, Function())`. The `Function()` argument is a function that will provide you with the element's children when needed.
 
-To use this API, create a matching function and an instance of `CustomRender`. 
+To use this API, create a matching function and an instance of `CustomRender`.
 
 Note: If you add any custom tags, you must add these tags to the [`tagsList`](#tagslist) parameter, otherwise they will not be rendered. See below for an example.
 
@@ -390,7 +391,7 @@ Widget html = Html(
 
 CustomRenderMatcher iframeYT() => (context) => context.tree.element?.attributes['src']?.contains("youtube.com/embed") ?? false;
 
-CustomRenderMatcher iframeOther() => (context) => !(context.tree.element?.attributes['src']?.contains("youtube.com/embed") 
+CustomRenderMatcher iframeOther() => (context) => !(context.tree.element?.attributes['src']?.contains("youtube.com/embed")
   ?? context.tree.element?.attributes['src'] == null);
 
 CustomRenderMatcher iframeNull() => (context) => context.tree.element?.attributes['src'] == null;
@@ -830,7 +831,8 @@ Widget htmlWidget = Html(
         }
       },
     )),
-  }
+  },
+  tagsList: Html.tags..add('tex'),
 );
 
 CustomRenderMatcher texMatcher() => (context) => context.tree.element?.localName == 'tex';

example/README.md

@@ -158,6 +158,7 @@ const htmlData = """
       body: SingleChildScrollView(
         child: Html(
           data: htmlData,
+          tagsList: Html.tags..addAll(["flutter"]),
           //Optional parameters:
           style: {
             "html": Style(

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

example/ios/Podfile.lock

@@ -24,11 +24,11 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/webview_flutter/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
-  wakelock: b0843b2479edbf6504d8d262c2959446f35373aa
+  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b
 
 PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

example/ios/Runner.xcodeproj/project.pbxproj

@@ -335,7 +335,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -414,7 +414,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -463,7 +463,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

example/lib/generated_plugin_registrant.dart

@@ -2,6 +2,7 @@
 // Generated file. Do not edit.
 //
 
+// ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
 
 import 'package:video_player_web/video_player_web.dart';

example/lib/main.dart

@@ -251,6 +251,7 @@ class _MyHomePageState extends State<MyHomePage> {
       body: SingleChildScrollView(
         child: Html(
           data: htmlData,
+          tagsList: Html.tags..addAll(["bird", "flutter"]),
           style: {
             "table": Style(
               backgroundColor: Color.fromARGB(0x50, 0xee, 0xee, 0xee),

lib/flutter_html.dart

@@ -8,7 +8,7 @@ import 'package:flutter_html/image_render.dart';
 import 'package:flutter_html/src/html_elements.dart';
 import 'package:flutter_html/style.dart';
 import 'package:html/dom.dart' as dom;
-import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter_html/src/navigation_delegate.dart';
 
 //export render context api
 export 'package:flutter_html/html_parser.dart';
@@ -25,6 +25,7 @@ export 'package:flutter_html/src/interactable_element.dart';
 export 'package:flutter_html/src/layout_element.dart';
 export 'package:flutter_html/src/replaced_element.dart';
 export 'package:flutter_html/src/styled_element.dart';
+export 'package:flutter_html/src/navigation_delegate.dart';
 //export style api
 export 'package:flutter_html/style.dart';
 
@@ -50,7 +51,7 @@ class Html extends StatelessWidget {
   ///
   /// **onImageTap** This is called whenever an image is tapped.
   ///
-  /// **tagsList** Tag names in this array will be the only tags rendered. By default all tags are rendered.
+  /// **tagsList** Tag names in this array will be the only tags rendered. By default all supported HTML tags are rendered.
   ///
   /// **style** Pass in the style information for the Html here.
   /// See [its wiki page](https://github.com/Sub6Resources/flutter_html/wiki/Style) for more info.
@@ -133,7 +134,7 @@ class Html extends StatelessWidget {
   /// A function that defines what to do when an image is tapped
   final OnTap? onImageTap;
 
-  /// A list of HTML tags that defines what elements are not rendered
+  /// A list of HTML tags that are the only tags that are rendered. By default, this list is empty and all supported HTML tags are rendered.
   final List<String> tagsList;
 
   /// Either return a custom widget for specific node types or return null to
@@ -202,7 +203,7 @@ class SelectableHtml extends StatelessWidget {
   /// **onAnchorTap** This function is called whenever an anchor (#anchor-id)
   /// is tapped.
   ///
-  /// **tagsList** Tag names in this array will be the only tags rendered. By default all tags that support selectable content are rendered.
+  /// **tagsList** Tag names in this array will be the only tags rendered. By default, all tags that support selectable content are rendered.
   ///
   /// **style** Pass in the style information for the Html here.
   /// See [its wiki page](https://github.com/Sub6Resources/flutter_html/wiki/Style) for more info.
@@ -222,6 +223,7 @@ class SelectableHtml extends StatelessWidget {
 
   SelectableHtml({
     Key? key,
+    GlobalKey? anchorKey,
     required this.data,
     this.onLinkTap,
     this.onAnchorTap,
@@ -230,11 +232,16 @@ class SelectableHtml extends StatelessWidget {
     this.style = const {},
     this.customRenders = const {},
     this.tagsList = const [],
+    this.selectionControls,
+    this.scrollPhysics,
   }) : document = null,
+        assert(data != null),
+        _anchorKey = anchorKey ?? GlobalKey(),
         super(key: key);
 
   SelectableHtml.fromDom({
     Key? key,
+    GlobalKey? anchorKey,
     required this.document,
     this.onLinkTap,
     this.onAnchorTap,
@@ -243,9 +250,16 @@ class SelectableHtml extends StatelessWidget {
     this.style = const {},
     this.customRenders = const {},
     this.tagsList = const [],
+    this.selectionControls,
+    this.scrollPhysics,
   }) : data = null,
+        assert(document != null),
+        _anchorKey = anchorKey ?? GlobalKey(),
         super(key: key);
 
+  /// A unique key for this Html widget to ensure uniqueness of anchors
+  final GlobalKey _anchorKey;
+
   /// The HTML data passed to the widget as a String
   final String? data;
 
@@ -266,12 +280,19 @@ class SelectableHtml extends StatelessWidget {
   /// flexible
   final bool shrinkWrap;
 
-  /// A list of HTML tags that defines what elements are not rendered
+  /// A list of HTML tags that are the only tags that are rendered. By default, this list is empty and all supported HTML tags are rendered.
   final List<String> tagsList;
 
   /// An API that allows you to override the default style for any HTML element
   final Map<String, Style> style;
 
+  /// Custom Selection controls allows you to override default toolbar and build custom toolbar
+  /// options
+  final TextSelectionControls? selectionControls;
+
+  /// Allows you to override the default scrollPhysics for [SelectableText.rich]
+  final ScrollPhysics? scrollPhysics;
+
   /// Either return a custom widget for specific node types or return null to
   /// fallback to the default rendering.
   final Map<CustomRenderMatcher, SelectableCustomRender> customRenders;
@@ -286,7 +307,7 @@ class SelectableHtml extends StatelessWidget {
     return Container(
       width: width,
       child: HtmlParser(
-        key: null,
+        key: _anchorKey,
         htmlData: doc,
         onLinkTap: onLinkTap,
         onAnchorTap: onAnchorTap,
@@ -303,6 +324,8 @@ class SelectableHtml extends StatelessWidget {
         imageRenders: defaultImageRenders,
         tagsList: tagsList.isEmpty ? SelectableHtml.tags : tagsList,
         navigationDelegateForIframe: null,
+        selectionControls: selectionControls,
+        scrollPhysics: scrollPhysics,
       ),
     );
   }