turbo-native-initializer 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89f212990b6d8acf8b1f37073d8b892b7f043bdf4a19d11997fabf620ba4ca1
-  data.tar.gz: d2b4ea5ee37d49c0d3eb23d4bb56894407a3ff5d535058ac21c54292439eae45
+  metadata.gz: a6841be700aef23b3f08578ca5600a2b04f749b0759b78524b9eeee25b401761
+  data.tar.gz: 150fcb0fdb292a111db55d614684162201e46fef74df2dd0d5e3bb07d1e631eb
 SHA512:
-  metadata.gz: 3002e6b664dd0c92f04c2535707e8008a5c38e6d61e129bf3d376aa586bf2906228323a6947910b7a9d107dbcc2e33403ee1a2de508d444d97d37cea54fa1434
-  data.tar.gz: 6884c3e84fef8d9462387a1ba5c787befe6b79053378bf6d21c5e65f68a3d31f117abf94a9eb0fb671581317968c17a3727247598b657b1171bf149316dbe00c
+  metadata.gz: 94495c27a497d66a322a394b5d0892d38ffd4b6db121dff707598864283efe3afd48ed50ab4f31ff08e60f64171ec2e7c2803131939e4aea202a1499e9d3bf31
+  data.tar.gz: dc44d0613e6e02f30de088a3f329297c8fd38e310e56c921a55d913c199862f6d44dfe468ff206bd0381dfedde8daf1def0acb41eef353b1dd93643421850b01

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/assets/json/configuration.json

@@ -2,11 +2,11 @@
   "settings": {},
   "rules": [
     { "patterns": [".*"], "properties": { "uri": "turbo://fragment/web", "pull_to_refresh_enabled": true } },
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop" } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none" } },
-    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal", "pull_to_refresh_enabled": false } },
+    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
     { "patterns": ["/numbers$"], "properties": { "uri": "turbo://fragment/numbers", "title": "Numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/assets/json/configuration.json

@@ -2,11 +2,11 @@
   "settings": {},
   "rules": [
     { "patterns": [".*"], "properties": { "uri": "turbo://fragment/web", "pull_to_refresh_enabled": true } },
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop" } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none" } },
-    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal", "pull_to_refresh_enabled": false } },
+    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
     { "patterns": ["/numbers$"], "properties": { "uri": "turbo://fragment/numbers", "title": "Numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Configuration/path-configuration.json

@@ -1,11 +1,11 @@
 {
   "settings": {},
   "rules": [
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
-    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop", "visitable": false } },
+    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "back", "visitable": false } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none", "visitable": false } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
+    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal", "pull-to-refresh-enabled": false } },
     { "patterns": ["^/$"], "properties": { "presentation": "replace-all" } },
-    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal" } },
     { "patterns": ["/numbers$"], "properties": { "view-controller": "numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift

@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {
@@ -43,8 +48,8 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isPop(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "pop"
+    private func isBack(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "back"
     }
 
     private func isRefresh(_ properties: PathProperties) -> Bool {
@@ -71,6 +76,14 @@ extension TurboNavigationController {
         return properties["visitable"] as? Bool ?? true
     }
 
+    private func isPullToRefreshEnabled(_ properties: PathProperties) -> Bool {
+        return properties["pull-to-refresh-enabled"] as? Bool ?? true
+    }
+
+    private func title(from properties: PathProperties) -> String? {
+        return properties["title"] as? String
+    }
+
     private func noticeMessage(from url: URL) -> String? {
         URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.first(where: { $0.name == "notice" })?.value
     }
@@ -90,13 +103,16 @@ extension TurboNavigationController {
             }
         }
 
-        return TurboWebViewController(url: url)
+        let viewController = TurboWebViewController(url: url)
+        viewController.pullToRefreshEnabled = isPullToRefreshEnabled(properties)
+        viewController.title = title(from: properties)
+        return viewController
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
             present(UINavigationController(rootViewController: viewController), animated: true)
-        } else if isPop(properties) {
+        } else if isBack(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboWebViewController.swift

@@ -5,6 +5,8 @@ import WebKit
 
 final class TurboWebViewController: VisitableViewController, ErrorPresenter, BridgeDestination {
 
+    var pullToRefreshEnabled = true
+
     private lazy var bridgeDelegate: BridgeDelegate = {
         BridgeDelegate(location: visitableURL.absoluteString, destination: self, componentTypes: BridgeComponent.allTypes)
     }()
@@ -20,6 +22,8 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
         navigationItem.backButtonTitle = "Back"
 
+        visitableView.allowsPullToRefresh = pullToRefreshEnabled
+
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
@@ -49,6 +53,10 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     // MARK: Visitable
 
+    override func visitableDidRender() {
+        title = title ?? visitableView.webView?.title
+    }
+
     override func visitableDidActivateWebView(_ webView: WKWebView) {
         bridgeDelegate.webViewDidBecomeActive(webView)
     }

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/Configuration/path-configuration.json

@@ -1,11 +1,11 @@
 {
   "settings": {},
   "rules": [
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
-    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop", "visitable": false } },
+    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "back", "visitable": false } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none", "visitable": false } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
+    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal", "pull-to-refresh-enabled": false } },
     { "patterns": ["^/$"], "properties": { "presentation": "replace-all" } },
-    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal" } },
     { "patterns": ["/numbers$"], "properties": { "view-controller": "numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift

@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {
@@ -43,8 +48,8 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isPop(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "pop"
+    private func isBack(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "back"
     }
 
     private func isRefresh(_ properties: PathProperties) -> Bool {
@@ -71,6 +76,14 @@ extension TurboNavigationController {
         return properties["visitable"] as? Bool ?? true
     }
 
+    private func isPullToRefreshEnabled(_ properties: PathProperties) -> Bool {
+        return properties["pull-to-refresh-enabled"] as? Bool ?? true
+    }
+
+    private func title(from properties: PathProperties) -> String? {
+        return properties["title"] as? String
+    }
+
     private func noticeMessage(from url: URL) -> String? {
         URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.first(where: { $0.name == "notice" })?.value
     }
@@ -90,13 +103,16 @@ extension TurboNavigationController {
             }
         }
 
-        return TurboWebViewController(url: url)
+        let viewController = TurboWebViewController(url: url)
+        viewController.pullToRefreshEnabled = isPullToRefreshEnabled(properties)
+        viewController.title = title(from: properties)
+        return viewController
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
             present(UINavigationController(rootViewController: viewController), animated: true)
-        } else if isPop(properties) {
+        } else if isBack(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboWebViewController.swift

@@ -5,6 +5,8 @@ import WebKit
 
 final class TurboWebViewController: VisitableViewController, ErrorPresenter, BridgeDestination {
 
+    var pullToRefreshEnabled = true
+
     private lazy var bridgeDelegate: BridgeDelegate = {
         BridgeDelegate(location: visitableURL.absoluteString, destination: self, componentTypes: BridgeComponent.allTypes)
     }()
@@ -20,6 +22,8 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
         navigationItem.backButtonTitle = "Back"
 
+        visitableView.allowsPullToRefresh = pullToRefreshEnabled
+
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
@@ -49,6 +53,10 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     // MARK: Visitable
 
+    override func visitableDidRender() {
+        title = title ?? visitableView.webView?.title
+    }
+
     override func visitableDidActivateWebView(_ webView: WKWebView) {
         bridgeDelegate.webViewDidBecomeActive(webView)
     }

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.16"
 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.16
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor