@capacitor/ios 4.0.0-alpha.1 → 4.0.0-alpha.2

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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))
+
+
+
+
+
 # [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
 
 

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -115,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/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

@@ -49,6 +49,6 @@
 -(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

@@ -109,6 +109,7 @@
 
 - (void)removeAllListeners:(CAPPluginCall *)call {
   [self.eventListeners removeAllObjects];
+  [call resolve];
 }
 
 - (NSArray<CAPPluginCall *>*)getListeners:(NSString *)eventName {
@@ -145,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

@@ -9,39 +9,39 @@ import Foundation
         self.config = config
     }
 
-    public func getString(configKey: String, defaultValue: String? = nil) -> String? {
+    @objc public func getString(_ configKey: String, _ defaultValue: String? = nil) -> String? {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? String {
             return val
         }
         return defaultValue
     }
 
-    public func getBoolean(configKey: String, defaultValue: Bool) -> Bool {
+    @objc public func getBoolean(_ configKey: String, _ defaultValue: Bool) -> Bool {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? Bool {
             return val
         }
         return defaultValue
     }
 
-    public func getInt(configKey: String, defaultValue: Int) -> Int {
+    @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? {
+    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? {
+    public func getObject(_ configKey: String) -> JSObject? {
         return (self.config)[keyPath: KeyPath(configKey)] as? JSObject
     }
 
-    public func isEmpty() -> Bool {
+    @objc public func isEmpty() -> Bool {
         return self.config.isEmpty
     }
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "4.0.0-alpha.1",
+  "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)",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7faec09fd724a0af7436f3d30c83856b7bb5ce51"
+  "gitHead": "5c588d5bd15b2b939c6efc25b7db9d6af29afae0"
 }