Merge branch 'main' of github.com:liveviewnative/liveview-client-swiftui into progress-view

carson-katri · carson-katri · commit bba3b0e8bc5e · 2023-01-25T15:04:06.000-05:00
diff --git a/Sources/LiveViewNative/BuiltinRegistry.swift b/Sources/LiveViewNative/BuiltinRegistry.swift
@@ -19,7 +19,7 @@ struct BuiltinRegistry {
         case "securefield":
             SecureField<R>(element: element, context: context)
         case "text":
-            Text(element: element, context: context)
+            Text(context: context)
         case "hstack":
             HStack<R>(element: element, context: context)
         case "vstack":
@@ -44,11 +44,24 @@ struct BuiltinRegistry {
             Shape(element: element, context: context, shape: Rectangle())
         case "roundedrectangle":
             Shape(element: element, context: context, shape: RoundedRectangle(from: element))
+        case "circle":
+            Shape(element: element, context: context, shape: Circle())
+        case "ellipse":
+            Shape(element: element, context: context, shape: Ellipse())
+        case "capsule":
+            Shape(element: element, context: context, shape: Capsule(from: element))
+        case "containerrelativeshape":
+            Shape(element: element, context: context, shape: ContainerRelativeShape())
         case "lvn-link":
             Link(element: element, context: context)
-        case "progressview":
+        case "progress-view":
             ProgressView(element: element, context: context)
-            
+        case "divider":
+            Divider()
+        case "edit-button":
+            EditButton()
+        case "toggle":
+            Toggle(element: element, context: context)
         case "phx-form":
             PhxForm<R>(element: element, context: context)
         case "phx-submit-button":
@@ -61,9 +74,9 @@ struct BuiltinRegistry {
     
     enum ModifierType: String {
         case frame
-        case listRowInsets
-        case listRowSeparator
-        case navigationTitle
+        case listRowInsets = "list_row_insets"
+        case listRowSeparator = "list_row_separator"
+        case navigationTitle = "navigation_title"
         case padding
         case tint
     }
diff --git a/Sources/LiveViewNative/LiveView.swift b/Sources/LiveViewNative/LiveView.swift
@@ -115,6 +115,6 @@ public struct LiveView<R: CustomRegistry>: View {
     }
     
     private var navigationRoot: some View {
-        NavStackEntryView(.init(url: rootCoordinator.url, coordinator: rootCoordinator))
+        NavStackEntryView(.init(url: session.url, coordinator: rootCoordinator))
     }
 }
diff --git a/Sources/LiveViewNative/Modifiers/NavigationTitleModifier.swift b/Sources/LiveViewNative/Modifiers/NavigationTitleModifier.swift
@@ -8,23 +8,36 @@
 import SwiftUI
 
 struct NavigationTitleModifier: ViewModifier, Decodable, Equatable {
-    private let title: String
+    fileprivate let title: String
+    private let cached: Bool
     
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.title = try container.decode(String.self, forKey: .title)
+        self.cached = false
     }
     
-    init(title: String) {
+    init(title: String, cached: Bool = false) {
         self.title = title
+        self.cached = cached
     }
     
     func body(content: Content) -> some View {
         content
             .navigationTitle(title)
+            .preference(key: NavigationTitleModifierKey.self, value: cached ? nil : self)
     }
     
     enum CodingKeys: String, CodingKey {
         case title
     }
 }
+
+/// A key that passes the navigation title up the View hierarchy via preferences.
+enum NavigationTitleModifierKey: PreferenceKey {
+    static var defaultValue: NavigationTitleModifier?
+    
+    static func reduce(value: inout NavigationTitleModifier?, nextValue: () -> NavigationTitleModifier?) {
+        value = nextValue().flatMap({ .init(title: $0.title, cached: true) }) ?? value
+    }
+}
diff --git a/Sources/LiveViewNative/NavStackEntryView.swift b/Sources/LiveViewNative/NavStackEntryView.swift
@@ -41,33 +41,48 @@ struct NavStackEntryView<R: CustomRegistry>: View {
     
     @ViewBuilder
     private var elementTree: some View {
-        switch coordinator.state {
-        case .connected:
-            if let doc = coordinator.document {
-                coordinator.builder.fromNodes(doc[doc.root()].children(), coordinator: coordinator, url: coordinator.url)
-                    .environment(\.coordinatorEnvironment, CoordinatorEnvironment(coordinator, document: doc))
-            } else {
-                fatalError("State is `.connected`, but no `Document` was found.")
-            }
-        default:
-            if R.LoadingView.self == Never.self {
-                switch coordinator.state {
-                case .connected:
-                    fatalError()
-                case .notConnected:
-                    SwiftUI.Text("Not Connected")
-                case .connecting:
-                    SwiftUI.Text("Connecting")
-                case .connectionFailed(let error):
-                    SwiftUI.VStack {
-                        SwiftUI.Text("Connection Failed")
-                            .font(.subheadline)
-                        SwiftUI.Text(error.localizedDescription)
+        if coordinator.url == entry.url {
+            switch coordinator.state {
+            case .connected:
+                if let doc = coordinator.document {
+                    coordinator.builder.fromNodes(doc[doc.root()].children(), coordinator: coordinator, url: coordinator.url)
+                        .environment(\.coordinatorEnvironment, CoordinatorEnvironment(coordinator, document: doc))
+                        .onPreferenceChange(NavigationTitleModifierKey.self) { navigationTitle in
+                            self.liveViewModel.cachedNavigationTitle = navigationTitle
+                            print("Nav title changed")
+                        }
+                } else {
+                    fatalError("State is `.connected`, but no `Document` was found.")
+                }
+            default:
+                let content = Group {
+                    if R.LoadingView.self == Never.self {
+                        switch coordinator.state {
+                        case .connected:
+                            fatalError()
+                        case .notConnected:
+                            SwiftUI.Text("Not Connected")
+                        case .connecting:
+                            SwiftUI.Text("Connecting")
+                        case .connectionFailed(let error):
+                            SwiftUI.VStack {
+                                SwiftUI.Text("Connection Failed")
+                                    .font(.subheadline)
+                                SwiftUI.Text(error.localizedDescription)
+                            }
+                        }
+                    } else {
+                        R.loadingView(for: coordinator.url, state: coordinator.state)
                     }
                 }
-            } else {
-                R.loadingView(for: coordinator.url, state: coordinator.state)
+                if let cachedNavigationTitle = liveViewModel.cachedNavigationTitle {
+                    content.modifier(cachedNavigationTitle)
+                } else {
+                    content
+                }
             }
+        } else if let cachedNavigationTitle = liveViewModel.cachedNavigationTitle {
+            SwiftUI.Text("").modifier(cachedNavigationTitle)
         }
     }
 }
diff --git a/Sources/LiveViewNative/Property Wrappers/ObservedElement.swift b/Sources/LiveViewNative/Property Wrappers/ObservedElement.swift
@@ -24,7 +24,7 @@ import Combine
 /// ## Example
 /// ```swift
 /// struct MyView: View {
-///     @ObservedElemenet private var element: ElementNode
+///     @ObservedElement private var element: ElementNode
 ///
 ///     var body: some View {
 ///         Text("Value: \(element.attributeValue(for: "my-attr") ?? "<none>")")
diff --git a/Sources/LiveViewNative/ViewModel.swift b/Sources/LiveViewNative/ViewModel.swift
@@ -14,6 +14,7 @@ import LiveViewNativeCore
 /// In a view in the LiveView tree, a model can be obtained using `@EnvironmentObject`.
 public class LiveViewModel<R: CustomRegistry>: ObservableObject {
     private var forms = [String: FormModel]()
+    var cachedNavigationTitle: NavigationTitleModifier?
     
     /// Get or create a ``FormModel`` for the `<form>` element with the given ID.
     public func getForm(elementID id: String) -> FormModel {
@@ -206,3 +207,15 @@ extension String: FormValue {
         self = formValue
     }
 }
+
+extension Bool: FormValue {
+    public var formValue: String {
+        self.description
+    }
+    
+    public init?(formValue: String) {
+        guard let value = Bool(formValue)
+        else { return nil }
+        self = value
+    }
+}
diff --git a/Sources/LiveViewNative/Views/Controls and Indicators/Value Inputs/Toggle.swift b/Sources/LiveViewNative/Views/Controls and Indicators/Value Inputs/Toggle.swift
@@ -0,0 +1,55 @@
+//
+//  Toggle.swift
+//
+//
+//  Created by Carson Katri on 1/17/23.
+//
+
+import SwiftUI
+
+struct Toggle<R: CustomRegistry>: View {
+    @ObservedElement private var element: ElementNode
+    let context: LiveContext<R>
+    
+    @FormState(default: false) var value: Bool
+    
+    init(element: ElementNode, context: LiveContext<R>) {
+        self.context = context
+    }
+    
+    public var body: some View {
+        SwiftUI.Toggle(isOn: $value) {
+            context.buildChildren(of: element)
+        }
+        .applyToggleStyle(
+            element.attributeValue(for: "toggle-style").flatMap(ToggleStyle.init) ?? .automatic
+        )
+    }
+}
+
+fileprivate enum ToggleStyle: String {
+    case automatic
+    case button
+    case `switch`
+#if os(macOS)
+    case checkbox
+#endif
+}
+
+fileprivate extension View {
+    @ViewBuilder
+    func applyToggleStyle(_ style: ToggleStyle) -> some View {
+        switch style {
+        case .automatic:
+            self.toggleStyle(.automatic)
+        case .button:
+            self.toggleStyle(.button)
+        case .`switch`:
+            self.toggleStyle(.switch)
+#if os(macOS)
+        case .checkbox:
+            self.toggleStyle(.checkbox)
+#endif
+        }
+    }
+}
diff --git a/Sources/LiveViewNative/Views/Layout Containers/Presentation Containers/NavigationLink.swift b/Sources/LiveViewNative/Views/Layout Containers/Presentation Containers/NavigationLink.swift
@@ -21,56 +21,18 @@ struct NavigationLink<R: CustomRegistry>: View {
     
     @ViewBuilder
     public var body: some View {
-        if let linkOpts = LinkOptions(element: element),
-           context.coordinator.session.config.navigationMode.supportsLinkState(linkOpts.state),
-           let url = linkOpts.url(in: context)
-        {
-            SwiftUI.NavigationLink(value: LiveNavigationEntry(url: url, coordinator: context.coordinator)) {
+        if let href = element.attributeValue(for: "destination").flatMap({
+            URL(string: $0, relativeTo: context.coordinator.url)?.appending(path: "").absoluteURL
+        }) {
+            SwiftUI.NavigationLink(
+                value: LiveNavigationEntry(
+                    url: href,
+                    coordinator: context.coordinator
+                )
+            ) {
                 context.buildChildren(of: element)
             }
             .disabled(element.attribute(named: "disabled") != nil)
-        } else {
-            // if there are no link options, or the coordinator doesn't support the required navigation, we don't show anything
-        }
-    }
-}
-
-struct LinkOptions {
-    let kind: LinkKind
-    let state: LiveRedirect.Kind
-    let href: String
-    
-    init?(element: ElementNode) {
-        guard let kindStr = element.attributeValue(for: "data-phx-link"),
-              let kind = LinkKind(rawValue: kindStr),
-              let stateStr = element.attributeValue(for: "data-phx-link-state"),
-              let state = LiveRedirect.Kind(rawValue: stateStr) else {
-            return nil
-        }
-        self.kind = kind
-        self.state = state
-        self.href = element.attributeValue(for: "data-phx-href")!
-    }
-    
-    @MainActor
-    func url<R: CustomRegistry>(in context: LiveContext<R>) -> URL? {
-        .init(string: href, relativeTo: context.coordinator.url)?.appending(path: "/").absoluteURL
-    }
-}
-
-enum LinkKind: String {
-    case redirect
-}
-
-extension LiveSessionConfiguration.NavigationMode {
-    func supportsLinkState(_ state: LiveRedirect.Kind) -> Bool {
-        switch self {
-        case .disabled:
-            return false
-        case .replaceOnly:
-            return state == .replace
-        case .enabled, .splitView:
-            return true
         }
     }
 }
diff --git a/Sources/LiveViewNative/Views/Layout Containers/Scroll Views/ScrollView.swift b/Sources/LiveViewNative/Views/Layout Containers/Scroll Views/ScrollView.swift
@@ -16,8 +16,28 @@ struct ScrollView<R: CustomRegistry>: View {
     }
     
     public var body: some View {
-        SwiftUI.ScrollView {
+        SwiftUI.ScrollView(axes, showsIndicators: showsIndicators) {
             context.buildChildren(of: element)
         }
     }
+    
+    private var axes: Axis.Set {
+        switch element.attributeValue(for: "axes") {
+        case "all":
+            return [.horizontal, .vertical]
+        case "horizontal":
+            return .horizontal
+        default:
+            return .vertical
+        }
+    }
+    
+    private var showsIndicators: Bool {
+        if let attr = element.attributeValue(for: "shows-indicators") {
+            return attr == "true"
+        } else {
+            return true
+        }
+    }
+    
 }
diff --git a/Sources/LiveViewNative/Views/Shapes/Shape.swift b/Sources/LiveViewNative/Views/Shapes/Shape.swift
@@ -28,12 +28,33 @@ struct Shape<S: SwiftUI.Shape>: View {
 
 extension RoundedRectangle {
     init(from element: ElementNode) {
-        let radius: Double
-        if let s = element.attributeValue(for: "corner-radius"), let d = Double(s) {
-            radius = d
-        } else {
-            radius = 5
+        let radius = element.attributeValue(for: "corner-radius").flatMap(Double.init) ?? 0
+        self.init(
+            cornerSize: .init(
+                width: element.attributeValue(for: "corner-width").flatMap(Double.init) ?? radius,
+                height: element.attributeValue(for: "corner-height").flatMap(Double.init) ?? radius
+            ),
+            style: (element.attributeValue(for: "style").flatMap(RoundedCornerStyle.init) ?? .circular).style
+        )
+    }
+}
+
+extension Capsule {
+    init(from element: ElementNode) {
+        self.init(
+            style: (element.attributeValue(for: "style").flatMap(RoundedCornerStyle.init) ?? .circular).style
+        )
+    }
+}
+
+private enum RoundedCornerStyle: String {
+    case circular
+    case continuous
+    
+    var style: SwiftUI.RoundedCornerStyle {
+        switch self {
+        case .circular: return .circular
+        case .continuous: return .continuous
         }
-        self.init(cornerRadius: radius)
     }
 }
diff --git a/Sources/LiveViewNative/Views/Text Input and Output/Text.swift b/Sources/LiveViewNative/Views/Text Input and Output/Text.swift
diff --git a/Tests/RenderingTests/ShapeTests.swift b/Tests/RenderingTests/ShapeTests.swift
diff --git a/Tests/RenderingTests/assertMatch.swift b/Tests/RenderingTests/assertMatch.swift

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@ public struct LiveView<R: CustomRegistry>: View {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`private var navigationRoot: some View {`
`118`		`- NavStackEntryView(.init(url: rootCoordinator.url, coordinator: rootCoordinator))`
	`118`	`+ NavStackEntryView(.init(url: session.url, coordinator: rootCoordinator))`
`119`	`119`	`}`
`120`	`120`	`}`