flet-webview 0.1.0.dev1__py3-none-any.whl → 0.2.0.dev44__py3-none-any.whl

flutter/flet_webview/lib/src/webview_mobile_and_mac.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flet/flet.dart';
 import 'package:flet_webview/src/utils/webview.dart';
 import 'package:flutter/material.dart';
@@ -7,11 +5,8 @@ import 'package:webview_flutter/webview_flutter.dart';
 
 class WebviewMobileAndMac extends StatefulWidget {
   final Control control;
-  final FletControlBackend backend;
-  final Color? bgcolor;
 
-  const WebviewMobileAndMac(
-      {super.key, required this.control, required this.backend, this.bgcolor});
+  const WebviewMobileAndMac({super.key, required this.control});
 
   @override
   State<WebviewMobileAndMac> createState() => _WebviewMobileAndMacState();
@@ -23,178 +18,169 @@ class _WebviewMobileAndMacState extends State<WebviewMobileAndMac> {
   @override
   void initState() {
     super.initState();
+    widget.control.addInvokeMethodListener(_invokeMethod);
 
     var params = const PlatformWebViewControllerCreationParams();
     controller = WebViewController.fromPlatformCreationParams(params);
 
-    var preventLink = widget.control.attrString("preventLink")?.trim();
-    if (widget.bgcolor != null) {
-      controller.setBackgroundColor(widget.bgcolor!);
-    }
-
     controller.setNavigationDelegate(
       NavigationDelegate(
         onProgress: (int progress) {
-          debugPrint('WebViewControl is loading (progress : $progress%)');
-          widget.backend.triggerControlEvent(
-              widget.control.id, "progress", progress.toString());
+          widget.control.triggerEvent("progress", progress);
         },
         onUrlChange: (UrlChange url) {
-          debugPrint('WebViewControl URL changed: ${url.url}');
-          widget.backend.triggerControlEvent(
-              widget.control.id, "url_change", url.url ?? "");
+          widget.control.triggerEvent("url_change", url.url);
         },
         onPageStarted: (String url) {
-          debugPrint('WebViewControl page started loading: $url');
-          widget.backend
-              .triggerControlEvent(widget.control.id, "page_started", url);
+          widget.control.triggerEvent("page_started", url);
         },
         onPageFinished: (String url) {
-          debugPrint('WebViewControl page finished loading: $url');
-          widget.backend
-              .triggerControlEvent(widget.control.id, "page_ended", url);
+          widget.control.triggerEvent("page_ended", url);
         },
         onWebResourceError: (WebResourceError error) {
-          widget.backend.triggerControlEvent(widget.control.id,
-              "web_resource_error", "WebView error: ${error.description}");
+          widget.control.triggerEvent("web_resource_error", error.description);
         },
         onNavigationRequest: (NavigationRequest request) {
-          if (preventLink != null && request.url.startsWith(preventLink)) {
-            return NavigationDecision.prevent;
-          }
-          return NavigationDecision.navigate;
+          var links = widget.control.get("prevent_link");
+          var prevent = links is List &&
+              links.isNotEmpty &&
+              links.any((l) => request.url.startsWith(l));
+          return prevent
+              ? NavigationDecision.prevent
+              : NavigationDecision.navigate;
         },
       ),
     );
 
+    // request
     controller.loadRequest(
-        Uri.parse(widget.control.attrString("url", "https://flet.dev")!),
+        Uri.parse(widget.control.getString("url", "https://flet.dev")!),
         method: parseLoadRequestMethod(
-            widget.control.attrString("method"), LoadRequestMethod.get)!);
-    controller.setOnScrollPositionChange((ScrollPositionChange position) {
-      widget.backend.triggerControlEvent(
-          widget.control.id,
-          "scroll",
-          jsonEncode({
-            "x": position.x.toString(),
-            "y": position.y.toString(),
-          }));
-    });
+            widget.control.getString("method"), LoadRequestMethod.get)!);
+
+    // scroll
+    if (!isMacOSDesktop()) {
+      controller.setOnScrollPositionChange((ScrollPositionChange position) {
+        widget.control
+            .triggerEvent("scroll", {"x": position.x, "y": position.y});
+      });
+    }
+
+    // console
     controller.setOnConsoleMessage((JavaScriptConsoleMessage message) {
-      widget.backend.triggerControlEvent(
-          widget.control.id,
-          "console_message",
-          jsonEncode({
-            "message": message.message,
-            "level": message.level.name,
-          }));
+      widget.control.triggerEvent("console_message",
+          {"message": message.message, "level": message.level.name});
     });
+
+    // alert
     controller.setOnJavaScriptAlertDialog(
         (JavaScriptAlertDialogRequest request) async {
-      widget.backend.triggerControlEvent(
-          widget.control.id,
-          "javascript_alert_dialog",
-          jsonEncode({
-            "message": request.message,
-            "url": request.url,
-          }));
+      widget.control.triggerEvent("javascript_alert_dialog",
+          {"message": request.message, "url": request.url});
     });
+  }
 
-    // Subscribe to backend methods
-    widget.backend.subscribeMethods(widget.control.id,
-        (methodName, args) async {
-      switch (methodName) {
-        case "reload":
-          await controller.reload();
-          break;
-        case "can_go_back":
-          return controller.canGoBack().toString();
-        case "can_go_forward":
-          return controller.canGoForward().toString();
-        case "go_back":
-          if (await controller.canGoBack()) {
-            await controller.goBack();
-          }
-          break;
-        case "go_forward":
-          if (await controller.canGoForward()) {
-            await controller.goForward();
-          }
-          break;
-        case "enable_zoom":
-          await controller.enableZoom(true);
-          break;
-        case "disable_zoom":
-          await controller.enableZoom(false);
-          break;
-        case "clear_cache":
-          await controller.clearCache();
-          break;
-        case "clear_local_storage":
-          await controller.clearLocalStorage();
-          break;
-        case "get_current_url":
-          return await controller.currentUrl();
-        case "get_title":
-          return await controller.getTitle();
-        case "get_user_agent":
-          return await controller.getUserAgent();
-        case "load_file":
-          var path = args["path"];
-          if (path != null) {
-            await controller.loadFile(path);
-          }
-          break;
-        case "load_html":
-          var html = args["value"];
-          if (html != null) {
-            await controller.loadHtmlString(html, baseUrl: args["base_url"]);
-          }
-          break;
-        case "load_request":
-          var url = args["url"];
-          if (url != null) {
-            await controller.loadRequest(Uri.parse(url),
-                method: parseLoadRequestMethod(
-                    args["method"], LoadRequestMethod.get)!);
-          }
-          break;
-        case "run_javascript":
-          var javascript = args["value"];
-          if (javascript != null) {
-            await controller.runJavaScript(javascript);
-          }
-          break;
-        case "scroll_to":
-          var x = parseInt(args["x"]);
-          var y = parseInt(args["y"]);
-          if (x != null && y != null) {
-            await controller.scrollTo(x, y);
-          }
-          break;
-        case "scroll_by":
-          var x = parseInt(args["x"]);
-          var y = parseInt(args["y"]);
-          if (x != null && y != null) {
-            await controller.scrollBy(x, y);
-          }
-          break;
-        case "set_javascript_mode":
-          var value = parseBool(args["value"]);
-          if (value != null) {
-            await controller.setJavaScriptMode(
-                value ? JavaScriptMode.unrestricted : JavaScriptMode.disabled);
-          }
-          break;
-      }
-      return null;
-    });
+  Future<dynamic> _invokeMethod(String name, dynamic args) async {
+    debugPrint("WebView.$name($args)");
+    switch (name) {
+      case "reload":
+        await controller.reload();
+        break;
+      case "can_go_back":
+        return controller.canGoBack().toString();
+      case "can_go_forward":
+        return controller.canGoForward().toString();
+      case "go_back":
+        if (await controller.canGoBack()) {
+          await controller.goBack();
+        }
+        break;
+      case "go_forward":
+        if (await controller.canGoForward()) {
+          await controller.goForward();
+        }
+        break;
+      case "enable_zoom":
+        await controller.enableZoom(true);
+        break;
+      case "disable_zoom":
+        await controller.enableZoom(false);
+        break;
+      case "clear_cache":
+        await controller.clearCache();
+        break;
+      case "clear_local_storage":
+        await controller.clearLocalStorage();
+        break;
+      case "get_current_url":
+        return await controller.currentUrl();
+      case "get_title":
+        return await controller.getTitle();
+      case "get_user_agent":
+        return await controller.getUserAgent();
+      case "load_file":
+        await controller.loadFile(args["path"]);
+        break;
+      case "load_html":
+        await controller.loadHtmlString(args["value"],
+            baseUrl: args["base_url"]);
+        break;
+      case "load_request":
+        var url = args["url"];
+        if (url != null) {
+          await controller.loadRequest(Uri.parse(url),
+              method: parseLoadRequestMethod(
+                  args["method"], LoadRequestMethod.get)!);
+        }
+        break;
+      case "run_javascript":
+        var javascript = args["value"];
+        if (javascript != null) {
+          await controller.runJavaScript(javascript);
+        }
+        break;
+      case "scroll_to":
+        var x = parseInt(args["x"]);
+        var y = parseInt(args["y"]);
+        if (x != null && y != null) {
+          await controller.scrollTo(x, y);
+        }
+        break;
+      case "scroll_by":
+        var x = parseInt(args["x"]);
+        var y = parseInt(args["y"]);
+        if (x != null && y != null) {
+          await controller.scrollBy(x, y);
+        }
+        break;
+      case "set_javascript_mode":
+        var value = parseBool(args["value"]);
+        if (value != null) {
+          await controller.setJavaScriptMode(
+              value ? JavaScriptMode.unrestricted : JavaScriptMode.disabled);
+        }
+        break;
+      default:
+        throw Exception("Unknown WebView method: $name");
+    }
+  }
+
+  @override
+  void dispose() {
+    debugPrint("WebViewControl dispose: ${widget.control.id}");
+    widget.control.removeInvokeMethodListener(_invokeMethod);
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     debugPrint("WebViewControl build: ${widget.control.id}");
 
+    var bgcolor = widget.control.getColor("bgcolor", context);
+
+    if (bgcolor != null) {
+      controller.setBackgroundColor(bgcolor);
+    }
     return WebViewWidget(controller: controller);
   }
 }

flutter/flet_webview/lib/src/webview_web.dart

@@ -5,9 +5,8 @@ import 'package:webview_flutter_web/webview_flutter_web.dart';
 
 class WebviewWeb extends StatefulWidget {
   final Control control;
-  final FletControlBackend backend;
 
-  const WebviewWeb({super.key, required this.control, required this.backend});
+  const WebviewWeb({super.key, required this.control});
 
   @override
   State<WebviewWeb> createState() => _WebviewWebState();
@@ -25,7 +24,7 @@ class _WebviewWebState extends State<WebviewWeb> {
     )..loadRequest(
         LoadRequestParams(
             uri: Uri.parse(
-                widget.control.attrString("url", "https://flet.dev")!)),
+                widget.control.getString("url", "https://flet.dev")!)),
       );
   }
 

flutter/flet_webview/lib/src/webview_web_vain.dart

@@ -1,16 +1,10 @@
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 
-class WebviewWeb extends StatefulWidget {
+class WebviewWeb extends StatelessWidget {
   final Control control;
-  final FletControlBackend backend;
 
-  const WebviewWeb({super.key, required this.control, required this.backend});
-  @override
-  State<WebviewWeb> createState() => _WebviewWebState();
-}
-
-class _WebviewWebState extends State<WebviewWeb> {
+  const WebviewWeb({super.key, required this.control});
   @override
   Widget build(BuildContext context) {
     return const ErrorControl("Webview is not yet supported on this platform.");

flutter/flet_webview/lib/src/webview_windows_and_linux.dart

@@ -1,16 +1,9 @@
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 
-class WebviewDesktop extends StatefulWidget {
-  final String url;
+class WebviewDesktop extends StatelessWidget {
+  const WebviewDesktop({Key? key}) : super(key: key);
 
-  const WebviewDesktop({Key? key, required this.url}) : super(key: key);
-
-  @override
-  State<WebviewDesktop> createState() => _WebviewDesktopState();
-}
-
-class _WebviewDesktopState extends State<WebviewDesktop> {
   @override
   Widget build(BuildContext context) {
     return const ErrorControl("Webview is not yet supported on this Platform.");

flutter/flet_webview/lib/src/webview_windows_and_linux_vain.dart

@@ -2,9 +2,7 @@ import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 
 class WebviewDesktop extends StatefulWidget {
-  final String url;
-
-  const WebviewDesktop({Key? key, required this.url}) : super(key: key);
+  const WebviewDesktop({Key? key}) : super(key: key);
 
   @override
   State<WebviewDesktop> createState() => _WebviewDesktopState();