[enhanced] v0.9.0

Author: daohoangson

demo_app/lib/screens/font_size.dart

@@ -55,7 +55,7 @@ class _Panel extends StatelessWidget {
                 ],
               ),
               const Divider(),
-              HtmlWidget(
+              const HtmlWidget(
                 '<p style="font-size: 1em">Almost every developer\'s favorite '
                 'molecule is C<sub>8</sub>H<sub>10</sub>N<sub>4</sub>O<sub>2</sub>, '
                 'also known as "caffeine."</p>',

demo_app/lib/screens/golden.dart

@@ -54,12 +54,7 @@ class Golden extends StatelessWidget {
         ),
         LimitedBox(
           maxHeight: 400,
-          child: enhanced.HtmlWidget(
-            html,
-            baseUrl: baseUrl,
-            // ignore: deprecated_member_use
-            webView: true,
-          ),
+          child: enhanced.HtmlWidget(html, baseUrl: baseUrl),
         ),
       ]);
     }

demo_app/lib/screens/hello_world.dart

@@ -159,12 +159,7 @@ class HelloWorldScreen extends StatelessWidget {
         body: SingleChildScrollView(
           child: Padding(
             padding: const EdgeInsets.all(8.0),
-            child: HtmlWidget(
-              kHtml,
-              key: context.key,
-              // ignore: deprecated_member_use
-              webView: true,
-            ),
+            child: HtmlWidget(kHtml, key: context.key),
           ),
         ),
       );

demo_app/lib/screens/huge_html.dart

@@ -5225,9 +5225,9 @@ class _ColumnScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) => Scaffold(
         appBar: AppBar(title: const Text('renderMode: Column')),
-        body: SingleChildScrollView(
+        body: const SingleChildScrollView(
           child: Padding(
-            padding: const EdgeInsets.all(8.0),
+            padding: EdgeInsets.all(8.0),
             child: RepaintBoundary(
               child: HtmlWidget(kHtml),
             ),
@@ -5240,26 +5240,26 @@ class _ListViewScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) => Scaffold(
         appBar: AppBar(title: const Text('renderMode: ListView')),
-        body: Padding(
-          padding: const EdgeInsets.all(8.0),
+        body: const Padding(
+          padding: EdgeInsets.all(8.0),
           child: HtmlWidget(kHtml, renderMode: RenderMode.listView),
         ),
       );
 }
 
 class _SliverListScreen extends StatelessWidget {
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) => const Scaffold(
         body: CustomScrollView(
           slivers: [
-            const SliverAppBar(
+            SliverAppBar(
               title: Text('renderMode: SliverList'),
               floating: true,
               expandedHeight: 200,
               flexibleSpace: Placeholder(),
             ),
             SliverPadding(
-              padding: const EdgeInsets.all(8.0),
+              padding: EdgeInsets.all(8.0),
               sliver: HtmlWidget(kHtml, renderMode: RenderMode.sliverList),
             ),
           ],

demo_app/lib/screens/iframe.dart

@@ -39,7 +39,7 @@ class _State extends State<IframeScreen> {
             CheckboxListTile(
               value: webView,
               onChanged: (v) => setState(() => webView = v),
-              title: HtmlWidget('<var>.webView</var>'),
+              title: const HtmlWidget('<var>.webView</var>'),
               subtitle: const Text('Renders web view, default ❌'),
             ),
             CheckboxListTile(
@@ -50,20 +50,34 @@ class _State extends State<IframeScreen> {
                 }
                 webViewJs = v;
               }),
-              title: HtmlWidget('<var>.webViewJs</var>'),
+              title: const HtmlWidget('<var>.webViewJs</var>'),
               subtitle: const Text('Allows JavaScript execution, default ✅'),
             ),
             Padding(
               padding: const EdgeInsets.all(8.0),
               child: HtmlWidget(
                 html,
-                // ignore: deprecated_member_use
-                webView: webView,
-                // ignore: deprecated_member_use
-                webViewJs: webViewJs,
+                factoryBuilder: () => _WidgetFactory(
+                  webView: webView,
+                  webViewJs: webViewJs,
+                ),
+                rebuildTriggers: RebuildTriggers([webView, webViewJs]),
               ),
             ),
           ],
         ),
       );
 }
+
+class _WidgetFactory extends WidgetFactory {
+  @override
+  final bool webView;
+
+  @override
+  final bool webViewJs;
+
+  _WidgetFactory({
+    @required this.webView,
+    @required this.webViewJs,
+  });
+}

packages/enhanced/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.0
+
+- Requires Flutter 3.3 (#821)
+- Add support for `SelectionArea` (#821)
+- Breaking changes: remove support for web view `HtmlWidget` parameters (#830)
+
 ## 0.8.5
 
 - Improve `IFRAME` error & timer handling (#709)

packages/enhanced/README.md

@@ -27,7 +27,7 @@ Add this to your app's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  flutter_widget_from_html: ^0.8.5
+  flutter_widget_from_html: ^0.9.0
 ```
 
 ### Platform specific configuration

packages/enhanced/lib/src/html_widget.dart

@@ -1,11 +1,6 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'
-    as core show HtmlWidget, RebuildTriggers;
+    as core show HtmlWidget;
 
-import 'data.dart';
-import 'helpers.dart';
 import 'widget_factory.dart';
 
 export 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'
@@ -14,85 +9,26 @@ export 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart
 /// A widget that builds Flutter widget tree from HTML
 /// with support for IFRAME, VIDEO and many other tags.
 class HtmlWidget extends core.HtmlWidget {
-  /// Controls whether IFRAME is rendered as [WebView].
-  ///
-  /// See [WidgetFactory.webView].
-  @Deprecated('Override WidgetFactory.webView instead')
-  final bool webView;
-
-  /// Controls whether debugging is enabled in WebViews.
-  ///
-  /// See [WidgetFactory.webViewDebuggingEnabled].
-  @Deprecated('Override WidgetFactory.webViewDebuggingEnabled instead')
-  final bool webViewDebuggingEnabled;
-
-  /// Controls whether to enable JavaScript in WebViews.
-  ///
-  /// See [WidgetFactory.webViewJs].
-  @Deprecated('Override WidgetFactory.webViewJs instead')
-  final bool webViewJs;
-
-  /// Controls whether to always allow media playback in WebViews.
-  ///
-  /// See [WidgetFactory.webViewMediaPlaybackAlwaysAllow].
-  @Deprecated('Override WidgetFactory.webViewMediaPlaybackAlwaysAllow instead')
-  final bool webViewMediaPlaybackAlwaysAllow;
-
-  /// The value used for the HTTP `User-Agent` request header in WebViews.
-  ///
-  /// See [WidgetFactory.webViewUserAgent].
-  @Deprecated('Override WidgetFactory.webViewUserAgent instead')
-  final String? webViewUserAgent;
-
   /// Creates a widget that builds Flutter widget tree from html.
   ///
   /// The [html] argument must not be null.
-  HtmlWidget(
-    String html, {
-    bool? buildAsync,
-    bool enableCaching = true,
+  const HtmlWidget(
+    super.html, {
+    super.buildAsync,
+    bool super.enableCaching = true,
     WidgetFactory Function()? factoryBuilder,
-    Key? key,
-    Uri? baseUrl,
-    CustomStylesBuilder? customStylesBuilder,
-    CustomWidgetBuilder? customWidgetBuilder,
-    OnErrorBuilder? onErrorBuilder,
-    OnLoadingBuilder? onLoadingBuilder,
-    void Function(ImageMetadata)? onTapImage,
-    FutureOr<bool> Function(String)? onTapUrl,
-    core.RebuildTriggers? rebuildTriggers,
-    RenderMode renderMode = RenderMode.column,
-    TextStyle? textStyle,
-    @Deprecated('Override WidgetFactory.webView instead') this.webView = false,
-    @Deprecated('Override WidgetFactory.webViewDebuggingEnabled instead')
-        this.webViewDebuggingEnabled = false,
-    @Deprecated('Override WidgetFactory.webViewJs instead')
-        this.webViewJs = true,
-    @Deprecated('Override WidgetFactory.webViewMediaPlaybackAlwaysAllow')
-        this.webViewMediaPlaybackAlwaysAllow = false,
-    @Deprecated('Override WidgetFactory.webViewUserAgent instead')
-        this.webViewUserAgent,
-  }) : super(
-          html,
-          baseUrl: baseUrl,
-          buildAsync: buildAsync,
-          customStylesBuilder: customStylesBuilder,
-          customWidgetBuilder: customWidgetBuilder,
-          enableCaching: enableCaching,
-          factoryBuilder: factoryBuilder ?? _getEnhancedWf,
-          onErrorBuilder: onErrorBuilder,
-          onLoadingBuilder: onLoadingBuilder,
-          onTapImage: onTapImage,
-          onTapUrl: onTapUrl,
-          rebuildTriggers: core.RebuildTriggers([
-            webView,
-            webViewJs,
-            if (rebuildTriggers != null) rebuildTriggers,
-          ]),
-          renderMode: renderMode,
-          textStyle: textStyle,
-          key: key,
-        );
+    super.key,
+    super.baseUrl,
+    super.customStylesBuilder,
+    super.customWidgetBuilder,
+    super.onErrorBuilder,
+    super.onLoadingBuilder,
+    super.onTapImage,
+    super.onTapUrl,
+    super.rebuildTriggers,
+    super.renderMode,
+    super.textStyle,
+  }) : super(factoryBuilder: factoryBuilder ?? _getEnhancedWf);
 
   static WidgetFactory _getEnhancedWf() => WidgetFactory();
 }

packages/enhanced/lib/src/widget_factory.dart

@@ -1,6 +1,3 @@
-// ignore_for_file: deprecated_member_use_from_same_package
-
-import 'package:flutter/widgets.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'
     as core show WidgetFactory;
 import 'package:fwfh_cached_network_image/fwfh_cached_network_image.dart';
@@ -10,8 +7,6 @@ import 'package:fwfh_svg/fwfh_svg.dart';
 import 'package:fwfh_url_launcher/fwfh_url_launcher.dart';
 import 'package:fwfh_webview/fwfh_webview.dart';
 
-import 'html_widget.dart';
-
 /// A factory to build widgets with [WebView], [VideoPlayer], etc.
 class WidgetFactory extends core.WidgetFactory
     with
@@ -20,30 +15,4 @@ class WidgetFactory extends core.WidgetFactory
         JustAudioFactory,
         SvgFactory,
         UrlLauncherFactory,
-        WebViewFactory {
-  HtmlWidget? _widget;
-
-  @override
-  bool get webView => _widget?.webView == true;
-
-  @override
-  bool get webViewDebuggingEnabled => _widget?.webViewDebuggingEnabled == true;
-
-  @override
-  bool get webViewJs => _widget?.webViewJs == true;
-
-  @override
-  bool get webViewMediaPlaybackAlwaysAllow =>
-      _widget?.webViewMediaPlaybackAlwaysAllow == true;
-
-  @override
-  String? get webViewUserAgent => _widget?.webViewUserAgent;
-
-  @override
-  void reset(State state) {
-    final widget = state.widget;
-    _widget = widget is HtmlWidget ? widget : null;
-
-    super.reset(state);
-  }
-}
+        WebViewFactory {}

packages/enhanced/pubspec.yaml

@@ -1,11 +1,11 @@
 name: flutter_widget_from_html
-version: 0.8.5
+version: 0.9.0
 description: Flutter package to render html as widgets that supports hyperlink, image, audio, video, iframe and many other tags.
 homepage: https://github.com/daohoangson/flutter_widget_from_html
 
 environment:
-  flutter: ">=2.8.0"
-  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=3.3.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   flutter: