@capacitor/ios 8.0.0-alpha.2 → 8.0.0-beta.0

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -27,19 +27,7 @@ import Cordova
         return false
     }()
 
-    // TODO: Remove in Capacitor 8 after moving status bar plugin extensions code
-    @objc func handleViewDidAppear() {
-        if bridge?.config.hasInitialFocus ?? true {
-            self.webView?.becomeFirstResponder()
-        }
-    }
-
-    deinit {
-        NotificationCenter.default.removeObserver(self)
-    }
-
     override public final func loadView() {
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleViewDidAppear), name: Notification.Name(rawValue: "CapacitorViewDidAppear"), object: nil)
         // load the configuration and set the logging flag
         let configDescriptor = instanceDescriptor()
         let configuration = InstanceConfiguration(with: configDescriptor, isDebug: CapacitorBridge.isDevEnvironment)
@@ -76,11 +64,17 @@ import Cordova
 
     override open func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        NotificationCenter.default.post(Notification(name: .capacitorViewDidAppear))
         if bridge?.config.hasInitialFocus ?? true {
             self.webView?.becomeFirstResponder()
         }
     }
 
+    override open func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        super.viewWillTransition(to: size, with: coordinator)
+        NotificationCenter.default.post(Notification(name: .capacitorViewWillTransition))
+    }
+
     override open func canPerformUnwindSegueAction(_ action: Selector, from fromViewController: UIViewController, withSender sender: Any) -> Bool {
         return false
     }
@@ -135,7 +129,7 @@ import Cordova
         }
         if let appendUserAgent = instanceConfiguration.appendedUserAgentString {
             if let appName = webViewConfiguration.applicationNameForUserAgent {
-                webViewConfiguration.applicationNameForUserAgent = "\(appName)  \(appendUserAgent)"
+                webViewConfiguration.applicationNameForUserAgent = "\(appName) \(appendUserAgent)"
             } else {
                 webViewConfiguration.applicationNameForUserAgent = appendUserAgent
             }

package/Capacitor/Capacitor/CAPNotifications.swift

@@ -16,6 +16,8 @@ extension Notification.Name {
     public static let capacitorDecidePolicyForNavigationAction =
         Notification.Name(rawValue: "CapacitorDecidePolicyForNavigationActionNotification")
     public static let capacitorStatusBarTapped = Notification.Name(rawValue: "CapacitorStatusBarTappedNotification")
+    public static let capacitorViewDidAppear = Notification.Name(rawValue: "CapacitorViewDidAppear")
+    public static let capacitorViewWillTransition = Notification.Name(rawValue: "CapacitorViewWillTransition")
 }
 
 @objc extension NSNotification {
@@ -26,6 +28,8 @@ extension Notification.Name {
     public static let capacitorDidFailToRegisterForRemoteNotifications = Notification.Name.capacitorDidFailToRegisterForRemoteNotifications
     public static let capacitorDecidePolicyForNavigationAction = Notification.Name.capacitorDecidePolicyForNavigationAction
     public static let capacitorStatusBarTapped = Notification.Name.capacitorStatusBarTapped
+    public static let capacitorViewDidAppear = Notification.Name.capacitorViewDidAppear
+    public static let capacitorViewWillTransition = Notification.Name.capacitorViewWillTransition
 }
 
 /**

package/Capacitor/Capacitor/CAPPlugin.h

@@ -38,6 +38,11 @@
  * Returning nil will defer to the default Capacitor policy
  */
 - (NSNumber* _Nullable)shouldOverrideLoad:(WKNavigationAction* _Nonnull)navigationAction;
+/**
+ * Allows plugins to hook into and respond to the WebView's URL authentication challenge.
+ * Returning false will defer to the default response of [.rejectProtectionSpace](https://developer.apple.com/documentation/Foundation/URLSession/AuthChallengeDisposition/rejectProtectionSpace).
+ */
+- (BOOL)handleWKWebViewURLAuthenticationChallenge:(NSURLAuthenticationChallenge* _Nonnull)challenge completionHandler:(void (^_Nonnull)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler;
 
 // Called after init if the plugin wants to do
 // some loading so the plugin author doesn't

package/Capacitor/Capacitor/CAPPlugin.m

@@ -171,5 +171,10 @@
     return nil;
 }
 
+- (BOOL)handleWKWebViewURLAuthenticationChallenge:(NSURLAuthenticationChallenge* _Nonnull)challenge completionHandler:(void (^_Nonnull)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler {
+    return NO;
+}
+
+
 @end
 

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -302,7 +302,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
      Register all plugins that have been declared
      */
     func registerPlugins() {
-        var pluginList: [AnyClass] = [CAPHttpPlugin.self, CAPConsolePlugin.self, CAPWebViewPlugin.self, CAPCookiesPlugin.self]
+        var pluginList: [AnyClass] = [CAPHttpPlugin.self, CAPConsolePlugin.self, CAPWebViewPlugin.self, CAPCookiesPlugin.self, CAPSystemBarsPlugin.self]
 
         if autoRegisterPlugins {
             do {

package/Capacitor/Capacitor/Plugins/SystemBars.swift

@@ -0,0 +1,133 @@
+import Foundation
+
+@objc(CAPSystemBarsPlugin)
+public class CAPSystemBarsPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "CAPSystemBarsPlugin"
+    public let jsName = "SystemBars"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "setStyle", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setAnimation", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "show", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "hide", returnType: CAPPluginReturnPromise)
+    ]
+
+    public private(set) var hideHomeIndicator: Bool = false
+
+    enum Style: String {
+        case dark = "DARK"
+        case light = "LIGHT"
+        case defaultStyle = "DEFAULT"
+    }
+
+    @objc override public func load() {
+        let hidden = getConfig().getBoolean("hidden", false)
+
+        if let style = getConfig().getString("style", "DEFAULT") {
+            setStyle(style: style)
+        }
+
+        if let animation = getConfig().getString("animation") {
+            setAnimation(animation: animation)
+        }
+
+        setHidden(hidden: hidden)
+    }
+
+    @objc func setStyle(_ call: CAPPluginCall) {
+        setStyle(style: call.getString("style") ?? Style.defaultStyle.rawValue)
+        call.resolve()
+    }
+
+    @objc func show(_ call: CAPPluginCall) {
+        let bar = call.getString("bar")
+
+        if let animation = call.getString("animation") {
+            setAnimation(animation: animation)
+        }
+
+        DispatchQueue.main.async {
+            self.setHidden(hidden: false, bar: bar)
+            call.resolve()
+        }
+    }
+
+    @objc func hide(_ call: CAPPluginCall) {
+        let bar = call.getString("bar")
+
+        if let animation = call.getString("animation") {
+            setAnimation(animation: animation)
+        }
+
+        DispatchQueue.main.async {
+            self.setHidden(hidden: true, bar: bar)
+            call.resolve()
+        }
+    }
+
+    @objc func setAnimation(_ call: CAPPluginCall) {
+        let animation = call.getString("animation", "FADE")
+        setAnimation(animation: animation)
+
+        call.resolve()
+    }
+
+    func setStyle(style: String) {
+        var newStyle: UIStatusBarStyle = .default
+
+        if let style = Style(rawValue: style.uppercased()) {
+            switch style {
+            case .dark:
+                newStyle = .lightContent
+            case .light:
+                newStyle = .darkContent
+            case .defaultStyle:
+                newStyle = .default
+            }
+        }
+
+        bridge?.statusBarStyle = newStyle
+    }
+
+    func setHidden(hidden: Bool, bar: String? = nil) {
+        if hidden {
+            if bar == nil || bar?.isEmpty ?? true || bar == "StatusBar" {
+                bridge?.statusBarVisible = false
+            }
+
+            if bar == nil || bar?.isEmpty ?? true || bar == "NavigationBar" {
+                hideHomeIndicator = true
+                bridge?.viewController?.setNeedsUpdateOfHomeIndicatorAutoHidden()
+            }
+
+            return
+        }
+
+        if bar == nil || bar?.isEmpty ?? true || bar == "StatusBar" {
+            bridge?.statusBarVisible = true
+        }
+
+        if bar == nil || bar?.isEmpty ?? true || bar == "NavigationBar" {
+            hideHomeIndicator = false
+            bridge?.viewController?.setNeedsUpdateOfHomeIndicatorAutoHidden()
+        }
+
+    }
+
+    func setAnimation(animation: String) {
+        if animation.uppercased() == "NONE" {
+            bridge?.statusBarAnimation = .none
+        } else {
+            bridge?.statusBarAnimation = .fade
+        }
+    }
+}
+
+extension CAPBridgeViewController {
+    override public var prefersHomeIndicatorAutoHidden: Bool {
+        if let systemBarPlugin = self.bridge?.plugin(withName: "SystemBars") as? CAPSystemBarsPlugin {
+            return systemBarPlugin.hideHomeIndicator
+        }
+
+        return false
+    }
+}

package/Capacitor/Capacitor/WKWebView+Capacitor.swift

@@ -62,7 +62,6 @@ internal extension WKWebView {
             method_setImplementation(method, imp)
         }
 
-        // iOS 13+
         let selectorMkIV: Selector = sel_getUid("_elementDidFocus:userIsInteracting:blurPreviousNode:activityStateChanges:userObject:")
 
         if let method = class_getInstanceMethod(targetClass, selectorMkIV) {

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -1,5 +1,5 @@
 import Foundation
-import MobileCoreServices
+import UniformTypeIdentifiers
 
 @objc(CAPWebViewAssetHandler)
 // swiftlint:disable type_body_length
@@ -106,12 +106,12 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
 
     open func mimeTypeForExtension(pathExtension: String) -> String {
         if !pathExtension.isEmpty {
-            if let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, pathExtension as NSString, nil)?.takeRetainedValue() {
-                if let mimetype = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType)?.takeRetainedValue() {
-                    return mimetype as String
+            if let uti = UTType(filenameExtension: pathExtension) {
+                if let mimetype = uti.preferredMIMEType {
+                    return mimetype
                 }
             }
-            // TODO: Remove in the future if Apple fixes the issue
+            // TODO: Remove when deployment target is set to iOS 17
             if let mimeType = mimeTypes[pathExtension] {
                 return mimeType
             }

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -47,7 +47,6 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
         bridge?.reset()
     }
 
-    @available(iOS 15, *)
     open func webView(
         _ webView: WKWebView,
         requestMediaCapturePermissionFor origin: WKSecurityOrigin,
@@ -58,7 +57,6 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
         decisionHandler(.grant)
     }
 
-    @available(iOS 15, *)
     open func webView(_ webView: WKWebView,
                       requestDeviceOrientationAndMotionPermissionFor origin: WKSecurityOrigin,
                       initiatedByFrame frame: WKFrameInfo,
@@ -159,9 +157,30 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
 
     open func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
         CAPLog.print("⚡️  WebView process terminated")
+        bridge?.reset()
         webView.reload()
     }
 
+    open func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping @MainActor (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+        guard let bridge = bridge else {
+            completionHandler(.rejectProtectionSpace, nil)
+            return
+        }
+
+        for pluginObject in bridge.plugins {
+            let plugin = pluginObject.value
+            let selector = NSSelectorFromString("handleWKWebViewURLAuthenticationChallenge:completionHandler:")
+            if plugin.responds(to: selector) {
+                if plugin.handleWKWebViewURLAuthenticationChallenge(challenge, completionHandler: completionHandler) {
+                    return
+                }
+            }
+        }
+
+        completionHandler(.rejectProtectionSpace, nil)
+        return
+    }
+
     // MARK: - WKScriptMessageHandler
 
     open func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {

package/Capacitor/Capacitor/assets/native-bridge.js

@@ -326,7 +326,7 @@ var nativeBridge = (function (exports) {
                         c.error(result.error);
                     }
                     else {
-                        c.dir(result.data);
+                        c.dir(JSON.stringify(result.data));
                     }
                     c.groupEnd();
                 }

package/CapacitorCordova/CapacitorCordova/CapacitorCordova.h

@@ -9,6 +9,7 @@ FOUNDATION_EXPORT const unsigned char CapacitorCordovaVersionString[];
 #import <Cordova/AppDelegate.h>
 #import <Cordova/CDV.h>
 #import <Cordova/CDVAvailability.h>
+#import <Cordova/CDVAvailabilityDeprecated.h>
 #import <Cordova/CDVCommandDelegate.h>
 #import <Cordova/CDVCommandDelegateImpl.h>
 #import <Cordova/CDVConfigParser.h>

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVAvailabilityDeprecated.h

@@ -0,0 +1,21 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+#define CDV_DEPRECATED(version, msg) __attribute__((deprecated("Deprecated in Cordova " #version ". " msg)))
+#define CDV_DEPRECATED_WITH_REPLACEMENT(version, msg, repl) __attribute__((deprecated("Deprecated in Cordova " #version ". " msg, repl)))

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.h

@@ -24,12 +24,6 @@
 #import "CDVAvailability.h"
 #import <WebKit/WebKit.h>
 
-@interface UIView (org_apache_cordova_UIView_Extension)
-
-@property (nonatomic, weak) UIScrollView* scrollView;
-
-@end
-
 extern NSString* const CDVPageDidLoadNotification;
 extern NSString* const CDVPluginHandleOpenURLNotification;
 extern NSString* const CDVPluginHandleOpenURLWithAppSourceAndAnnotationNotification;
@@ -54,7 +48,7 @@ extern NSString* const CDVViewWillTransitionToSizeNotification;
 @interface CDVPlugin : NSObject {}
 
 - (instancetype)initWithWebViewEngine:(WKWebView *)theWebViewEngine;
-@property (nonatomic, weak) UIView* webView;
+@property (nonatomic, weak) WKWebView* webView;
 @property (nonatomic, weak) WKWebView * webViewEngine;
 @property (nonatomic, strong) NSString * className;
 

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin.m

@@ -18,24 +18,6 @@
  */
 
 #import "CDVPlugin.h"
-#include <objc/message.h>
-
-@implementation UIView (org_apache_cordova_UIView_Extension)
-
-@dynamic scrollView;
-
-- (UIScrollView*)scrollView
-{
-    SEL scrollViewSelector = NSSelectorFromString(@"scrollView");
-
-    if ([self respondsToSelector:scrollViewSelector]) {
-        return ((id (*)(id, SEL))objc_msgSend)(self, scrollViewSelector);
-    }
-
-    return nil;
-}
-
-@end
 
 NSString* const CDVPageDidLoadNotification = @"CDVPageDidLoadNotification";
 NSString* const CDVPluginHandleOpenURLNotification = @"CDVPluginHandleOpenURLNotification";

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVWebViewProcessPoolFactory.h

@@ -18,7 +18,14 @@
  */
 
 #import <WebKit/WebKit.h>
+#import <Cordova/CDVAvailabilityDeprecated.h>
 
+/**
+ @Metadata {
+    @Available(Cordova, introduced: "6.2.0", deprecated: "8.0.0")
+ }
+ */
+CDV_DEPRECATED(8.0.0, "WebKit WKProcessPool is deprecated in iOS")
 @interface CDVWebViewProcessPoolFactory : NSObject
 @property (nonatomic, retain) WKProcessPool* sharedPool;
 

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVWebViewProcessPoolFactory.m

@@ -21,6 +21,10 @@
 @import WebKit;
 #import <Cordova/CDVWebViewProcessPoolFactory.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+
 static CDVWebViewProcessPoolFactory *factory = nil;
 
 @implementation CDVWebViewProcessPoolFactory
@@ -47,3 +51,5 @@ static CDVWebViewProcessPoolFactory *factory = nil;
     return _sharedPool;
 }
 @end
+
+#pragma clang diagnostic pop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "8.0.0-alpha.2",
+  "version": "8.0.0-beta.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -21,11 +21,11 @@
   ],
   "scripts": {
     "verify": "npm run xc:build:Capacitor && npm run xc:build:CapacitorCordova",
-    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' && cd ..",
+    "xc:build:Capacitor": "cd Capacitor && xcodebuild clean test -workspace Capacitor.xcworkspace -scheme Capacitor -destination 'platform=iOS Simulator,name=iPhone 16,OS=26.0.1' && cd ..",
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^8.0.0-alpha.2"
+    "@capacitor/core": "^8.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"