@capacitor/ios 3.6.0 → 4.0.0-beta.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-beta.0](https://github.com/ionic-team/capacitor/compare/3.6.0...4.0.0-beta.0) (2022-06-17)
+
+
+### Bug Fixes
+
+* **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))
+* **ios:** Support of range requests on WebViewAssetHandler ([#5659](https://github.com/ionic-team/capacitor/issues/5659)) ([348c08d](https://github.com/ionic-team/capacitor/commit/348c08d511e9d57a1b2ecedc3290c65fa9ba3924))
+
+
+
+
+
 # [3.6.0](https://github.com/ionic-team/capacitor/compare/3.5.1...3.6.0) (2022-06-17)
 
 
@@ -19,6 +37,24 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
+
+
+### Bug Fixes
+
+* **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.5.1](https://github.com/ionic-team/capacitor/compare/3.5.0...3.5.1) (2022-05-04)
 
 **Note:** Version bump only for package @capacitor/ios
@@ -38,6 +74,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+# [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
+
+
+### Features
+
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
+
+
+
+
+
 ## [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
@@ -53,7 +100,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-
 ## [3.4.1](https://github.com/ionic-team/capacitor/compare/3.4.0...3.4.1) (2022-02-09)
 
 

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -119,6 +119,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/UIColor.swift

@@ -26,14 +26,14 @@ public extension CapacitorExtensionTypeWrapper where T: UIColor {
             with: ""
         )
 
-        var argb: UInt32 = 0
+        var argb: UInt64 = 0
 
         var red: CGFloat = 0.0
         var green: CGFloat = 0.0
         var blue: CGFloat = 0.0
         var alpha: CGFloat = 1.0
 
-        guard Scanner(string: hexString).scanHexInt32(&argb) else { return nil }
+        guard Scanner(string: hexString).scanHexInt64(&argb) else { return nil }
 
         if hexString.count == 6 {
             red = CGFloat((argb & 0xFF0000) >> 16) / 255.0

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -30,25 +30,46 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
 
         do {
             var data = Data()
-            if !stringToLoad.contains("cordova.js") {
-                if isMediaExtension(pathExtension: url.pathExtension) {
-                    data = try Data(contentsOf: fileUrl, options: Data.ReadingOptions.mappedIfSafe)
-                } else {
-                    data = try Data(contentsOf: fileUrl)
-                }
-            }
             let mimeType = mimeTypeForExtension(pathExtension: url.pathExtension)
-            let expectedContentLength = data.count
-            let headers =  [
+            var headers =  [
                 "Content-Type": mimeType,
                 "Cache-Control": "no-cache"
             ]
-            let urlResponse = URLResponse(url: localUrl, mimeType: mimeType, expectedContentLength: expectedContentLength, textEncodingName: nil)
-            let httpResponse = HTTPURLResponse(url: localUrl, statusCode: 200, httpVersion: nil, headerFields: headers)
-            if isMediaExtension(pathExtension: url.pathExtension) {
-                urlSchemeTask.didReceive(urlResponse)
+            if let rangeString = urlSchemeTask.request.value(forHTTPHeaderField: "Range"),
+               let totalSize = try fileUrl.resourceValues(forKeys: [.fileSizeKey]).fileSize,
+               isMediaExtension(pathExtension: url.pathExtension) {
+                let fileHandle = try FileHandle(forReadingFrom: fileUrl)
+                let parts = rangeString.components(separatedBy: "=")
+                let streamParts = parts[1].components(separatedBy: "-")
+                let fromRange = Int(streamParts[0]) ?? 0
+                var toRange = totalSize - 1
+                if streamParts.count > 1 {
+                    toRange = Int(streamParts[1]) ?? toRange
+                }
+                let rangeLength = toRange - fromRange + 1
+                try fileHandle.seek(toOffset: UInt64(fromRange))
+                data = fileHandle.readData(ofLength: rangeLength)
+                headers["Accept-Ranges"] = "bytes"
+                headers["Content-Range"] = "bytes \(fromRange)-\(toRange)/\(totalSize)"
+                headers["Content-Length"] = String(data.count)
+                let response = HTTPURLResponse(url: localUrl, statusCode: 206, httpVersion: nil, headerFields: headers)
+                urlSchemeTask.didReceive(response!)
+                try fileHandle.close()
             } else {
-                urlSchemeTask.didReceive(httpResponse!)
+                if !stringToLoad.contains("cordova.js") {
+                    if isMediaExtension(pathExtension: url.pathExtension) {
+                        data = try Data(contentsOf: fileUrl, options: Data.ReadingOptions.mappedIfSafe)
+                    } else {
+                        data = try Data(contentsOf: fileUrl)
+                    }
+                }
+                let urlResponse = URLResponse(url: localUrl, mimeType: mimeType, expectedContentLength: data.count, textEncodingName: nil)
+                let httpResponse = HTTPURLResponse(url: localUrl, statusCode: 200, httpVersion: nil, headerFields: headers)
+                if isMediaExtension(pathExtension: url.pathExtension) {
+                    urlSchemeTask.didReceive(urlResponse)
+                } else {
+                    urlSchemeTask.didReceive(httpResponse!)
+                }
             }
             urlSchemeTask.didReceive(data)
         } catch let error as NSError {

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.6.0",
+  "version": "4.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)",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1e06a199a44bb5321f0fb48b5fbca961cc1dbb50"
+  "gitHead": "d9e553f76fac74df6ab0f2bf5c3da18e51b2282b"
 }