Added InAppBrowser.onMainWindowWillClose event, Added WindowType.WIND…

…OW for InAppWebViewSettings.windowType, fix #1738, Fixed InAppWebViewController.callAsyncJavaScript Android-issue when the last line of the functionBody parameter includes a code comment

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

dev_packages/flutter_inappwebview_internal_annotations/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.0.0-rc.1
+
+- Updated minimum platform interface and implementation versions
+- Added `InAppBrowser.onMainWindowWillClose` event
+- Added `WindowType.WINDOW` for `InAppWebViewSettings.windowType`
+- Fixed "Cloudflare Turnstile failure" [#1738](https://github.com/pichillilorenzo/flutter_inappwebview/issues/1738)
+- Fixed `InAppWebViewController.callAsyncJavaScript` Android-issue when the last line of the `functionBody` parameter includes a code comment
+
+### BREAKING CHANGES
+
+- Default value of `InAppWebViewSettings.windowType` is `WindowType.WINDOW`
+
 ## 6.0.0-beta.32
 
 - Updated minimum platform interface and implementation versions
@@ -17,7 +29,7 @@
 - Fixed "onClosed not considering back navigation or up button / close button in ChromeSafariBrowser when using noHistory: true" [#1882](https://github.com/pichillilorenzo/flutter_inappwebview/issues/1882)
 - Merged "Fixed error in InterceptAjaxRequestJS 'Failed to set responseType property'" [#1904](https://github.com/pichillilorenzo/flutter_inappwebview/pull/1904) (thanks to [EArminjon](https://github.com/EArminjon))
 
-### BREAKING CHANGE
+### BREAKING CHANGES
 
 - Due to Flutter platform channels async nature, using `useShouldInterceptAjaxRequest: true` would break sync ajax requests, so that the `XMLHttpRequest.send()` will not wait for the response. To fix this issue, the default value of `InAppWebViewSettings.interceptOnlyAsyncAjaxRequests` is `true`. To intercept also sync ajax requests, this value should be `false`.
 

flutter_inappwebview/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview/example/integration_test/in_app_webview/on_received_icon.dart

@@ -26,7 +26,9 @@ void onReceivedIcon() {
             pageLoaded.complete();
           },
           onReceivedIcon: (controller, icon) {
-            onReceivedIconCompleter.complete(icon);
+            if (!onReceivedIconCompleter.isCompleted) {
+              onReceivedIconCompleter.complete(icon);
+            }
           },
         ),
       ),

flutter_inappwebview/example/lib/in_app_browser_example.screen.dart

@@ -61,6 +61,10 @@ class MyInAppBrowser extends InAppBrowser {
     print("\n\nOverride ${navigationAction.request.url}\n\n");
     return NavigationActionPolicy.ALLOW;
   }
+
+  void onMainWindowWillClose() {
+    close();
+  }
 }
 
 class InAppBrowserExampleScreen extends StatefulWidget {

flutter_inappwebview/example/lib/in_app_webiew_example.screen.dart

@@ -116,7 +116,7 @@ class _InAppWebViewExampleScreenState extends State<InAppWebViewExampleScreen> {
                 InAppWebView(
                   key: webViewKey,
                   initialUrlRequest:
-                      URLRequest(url: WebUri('https://flutter.dev')),
+                      URLRequest(url: WebUri('https://google.com')),
                   // initialUrlRequest:
                   // URLRequest(url: WebUri(Uri.base.toString().replaceFirst("/#/", "/") + 'page.html')),
                   // initialFile: "assets/index.html",

flutter_inappwebview/lib/src/in_app_browser/in_app_browser.dart

@@ -538,4 +538,7 @@ class InAppBrowser implements PlatformInAppBrowserEvents {
       NavigationAction navigationAction) {
     return null;
   }
+
+  @override
+  void onMainWindowWillClose() {}
 }

flutter_inappwebview/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
-version: 6.0.0-beta.32
+version: 6.0.0-rc.1
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -18,11 +18,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.0.6
-  flutter_inappwebview_android: ^1.0.8
-  flutter_inappwebview_ios: ^1.0.9
-  flutter_inappwebview_macos: ^1.0.7
-  flutter_inappwebview_web: ^1.0.4
+  flutter_inappwebview_platform_interface: ^1.0.7
+  flutter_inappwebview_android: ^1.0.9
+  flutter_inappwebview_ios: ^1.0.10
+  flutter_inappwebview_macos: ^1.0.8
+  flutter_inappwebview_web: ^1.0.5
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_android/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.9
+
+- Updated `flutter_inappwebview_platform_interface` version dependency to `^1.0.7`
+- Fixed "Cloudflare Turnstile failure" [#1738](https://github.com/pichillilorenzo/flutter_inappwebview/issues/1738)
+- Fixed `InAppWebViewController.callAsyncJavaScript` issue when the last line of the `functionBody` parameter includes a code comment
+
 ## 1.0.8
 
 - Implemented `InAppWebViewSettings.interceptOnlyAsyncAjaxRequests`

flutter_inappwebview_android/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java

@@ -15,6 +15,15 @@ public class ConsoleLogJS {
   );
 
   public static final String CONSOLE_LOG_JS_SOURCE = "(function(console) {" +
+          "   function _buildMessage(args) {" +
+          "     var message = '';" +
+          "     for (var i in args) {" +
+          "       try {" +
+          "         message += message === '' ? args[i] : ' ' + args[i];" +
+          "       } catch(ignored) {}" +
+          "     }" +
+          "     return message;" +
+          "   }" +
           "   var oldLogs = {" +
           "       'log': console.log," +
           "       'debug': console.debug," +
@@ -25,16 +34,7 @@ public class ConsoleLogJS {
           "   for (var k in oldLogs) {" +
           "       (function(oldLog) {" +
           "           console[oldLog] = function() {" +
-          "               var message = '';" +
-          "               for (var i in arguments) {" +
-          "                   if (message == '') {" +
-          "                       message += arguments[i];" +
-          "                   }" +
-          "                   else {" +
-          "                       message += ' ' + arguments[i];" +
-          "                   }" +
-          "               }" +
-          "               oldLogs[oldLog].call(console, message);" +
+          "               oldLogs[oldLog].call(console, _buildMessage(arguments));" +
           "           }" +
           "       })(k);" +
           "   }" +

flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/PluginScriptsUtil.java

@@ -18,7 +18,7 @@ public class PluginScriptsUtil {
 
   public static final String CALL_ASYNC_JAVA_SCRIPT_WRAPPER_JS_SOURCE = "(function(obj) {" +
           "  (async function(" + VAR_FUNCTION_ARGUMENT_NAMES + ") {" +
-          "    " + VAR_FUNCTION_BODY +
+          "    \n" + VAR_FUNCTION_BODY + "\n" +
           "  })(" + VAR_FUNCTION_ARGUMENT_VALUES + ").then(function(value) {" +
           "    window." + JavaScriptBridgeJS.JAVASCRIPT_BRIDGE_NAME + ".callHandler('callAsyncJavaScript', {'value': value, 'error': null, 'resultUuid': '" + VAR_RESULT_UUID + "'});" +
           "  }).catch(function(error) {" +

flutter_inappwebview_android/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_android
 description: Android implementation of the flutter_inappwebview plugin.
-version: 1.0.8
+version: 1.0.9
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_android
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -18,7 +18,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.0.6
+  flutter_inappwebview_platform_interface: ^1.0.7
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.10
+
+- Updated `flutter_inappwebview_platform_interface` version dependency to `^1.0.7`
+
 ## 1.0.9
 
 - Implemented `InAppWebViewSettings.interceptOnlyAsyncAjaxRequests`

flutter_inappwebview_ios/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview_ios/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_ios
 description: iOS implementation of the flutter_inappwebview plugin.
-version: 1.0.9
+version: 1.0.10
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_ios
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -18,7 +18,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.0.6
+  flutter_inappwebview_platform_interface: ^1.0.7
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_macos/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.8
+
+- Updated `flutter_inappwebview_platform_interface` version dependency to `^1.0.7`
+- Implemented `InAppBrowser.onMainWindowWillClose` event
+
 ## 1.0.7
 
 - Implemented `InAppWebViewSettings.interceptOnlyAsyncAjaxRequests`
@@ -29,7 +34,7 @@
 ## 1.0.1
 
 - Added `PlatformPrintJobController.onComplete` setter
-- Updated `flutter_inappwebview_platform_interface` version dependency to `1.0.2`
+- Updated `flutter_inappwebview_platform_interface` version dependency to `^1.0.2`
 
 ## 1.0.0
 

flutter_inappwebview_macos/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview_macos/lib/src/in_app_browser/in_app_browser.dart

@@ -122,6 +122,10 @@ class MacOSInAppBrowser extends PlatformInAppBrowser with ChannelController {
           }
         }
         break;
+      case "onMainWindowWillClose":
+        _debugLog(call.method, call.arguments);
+        eventHandler?.onMainWindowWillClose();
+        break;
       case "onExit":
         _debugLog(call.method, call.arguments);
         _isOpened = false;

flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserChannelDelegate.swift

@@ -25,6 +25,11 @@ public class InAppBrowserChannelDelegate : ChannelDelegate {
         channel?.invokeMethod("onMenuItemClicked", arguments: arguments)
     }
 
+    public func onMainWindowWillClose() {
+        let arguments: [String: Any?] = [:]
+        channel?.invokeMethod("onMainWindowWillClose", arguments: arguments)
+    }
+
     public func onExit() {
         let arguments: [String: Any?] = [:]
         channel?.invokeMethod("onExit", arguments: arguments)

flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserManager.swift

@@ -86,8 +86,10 @@ public class InAppBrowserManager: ChannelDelegate {
 
         if #available(macOS 10.12, *), browserSettings.windowType == .tabbed {
             NSApplication.shared.mainWindow?.addTabbedWindow(window, ordered: .above)
-        } else {
+        } else if browserSettings.windowType == .child {
             NSApplication.shared.mainWindow?.addChildWindow(window, ordered: .above)
+        } else {
+            window.windowController?.showWindow(self)
         }
 
         if browserSettings.hidden {

flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserSettings.swift

@@ -16,7 +16,7 @@ public class InAppBrowserSettings: ISettings<InAppBrowserWebViewController> {
     var hideUrlBar = false
     var hideProgressBar = false
     var toolbarTopFixedTitle: String?
-    var windowType = InAppBrowserWindowType.child
+    var windowType = InAppBrowserWindowType.window
     var windowAlphaValue = 1.0
     var _windowStyleMask: NSNumber?
     var windowStyleMask: NSWindow.StyleMask? {

flutter_inappwebview_macos/macos/Classes/InAppBrowser/InAppBrowserWindow.swift

@@ -62,7 +62,7 @@ public class InAppBrowserWindow : NSWindow, NSWindowDelegate, NSToolbarDelegate,
         delegate = self
 
         NotificationCenter.default.addObserver(self,
-                                               selector: #selector(onMainWindowClose(_:)),
+                                               selector: #selector(onMainWindowWillClose(_:)),
                                                name: NSWindow.willCloseNotification,
                                                object: NSApplication.shared.mainWindow)
 
@@ -348,13 +348,17 @@ public class InAppBrowserWindow : NSWindow, NSWindowDelegate, NSToolbarDelegate,
         dispose()
     }
 
-    @objc func onMainWindowClose(_ notification: Notification) {
-        close()
+    @objc func onMainWindowWillClose(_ notification: Notification) {
+        if let webViewController = contentViewController as? InAppBrowserWebViewController {
+            webViewController.channelDelegate?.onMainWindowWillClose()
+        }
     }
 
-
     public func dispose() {
         delegate = nil
+        NotificationCenter.default.removeObserver(self,
+                                                  name: NSWindow.willCloseNotification,
+                                                  object: NSApplication.shared.mainWindow)
         if let webViewController = contentViewController as? InAppBrowserWebViewController {
             webViewController.dispose()
         }

flutter_inappwebview_macos/macos/Classes/Types/InAppBrowserWindowType.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 public enum InAppBrowserWindowType: String {
+    case window = "WINDOW"
     case child = "CHILD"
     case tabbed = "TABBED"
 }

flutter_inappwebview_macos/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_macos
 description: macOS implementation of the flutter_inappwebview plugin.
-version: 1.0.7
+version: 1.0.8
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_macos
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -18,7 +18,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.0.6
+  flutter_inappwebview_platform_interface: ^1.0.7
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_platform_interface/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.7
+
+- Added `InAppBrowser.onMainWindowWillClose` event
+- Added `WindowType.WINDOW` for `InAppWebViewSettings.windowType`
+
 ## 1.0.6
 
 - Added `InAppWebViewSettings.interceptOnlyAsyncAjaxRequests` [#1905](https://github.com/pichillilorenzo/flutter_inappwebview/issues/1905)

flutter_inappwebview_platform_interface/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Lorenzo Pichilli
+   Copyright 2023 Lorenzo Pichilli
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

flutter_inappwebview_platform_interface/lib/src/in_app_browser/in_app_browser_settings.dart

@@ -254,7 +254,7 @@ class InAppBrowserSettings_
   ModalTransitionStyle_? transitionStyle;
 
   ///How the browser window should be added to the main window.
-  ///The default value is [WindowType.CHILD].
+  ///The default value is [WindowType.WINDOW].
   ///
   ///**Officially Supported Platforms/Implementations**:
   ///- MacOS