Support current-value-label

Author: carson-katri

Sources/LiveViewNative/LiveContext.swift

@@ -47,14 +47,11 @@ public struct LiveContext<R: CustomRegistry> {
         return coordinator.builder.fromNodes(element.children(), context: self)
     }
 
-    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({ child in
+    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
@@ -63,7 +60,25 @@ public struct LiveContext<R: CustomRegistry> {
             } 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 {

Sources/LiveViewNative/Views/Controls and Indicators/Indicators/ProgressView.swift

@@ -20,25 +20,37 @@ struct ProgressView<R: CustomRegistry>: View {
             if let timerIntervalStart = element.attributeValue(for: "timer-interval-start").flatMap({ try? ElixirDateParseStrategy().parse($0) }),
                let timerIntervalEnd = element.attributeValue(for: "timer-interval-end").flatMap({ try? ElixirDateParseStrategy().parse($0) })
             {
-                // TODO: Note that this variant has a default `currentValueLabel`, which should be used if no current value label slot is used. It seems to only be active when initializing without the `currentValueLabel` argument.
-                SwiftUI.ProgressView(
-                    timerInterval: timerIntervalStart...timerIntervalEnd,
-                    countsDown: element.attributeValue(for: "counts-down") != "false"
-                ) {
-                    context.buildChildren(of: element)
+                // SwiftUI's default `currentValueLabel` is not present unless the argument is not included in the initializer.
+                // Check if we have it first otherwise use the default.
+                if context.hasChild(of: element, withTagName: "current-value-label", namespace: "progress-view") {
+                    SwiftUI.ProgressView(
+                        timerInterval: timerIntervalStart...timerIntervalEnd,
+                        countsDown: element.attributeValue(for: "counts-down") != "false"
+                    ) {
+                        context.buildChildren(of: element, withTagName: "label", namespace: "progress-view", includeDefaultSlot: true)
+                    } currentValueLabel: {
+                        context.buildChildren(of: element, withTagName: "current-value-label", namespace: "progress-view")
+                    }
+                } else {
+                    SwiftUI.ProgressView(
+                        timerInterval: timerIntervalStart...timerIntervalEnd,
+                        countsDown: element.attributeValue(for: "counts-down") != "false"
+                    ) {
+                        context.buildChildren(of: element, withTagName: "label", namespace: "progress-view", includeDefaultSlot: true)
+                    }
                 }
             } else if let value = element.attributeValue(for: "value").flatMap(Double.init) {
                 SwiftUI.ProgressView(
                     value: value,
                     total: element.attributeValue(for: "total").flatMap(Double.init) ?? 1
                 ) {
-                    context.buildChildren(of: element)
+                    context.buildChildren(of: element, withTagName: "label", namespace: "progress-view", includeDefaultSlot: true)
                 } currentValueLabel: {
-                    EmptyView() // TODO: Implement currentValueLabel once we have a design for multi-body content.
+                    context.buildChildren(of: element, withTagName: "current-value-label", namespace: "progress-view")
                 }
             } else {
                 SwiftUI.ProgressView {
-                    context.buildChildren(of: element)
+                    context.buildChildren(of: element, withTagName: "label", namespace: "progress-view", includeDefaultSlot: true)
                 }
             }
         }

Sources/LiveViewNative/Views/Controls and Indicators/Value Inputs/Slider.swift

@@ -26,8 +26,7 @@ struct Slider<R: CustomRegistry>: View {
                 in: lowerBound...upperBound,
                 step: step
             ) {
-                context.buildChildren(of: element, defaultSlotFor: "slider")
-                context.buildChildren(of: element, withTagName: "label", namespace: "slider")
+                context.buildChildren(of: element, withTagName: "label", namespace: "slider", includeDefaultSlot: true)
             } minimumValueLabel: {
                 context.buildChildren(of: element, withTagName: "minimum-value-label", namespace: "slider")
             } maximumValueLabel: {
@@ -38,8 +37,7 @@ struct Slider<R: CustomRegistry>: View {
                 value: $value,
                 in: lowerBound...upperBound
             ) {
-                context.buildChildren(of: element, defaultSlotFor: "slider")
-                context.buildChildren(of: element, withTagName: "label", namespace: "slider")
+                context.buildChildren(of: element, withTagName: "label", namespace: "slider", includeDefaultSlot: true)
             } minimumValueLabel: {
                 context.buildChildren(of: element, withTagName: "minimum-value-label", namespace: "slider")
             } maximumValueLabel: {