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

Author: carson-katri

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests on iOS Simulator
+        shell: bash
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_14.2.app
+          xcodebuild test -scheme LiveViewNative -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14 Pro"

Package.resolved

@@ -14,46 +14,48 @@ struct BuiltinRegistry {
     @ViewBuilder
     static func lookup<R: CustomRegistry>(_ name: String, _ element: ElementNode, context: LiveContext<R>) -> some View {
         switch name {
-        case "textfield":
+        case "text-field":
             TextField<R>(element: element, context: context)
-        case "securefield":
+        case "secure-field":
             SecureField<R>(element: element, context: context)
         case "text":
             Text(context: context)
-        case "hstack":
+        case "h-stack", "hstack":
             HStack<R>(element: element, context: context)
-        case "vstack":
+        case "v-stack", "vstack":
             VStack<R>(element: element, context: context)
-        case "zstack":
+        case "z-stack", "zstack":
             ZStack<R>(element: element, context: context)
         case "button":
             Button<R>(element: element, context: context, action: nil)
         case "image":
             Image(element: element, context: context)
-        case "asyncimage":
+        case "async-image":
             AsyncImage(element: element, context: context)
-        case "scrollview":
+        case "scroll-view":
             ScrollView<R>(element: element, context: context)
         case "spacer":
             Spacer(element: element, context: context)
-        case "navigationlink":
+        case "navigation-link":
             NavigationLink(element: element, context: context)
         case "list":
             List<R>(element: element, context: context)
         case "rectangle":
             Shape(element: element, context: context, shape: Rectangle())
-        case "roundedrectangle":
+        case "rounded-rectangle":
             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":
+        case "container-relative-shape":
             Shape(element: element, context: context, shape: ContainerRelativeShape())
         case "lvn-link":
             Link(element: element, context: context)
+        case "progress-view":
+            ProgressView(element: element, context: context)
         case "divider":
             Divider()
 #if os(iOS)
@@ -62,6 +64,10 @@ struct BuiltinRegistry {
 #endif
         case "toggle":
             Toggle(element: element, context: context)
+        case "menu":
+            Menu(element: element, context: context)
+        case "slider":
+            Slider(element: element, context: context)
         case "phx-form":
             PhxForm<R>(element: element, context: context)
         case "phx-submit-button":

Sources/LiveViewNative/BuiltinRegistry.swift

@@ -133,6 +133,7 @@ public class LiveViewCoordinator<R: CustomRegistry>: ObservableObject {
         if let channel {
             guard !channel.isJoined, !channel.isJoining else { return }
         }
+        internalState = .startingConnection
         do {
             try await connectLiveView()
         } catch {

Sources/LiveViewNative/Coordinators/LiveViewCoordinator.swift

@@ -48,13 +48,8 @@ public protocol CustomRegistry {
     /// }
     /// ```
     ///
-    /// If your registry does not support any custom tags, you can set this type alias to the ``EmptyRegistry/None`` type:
-    /// ```swift
-    /// struct MyRegistry: CustomRegistry {
-    ///     typealias TagName = EmptyRegistry.None
-    /// }
-    /// ```
-    associatedtype TagName: RawRepresentable where TagName.RawValue == String
+    /// This will default to the ``EmptyRegistry/None`` type if you don't support any custom tags.
+    associatedtype TagName: RawRepresentable = EmptyRegistry.None where TagName.RawValue == String
     /// A type represnting the custom modifier types that this registry can handle.
     ///
     /// This type must be `RawRepresentable` and its raw values must be strings.
@@ -69,21 +64,16 @@ public protocol CustomRegistry {
     /// }
     /// ```
     ///
-    /// If your registry does not support any custom modifiers, you can set this type alias to the ``EmptyRegistry/None`` type:
-    /// ```swift
-    /// struct MyRegistry: CustomRegistry {
-    ///     typealias ModifierType = EmptyRegistry.None
-    /// }
-    /// ```
-    associatedtype ModifierType: RawRepresentable where ModifierType.RawValue == String
+    /// This will default to the ``EmptyRegistry/None`` type if you don't support any custom modifiers.
+    associatedtype ModifierType: RawRepresentable = EmptyRegistry.None where ModifierType.RawValue == String
     /// The type of view this registry returns from the `lookup` method.
     ///
     /// Generally, implementors will use an opaque return type on their ``lookup(_:element:context:)-895au`` implementations and this will be inferred automatically.
-    associatedtype CustomView: View
+    associatedtype CustomView: View = Never
     /// The type of view this registry produces for loading views.
     ///
     /// Generally, implementors will use an opaque return type on their ``loadingView(for:state:)-2uoy9`` implementations and this will be inferred automatically.
-    associatedtype LoadingView: View
+    associatedtype LoadingView: View = Never
 
     /// This method is called by LiveView Native when it needs to construct a custom view.
     ///

Sources/LiveViewNative/CustomRegistry.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import LiveViewNativeCore
 
 /// The context provides information at initialization-time to views in a LiveView.
 public struct LiveContext<R: CustomRegistry> {
@@ -45,4 +46,54 @@ public struct LiveContext<R: CustomRegistry> {
     public func buildChildren(of element: ElementNode) -> some View {
         return coordinator.builder.fromNodes(element.children(), context: self)
     }
+    
+    private static func elementWithName(
+        _ tagName: String,
+        namespace: String?
+    ) -> (NodeChildrenSequence.Element) -> Bool {
+        { child in
+            if case let .element(element) = child.data,
+               element.namespace == namespace,
+               element.tag == tagName
+            {
+                return true
+            } else {
+                return false
+            }
+        }
+    }
+    
+    public func hasChild(
+        of element: ElementNode,
+        withTagName tagName: String,
+        namespace: String? = nil
+    ) -> Bool {
+        element.children().contains(where: Self.elementWithName(tagName, namespace: namespace))
+    }
+    
+    public func buildChildren(
+        of element: ElementNode,
+        withTagName tagName: String,
+        namespace: String? = nil,
+        includeDefaultSlot: Bool = false
+    ) -> some View {
+        let children = element.children()
+        let namedSlotChildren = children.filter(Self.elementWithName(tagName, namespace: namespace))
+        if namedSlotChildren.isEmpty && includeDefaultSlot {
+            let defaultSlotChildren = children.filter({
+                if case let .element(element) = $0.data {
+                    return element.namespace != tagName
+                } else {
+                    return true
+                }
+            })
+            return ForEach(defaultSlotChildren.map({ ($0.id, $0.children()) }), id: \.0) { subChildren in
+                coordinator.builder.fromNodes(subChildren.1, context: self)
+            }
+        } else {
+            return ForEach(namedSlotChildren.map({ ($0.id, $0.children()) }), id: \.0) { subChildren in
+                coordinator.builder.fromNodes(subChildren.1, context: self)
+            }
+        }
+    }
 }

Sources/LiveViewNative/LiveContext.swift

@@ -1,6 +1,6 @@
 # AsyncImage
 
-`<asyncimage>`, displays images loaded from a remote URL.
+`<async-image>`, displays images loaded from a remote URL.
 
 ## Attributes
 

Sources/LiveViewNative/LiveViewNative.docc/Elements/AsyncImage.md

@@ -1,6 +1,6 @@
 # HStack
 
-`<hstack>`, lays out children in a horizontal line.
+`<h-stack>`, lays out children in a horizontal line.
 
 ## Attributes
 

Sources/LiveViewNative/LiveViewNative.docc/Elements/HStack.md

@@ -1,6 +1,6 @@
 # NavigationLink
 
-`<navigationlink>`, links to another live view page.
+`<navigation-link>`, links to another live view page.
 
 ## Attributes
 

Sources/LiveViewNative/LiveViewNative.docc/Elements/NavigationLink.md

@@ -1,6 +1,6 @@
 # RoundedRectangle
 
-`<roundedrectangle>`, a rectangle shape with rounded corners.
+`<rounded-rectangle>`, a rectangle shape with rounded corners.
 
 ## Attributes