From e0e72b6f93516a125596eba9077c6832e375c73c Mon Sep 17 00:00:00 2001
From: Mark Fransen <swiftymf@gmail.com>
Date: Tue, 28 Jan 2025 17:42:26 -0800
Subject: [PATCH 1/3] Allow srcdoc and point dependencies to itself (#1)

* Update pubspec to point to this repo/branch

* Update imports for each package to point to the internal packages and
not the git repo
---
 example/pubspec.yaml                          |  9 +++----
 packages/flutter_html_all/pubspec.yaml        | 24 ++++++++++++-------
 packages/flutter_html_audio/pubspec.yaml      |  8 ++++---
 .../lib/iframe_mobile.dart                    | 13 ++++++++++
 packages/flutter_html_iframe/pubspec.yaml     |  8 ++++---
 packages/flutter_html_math/pubspec.yaml       |  8 ++++---
 packages/flutter_html_svg/pubspec.yaml        |  8 ++++---
 packages/flutter_html_table/pubspec.yaml      |  8 ++++---
 packages/flutter_html_video/pubspec.yaml      | 10 ++++----
 9 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 71e0332d40..98f526d07a 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -4,13 +4,11 @@ publish_to: none
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   flutter_html:
-    path: ..
-  flutter_html_all:
-    path: ../packages/flutter_html_all
+    path: ../
   flutter:
     sdk: flutter
 
@@ -20,9 +18,8 @@ dev_dependencies:
   flutter_lints: ^2.0.1
 
 flutter:
-
   uses-material-design: true
 
   assets:
     - assets/html5.png
-    - assets/mac.svg
\ No newline at end of file
+    - assets/mac.svg
diff --git a/packages/flutter_html_all/pubspec.yaml b/packages/flutter_html_all/pubspec.yaml
index ae6a082b17..998cb01cd6 100644
--- a/packages/flutter_html_all/pubspec.yaml
+++ b/packages/flutter_html_all/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_all
 description: All optional flutter_html widgets, bundled into a single package.
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.12.0 <4.0.0"
@@ -10,14 +11,21 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  flutter_html_audio: ^3.0.0-beta.2
-  flutter_html_iframe: ^3.0.0-beta.2
-  flutter_html_math: ^3.0.0-beta.2
-  flutter_html_svg: ^3.0.0-beta.2
-  flutter_html_table: ^3.0.0-beta.2
-  flutter_html_video: ^3.0.0-beta.2
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  flutter_html_audio:
+    path: ../flutter_html_audio
+  flutter_html_iframe:
+    path: ../flutter_html_iframe
+  flutter_html_math:
+    path: ../flutter_html_math
+  flutter_html_svg:
+    path: ../flutter_html_svg
+  flutter_html_table:
+    path: ../flutter_html_table
+  flutter_html_video:
+    path: ../flutter_html_video
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_html_audio/pubspec.yaml b/packages/flutter_html_audio/pubspec.yaml
index 3c414a36f1..b1085a89b1 100644
--- a/packages/flutter_html_audio/pubspec.yaml
+++ b/packages/flutter_html_audio/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_audio
 description: This extension package allows the <audio> tag to be rendered using the flutter_html package
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.12.0 <4.0.0"
@@ -10,9 +11,10 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  video_player: '>=2.2.8 <3.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  video_player: ">=2.2.8 <3.0.0"
   chewie_audio: ^1.5.0
 
 dev_dependencies:
diff --git a/packages/flutter_html_iframe/lib/iframe_mobile.dart b/packages/flutter_html_iframe/lib/iframe_mobile.dart
index 9c73e65cba..c40a72ac7e 100644
--- a/packages/flutter_html_iframe/lib/iframe_mobile.dart
+++ b/packages/flutter_html_iframe/lib/iframe_mobile.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -34,6 +36,17 @@ class IframeWidget extends StatelessWidget {
     final givenHeight =
         double.tryParse(extensionContext.attributes['height'] ?? "");
 
+    Uri? srcUri;
+    if (extensionContext.attributes['srcdoc'] != null) {
+      srcUri = Uri.dataFromString(
+        extensionContext.attributes['srcdoc'] ?? '',
+        mimeType: 'text/html',
+        encoding: Encoding.getByName('utf-8'),
+      );
+    } else {
+      srcUri = Uri.tryParse(extensionContext.attributes['src'] ?? "") ?? Uri();
+    }
+
     return SizedBox(
       width: givenWidth ?? (givenHeight ?? 150) * 2,
       height: givenHeight ?? (givenWidth ?? 300) / 2,
diff --git a/packages/flutter_html_iframe/pubspec.yaml b/packages/flutter_html_iframe/pubspec.yaml
index a9828a2e9c..0c07afae0c 100644
--- a/packages/flutter_html_iframe/pubspec.yaml
+++ b/packages/flutter_html_iframe/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_iframe
 description: This extension package allows the <iframe> tag to be rendered using the flutter_html package
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.12.0 <4.0.0"
@@ -10,9 +11,10 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  webview_flutter: '>=4.0.0 <5.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  webview_flutter: ">=4.0.0 <5.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_html_math/pubspec.yaml b/packages/flutter_html_math/pubspec.yaml
index 375538de19..2b1a3ef81b 100644
--- a/packages/flutter_html_math/pubspec.yaml
+++ b/packages/flutter_html_math/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_math
 description: This extension package allows the <math> tag to be rendered using the flutter_html package
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.12.0 <4.0.0"
@@ -10,9 +11,10 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  flutter_math_fork: '>=0.6.0 <1.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  flutter_math_fork: ">=0.6.0 <1.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_html_svg/pubspec.yaml b/packages/flutter_html_svg/pubspec.yaml
index 200fc08cb0..f00862a292 100644
--- a/packages/flutter_html_svg/pubspec.yaml
+++ b/packages/flutter_html_svg/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_svg
 description: This extension package allows the <svg> tag and svg-based img sources to be rendered using the flutter_html package
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.17.0 <4.0.0"
@@ -10,9 +11,10 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  flutter_svg: '>=1.0.0 <3.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  flutter_svg: ">=1.0.0 <3.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_html_table/pubspec.yaml b/packages/flutter_html_table/pubspec.yaml
index 7a78b11386..01e4d7f9c0 100644
--- a/packages/flutter_html_table/pubspec.yaml
+++ b/packages/flutter_html_table/pubspec.yaml
@@ -3,6 +3,7 @@ description: This extension package allows the <table> tag to be rendered using
 
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.17.0 <4.0.0"
@@ -11,9 +12,10 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  flutter_layout_grid: '>=1.0.1 <3.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  flutter_layout_grid: ">=1.0.1 <3.0.0"
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_html_video/pubspec.yaml b/packages/flutter_html_video/pubspec.yaml
index 4eb4a7a7c0..7234010388 100644
--- a/packages/flutter_html_video/pubspec.yaml
+++ b/packages/flutter_html_video/pubspec.yaml
@@ -2,6 +2,7 @@ name: flutter_html_video
 description: This extension package allows the <video> tag to be rendered using the flutter_html package
 version: 3.0.0-beta.2
 homepage: https://github.com/Sub6Resources/flutter_html
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.12.0 <4.0.0"
@@ -10,10 +11,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: '>=0.15.0 <1.0.0'
-  flutter_html: ^3.0.0-beta.2
-  video_player: '>=2.2.8 <3.0.0'
-  chewie: '>=1.1.0 <2.0.0'
+  html: ">=0.15.0 <1.0.0"
+  flutter_html:
+    path: ../..
+  video_player: ">=2.2.8 <3.0.0"
+  chewie: ">=1.1.0 <2.0.0"
 
 dev_dependencies:
   flutter_test:

From 231a5841feb69d99f3ae3519d8adb33d43b6bf3a Mon Sep 17 00:00:00 2001
From: chillbrodev <jon@uptechstudio.com>
Date: Fri, 11 Jul 2025 15:17:27 -0700
Subject: [PATCH 2/3] [flutter_html_iframe] Fix compile error in Flutter 3.32.0

- correct conditional imports: use dart.library.js_interop instead of dart.library.html
- remove ui_fake classes, it is legacy implementation and should be replaced by web_ui package

This was kinda fixed in a PR
https://github.com/Sub6Resources/flutter_html/pull/1485
---
 .fvmrc                                        |  3 ++
 .gitignore                                    |  5 ++-
 .../Flutter/ephemeral/flutter_lldb_helper.py  | 32 +++++++++++++++++++
 .../ios/Flutter/ephemeral/flutter_lldbinit    |  5 +++
 .../Flutter/GeneratedPluginRegistrant.swift   |  2 --
 lib/src/css_parser.dart                       |  8 ++---
 lib/src/style.dart                            | 12 +++----
 .../lib/flutter_html_iframe.dart              |  2 +-
 .../flutter_html_iframe/lib/iframe_web.dart   | 10 +++---
 .../lib/shims/dart_ui.dart                    | 10 ------
 .../lib/shims/dart_ui_fake.dart               | 19 -----------
 .../lib/shims/dart_ui_real.dart               |  5 ---
 packages/flutter_html_iframe/pubspec.yaml     |  4 +--
 .../flutter_html_svg/test/test_utils.dart     |  2 +-
 14 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 .fvmrc
 create mode 100644 example/ios/Flutter/ephemeral/flutter_lldb_helper.py
 create mode 100644 example/ios/Flutter/ephemeral/flutter_lldbinit
 delete mode 100644 packages/flutter_html_iframe/lib/shims/dart_ui.dart
 delete mode 100644 packages/flutter_html_iframe/lib/shims/dart_ui_fake.dart
 delete mode 100644 packages/flutter_html_iframe/lib/shims/dart_ui_real.dart

diff --git a/.fvmrc b/.fvmrc
new file mode 100644
index 0000000000..7d2a608dfa
--- /dev/null
+++ b/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.32.6"
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 188d2e1fa5..3734711996 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,4 +156,7 @@ packages/**/pubspec_overrides.yaml
 ./pubspec_overrides.yaml
 /example/pubspec_overrides.yaml
 
-coverage/
\ No newline at end of file
+coverage/
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/example/ios/Flutter/ephemeral/flutter_lldb_helper.py b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py
new file mode 100644
index 0000000000..a88caf99df
--- /dev/null
+++ b/example/ios/Flutter/ephemeral/flutter_lldb_helper.py
@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")
diff --git a/example/ios/Flutter/ephemeral/flutter_lldbinit b/example/ios/Flutter/ephemeral/flutter_lldbinit
new file mode 100644
index 0000000000..e3ba6fbedc
--- /dev/null
+++ b/example/ios/Flutter/ephemeral/flutter_lldbinit
@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py
diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 1c2c9b0787..cccf817a52 100644
--- a/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,8 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import wakelock_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
 }
diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
index c0fcf02f8b..6255a335de 100644
--- a/lib/src/css_parser.dart
+++ b/lib/src/css_parser.dart
@@ -671,10 +671,8 @@ Style? inlineCssToStyle(String? inlineStyle, OnCssParseError? errorHandler) {
     return declarationsToStyle(declarations["*"]!);
   } else if (errorHandler != null) {
     String? newCss = errorHandler.call(inlineStyle ?? "", errors);
-    if (newCss != null) {
-      return inlineCssToStyle(newCss, errorHandler);
+    return inlineCssToStyle(newCss, errorHandler);
     }
-  }
   return null;
 }
 
@@ -689,10 +687,8 @@ Map<String, Map<String, List<css.Expression>>> parseExternalCss(
     return DeclarationVisitor().getDeclarations(sheet);
   } else if (errorHandler != null) {
     String? newCss = errorHandler.call(css, errors);
-    if (newCss != null) {
-      return parseExternalCss(newCss, errorHandler);
+    return parseExternalCss(newCss, errorHandler);
     }
-  }
   return {};
 }
 
diff --git a/lib/src/style.dart b/lib/src/style.dart
index 004b32f4e7..6c6a68cd03 100644
--- a/lib/src/style.dart
+++ b/lib/src/style.dart
@@ -561,10 +561,8 @@ class Style {
 extension _MarginRelativeValues on Margin {
   Margin? getRelativeValue(double remValue, double emValue) {
     double? calculatedValue = calculateRelativeValue(remValue, emValue);
-    if (calculatedValue != null) {
-      return Margin(calculatedValue);
-    }
-
+    return Margin(calculatedValue);
+  
     return null;
   }
 }
@@ -572,10 +570,8 @@ extension _MarginRelativeValues on Margin {
 extension _PaddingRelativeValues on HtmlPadding {
   HtmlPadding? getRelativeValue(double remValue, double emValue) {
     double? calculatedValue = calculateRelativeValue(remValue, emValue);
-    if (calculatedValue != null) {
-      return HtmlPadding(calculatedValue);
-    }
-
+    return HtmlPadding(calculatedValue);
+  
     return null;
   }
 }
diff --git a/packages/flutter_html_iframe/lib/flutter_html_iframe.dart b/packages/flutter_html_iframe/lib/flutter_html_iframe.dart
index 18ff5dead8..8d4cf66341 100644
--- a/packages/flutter_html_iframe/lib/flutter_html_iframe.dart
+++ b/packages/flutter_html_iframe/lib/flutter_html_iframe.dart
@@ -6,7 +6,7 @@ import 'package:webview_flutter/webview_flutter.dart';
 
 import 'iframe_unsupported.dart'
     if (dart.library.io) 'iframe_mobile.dart'
-    if (dart.library.html) 'iframe_web.dart';
+    if (dart.library.js_interop) 'iframe_web.dart';
 
 class IframeHtmlExtension extends HtmlExtension {
   final NavigationDelegate? navigationDelegate;
diff --git a/packages/flutter_html_iframe/lib/iframe_web.dart b/packages/flutter_html_iframe/lib/iframe_web.dart
index 3751c87a71..fca84f859c 100644
--- a/packages/flutter_html_iframe/lib/iframe_web.dart
+++ b/packages/flutter_html_iframe/lib/iframe_web.dart
@@ -1,11 +1,11 @@
 import 'dart:convert';
 import 'dart:math';
+import 'package:web/web.dart' as web;
+import 'dart:ui_web' as ui_web;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_html_iframe/shims/dart_ui.dart' as ui;
 // ignore: avoid_web_libraries_in_flutter
-import 'dart:html' as html;
 
 import 'package:webview_flutter/webview_flutter.dart';
 
@@ -25,13 +25,13 @@ class IframeWidget extends StatelessWidget {
         double.tryParse(extensionContext.attributes['width'] ?? "");
     final givenHeight =
         double.tryParse(extensionContext.attributes['height'] ?? "");
-    final html.IFrameElement iframe = html.IFrameElement()
+    final web.HTMLIFrameElement iframe = web.HTMLIFrameElement()
       ..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString()
       ..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString()
-      ..src = extensionContext.attributes['src']
+      ..src = extensionContext.attributes['src'] ?? ''
       ..style.border = 'none';
     final String createdViewId = _getRandString(10);
-    ui.platformViewRegistry
+    ui_web.platformViewRegistry
         .registerViewFactory(createdViewId, (int viewId) => iframe);
     return SizedBox(
       width: double.tryParse(extensionContext.attributes['width'] ?? "") ??
diff --git a/packages/flutter_html_iframe/lib/shims/dart_ui.dart b/packages/flutter_html_iframe/lib/shims/dart_ui.dart
deleted file mode 100644
index bce4ad1b17..0000000000
--- a/packages/flutter_html_iframe/lib/shims/dart_ui.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2019 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/// This file shims dart:ui in web-only scenarios, getting rid of the need to
-/// suppress analyzer warnings.
-
-// TODO: flutter/flutter#55000 Remove this file once web-only dart:ui APIs
-// are exposed from a dedicated place.
-export 'dart_ui_fake.dart' if (dart.library.html) 'dart_ui_real.dart';
diff --git a/packages/flutter_html_iframe/lib/shims/dart_ui_fake.dart b/packages/flutter_html_iframe/lib/shims/dart_ui_fake.dart
deleted file mode 100644
index 4e528a7337..0000000000
--- a/packages/flutter_html_iframe/lib/shims/dart_ui_fake.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2019 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Fake interface for the logic that this package needs from (web-only) dart:ui.
-// This is conditionally exported so the analyzer sees these methods as available.
-
-/// Shim for web_ui engine.PlatformViewRegistry
-/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L62
-// ignore: camel_case_types
-class platformViewRegistry {
-  /// Shim for registerViewFactory
-  /// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L72
-  static void registerViewFactory(
-      String viewTypeId, dynamic Function(int viewId) viewFactory) {}
-}
-
-/// Signature of callbacks that have no arguments and return no data.
-typedef VoidCallback = void Function();
diff --git a/packages/flutter_html_iframe/lib/shims/dart_ui_real.dart b/packages/flutter_html_iframe/lib/shims/dart_ui_real.dart
deleted file mode 100644
index 90ecd7d002..0000000000
--- a/packages/flutter_html_iframe/lib/shims/dart_ui_real.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2019 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export 'dart:ui';
diff --git a/packages/flutter_html_iframe/pubspec.yaml b/packages/flutter_html_iframe/pubspec.yaml
index 0c07afae0c..8021e7ae0f 100644
--- a/packages/flutter_html_iframe/pubspec.yaml
+++ b/packages/flutter_html_iframe/pubspec.yaml
@@ -11,9 +11,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: ">=0.15.0 <1.0.0"
   flutter_html:
     path: ../..
+  web: ^1.1.1
   webview_flutter: ">=4.0.0 <5.0.0"
 
 dev_dependencies:
@@ -29,4 +29,4 @@ topics:
   - css
   - iframe
   - layout
-  - flutter_html
+  - web
diff --git a/packages/flutter_html_svg/test/test_utils.dart b/packages/flutter_html_svg/test/test_utils.dart
index 7660238893..32370bd4c7 100644
--- a/packages/flutter_html_svg/test/test_utils.dart
+++ b/packages/flutter_html_svg/test/test_utils.dart
@@ -14,7 +14,7 @@ const svgString = '''
 </svg>
 ''';
 final String svgEncoded = Uri.encodeFull(svgString);
-final svgBase64 = base64Encode(utf8.encode(svgString) as Uint8List);
+final svgBase64 = base64Encode(utf8.encode(svgString));
 
 class FakeAssetBundle extends Fake implements AssetBundle {
   @override

From ecf972e2290a56d0be2bf24ee6dec7e65d920467 Mon Sep 17 00:00:00 2001
From: Mark Fransen <swiftymf@gmail.com>
Date: Wed, 16 Jul 2025 12:16:13 -0700
Subject: [PATCH 3/3] Add null check in style.dart and css_parser.dart

---
 lib/src/css_parser.dart | 8 ++++++--
 lib/src/style.dart      | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
index 6255a335de..c0fcf02f8b 100644
--- a/lib/src/css_parser.dart
+++ b/lib/src/css_parser.dart
@@ -671,8 +671,10 @@ Style? inlineCssToStyle(String? inlineStyle, OnCssParseError? errorHandler) {
     return declarationsToStyle(declarations["*"]!);
   } else if (errorHandler != null) {
     String? newCss = errorHandler.call(inlineStyle ?? "", errors);
-    return inlineCssToStyle(newCss, errorHandler);
+    if (newCss != null) {
+      return inlineCssToStyle(newCss, errorHandler);
     }
+  }
   return null;
 }
 
@@ -687,8 +689,10 @@ Map<String, Map<String, List<css.Expression>>> parseExternalCss(
     return DeclarationVisitor().getDeclarations(sheet);
   } else if (errorHandler != null) {
     String? newCss = errorHandler.call(css, errors);
-    return parseExternalCss(newCss, errorHandler);
+    if (newCss != null) {
+      return parseExternalCss(newCss, errorHandler);
     }
+  }
   return {};
 }
 
diff --git a/lib/src/style.dart b/lib/src/style.dart
index 6c6a68cd03..4a7956d43b 100644
--- a/lib/src/style.dart
+++ b/lib/src/style.dart
@@ -561,7 +561,9 @@ class Style {
 extension _MarginRelativeValues on Margin {
   Margin? getRelativeValue(double remValue, double emValue) {
     double? calculatedValue = calculateRelativeValue(remValue, emValue);
-    return Margin(calculatedValue);
+    if (calculatedValue != null) {
+        return Margin(calculatedValue);
+    }
   
     return null;
   }
@@ -570,8 +572,9 @@ extension _MarginRelativeValues on Margin {
 extension _PaddingRelativeValues on HtmlPadding {
   HtmlPadding? getRelativeValue(double remValue, double emValue) {
     double? calculatedValue = calculateRelativeValue(remValue, emValue);
-    return HtmlPadding(calculatedValue);
-  
+    if (calculatedValue != null) {
+      return HtmlPadding(calculatedValue);
+    }
     return null;
   }
 }