@capacitor/ios 3.5.0 → 4.0.0-alpha.2

package/CHANGELOG.md

@@ -3,28 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.5.0](https://github.com/ionic-team/capacitor/compare/3.4.3...3.5.0) (2022-04-22)
+# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
 
 
-### Features
+### Bug Fixes
 
-* **ios:** Add overrideable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa))
+* **ios:** make removeAllListeners return a promise ([#5526](https://github.com/ionic-team/capacitor/issues/5526)) ([815f71b](https://github.com/ionic-team/capacitor/commit/815f71b6b62f6c4d5f66e6a36c190bb00a96fdcc))
 
 
+### Features
 
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
+* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
 
 
-## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
 
-**Note:** Version bump only for package @capacitor/ios
 
 
+# [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
 
 
+### Features
 
-## [3.4.2](https://github.com/ionic-team/capacitor/compare/3.4.1...3.4.2) (2022-03-03)
-
-**Note:** Version bump only for package @capacitor/ios
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
 
 
 

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -42,7 +42,7 @@ import Cordova
         setScreenOrientationDefaults()
 
         // get the web view
-        let assetHandler = WebViewAssetHandler(router: router())
+        let assetHandler = WebViewAssetHandler()
         assetHandler.setAssetPath(configuration.appLocation.path)
         let delegationHandler = WebViewDelegationHandler()
         prepareWebView(with: configuration, assetHandler: assetHandler, delegationHandler: delegationHandler)
@@ -89,11 +89,7 @@ import Cordova
         }
         return descriptor
     }
-    
-    open func router() -> Router {
-       return _Router()
-    }
-    
+
     /**
      The WKWebViewConfiguration to use for the webview.
 
@@ -119,6 +115,15 @@ import Cordova
                 webViewConfiguration.applicationNameForUserAgent = appendUserAgent
             }
         }
+        if let preferredContentMode = instanceConfiguration.preferredContentMode {
+            var mode = WKWebpagePreferences.ContentMode.recommended
+            if preferredContentMode == "mobile" {
+                mode = WKWebpagePreferences.ContentMode.mobile
+            } else if preferredContentMode == "desktop" {
+                mode = WKWebpagePreferences.ContentMode.desktop
+            }
+            webViewConfiguration.defaultWebpagePreferences.preferredContentMode = mode
+        }
         return webViewConfiguration
     }
 

package/Capacitor/Capacitor/CAPInstanceConfiguration.h

@@ -23,6 +23,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
 @property (nonatomic, readonly, nonnull) NSURL *appLocation;
 @property (nonatomic, readonly, nullable) NSString *appStartPath;
 @property (nonatomic, readonly) BOOL limitsNavigationsToAppBoundDomains;
+@property (nonatomic, readonly, nullable) NSString *preferredContentMode;
 
 @property (nonatomic, readonly, nonnull) NSDictionary *legacyConfig DEPRECATED_MSG_ATTRIBUTE("Use direct properties instead");
 

package/Capacitor/Capacitor/CAPInstanceConfiguration.m

@@ -35,6 +35,7 @@
         _appLocation = descriptor.appLocation;
         _appStartPath = descriptor.appStartPath;
         _limitsNavigationsToAppBoundDomains = descriptor.limitsNavigationsToAppBoundDomains;
+        _preferredContentMode = descriptor.preferredContentMode;
         _pluginConfigurations = descriptor.pluginConfigurations;
         _legacyConfig = descriptor.legacyConfig;
         // construct the necessary URLs

package/Capacitor/Capacitor/CAPInstanceConfiguration.swift

@@ -15,10 +15,18 @@ extension InstanceConfiguration {
         return serverURL
     }
 
+    @available(*, deprecated, message: "Use getPluginConfig")
     @objc public func getPluginConfigValue(_ pluginId: String, _ configKey: String) -> Any? {
         return (pluginConfigurations as? JSObject)?[keyPath: KeyPath("\(pluginId).\(configKey)")]
     }
 
+    @objc public func getPluginConfig(_ pluginId: String) -> PluginConfig {
+        if let cfg = (pluginConfigurations as? JSObject)?[keyPath: KeyPath("\(pluginId)")] as? JSObject {
+            return PluginConfig(config: cfg)
+        }
+        return PluginConfig(config: JSObject())
+    }
+
     @objc public func shouldAllowNavigation(to host: String) -> Bool {
         for hostname in allowedNavigationHostnames {
             if doesHost(host, match: hostname) {

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -108,6 +108,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
  @discussion Defaults to @c false. Set by @c ios.limitsNavigationsToAppBoundDomains in the configuration file.  Required to be @c true for plugins to work if the app includes @c WKAppBoundDomains in the Info.plist.
  */
 @property (nonatomic, assign) BOOL limitsNavigationsToAppBoundDomains;
+/**
+ @brief The content mode for the web view to use when it loads and renders web content.
+ @discussion Defaults to  @c recommended. Set by @c ios.preferredContentMode in the configuration file.
+ */
+@property (nonatomic, copy, nullable) NSString *preferredContentMode;
 /**
  @brief The parser used to load the cofiguration for Cordova plugins.
  */

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -125,6 +125,9 @@ internal extension InstanceDescriptor {
             if let limitsNavigations = config[keyPath: "ios.limitsNavigationsToAppBoundDomains"] as? Bool {
                 limitsNavigationsToAppBoundDomains = limitsNavigations
             }
+            if let preferredMode = (config[keyPath: "ios.preferredContentMode"] as? String) {
+                preferredContentMode = preferredMode
+            }
         }
     }
     // swiftlint:enable cyclomatic_complexity

package/Capacitor/Capacitor/CAPPlugin.h

@@ -4,6 +4,8 @@
 @protocol CAPBridgeProtocol;
 @class CAPPluginCall;
 
+@class PluginConfig;
+
 @interface CAPPlugin : NSObject
 
 @property (nonatomic, weak, nullable) WKWebView *webView;
@@ -44,8 +46,9 @@
 -(NSString* _Nonnull)getId;
 -(BOOL)getBool:(CAPPluginCall* _Nonnull) call field:(NSString* _Nonnull)field defaultValue:(BOOL)defaultValue DEPRECATED_MSG_ATTRIBUTE("Use accessors on CAPPluginCall instead. See CAPBridgedJSTypes.h for Obj-C implementations.");
 -(NSString* _Nullable)getString:(CAPPluginCall* _Nonnull)call field:(NSString* _Nonnull)field defaultValue:(NSString* _Nonnull)defaultValue DEPRECATED_MSG_ATTRIBUTE("Use accessors on CAPPluginCall instead. See CAPBridgedJSTypes.h for Obj-C implementations.");
--(id _Nullable)getConfigValue:(NSString* _Nonnull)key;
+-(id _Nullable)getConfigValue:(NSString* _Nonnull)key __deprecated_msg("use getConfig() and access config values using the methods available depending on the type.");
+-(PluginConfig* _Nonnull)getConfig;
 -(void)setCenteredPopover:(UIViewController* _Nonnull)vc;
--(BOOL)supportsPopover;
+-(BOOL)supportsPopover DEPRECATED_MSG_ATTRIBUTE("All iOS 13+ devices support popover");
 
 @end

package/Capacitor/Capacitor/CAPPlugin.m

@@ -29,10 +29,14 @@
   return [call getString:field defaultValue:defaultValue];
 }
 
--(id)getConfigValue:(NSString *)key {
+-(id)getConfigValue:(NSString *)key __deprecated {
   return [self.bridge.config getPluginConfigValue:self.pluginName :key];
 }
 
+-(PluginConfig*)getConfig {
+    return [self.bridge.config getPluginConfig:self.pluginName];
+}
+
 -(void)load {}
 
 - (void)addEventListener:(NSString *)eventName listener:(CAPPluginCall *)listener {
@@ -105,6 +109,7 @@
 
 - (void)removeAllListeners:(CAPPluginCall *)call {
   [self.eventListeners removeAllObjects];
+  [call resolve];
 }
 
 - (NSArray<CAPPluginCall *>*)getListeners:(NSString *)eventName {
@@ -141,11 +146,7 @@
 }
 
 -(BOOL)supportsPopover {
-  if (@available(iOS 13, *)) {
     return YES;
-  } else {
-    return UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad;
-  }
 }
 
 - (NSNumber*)shouldOverrideLoad:(WKNavigationAction*)navigationAction {

package/Capacitor/Capacitor/JSExport.swift

@@ -97,7 +97,7 @@ internal class JSExport {
             let methods = [
                 PluginHeaderMethod(name: "addListener", rtype: nil),
                 PluginHeaderMethod(name: "removeListener", rtype: nil),
-                PluginHeaderMethod(name: "removeAllListeners", rtype: nil),
+                PluginHeaderMethod(name: "removeAllListeners", rtype: "promise"),
                 PluginHeaderMethod(name: "checkPermissions", rtype: "promise"),
                 PluginHeaderMethod(name: "requestPermissions", rtype: "promise")
             ]

package/Capacitor/Capacitor/PluginConfig.swift

@@ -0,0 +1,56 @@
+import Foundation
+
+@objc public class PluginConfig: NSObject {
+
+    // The object containing the plugin config values
+    private var config: JSObject
+
+    init(config: JSObject) {
+        self.config = config
+    }
+
+    @objc public func getString(_ configKey: String, _ defaultValue: String? = nil) -> String? {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? String {
+            return val
+        }
+        return defaultValue
+    }
+
+    @objc public func getBoolean(_ configKey: String, _ defaultValue: Bool) -> Bool {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? Bool {
+            return val
+        }
+        return defaultValue
+    }
+
+    @objc public func getInt(_ configKey: String, _ defaultValue: Int) -> Int {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? Int {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getArray(_ configKey: String, _ defaultValue: JSArray? = nil) -> JSArray? {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? JSArray {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getObject(_ configKey: String) -> JSObject? {
+        return (self.config)[keyPath: KeyPath(configKey)] as? JSObject
+    }
+
+    @objc public func isEmpty() -> Bool {
+        return self.config.isEmpty
+    }
+
+    /**
+     * Gets the JSObject containing the config of the the provided plugin ID.
+     *
+     * @return The config for that plugin
+     */
+    public func getConfigJSON() -> JSObject {
+        return self.config
+    }
+}

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -3,13 +3,8 @@ import MobileCoreServices
 
 @objc(CAPWebViewAssetHandler)
 internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
-    private let router: Router
+
     private var basePath: String = ""
-    
-    init(router: Router) {
-        self.router = router
-        super.init()
-    }
 
     func setAssetPath(_ assetPath: String) {
         self.basePath = assetPath
@@ -19,14 +14,14 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         var startPath = self.basePath
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
-        
-        let resolvedRoute = router.route(for: stringToLoad)
+
         if stringToLoad.starts(with: CapacitorBridge.fileStartIdentifier) {
             startPath = stringToLoad.replacingOccurrences(of: CapacitorBridge.fileStartIdentifier, with: "")
+        } else if stringToLoad.isEmpty || url.pathExtension.isEmpty {
+            startPath.append("/index.html")
         } else {
-            startPath.append(resolvedRoute)
+            startPath.append(stringToLoad)
         }
-        
         let localUrl = URL.init(string: url.absoluteString)!
         let fileUrl = URL.init(fileURLWithPath: startPath)
 

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -47,8 +47,6 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
         bridge?.reset()
     }
     
-    // TODO: remove once Xcode 12 support is dropped
-    #if compiler(>=5.5)
     @available(iOS 15, *)
     func webView(
         _ webView: WKWebView,
@@ -67,7 +65,6 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
           decisionHandler: @escaping (WKPermissionDecision) -> Void) {
         decisionHandler(.grant)
     }
-    #endif
 
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         // post a notification for any listeners

package/Capacitor.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/capacitorjs'
   s.license = 'MIT'
   s.homepage = 'https://capacitorjs.com/'
-  s.ios.deployment_target  = '12.0'
+  s.ios.deployment_target  = '13.0'
   s.authors = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source = { :git => 'https://github.com/ionic-team/capacitor.git', :branch => "portals-dev" }
   s.source_files = 'Capacitor/Capacitor/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/**/*.{swift,h,m}'

package/CapacitorCordova.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.license      = 'MIT'
   s.authors      = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source       = { :git => 'https://github.com/ionic-team/capacitor', :tag => s.version.to_s }
-  s.platform     = :ios, 12.0
+  s.platform     = :ios, 13.0
   s.source_files = 'CapacitorCordova/CapacitorCordova/**/*.{h,m}'
   s.public_header_files = 'CapacitorCordova/CapacitorCordova/Classes/Public/*.h', 'CapacitorCordova/CapacitorCordova/CapacitorCordova.h'
   s.module_map = 'CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "3.5.0",
+  "version": "4.0.0-alpha.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -24,10 +24,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.5.0"
+    "@capacitor/core": "^3.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f03e1a67140c8af25288456f9e99dd6234b50f25"
+  "gitHead": "5c588d5bd15b2b939c6efc25b7db9d6af29afae0"
 }

package/Capacitor/Capacitor/Router.swift

@@ -1,27 +0,0 @@
-//
-//  Router.swift
-//  Capacitor
-//
-//  Created by Steven Sherry on 3/29/22.
-//  Copyright © 2022 Drifty Co. All rights reserved.
-//
-
-import Foundation
-
-public protocol Router {
-    func route(for path: String) -> String
-}
-
-// swiftlint:disable:next type_name
-internal struct _Router: Router {
-    func route(for path: String) -> String {
-        let pathUrl = URL(string: path)
-       
-        // if the pathUrl is null, then it is an invalid url (meaning it is empty or just plain invalid) then we want to route to /index.html
-        if pathUrl?.pathExtension.isEmpty ?? true {
-            return "/index.html"
-        }
-        
-        return path
-    }
-}