@capgo/inappbrowser 7.6.12 → 7.7.2

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -20,6 +20,9 @@ import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Environment;
+import android.print.PrintAttributes;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Base64;
@@ -214,6 +217,44 @@ public class WebViewDialog extends Dialog {
     }
   }
 
+  public class PrintInterface {
+
+    private Context context;
+    private WebView webView;
+
+    public PrintInterface(Context context, WebView webView) {
+      this.context = context;
+      this.webView = webView;
+    }
+
+    @JavascriptInterface
+    public void print() {
+      // Run on UI thread since printing requires UI operations
+      ((Activity) context).runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              // Create a print job from the WebView content
+              PrintManager printManager =
+                (PrintManager) context.getSystemService(Context.PRINT_SERVICE);
+              String jobName = "Document_" + System.currentTimeMillis();
+
+              PrintDocumentAdapter printAdapter;
+
+              // For API 21+ (Lollipop and above)
+              printAdapter = webView.createPrintDocumentAdapter(jobName);
+
+              printManager.print(
+                jobName,
+                printAdapter,
+                new PrintAttributes.Builder().build()
+              );
+            }
+          }
+        );
+    }
+  }
+
   @SuppressLint({ "SetJavaScriptEnabled", "AddJavascriptInterface" })
   public void presentWebView() {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -317,6 +358,10 @@ public class WebViewDialog extends Dialog {
       new PreShowScriptInterface(),
       "PreShowScriptInterface"
     );
+    _webView.addJavascriptInterface(
+      new PrintInterface(this._context, _webView),
+      "PrintInterface"
+    );
     _webView.getSettings().setJavaScriptEnabled(true);
     _webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
     _webView.getSettings().setDatabaseEnabled(true);
@@ -1037,7 +1082,13 @@ public class WebViewDialog extends Dialog {
       "            window.AndroidInterface.close(); " +
       "        } " +
       "    }; " +
-      "}";
+      "} " +
+      // Override the window.print function to use our PrintInterface
+      "window.print = function() { " +
+      "    if (window.PrintInterface) { " +
+      "        window.PrintInterface.print(); " +
+      "    } " +
+      "};";
     _webView.evaluateJavascript(script, null);
   }
 

package/android/src/main/res/layout/tool_bar.xml

@@ -8,14 +8,17 @@
     android:elevation="4dp"
     app:titleTextColor="#262626">
 
-    <ImageButton
-        android:id="@+id/closeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_clear_24px"
-        android:layout_gravity="start"
-        android:background="#eeeeef"
-        android:contentDescription="@string/close_button" />
+	<ImageButton
+		android:id="@+id/closeButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="start"
+		android:background="#eeeeef"
+		android:contentDescription="@string/close_button"
+		android:minWidth="38dp"
+		android:minHeight="38dp"
+		android:src="@drawable/ic_clear_24px"
+		android:translationX="-8dp" />
 
     <ImageButton
         android:id="@+id/buttonNearDone"

package/ios/Plugin/WKWebViewController.swift

@@ -478,7 +478,20 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             semaphore.signal()
         } else if message.name == "close" {
             closeView()
-        }
+		} else if message.name == "magicPrint" {
+			if let webView = self.webView {
+				let printController = UIPrintInteractionController.shared
+
+				let printInfo = UIPrintInfo(dictionary: nil)
+				printInfo.outputType = .general
+				printInfo.jobName = "Print Job"
+
+				printController.printInfo = printInfo
+				printController.printFormatter = webView.viewPrintFormatter()
+
+				printController.present(animated: true, completionHandler: nil)
+			}
+		}
     }
 
     func injectJavaScriptInterface() {
@@ -496,9 +509,17 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
                         };
                 }
                 """
-        DispatchQueue.main.async {
-            self.webView?.evaluateJavaScript(script, completionHandler: nil)
-        }
+		DispatchQueue.main.async {
+			self.webView?.evaluateJavaScript(script) { result, error in
+				if let error = error {
+					print("JavaScript evaluation error: \(error)")
+				} else if let result = result {
+					print("JavaScript result: \(result)")
+				} else {
+					print("JavaScript executed with no result")
+				}
+			}
+		}
     }
 
     open func initWebview(isInspectable: Bool = true) {
@@ -513,14 +534,35 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         userContentController.add(self, name: "preShowScriptError")
         userContentController.add(self, name: "preShowScriptSuccess")
         userContentController.add(self, name: "close")
+		 userContentController.add(self, name: "magicPrint")
+
+		// Inject JavaScript to override window.print
+		let script = WKUserScript(
+			source: """
+			window.print = function() {
+				window.webkit.messageHandlers.magicPrint.postMessage('magicPrint');
+			};
+			""",
+			injectionTime: .atDocumentStart,
+			forMainFrameOnly: false
+		)
+		userContentController.addUserScript(script)
+
         webConfiguration.allowsInlineMediaPlayback = true
         webConfiguration.userContentController = userContentController
+
         let webView = WKWebView(frame: .zero, configuration: webConfiguration)
 
-        if webView.responds(to: Selector(("setInspectable:"))) {
-            // Fix: https://stackoverflow.com/questions/76216183/how-to-debug-wkwebview-in-ios-16-4-1-using-xcode-14-2/76603043#76603043
-            webView.perform(Selector(("setInspectable:")), with: isInspectable)
-        }
+//        if webView.responds(to: Selector(("setInspectable:"))) {
+//            // Fix: https://stackoverflow.com/questions/76216183/how-to-debug-wkwebview-in-ios-16-4-1-using-xcode-14-2/76603043#76603043
+//            webView.perform(Selector(("setInspectable:")), with: isInspectable)
+//        }
+
+		if #available(iOS 16.4, *) {
+			webView.isInspectable = true
+		} else {
+			// Fallback on earlier versions
+		}
 
         if self.blankNavigationTab {
             // First add the webView to view hierarchy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "7.6.12",
+  "version": "7.7.2",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",