turbo-native-initializer 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b3658efa201b5340d0e5ecdc401395f6659c235a5177c1e7a6b908b69a2f09
-  data.tar.gz: 7327665391ec9be569354ad811f9565a6164da08aea90c3e8bfe04f65e03cf5a
+  metadata.gz: a6841be700aef23b3f08578ca5600a2b04f749b0759b78524b9eeee25b401761
+  data.tar.gz: 150fcb0fdb292a111db55d614684162201e46fef74df2dd0d5e3bb07d1e631eb
 SHA512:
-  metadata.gz: 1dcedc375f6de7437ff80b816424e599b7b266713c94417a6752bf16104e8ac719f0cbbed03b500efe891a3590f84c000a16f254d25e8fac5c6546883a4b8a30
-  data.tar.gz: b5e35c0791bf2a6b3fdc6eeaec4c45b5b14388b796c9d51f3539d2547fd93f106c01d483ec6a90d7cb6d73359cdfb2d76501226dab9fd070535f082922c6ef1c
+  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_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/version.rb

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.15"
+  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.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor