refactor: fix typo, improve readability and reduce nesting

andredestro · andredestro · commit 252ec10e9b45 · 2025-07-17T15:50:47.000+01:00
diff --git a/OSInAppBrowserLib/RouterAdapters/OSIABWebViewRouterAdapter.swift b/OSInAppBrowserLib/RouterAdapters/OSIABWebViewRouterAdapter.swift
@@ -21,8 +21,8 @@ public class OSIABWebViewRouterAdapter: NSObject, OSIABRouter {
     ///   - cacheManager: Object that manages the browser's cache
     ///   - callbackHandler: Object that manages all the callbacks available for the WebView.
     public init(
-        _ options: OSIABWebViewOptions,
-        _ customHeaders: [String: String]? = nil,
+        options: OSIABWebViewOptions,
+        customHeaders: [String: String]? = nil,
         cacheManager: OSIABCacheManager,
         callbackHandler: OSIABWebViewCallbackHandler
     ) {
@@ -41,13 +41,13 @@ public class OSIABWebViewRouterAdapter: NSObject, OSIABRouter {
         
         let viewModel = OSIABWebViewModel(
             url: url,
-            customHeaders: self.customHeaders,
-            self.options.toConfigurationModel().toWebViewConfiguration(),
-            self.options.allowOverScroll,
-            self.options.customUserAgent,
-            self.options.allowsBackForwardNavigationGestures,
-            uiModel: self.options.toUIModel(),
-            callbackHandler: self.callbackHandler
+            customHeaders: customHeaders,
+            webViewConfiguration: options.toConfigurationModel().toWebViewConfiguration(),
+            scrollViewBounces: options.allowOverScroll,
+            customUserAgent: options.customUserAgent,
+            backForwardNavigationGestures: options.allowsBackForwardNavigationGestures,
+            uiModel: options.toUIModel(),
+            callbackHandler: callbackHandler
         )
         
         let dismissCallback: () -> Void = { self.callbackHandler.onBrowserClosed(true) }
@@ -58,8 +58,8 @@ public class OSIABWebViewRouterAdapter: NSObject, OSIABRouter {
         } else {
             hostingController = OSIABWebView13Controller(rootView: .init(viewModel), dismiss: dismissCallback)
         }
-        hostingController.modalPresentationStyle = self.options.modalPresentationStyle
-        hostingController.modalTransitionStyle = self.options.modalTransitionStyle
+        hostingController.modalPresentationStyle = options.modalPresentationStyle
+        hostingController.modalTransitionStyle = options.modalTransitionStyle
         hostingController.presentationController?.delegate = self
         
         completionHandler(hostingController)
@@ -72,23 +72,23 @@ private extension OSIABWebViewOptions {
     /// - Returns: The `OSIABWebViewConfigurationModel` equivalent value.
     func toConfigurationModel() -> OSIABWebViewConfigurationModel {
         .init(
-            self.mediaTypesRequiringUserActionForPlayback,
-            self.enableViewportScale,
-            self.allowInLineMediaPlayback,
-            self.surpressIncrementalRendering
+            mediaTypesRequiringUserActionForPlayback,
+            enableViewportScale,
+            allowInLineMediaPlayback,
+            surpressIncrementalRendering
         )
     }
     
     /// Converts the current value to `OSIABWebViewUIModel` equivalent.
     /// - Returns: The `OSIABWebViewUIModel` equivalent value.
     func toUIModel() -> OSIABWebViewUIModel {
         .init(
-            showURL: self.showURL,
-            showToolbar: self.showToolbar,
-            toolbarPosition: self.toolbarPosition,
-            showNavigationButtons: self.showNavigationButtons,
-            leftToRight: self.leftToRight,
-            closeButtonText: self.closeButtonText
+            showURL: showURL,
+            showToolbar: showToolbar,
+            toolbarPosition: toolbarPosition,
+            showNavigationButtons: showNavigationButtons,
+            leftToRight: leftToRight,
+            closeButtonText: closeButtonText
         )
     }
 }
diff --git a/OSInAppBrowserLib/WebView/OSIABWebViewModel.swift b/OSInAppBrowserLib/WebView/OSIABWebViewModel.swift
@@ -1,5 +1,5 @@
 import Combine
-import WebKit
+@preconcurrency import WebKit
 
 /// View Model containing all the WebView's customisations.
 class OSIABWebViewModel: NSObject, ObservableObject {
@@ -34,7 +34,7 @@ class OSIABWebViewModel: NSObject, ObservableObject {
     /// Indicates if the forward button is available for pressing.
     @Published private(set) var forwardButtonEnabled: Bool = true
     
-    /// The current adress label being displayed on the screen. Empty string indicates that the address will not be displayed.
+    /// The current address label being displayed on the screen. Empty string indicates that the address will not be displayed.
     @Published private(set) var addressLabel: String = ""
     
     private var cancellables = Set<AnyCancellable>()
@@ -50,10 +50,10 @@ class OSIABWebViewModel: NSObject, ObservableObject {
     init(
         url: URL,
         customHeaders: [String: String]? = nil,
-        _ webView: WKWebView,
-        _ scrollViewBounces: Bool = true,
-        _ customUserAgent: String? = nil,
-        _ backForwardNavigationGestures: Bool = true,
+        webView: WKWebView,
+        scrollViewBounces: Bool = true,
+        customUserAgent: String? = nil,
+        backForwardNavigationGestures: Bool = true,
         uiModel: OSIABWebViewUIModel,
         callbackHandler: OSIABWebViewCallbackHandler
     ) {
@@ -62,17 +62,12 @@ class OSIABWebViewModel: NSObject, ObservableObject {
         self.webView = webView
         self.closeButtonText = uiModel.closeButtonText
         self.callbackHandler = callbackHandler
-        if uiModel.showToolbar {
-            self.toolbarPosition = uiModel.toolbarPosition
-            if uiModel.showURL {
-                self.addressLabel = url.absoluteString
-            }
-        } else {
-            self.toolbarPosition = nil
+        self.toolbarPosition = uiModel.showToolbar ? uiModel.toolbarPosition : nil
+        if uiModel.showToolbar && uiModel.showURL {
+            self.addressLabel = url.absoluteString
         }
         self.showNavigationButtons = uiModel.showNavigationButtons
         self.leftToRight = uiModel.leftToRight
-        
         super.init()
         self.webView.allowsBackForwardNavigationGestures = backForwardNavigationGestures
         self.webView.scrollView.bounces = scrollViewBounces
@@ -93,20 +88,20 @@ class OSIABWebViewModel: NSObject, ObservableObject {
     convenience init(
         url: URL,
         customHeaders: [String: String]? = nil,
-        _ webViewConfiguration: WKWebViewConfiguration,
-        _ scrollViewBounces: Bool = true,
-        _ customUserAgent: String? = nil,
-        _ backForwardNavigationGestures: Bool = true,
+        webViewConfiguration: WKWebViewConfiguration,
+        scrollViewBounces: Bool = true,
+        customUserAgent: String? = nil,
+        backForwardNavigationGestures: Bool = true,
         uiModel: OSIABWebViewUIModel,
         callbackHandler: OSIABWebViewCallbackHandler
     ) {
         self.init(
             url: url,
             customHeaders: customHeaders,
-            WKWebView(frame: .zero, configuration: webViewConfiguration),
-            scrollViewBounces,
-            customUserAgent,
-            backForwardNavigationGestures,
+            webView: WKWebView(frame: .zero, configuration: webViewConfiguration),
+            scrollViewBounces: scrollViewBounces,
+            customUserAgent: customUserAgent,
+            backForwardNavigationGestures: backForwardNavigationGestures,
             uiModel: uiModel,
             callbackHandler: callbackHandler
         )
@@ -115,50 +110,43 @@ class OSIABWebViewModel: NSObject, ObservableObject {
     /// Setups the combine bindings, so that the Published properties can be filled automatically and reactively.
     private func setupBindings(_ showURL: Bool, _ showToolbar: Bool, _ showNavigationButtons: Bool) {
         if #available(iOS 14.0, *) {
-            self.webView.publisher(for: \.isLoading)
+            webView.publisher(for: \.isLoading)
                 .assign(to: &$isLoading)
-            
-            self.webView.publisher(for: \.url)
+            webView.publisher(for: \.url)
                 .compactMap { $0 }
                 .assign(to: &$url)
-            
             if showToolbar {
                 if showNavigationButtons {
-                    self.webView.publisher(for: \.canGoBack)
+                    webView.publisher(for: \.canGoBack)
                         .assign(to: &$backButtonEnabled)
                     
-                    self.webView.publisher(for: \.canGoForward)
+                    webView.publisher(for: \.canGoForward)
                         .assign(to: &$forwardButtonEnabled)
                 }
-                
                 if showURL {
-                    self.$url.map(\.absoluteString)
+                    $url.map(\.absoluteString)
                         .assign(to: &$addressLabel)
                 }
             }
         } else {
-            self.webView.publisher(for: \.isLoading)
+            webView.publisher(for: \.isLoading)
                 .assign(to: \.isLoading, on: self)
                 .store(in: &cancellables)
-            
-            self.webView.publisher(for: \.url)
+            webView.publisher(for: \.url)
                 .compactMap { $0 }
                 .assign(to: \.url, on: self)
                 .store(in: &cancellables)
-            
             if showToolbar {
                 if showNavigationButtons {
-                    self.webView.publisher(for: \.canGoBack)
+                    webView.publisher(for: \.canGoBack)
                         .assign(to: \.backButtonEnabled, on: self)
                         .store(in: &cancellables)
-                    
-                    self.webView.publisher(for: \.canGoForward)
+                    webView.publisher(for: \.canGoForward)
                         .assign(to: \.forwardButtonEnabled, on: self)
                         .store(in: &cancellables)
                 }
-                
                 if showURL {
-                    self.$url.map(\.absoluteString)
+                    $url.map(\.absoluteString)
                         .assign(to: \.addressLabel, on: self)
                         .store(in: &cancellables)
                 }
@@ -168,76 +156,69 @@ class OSIABWebViewModel: NSObject, ObservableObject {
     
     /// Loads the URL within the WebView. Is the first operation to be performed when the view is displayed.
     func loadURL() {
-        var request = URLRequest(url: self.url)
-        if let headers = self.customHeaders {
-            for (key, value) in headers {
-                request.setValue(value, forHTTPHeaderField: key)
-            }
+        var request = URLRequest(url: url)
+        customHeaders?.forEach { key, value in
+            request.setValue(value, forHTTPHeaderField: key)
         }
-        self.webView.load(request)
+        webView.load(request)
     }
     
     /// Signals the WebView to move forward. This is performed as a reaction to a button click.
     func forwardButtonPressed() {
-        self.webView.goForward()
+        webView.goForward()
     }
     
     /// Signals the WebView to move backwards. This is performed as a reaction to a button click.
     func backButtonPressed() {
-        self.webView.goBack()
+        webView.goBack()
     }
     
     /// Signals the WebView to be closed, triggering the `browserClosed` event. This is performed as a reaction to a button click.
     func closeButtonPressed() {
-        self.callbackHandler.onBrowserClosed(false)
+        callbackHandler.onBrowserClosed(false)
     }
 }
 
 // MARK: - WKNavigationDelegate implementation
 extension OSIABWebViewModel: WKNavigationDelegate {
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        var shouldStart = true
-        
         guard let url = navigationAction.request.url, url == navigationAction.request.mainDocumentURL else { return decisionHandler(.cancel) }
         
         // if is an app store, tel, sms, mailto or geo link, let the system handle it, otherwise it fails to load it
         if ["itms-appss", "itms-apps", "tel", "sms", "mailto", "geo"].contains(url.scheme) {
             webView.stopLoading()
-            self.callbackHandler.onDelegateURL(url)
-            shouldStart = false
+            callbackHandler.onDelegateURL(url)
+            decisionHandler(.cancel)
+            return
         }
         
-        if shouldStart {
-            if navigationAction.targetFrame != nil {
-                decisionHandler(.allow)
-            } else {
-                webView.load(navigationAction.request)
-                decisionHandler(.cancel)
-            }
+        if navigationAction.targetFrame != nil {
+            decisionHandler(.allow)
         } else {
+            webView.load(navigationAction.request)
             decisionHandler(.cancel)
         }
     }
     
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        if !self.firstLoadDone {
-            self.callbackHandler.onBrowserPageLoad()
-            self.firstLoadDone = true
+        if !firstLoadDone {
+            callbackHandler.onBrowserPageLoad()
+            firstLoadDone = true
         } else {
-            self.callbackHandler.onBrowserPageNavigationCompleted(url.absoluteString)
+            callbackHandler.onBrowserPageNavigationCompleted(url.absoluteString)
         }
         error = nil
     }
     
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        self.webView(webView, didFailedNavigation: "didFailNavigation", with: error)
+        handleWebViewNavigationError("didFailNavigation", error: error)
     }
     
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        self.webView(webView, didFailedNavigation: "didFailProvisionalNavigation", with: error)
+        handleWebViewNavigationError("didFailProvisionalNavigation", error: error)
     }
     
-    private func webView(_ webView: WKWebView, didFailedNavigation delegateName: String, with error: Error) {
+    private func handleWebViewNavigationError(_ delegateName: String, error: Error) {
         print("webView: \(delegateName) - \(error.localizedDescription)")
         if (error as NSError).code != NSURLErrorCancelled {
             self.error = error
@@ -258,7 +239,6 @@ extension OSIABWebViewModel: WKUIDelegate {
     private func createAlertController(withBodyText message: String, okButtonHandler: @escaping ButtonHandler, cancelButtonHandler: ButtonHandler? = nil) -> UIAlertController {
         let title = Bundle.main.infoDictionary?[kCFBundleNameKey as String] as? String ?? ""
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
-        
         let okAction = UIAlertAction(title: "OK", style: .default) { _ in
             okButtonHandler(alert)
         }
@@ -275,42 +255,40 @@ extension OSIABWebViewModel: WKUIDelegate {
     }
     
     func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
-        let result = self.createAlertController(
+        let result = createAlertController(
             withBodyText: message,
             okButtonHandler: { alert in
                 completionHandler()
                 alert.dismiss(animated: true)
             }
         )
-        self.callbackHandler.onDelegateAlertController(result)
+        callbackHandler.onDelegateAlertController(result)
     }
     
     func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
         let handler: (UIAlertController, Bool) -> Void = { alert, input in
             completionHandler(input)
             alert.dismiss(animated: true)
         }
-        
-        let result = self.createAlertController(
+        let result = createAlertController(
             withBodyText: message,
             okButtonHandler: { handler($0, true) },
             cancelButtonHandler: { handler($0, false) }
         )
-        self.callbackHandler.onDelegateAlertController(result)
+        callbackHandler.onDelegateAlertController(result)
     }
     
     func webView(_ webView: WKWebView, runJavaScriptTextInputPanelWithPrompt prompt: String, defaultText: String?, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (String?) -> Void) {
         let handler: (UIAlertController, Bool) -> Void = { alert, returnTextField in
             completionHandler(returnTextField ? alert.textFields?.first?.text : nil)
             alert.dismiss(animated: true)
         }
-        
-        let result = self.createAlertController(
+        let result = createAlertController(
             withBodyText: prompt,
             okButtonHandler: { handler($0, true) },
             cancelButtonHandler: { handler($0, false) }
         )
         result.addTextField { $0.text = defaultText }
-        self.callbackHandler.onDelegateAlertController(result)
+        callbackHandler.onDelegateAlertController(result)
     }
 }
diff --git a/OSInAppBrowserLib/WebView/Views/OSIABWebView.swift b/OSInAppBrowserLib/WebView/Views/OSIABWebView.swift
@@ -83,7 +83,7 @@ private extension OSIABWebViewModel {
         let configurationModel = OSIABWebViewConfigurationModel()
         self.init(
             url: .init(string: url)!,
-            configurationModel.toWebViewConfiguration(),
+            webViewConfiguration: configurationModel.toWebViewConfiguration(),
             uiModel: .init(
                 showURL: showURL,
                 showToolbar: showToolbar,
diff --git a/OSInAppBrowserLib/WebView/Views/OSIABWebView13WrapperView.swift b/OSInAppBrowserLib/WebView/Views/OSIABWebView13WrapperView.swift
@@ -52,7 +52,7 @@ private extension OSIABWebViewModel {
         let configurationModel = OSIABWebViewConfigurationModel()
         self.init(
             url: .init(string: "https://outsystems.com")!,
-            configurationModel.toWebViewConfiguration(),
+            webViewConfiguration: configurationModel.toWebViewConfiguration(),
             uiModel: .init(toolbarPosition: toolbarPosition),
             callbackHandler: .init(
                 onDelegateURL: { _ in },
@@ -68,7 +68,7 @@ private extension OSIABWebViewModel {
         let configurationModel = OSIABWebViewConfigurationModel()
         self.init(
             url: .init(string: url)!,
-            configurationModel.toWebViewConfiguration(),
+            webViewConfiguration: configurationModel.toWebViewConfiguration(),
             uiModel: .init(),
             callbackHandler: .init(
                 onDelegateURL: { _ in },
diff --git a/OSInAppBrowserLib/WebView/Views/OSIABWebViewWrapperView.swift b/OSInAppBrowserLib/WebView/Views/OSIABWebViewWrapperView.swift
