flet-webview 0.86.4__tar.gz → 1.0.0.dev0__tar.gz

{flet_webview-0.86.4/src/flet_webview.egg-info → flet_webview-1.0.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-webview
-Version: 0.86.4
+Version: 1.0.0.dev0
 Summary: Embed web content inside Flet apps via WebView.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.86.4
+Requires-Dist: flet==1.0.0.dev0
 Requires-Dist: typing-extensions; python_version < "3.11"
 Dynamic: license-file
 

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-webview"
-version = "0.86.4"
+version = "1.0.0.dev0"
 description = "Embed web content inside Flet apps via WebView."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==0.86.4",
+    "flet==1.0.0.dev0",
     "typing-extensions; python_version < '3.11'",
 ]
 

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/src/flet_webview/webview.py

@@ -30,7 +30,16 @@ class WebView(ft.LayoutControl):
     """
 
     url: Optional[str] = None
-    """The URL of the web page to load."""
+    """
+    The URL of the web page to load.
+
+    Note:
+        A `file://` URL pointing to a local file is supported on the following
+        platforms only: iOS, Android, and macOS. It loads that file's sibling
+        assets (scripts, stylesheets, images) as well, and is equivalent to
+        calling :meth:`load_file` with the same file once this control is
+        mounted. On web, only URLs the browser can load in an iframe work.
+    """
 
     prevent_links: Optional[list[str]] = None
     """List of url-prefixes that should not be followed/loaded/downloaded."""
@@ -296,8 +305,9 @@ class WebView(ft.LayoutControl):
         Makes an HTTP request and loads the response in the webview.
 
         Args:
-            url: The URL to load.
-            method: The HTTP method to use.
+            url: The URL to load. A `file://` URL is loaded as a local file,
+                the same way :meth:`load_file` does.
+            method: The HTTP method to use. Ignored for `file://` URLs.
 
         Note:
             Works only on the following platforms: iOS, Android, and macOS.
@@ -333,6 +343,8 @@ class WebView(ft.LayoutControl):
         Args:
             value: The HTML string to load.
             base_url: The base URL to use when resolving relative URLs within the value.
+                May be a `file://` URL, in which case the referenced local files are
+                made readable to the webview.
         """
         self._check_mobile_or_mac_platform()
         await self._invoke_method(
@@ -383,6 +395,8 @@ class WebView(ft.LayoutControl):
             - Works only on the following platforms: iOS, Android, and macOS.
             - Disabling the JavaScript execution on the page may result to
                 unexpected web page behaviour.
+            - Defaults to :attr:`flet_webview.JavaScriptMode.UNRESTRICTED`,
+                which is applied before the first page load.
 
         Args:
             mode: The JavaScript mode to set.

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0/src/flet_webview.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-webview
-Version: 0.86.4
+Version: 1.0.0.dev0
 Summary: Embed web content inside Flet apps via WebView.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==0.86.4
+Requires-Dist: flet==1.0.0.dev0
 Requires-Dist: typing-extensions; python_version < "3.11"
 Dynamic: license-file
 

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/src/flet_webview.egg-info/SOURCES.txt

@@ -18,4 +18,6 @@ src/flutter/flet_webview/lib/src/webview_web.dart
 src/flutter/flet_webview/lib/src/webview_web_vain.dart
 src/flutter/flet_webview/lib/src/webview_windows_and_linux.dart
 src/flutter/flet_webview/lib/src/webview_windows_and_linux_vain.dart
+src/flutter/flet_webview/lib/src/utils/file_access.dart
+src/flutter/flet_webview/lib/src/utils/file_access_vain.dart
 src/flutter/flet_webview/lib/src/utils/webview.dart

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/src/flet_webview.egg-info/requires.txt

@@ -1,4 +1,4 @@
-flet==0.86.4
+flet==1.0.0.dev0
 
 [:python_version < "3.11"]
 typing-extensions

flet_webview-1.0.0.dev0/src/flutter/flet_webview/lib/src/utils/file_access.dart

@@ -0,0 +1,15 @@
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:webview_flutter_android/webview_flutter_android.dart';
+
+/// Grants the underlying webview permission to read `file://` URLs.
+///
+/// Only Android needs this: `WebSettings.allowFileAccess` defaults to `false`
+/// when the app targets API 30 or above, so local pages fail to load with
+/// `net::ERR_ACCESS_DENIED`. A no-op on every other platform, where the
+/// webview already has access to the app's own container.
+Future<void> allowFileAccess(WebViewController controller) async {
+  final platformController = controller.platform;
+  if (platformController is AndroidWebViewController) {
+    await platformController.setAllowFileAccess(true);
+  }
+}

flet_webview-1.0.0.dev0/src/flutter/flet_webview/lib/src/utils/file_access_vain.dart

@@ -0,0 +1,7 @@
+import 'package:webview_flutter/webview_flutter.dart';
+
+/// Web stub for [allowFileAccess].
+///
+/// `webview_flutter_android` imports `dart:io` and therefore cannot be
+/// compiled for the web, so it is conditionally swapped out for this no-op.
+Future<void> allowFileAccess(WebViewController controller) async {}

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/src/flutter/flet_webview/lib/src/webview_mobile_and_mac.dart

@@ -3,6 +3,9 @@ import 'package:flet_webview/src/utils/webview.dart';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
+import 'utils/file_access_vain.dart'
+    if (dart.library.io) 'utils/file_access.dart';
+
 class WebviewMobileAndMac extends StatefulWidget {
   final Control control;
 
@@ -24,6 +27,28 @@ class _WebviewMobileAndMacState extends State<WebviewMobileAndMac> {
     return links.any((link) => link is String && url.startsWith(link));
   }
 
+  /// Loads [url], routing `file:` URLs through [WebViewController.loadFile].
+  ///
+  /// `loadFile` is the only entry point that grants the platform webview
+  /// access to the local filesystem: on Android it flips
+  /// `WebSettings.allowFileAccess`, which defaults to `false` when targeting
+  /// API 30+, and on iOS/macOS it uses `loadFileURL:allowingReadAccessToURL:`
+  /// so that sibling assets (scripts, stylesheets, images) resolve too.
+  /// A plain `loadRequest` of a `file:` URL fails with
+  /// `net::ERR_ACCESS_DENIED` on Android.
+  Future<void> _load(String url, LoadRequestMethod method) async {
+    var uri = Uri.parse(url);
+    if (uri.scheme == "file") {
+      try {
+        await controller.loadFile(uri.toFilePath());
+        return;
+      } on UnsupportedError catch (e) {
+        debugPrint("WebView: $url is not a valid local file path: $e");
+      }
+    }
+    await controller.loadRequest(uri, method: method);
+  }
+
   void _setOptionalEventHandlers() {
     // macOS currently does not surface scroll callbacks via webview_flutter.
     if (!isMacOSDesktop() &&
@@ -107,11 +132,14 @@ class _WebviewMobileAndMacState extends State<WebviewMobileAndMac> {
       ),
     );
 
-    // request
-    controller.loadRequest(
-        Uri.parse(widget.control.getString("url", "https://flet.dev")!),
-        method: parseLoadRequestMethod(
-            widget.control.getString("method"), LoadRequestMethod.get)!);
+    // Android's WebSettings.javaScriptEnabled defaults to false, unlike
+    // WKWebView and the web platform, so a page would silently run no script
+    // there. Enable it before the first load; `set_javascript_mode` can turn
+    // it back off afterwards.
+    controller.setJavaScriptMode(JavaScriptMode.unrestricted).then((_) => _load(
+        widget.control.getString("url", "https://flet.dev")!,
+        parseLoadRequestMethod(
+            widget.control.getString("method"), LoadRequestMethod.get)!));
 
     _setOptionalEventHandlers();
   }
@@ -158,15 +186,19 @@ class _WebviewMobileAndMacState extends State<WebviewMobileAndMac> {
         await controller.loadFile(args["path"]);
         break;
       case "load_html":
-        await controller.loadHtmlString(args["value"],
-            baseUrl: args["base_url"]);
+        var baseUrl = args["base_url"];
+        if (baseUrl != null && Uri.tryParse(baseUrl)?.scheme == "file") {
+          // Android's loadDataWithBaseURL does not grant file access on its
+          // own, so local sub-resources would be denied.
+          await allowFileAccess(controller);
+        }
+        await controller.loadHtmlString(args["value"], baseUrl: baseUrl);
         break;
       case "load_request":
         var url = args["url"];
         if (url != null) {
-          await controller.loadRequest(Uri.parse(url),
-              method: parseLoadRequestMethod(
-                  args["method"], LoadRequestMethod.get)!);
+          await _load(url,
+              parseLoadRequestMethod(args["method"], LoadRequestMethod.get)!);
         }
         break;
       case "run_javascript":

{flet_webview-0.86.4 → flet_webview-1.0.0.dev0}/src/flutter/flet_webview/pubspec.yaml

@@ -15,6 +15,7 @@ dependencies:
 
   collection: ^1.16.0
   webview_flutter: ^4.13.1
+  webview_flutter_android: ^4.7.0
   webview_flutter_web: 0.2.3+4
   webview_flutter_platform_interface: 2.14.0