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

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -59,10 +59,17 @@ import Cordova
 
     override open func viewDidLoad() {
         super.viewDidLoad()
-        self.becomeFirstResponder()
         loadWebView()
     }
 
+    override open func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        if bridge?.config.hasInitialFocus ?? true {
+            self.webView?.becomeFirstResponder()
+        }
+    }
+
     override open func canPerformUnwindSegueAction(_ action: Selector, from fromViewController: UIViewController, withSender sender: Any) -> Bool {
         return false
     }

package/Capacitor/Capacitor/CAPInstanceConfiguration.h

@@ -21,6 +21,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
 @property (nonatomic, readonly) BOOL allowLinkPreviews;
 @property (nonatomic, readonly) BOOL handleApplicationNotifications;
 @property (nonatomic, readonly) BOOL isWebDebuggable;
+@property (nonatomic, readonly) BOOL hasInitialFocus;
 @property (nonatomic, readonly) BOOL cordovaDeployDisabled;
 @property (nonatomic, readonly) UIScrollViewContentInsetAdjustmentBehavior contentInsetAdjustmentBehavior;
 @property (nonatomic, readonly, nonnull) NSURL *appLocation;

package/Capacitor/Capacitor/CAPInstanceConfiguration.m

@@ -39,6 +39,7 @@
         _preferredContentMode = descriptor.preferredContentMode;
         _pluginConfigurations = descriptor.pluginConfigurations;
         _isWebDebuggable = descriptor.isWebDebuggable;
+        _hasInitialFocus = descriptor.hasInitialFocus;
         _legacyConfig = descriptor.legacyConfig;
         // construct the necessary URLs
         _localURL = [[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@://%@", descriptor.urlScheme, descriptor.urlHostname]];
@@ -71,6 +72,7 @@
         _allowLinkPreviews = configuration.allowLinkPreviews;
         _handleApplicationNotifications = configuration.handleApplicationNotifications;
         _isWebDebuggable = configuration.isWebDebuggable;
+        _hasInitialFocus = configuration.hasInitialFocus;
         _cordovaDeployDisabled = configuration.cordovaDeployDisabled;
         _contentInsetAdjustmentBehavior = configuration.contentInsetAdjustmentBehavior;
         // we don't care about internal usage of deprecated APIs and the framework should build cleanly

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -103,6 +103,12 @@ NS_SWIFT_NAME(InstanceDescriptor)
  @discussion Defaults to true in debug mode and false in production
  */
 @property (nonatomic, assign) BOOL isWebDebuggable;
+/**
+ @brief Whether or not the webview will have focus.
+ @discussion Defaults to @c true.  Set by @c ios.initialFocus in the configuration file.
+ */
+@property (nonatomic, assign) BOOL hasInitialFocus;
+
 /**
  @brief How the web view will inset its content
  @discussion Set by @c ios.contentInset in the configuration file. Corresponds to @c contentInsetAdjustmentBehavior on WKWebView.

package/Capacitor/Capacitor/CAPInstanceDescriptor.m

@@ -41,6 +41,7 @@ NSString* const CAPInstanceDescriptorDefaultHostname = @"localhost";
     _allowLinkPreviews = YES;
     _handleApplicationNotifications = YES;
     _isWebDebuggable = NO;
+    _hasInitialFocus = YES;
     _contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     _appLocation = location;
     _limitsNavigationsToAppBoundDomains = FALSE;

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -141,6 +141,9 @@ internal extension InstanceDescriptor {
                 isWebDebuggable = true
                 #endif
             }
+            if let initialFocus = (config[keyPath: "ios.initialFocus"] as? Bool) ?? (config[keyPath: "initialFocus"] as? Bool) {
+                hasInitialFocus = initialFocus
+            }
         }
     }
     // swiftlint:enable cyclomatic_complexity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "7.0.0-alpha.2",
+  "version": "7.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)",
@@ -26,7 +26,7 @@
     "xc:build:xcframework": "scripts/build.sh xcframework"
   },
   "peerDependencies": {
-    "@capacitor/core": "^7.0.0-alpha.2"
+    "@capacitor/core": "^7.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"