turbo-native-initializer 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89f212990b6d8acf8b1f37073d8b892b7f043bdf4a19d11997fabf620ba4ca1
-  data.tar.gz: d2b4ea5ee37d49c0d3eb23d4bb56894407a3ff5d535058ac21c54292439eae45
+  metadata.gz: d5b3658efa201b5340d0e5ecdc401395f6659c235a5177c1e7a6b908b69a2f09
+  data.tar.gz: 7327665391ec9be569354ad811f9565a6164da08aea90c3e8bfe04f65e03cf5a
 SHA512:
-  metadata.gz: 3002e6b664dd0c92f04c2535707e8008a5c38e6d61e129bf3d376aa586bf2906228323a6947910b7a9d107dbcc2e33403ee1a2de508d444d97d37cea54fa1434
-  data.tar.gz: 6884c3e84fef8d9462387a1ba5c787befe6b79053378bf6d21c5e65f68a3d31f117abf94a9eb0fb671581317968c17a3727247598b657b1171bf149316dbe00c
+  metadata.gz: 1dcedc375f6de7437ff80b816424e599b7b266713c94417a6752bf16104e8ac719f0cbbed03b500efe891a3590f84c000a16f254d25e8fac5c6546883a4b8a30
+  data.tar.gz: b5e35c0791bf2a6b3fdc6eeaec4c45b5b14388b796c9d51f3539d2547fd93f106c01d483ec6a90d7cb6d73359cdfb2d76501226dab9fd070535f082922c6ef1c

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/SceneDelegate.swift.tt

@@ -14,9 +14,7 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        guard let window = window else { fatalError() }
-
-        navigationController = window.rootViewController as? TurboNavigationController
+        navigationController = window!.rootViewController as? TurboNavigationController
         navigationController.session = session
         navigationController.modalSession = modalSession
     }
@@ -68,6 +66,14 @@ extension SceneDelegate: SessionDelegate {
         navigationController.route(url: proposal.url, options: proposal.options, properties: proposal.properties)
     }
 
+    func session(_ session: Session, openExternalURL url: URL) {
+        if url.host == rootURL.host, !url.pathExtension.isEmpty {
+            navigationController.present(SFSafariViewController(url: url), animated: true)
+        } else {
+            UIApplication.shared.open(url)
+        }
+    }
+
     func session(_ session: Session, didFailRequestForVisitable visitable: Visitable, error: Error) {
         if let turboError = error as? TurboError, case let .http(statusCode) = turboError, statusCode == 401 {
             promptForAuthentication()
@@ -78,58 +84,22 @@ extension SceneDelegate: SessionDelegate {
         }
     }
 
-    // When a form submission completes in the modal session, we need to
-    // manually clear the snapshot cache in the default session, since we
-    // don't want potentially stale cached snapshots to be used
     func sessionDidFinishFormSubmission(_ session: Session) {
         if (session == modalSession) {
             self.session.clearSnapshotCache()
         }
     }
 
-    func sessionDidLoadWebView(_ session: Session) {
-        session.webView.navigationDelegate = self
-    }
-
     func sessionWebViewProcessDidTerminate(_ session: Session) {
         session.reload()
     }
 }
 
-extension SceneDelegate: WKNavigationDelegate {
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        if navigationAction.navigationType == .linkActivated {
-            // Any link that's not on the same domain as the Turbo root url will go through here
-            // Other links on the domain, but that have an extension that is non-html will also go here
-            // You can decide how to handle those, by default if you're not the navigationDelegate
-            // the Session will open them in the default browser
-
-            let url = navigationAction.request.url!
-
-            // For this demo, we'll load files from our domain in a SafariViewController so you
-            // don't need to leave the app. You might expand this in your app
-            // to open all audio/video/images in a native media viewer
-            if url.host == rootURL.host, !url.pathExtension.isEmpty {
-                let safariViewController = SFSafariViewController(url: url)
-                navigationController.present(safariViewController, animated: true)
-            } else {
-                UIApplication.shared.open(url)
-            }
-
-            decisionHandler(.cancel)
-        } else {
-            decisionHandler(.allow)
-        }
-    }
-}
-
 extension SceneDelegate: WKUIDelegate {
     func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
         let confirm = UIAlertController(title: nil, message: message, preferredStyle: .alert)
         confirm.addAction(UIAlertAction(title: "Cancel", style: .cancel) { _ in completionHandler(false) })
         confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })
-
-        // JavaScript alerts in Turbo Native
         navigationController.present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/SceneDelegate.swift.tt

@@ -14,14 +14,8 @@ final class SceneDelegate: UIResponder {
     private let rootURL2 = <%= name %>.homeURL2
 
     private var tabBarController: UITabBarController!
-
-    private lazy var navigationController1 = {
-        tabBarController.viewControllers![0] as! TurboNavigationController
-    }()
-
-    private lazy var navigationController2 = {
-        tabBarController.viewControllers![1] as! TurboNavigationController
-    }()
+    private var navigationController1: TurboNavigationController!
+    private var navigationController2: TurboNavigationController!
 
     private func navigationController() -> TurboNavigationController {
         tabBarController.selectedViewController as! TurboNavigationController
@@ -30,13 +24,13 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        guard let window = window else { fatalError() }
-
-        tabBarController = window.rootViewController as? UITabBarController
+        tabBarController = window!.rootViewController as? UITabBarController
 
+        navigationController1 = tabBarController.viewControllers![0] as? TurboNavigationController
         navigationController1.session = session1
         navigationController1.modalSession = modalSession
 
+        navigationController2 = tabBarController.viewControllers![1] as? TurboNavigationController
         navigationController2.session = session2
         navigationController2.modalSession = modalSession
     }
@@ -88,6 +82,14 @@ extension SceneDelegate: SessionDelegate {
         navigationController().route(url: proposal.url, options: proposal.options, properties: proposal.properties)
     }
 
+    func session(_ session: Session, openExternalURL url: URL) {
+        if url.host == baseURL.host, !url.pathExtension.isEmpty {
+            navigationController().present(SFSafariViewController(url: url), animated: true)
+        } else {
+            UIApplication.shared.open(url)
+        }
+    }
+
     func session(_ session: Session, didFailRequestForVisitable visitable: Visitable, error: Error) {
         if let errorPresenter = visitable as? ErrorPresenter {
             errorPresenter.presentError(error) { session.reload() }
@@ -96,58 +98,22 @@ extension SceneDelegate: SessionDelegate {
         }
     }
 
-    // When a form submission completes in the modal session, we need to
-    // manually clear the snapshot cache in the default session, since we
-    // don't want potentially stale cached snapshots to be used
     func sessionDidFinishFormSubmission(_ session: Session) {
         if (session == modalSession) {
             self.session().clearSnapshotCache()
         }
     }
 
-    func sessionDidLoadWebView(_ session: Session) {
-        session.webView.navigationDelegate = self
-    }
-
     func sessionWebViewProcessDidTerminate(_ session: Session) {
         session.reload()
     }
 }
 
-extension SceneDelegate: WKNavigationDelegate {
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        if navigationAction.navigationType == .linkActivated {
-            // Any link that's not on the same domain as the Turbo root url will go through here
-            // Other links on the domain, but that have an extension that is non-html will also go here
-            // You can decide how to handle those, by default if you're not the navigationDelegate
-            // the Session will open them in the default browser
-
-            let url = navigationAction.request.url!
-
-            // For this demo, we'll load files from our domain in a SafariViewController so you
-            // don't need to leave the app. You might expand this in your app
-            // to open all audio/video/images in a native media viewer
-            if url.host == baseURL.host, !url.pathExtension.isEmpty {
-                let safariViewController = SFSafariViewController(url: url)
-                navigationController().present(safariViewController, animated: true)
-            } else {
-                UIApplication.shared.open(url)
-            }
-
-            decisionHandler(.cancel)
-        } else {
-            decisionHandler(.allow)
-        }
-    }
-}
-
 extension SceneDelegate: WKUIDelegate {
     func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
         let confirm = UIAlertController(title: nil, message: message, preferredStyle: .alert)
         confirm.addAction(UIAlertAction(title: "Cancel", style: .cancel) { _ in completionHandler(false) })
-        confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })
-
-        // JavaScript alerts in Turbo Native
+        confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })        
         navigationController().present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/version.rb

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor