Merge branch 'master' of github.com:liveviewnative/liveview-client-swiftui into link

Author: carson-katri

Package.resolved

@@ -18,7 +18,6 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
          .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
          .package(url: "https://github.com/davidstump/SwiftPhoenixClient.git", .upToNextMinor(from: "5.0.0")),
-         .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", .upToNextMinor(from: "0.1.4")),
          .package(url: "https://github.com/liveviewnative/liveview-native-core-swift.git", branch: "main"),
     ],
     targets: [
@@ -29,11 +28,8 @@ let package = Package(
             dependencies: [
                 "SwiftSoup",
                 "SwiftPhoenixClient",
-                .product(name: "Introspect", package: "SwiftUI-Introspect"),
-                .target(name: "LVNObjC"),
                 .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift"),
             ]),
-        .target(name: "LVNObjC"),
         .testTarget(
             name: "LiveViewNativeTests",
             dependencies: ["LiveViewNative"]),

Package.swift

@@ -16,6 +16,8 @@ struct BuiltinRegistry {
         switch name {
         case "textfield":
             TextField<R>(element: element, context: context)
+        case "securefield":
+            SecureField<R>(element: element, context: context)
         case "text":
             Text(element: element, context: context)
         case "hstack":
@@ -47,8 +49,6 @@ struct BuiltinRegistry {
 
         case "phx-form":
             PhxForm<R>(element: element, context: context)
-        case "phx-hero":
-            PhxHeroView(element: element, context: context)
         case "phx-submit-button":
             PhxSubmitButton(element: element, context: context)
         default:
@@ -59,9 +59,9 @@ struct BuiltinRegistry {
 
     enum ModifierType: String {
         case frame
-        case listRowInsets = "list_row_insets"
-        case listRowSeparator = "list_row_separator"
-        case navigationTitle = "navigation_title"
+        case listRowInsets
+        case listRowSeparator
+        case navigationTitle
         case padding
         case tint
     }

Sources/LVNObjC/ProxyingNavigationControllerDelegate.h

@@ -0,0 +1,36 @@
+//
+//  LiveConnectionError.swift
+//  
+//
+//  Created by Carson Katri on 1/6/23.
+//
+
+import Foundation
+import SwiftPhoenixClient
+
+public enum LiveConnectionError: Error {
+    case initialFetchError(Error)
+    case initialFetchUnexpectedResponse(URLResponse)
+    /// An error encountered when parsing the initial HTML.
+    case initialParseError
+    case socketError(Error)
+    case joinError(Message)
+    case eventError(Message)
+    
+    var localizedDescription: String {
+        switch self {
+        case .initialFetchError(let error):
+            return "initialFetchError(\(error))"
+        case .initialFetchUnexpectedResponse(let resp):
+            return "initialFetchUnexpectedResponse(\(resp))"
+        case .initialParseError:
+            return "initialParseError"
+        case .socketError(let error):
+            return "socketError(\(error))"
+        case .joinError(let message):
+            return "joinError(\(message.payload))"
+        case .eventError(let message):
+            return "eventError(\(message.payload))"
+        }
+    }
+}

Sources/LVNObjC/ProxyingNavigationControllerDelegate.m

@@ -0,0 +1,22 @@
+//
+//  LiveNavigationEntry.swift
+//  
+//
+//  Created by Carson Katri on 1/10/23.
+//
+
+import Foundation
+
+struct LiveNavigationEntry<R: CustomRegistry>: Hashable {
+    let url: URL
+    let coordinator: LiveViewCoordinator<R>
+    
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.url == rhs.url && lhs.coordinator === rhs.coordinator
+    }
+    
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(url)
+        hasher.combine(ObjectIdentifier(coordinator))
+    }
+}

Sources/LVNObjC/include/LVNObjC.h

@@ -1,14 +1,14 @@
 //
-//  LiveViewConfiguration.swift
+//  LiveSessionConfiguration.swift
 // LiveViewNative
 //
 //  Created by Shadowfacts on 3/30/22.
 //
 
 import Foundation
 
-/// An object that configures the behavior of a ``LiveViewCoordinator``.
-public struct LiveViewConfiguration {
+/// An object that configures the behavior of a ``LiveSessionCoordinator``.
+public struct LiveSessionConfiguration {
     /// Whether this coordinators allows its live view to navigate.
     ///
     /// By default, navigation is ``NavigationMode-swift.enum/disabled``.
@@ -25,10 +25,10 @@ public struct LiveViewConfiguration {
 
     // Non-final API for internal use only.
     @_spi(NarwinChat)
-    public var eventHandlersEnabled: Bool = false
+    public var eventHandlersEnabled: Bool = true
 
     @_spi(NarwinChat)
-    public var liveRedirectsEnabled: Bool = false
+    public var liveRedirectsEnabled: Bool = true
 
     /// Constructs a default, empty configuration.
     public init() {
@@ -42,5 +42,7 @@ public struct LiveViewConfiguration {
         case replaceOnly
         /// Navigation is fully enabled. Both replace and push redirects are allowed.
         case enabled
+        /// Navigation is fully enabled and uses a `NavigationSplitView` for the UI.
+        case splitView
     }
 }