manual copy of the PR

pichillilorenzo#2168 it is not yet implemented so lets change it until this get the main repo
fhdeodato · Jun 17, 2024 · 6145f25 · 6145f25
1 parent b0dbccc
commit 6145f25
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 0 deletions.
diff --git a/flutter_inappwebview/lib/src/in_app_webview/in_app_webview_controller.dart b/flutter_inappwebview/lib/src/in_app_webview/in_app_webview_controller.dart
@@ -290,6 +290,9 @@ class InAppWebViewController {
   Future<InAppWebViewHitTestResult?> getHitTestResult() =>
       platform.getHitTestResult();
 
+  ///{@macro flutter_inappwebview_platform_interface.PlatformInAppWebViewController.requestFocus}
+  Future<void> requestFocus() => platform.requestFocus();
+
   ///{@macro flutter_inappwebview_platform_interface.PlatformInAppWebViewController.clearFocus}
   Future<void> clearFocus() => platform.clearFocus();
 

diff --git a/...java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegate.java b/...java/com/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegate.java
@@ -474,6 +474,12 @@ public void onReceiveValue(String value) {
         }
         result.success(true);
         break;
+      case requestFocus:
+        if (webView != null) {
+          webView.requestFocus();
+        }
+        result.success(true);
+        break;
       case setContextMenu:
         if (webView != null) {
           Map<String, Object> contextMenu = (Map<String, Object>) call.argument("contextMenu");

diff --git a/...m/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegateMethods.java b/...m/pichillilorenzo/flutter_inappwebview_android/webview/WebViewChannelDelegateMethods.java
@@ -62,6 +62,7 @@ public enum WebViewChannelDelegateMethods {
   saveWebArchive,
   zoomIn,
   zoomOut,
+  requestFocus,
   clearFocus,
   setContextMenu,
   requestFocusNodeHref,

diff --git a/flutter_inappwebview_android/lib/src/in_app_webview/in_app_webview_controller.dart b/flutter_inappwebview_android/lib/src/in_app_webview/in_app_webview_controller.dart
@@ -2241,6 +2241,12 @@ class AndroidInAppWebViewController extends PlatformInAppWebViewController
     return InAppWebViewHitTestResult(type: type, extra: extra);
   }
 
+  @override
+  Future<void> requestFocus() async {
+    Map<String, dynamic> args = <String, dynamic>{};
+    return await channel?.invokeMethod('requestFocus', args);
+  }
+
   @override
   Future<void> clearFocus() async {
     Map<String, dynamic> args = <String, dynamic>{};

diff --git a/flutter_inappwebview_ios/ios/Classes/InAppWebView/InAppWebView.swift b/flutter_inappwebview_ios/ios/Classes/InAppWebView/InAppWebView.swift
@@ -3129,6 +3129,10 @@ if(window.\(JAVASCRIPT_BRIDGE_NAME)[\(_callHandlerID)] != null) {
     public func clearFocus() {
         self.scrollView.subviews.first?.resignFirstResponder()
     }
+
+    public func requestFocus() {
+        self.scrollView.subviews.first?.becomeFirstResponder()
+    }
 
     public func getCertificate() -> SslCertificate? {
         guard let scheme = url?.scheme,

diff --git a/flutter_inappwebview_ios/ios/Classes/InAppWebView/WebViewChannelDelegate.swift b/flutter_inappwebview_ios/ios/Classes/InAppWebView/WebViewChannelDelegate.swift
@@ -348,6 +348,10 @@ public class WebViewChannelDelegate: ChannelDelegate {
             webView?.clearFocus()
             result(true)
             break
+        case .requestFocus:
+            webView?.requestFocus()
+            result(true)
+            break
         case .setContextMenu:
             if let webView = webView {
                 let contextMenu = arguments!["contextMenu"] as? [String: Any]

diff --git a/flutter_inappwebview_ios/ios/Classes/InAppWebView/WebViewChannelDelegateMethods.swift b/flutter_inappwebview_ios/ios/Classes/InAppWebView/WebViewChannelDelegateMethods.swift
@@ -59,6 +59,7 @@ public enum WebViewChannelDelegateMethods: String {
     case getSelectedText = "getSelectedText"
     case getHitTestResult = "getHitTestResult"
     case clearFocus = "clearFocus"
+    case requestFocus = "requestFocus"
     case setContextMenu = "setContextMenu"
     case requestFocusNodeHref = "requestFocusNodeHref"
     case requestImageRef = "requestImageRef"

diff --git a/flutter_inappwebview_ios/lib/src/in_app_webview/in_app_webview_controller.dart b/flutter_inappwebview_ios/lib/src/in_app_webview/in_app_webview_controller.dart
@@ -2234,6 +2234,12 @@ class IOSInAppWebViewController extends PlatformInAppWebViewController
     return await channel?.invokeMethod('clearFocus', args);
   }
 
+  @override
+  Future<void> requestFocus() async {
+    Map<String, dynamic> args = <String, dynamic>{};
+    return await channel?.invokeMethod('requestFocus', args);
+  }
+
   @override
   Future<void> setContextMenu(ContextMenu? contextMenu) async {
     Map<String, dynamic> args = <String, dynamic>{};

diff --git a/...ppwebview_platform_interface/lib/src/in_app_webview/platform_inappwebview_controller.dart b/...ppwebview_platform_interface/lib/src/in_app_webview/platform_inappwebview_controller.dart
@@ -1045,6 +1045,11 @@ abstract class PlatformInAppWebViewController extends PlatformInterface
         'getHitTestResult is not implemented on the current platform');
   }
 
+  Future<void> requestFocus() {
+    throw UnimplementedError(
+        'requestFocus is not implemented on the current platform');
+  }
+
   ///{@template flutter_inappwebview_platform_interface.PlatformInAppWebViewController.clearFocus}
   ///Clears the current focus. On iOS and Android native WebView, it will clear also, for example, the current text selection.
   ///