Merge remote-tracking branch 'origin/master' into feature/modularization

# Conflicts:
#	README.md
#	example/lib/main.dart
#	lib/flutter_html.dart
#	lib/html_parser.dart
#	lib/image_render.dart
#	lib/src/html_elements.dart
#	lib/src/layout_element.dart
#	lib/src/replaced_element.dart
#	lib/src/utils.dart
#	lib/src/widgets/iframe_mobile.dart
#	lib/src/widgets/iframe_unsupported.dart
#	lib/src/widgets/iframe_web.dart
#	pubspec.yaml
#	test/html_parser_test.dart

Author: tneotia

CHANGELOG.md

@@ -1,3 +1,66 @@
+## [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
+
+## [2.1.0] - June 3, 2021:
+* SelectableHtml widget (supporting a subset of tags) which allow text selection
+* Fixed shrinkWrap to actually shrink the horizontal space
+* Support style tags to apply styling from inline css
+* Support applying styles from Flutter themes
+* Mouse hover on links when using Flutter Web
+* Allow custom anchor link tap implementations
+* Support additional list styling options
+* Fix several minor whitespace issues in text flow
+* Fixed specific colspan/rowspan usages in tables
+* Fixed whitespace issues around images
+* Swallow duplicate ids to prevent crashing the widget
+* Fixes crashing tap detection when using both link and image taps
+* Updates external dependencies
+* Raised minimum Flutter version to 2.2.0
+
 ## [2.0.0] - April 29, 2021:
 * Stable release with all 2.0.0-nullsafety.X changes
 

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/README.md

@@ -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/Flutter/AppFrameworkInfo.plist

@@ -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/Podfile.lock

@@ -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/ios/Runner.xcodeproj/project.pbxproj

@@ -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/generated_plugin_registrant.dart

@@ -104,9 +104,11 @@ const htmlData = r"""
             <li>a</li>
             <li>nested</li>
             <li>unordered
-            <ol>
+            <ol style="list-style-type: lower-alpha;" start="5">
             <li>With a nested</li>
-            <li>ordered list.</li>
+            <li>ordered list</li>
+            <li>with a lower alpha list style</li>
+            <li>starting at letter e</li>
             </ol>
             </li>
             <li>list</li>
@@ -269,23 +271,23 @@ class _MyHomePageState extends State<MyHomePage> {
           },
           tagsList: Html.tags..addAll(['tex', 'bird', 'flutter']),
           customRenders: {
-            texMatcher(): CustomRender.fromWidget(widget: (context, buildChildren) => Math.tex(
+            tagMatcher("tex"): CustomRender.widget(widget: (context, buildChildren) => Math.tex(
               context.tree.element?.innerHtml ?? '',
               mathStyle: MathStyle.display,
               textStyle: context.style.generateTextStyle(),
               onErrorFallback: (FlutterMathException e) {
                 return Text(e.message);
               },
             )),
-            birdMatcher(): CustomRender.fromInlineSpan(inlineSpan: (context, buildChildren) => TextSpan(text: "🐦")),
-            flutterMatcher(): CustomRender.fromWidget(widget: (context, buildChildren) => FlutterLogo(
+            tagMatcher("bird"): CustomRender.inlineSpan(inlineSpan: (context, buildChildren) => TextSpan(text: "🐦")),
+            tagMatcher("flutter"): CustomRender.widget(widget: (context, buildChildren) => FlutterLogo(
               style: (context.tree.element!.attributes['horizontal'] != null)
                   ? FlutterLogoStyle.horizontal
                   : FlutterLogoStyle.markOnly,
               textColor: context.style.color!,
               size: context.style.fontSize!.size! * 5,
             )),
-            tableMatcher(): CustomRender.fromWidget(widget: (context, buildChildren) => SingleChildScrollView(
+            tagMatcher("table"): CustomRender.widget(widget: (context, buildChildren) => SingleChildScrollView(
               scrollDirection: Axis.horizontal,
               child: tableRender.call().widget!.call(context, buildChildren),
             )),

example/lib/main.dart

@@ -1,6 +1,6 @@
 name: example
 description: flutter_html example app.
-
+publish_to: none
 version: 1.0.0+1
 
 environment: