@capgo/capacitor-inappbrowser 8.19.0 → 8.20.0

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -446,13 +446,15 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.19.0"
+    private let pluginVersion: String = "8.20.0"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "goBack", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "open", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "openWebView", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setFullscreen", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getFullscreen", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "clearCookies", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getCookies", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "clearAllCookies", returnType: CAPPluginReturnPromise),
@@ -555,6 +557,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func unregisterWebView(id: String) {
+        webViewControllers[id]?.setBrowserFullscreen(false)
         detachFramedOverlayWebView(id: id)
         detachLayeredWebView(id: id)
         if let webView = webViewControllers[id]?.capableWebView {
@@ -649,7 +652,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return nil
         }
 
-        let navigationController = UINavigationController(rootViewController: popupController)
+        let navigationController = BrowserNavigationController(rootViewController: popupController)
         cloneNavigationAppearance(from: parentController.navigationController, to: navigationController)
         let shouldActivatePopup = ActiveWebViewSupport.shouldActivateNewWebView(
             isHidden: shouldHidePopup,
@@ -827,7 +830,15 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         dismissActiveKeyboard()
         let presenter = self.bridge?.viewController?.presentedViewController ?? self.bridge?.viewController
         presentNavigationControllerSafely(navigationController, from: presenter, animated: isAnimated) { presented in
-            if !presented {
+            if presented {
+                if let resolvedId,
+                   let controller = self.webViewControllers[resolvedId],
+                   self.navigationControllers[resolvedId] === navigationController,
+                   navigationController.presentedViewController == nil,
+                   !navigationController.isBeingDismissed {
+                    self.setActiveWebView(id: resolvedId, webView: controller, navigationController: navigationController)
+                }
+            } else {
                 // openWebView already resolves with the webView id on success.
                 // Resolving here caused a double-resolve (empty, then with id). See #631.
                 self.currentPluginCall?.reject("Failed to present webview")
@@ -1486,6 +1497,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let height = call.getFloat("height")
         let xPos = call.getFloat("x")
         let yPos = call.getFloat("y")
+        let fullscreen = call.getBool("fullscreen", false)
+        if fullscreen && (toBack || width != nil || height != nil || xPos != nil || yPos != nil) {
+            call.reject("Fullscreen is not supported for framed or behind-host WebViews")
+            return
+        }
 
         // Read disableOverscroll option (iOS only - controls WebView bounce effect)
         let disableOverscroll = call.getBool("disableOverscroll", false)
@@ -1753,7 +1769,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
 
-            self.navigationWebViewController = UINavigationController.init(rootViewController: webViewController)
+            self.navigationWebViewController = BrowserNavigationController(rootViewController: webViewController)
             if let navigationController = self.navigationWebViewController {
                 self.registerWebView(id: webViewId, webView: webViewController, navigationController: navigationController)
             }
@@ -1855,6 +1871,8 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
             }
 
+            webViewController.pendingStartupFullscreen = fullscreen
+
             // We don't use the toolbar anymore, always hide it
             self.navigationWebViewController?.setToolbarHidden(true, animated: false)
 
@@ -1952,6 +1970,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             self.isHidden = hidden
 
             if hidden {
+                webViewController.setBrowserFullscreen(false)
                 if let resolvedId {
                     self.detachFramedOverlayWebView(id: resolvedId)
                     self.detachLayeredWebView(id: resolvedId)
@@ -2045,6 +2064,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             }
 
             let transparentBackground = call.getBool("transparentBackground", true)
+            webViewController.setBrowserFullscreen(false)
             self.dismissNavigationControllerIfPresented(navigationController) {
                 webViewController.isLayeredBehind = true
                 webViewController.transparentHostBackground = transparentBackground
@@ -2661,9 +2681,21 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func appDidBecomeActive(_ notification: NSNotification) {
         self.hidePrivacyScreen()
+        guard let controller = webViewController,
+              controller.pendingStartupFullscreen,
+              let navigation = controller.navigationController,
+              navigation.presentingViewController != nil,
+              navigation.presentedViewController == nil,
+              controller.presentedViewController == nil,
+              controller.viewIfLoaded?.window != nil,
+              controller.capableWebView?.superview === controller.viewIfLoaded else { return }
+        controller.setBrowserFullscreen(true)
     }
 
     @objc func appWillResignActive(_ notification: NSNotification) {
+        for controller in webViewControllers.values {
+            controller.setBrowserFullscreen(false)
+        }
         self.showPrivacyScreen()
     }
 
@@ -2991,3 +3023,50 @@ extension CapgoInAppBrowserPlugin {
 
 }
 
+
+extension CapgoInAppBrowserPlugin {
+    @objc func setFullscreen(_ call: CAPPluginCall) {
+        guard let value = call.options["enabled"] as? NSNumber,
+              CFGetTypeID(value) == CFBooleanGetTypeID() else {
+            call.reject("enabled must be a boolean")
+            return
+        }
+        let enabled = value.boolValue
+        DispatchQueue.main.async {
+            guard let id = call.getString("id") ?? self.activeWebViewId,
+                  let controller = self.webViewControllers[id],
+                  controller.capableWebView != nil else {
+                call.reject("WebView is not initialized or does not support fullscreen")
+                return
+            }
+            if enabled {
+                guard controller.supportsBrowserFullscreen,
+                      let navigation = self.navigationControllers[id],
+                      navigation.presentingViewController != nil,
+                      navigation.presentedViewController == nil,
+                      controller.presentedViewController == nil,
+                      controller.viewIfLoaded?.window != nil,
+                      controller.capableWebView?.superview === controller.view,
+                      UIApplication.shared.applicationState == .active else {
+                    call.reject("Fullscreen requires a visible, frontmost, unframed WebView")
+                    return
+                }
+            }
+            controller.setBrowserFullscreen(enabled)
+            call.resolve()
+        }
+    }
+
+    @objc func getFullscreen(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            guard let id = call.getString("id") ?? self.activeWebViewId,
+                  let controller = self.webViewControllers[id],
+                  controller.capableWebView != nil else {
+                call.reject("WebView is not initialized or does not support fullscreen")
+                return
+            }
+            call.resolve(["enabled": controller.isBrowserFullscreen])
+        }
+    }
+
+}

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -446,6 +446,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var capBrowserPlugin: CapgoInAppBrowserPlugin?
     open var isInspectable: Bool = false
     var instanceId: String = ""
+    var browserFullscreen = BrowserFullscreenState()
+
+    override open var prefersStatusBarHidden: Bool { isBrowserFullscreen }
+    override open var prefersHomeIndicatorAutoHidden: Bool { isBrowserFullscreen }
+
     var shareDisclaimer: [String: Any]?
     var shareSubject: String?
     var didpageInit = false
@@ -1235,6 +1240,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         hostView.insertSubview(backgroundView, at: 0)
         backgroundView.translatesAutoresizingMaskIntoConstraints = false
         backgroundView.backgroundColor = color
+        backgroundView.isHidden = isBrowserFullscreen
 
         var constraints = [
             backgroundView.topAnchor.constraint(equalTo: hostView.topAnchor),
@@ -1475,6 +1481,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     override open func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         syncWebViewSafeAreaLayout()
+        updateFullscreenExitButtonPosition()
         refreshWebViewViewportIfNeeded()
     }
 
@@ -2379,7 +2386,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     }
 
     private func applyNavigationVisibility() {
-        navigationController?.setNavigationBarHidden(blankNavigationTab, animated: false)
+        navigationController?.setNavigationBarHidden(isBrowserFullscreen || blankNavigationTab, animated: false)
         // Always hide toolbar since we never want it.
         navigationController?.setToolbarHidden(true, animated: false)
     }
@@ -2412,6 +2419,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
             }
         }
 
+        // Apply only when presented; hidden startup must not change the host's system bars.
+        if pendingStartupFullscreen && UIApplication.shared.applicationState == .active {
+            setBrowserFullscreen(true)
+        }
+
         // Update status bar style
         updateStatusBarStyle()
 
@@ -2462,7 +2474,12 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     override open func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        rollbackState()
+        if isBeingDismissed || isMovingFromParent || navigationController?.isBeingDismissed == true {
+            setBrowserFullscreen(false)
+        }
+        if !isBrowserFullscreen {
+            rollbackState()
+        }
     }
 
     override open func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
@@ -2597,6 +2614,7 @@ public extension WKWebViewController {
     }
 
     func cleanupWebView() {
+        setBrowserFullscreen(false)
         guard let webView = self.webView else { return }
         webView.stopLoading()
         previewItemURL = nil
@@ -3650,6 +3668,10 @@ extension WKWebViewController: WKNavigationDelegate {
             return
         }
 
+        if navigationAction.targetFrame?.isMainFrame == true {
+            exitFullscreenIfOriginChanges(to: url)
+        }
+
         if handleDownloads, url.scheme?.lowercased() == "blob" {
             handleBlobDownloadFromPage(
                 blobUrl: url.absoluteString,
@@ -3725,6 +3747,9 @@ extension WKWebViewController: WKNavigationDelegate {
     }
 
     public func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+        if navigationResponse.isForMainFrame {
+            exitFullscreenIfOriginChanges(to: navigationResponse.response.url)
+        }
         if shouldInterceptDownload(for: navigationResponse) {
             decisionHandler(.download)
             return
@@ -3743,10 +3768,6 @@ extension WKWebViewController: WKNavigationDelegate {
         stopReloadGesture()
     }
 
-    public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
-        stopReloadGesture()
-    }
-
     // MARK: - Dimension Management
 
     func applyCustomDimensions() {
@@ -3799,6 +3820,7 @@ extension WKWebViewController: WKNavigationDelegate {
 
     /// Update dimensions at runtime
     func updateDimensions(width: CGFloat?, height: CGFloat?, xPos: CGFloat?, yPos: CGFloat?) {
+        setBrowserFullscreen(false)
         // Update stored dimensions
         if let width = width {
             customWidth = width
@@ -3818,6 +3840,10 @@ extension WKWebViewController: WKNavigationDelegate {
     }
 
     func updateSafeTopMargin(_ enabled: Bool) {
+        if isBrowserFullscreen && !browserFullscreen.applyingLayout {
+            browserFullscreen.baseline?.safeTop = enabled
+            return
+        }
         guard enabled != self.enabledSafeTopMargin else { return }
         self.enabledSafeTopMargin = enabled
         guard let webView = self.webView else { return }
@@ -3840,6 +3866,10 @@ extension WKWebViewController: WKNavigationDelegate {
     }
 
     func updateSafeBottomMargin(_ enabled: Bool) {
+        if isBrowserFullscreen && !browserFullscreen.applyingLayout {
+            browserFullscreen.baseline?.safeBottom = enabled
+            return
+        }
         guard enabled != self.enabledSafeBottomMargin else { return }
         self.enabledSafeBottomMargin = enabled
         guard let webView = self.webView else { return }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.19.0",
+  "version": "8.20.0",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -35,7 +35,7 @@
     "verify:ios": "bun run build:proxy-bridge && xcodebuild -scheme CapgoCapacitorInappbrowser -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "bun run build && bun run test:web",
-    "test:web": "bun test src/proxy-bridge-support.test.ts src/bundled-asset-support.test.ts",
+    "test:web": "bun test src/proxy-bridge-support.test.ts src/bundled-asset-support.test.ts src/fullscreen-web.test.ts",
     "test:maestro:android": "./scripts/test-maestro-android.sh",
     "lint": "bun run eslint && bun run prettier -- --check && bun run swiftlint -- lint",
     "fmt": "bun run eslint -- --fix && bun run prettier -- --write && bun run swiftlint -- --fix --format",