Add LabeledContent support (#605)

Author: Kyle-Ye

Example/HostingExample/ViewController.swift

@@ -66,6 +66,6 @@ class ViewController: NSViewController {
 
 struct ContentView: View {
     var body: some View {
-        ForEachExample()
+        ToggleExample()
     }
 }

Example/OpenSwiftUIUITests/View/LabeledContent/LabeledContentUITests.swift

@@ -0,0 +1,54 @@
+//
+//  LabeledContentUITests.swift
+//  OpenSwiftUIUITests
+
+import Testing
+import SnapshotTesting
+
+@MainActor
+@Suite(.snapshots(record: .never, diffTool: diffTool))
+struct LabeledContentUITests {
+    @Test
+    func defaultStyle() {
+        struct ContentView: View {
+            var body: some View {
+                LabeledContent {
+                    Color.red
+                } label: {
+                    Color.blue
+                }
+
+            }
+        }
+        #if os(iOS) || os(visionOS)
+        openSwiftUIAssertSnapshot(of: ContentView())
+        #else
+        // FIXME: defaultStlye is not the same on macOS platform
+        withKnownIssue {
+            openSwiftUIAssertSnapshot(of: ContentView())
+        }
+        #endif
+    }
+
+    @Test
+    func customStyle() {
+        struct CustomStyle: LabeledContentStyle {
+            func makeBody(configuration: Configuration) -> some View {
+                VStack(spacing: 0) {
+                    configuration.label
+                    configuration.content
+                }
+            }
+        }
+        struct ContentView: View {
+            var body: some View {
+                LabeledContent {
+                    Color.red
+                } label: {
+                    Color.blue
+                }.labeledContentStyle(CustomStyle())
+            }
+        }
+        openSwiftUIAssertSnapshot(of: ContentView())
+    }
+}

Example/SharedExample/View/ToggleExample.swift

@@ -9,9 +9,9 @@ import SwiftUI
 #endif
 
 struct ToggleExample: View {
-    // FIXME: Fix Representable update logic and add test case
-    @State var toggle = false
-    
+    // FIXME: Add UI test case
+    @State private var toggle = false
+
     var body: some View {
         Toggle(isOn: $toggle) {
             Color.red

Sources/OpenSwiftUI/View/Label/AccessibilityLabeledContent.swift renamed to Sources/OpenSwiftUI/View/LabelContent/AccessibilityLabeledContent.swift

@@ -33,18 +33,21 @@ public struct AutomaticLabeledContentStyle: LabeledContentStyle {
         _openSwiftUIEmptyStub()
     }
 
-    // FIXME
+    // FIXME: Blocked by StyleContextAcceptsPredicate
     public func makeBody(configuration: AutomaticLabeledContentStyle.Configuration) -> some View {
-        LabeledContent {
+        HStack {
+            configuration.label
             configuration.content
-                .modifier(_LabeledContentStyleModifier(style: self))
-        } label: {
-            StaticIf(LabelVisibilityConfigured.self) {
-                labelsVisibility == .hidden ? nil : configuration.label
-            } else: {
-                configuration.label
-            }
         }
+//        LabeledContent {
+//            configuration.content
+//                .labeledContentStyle(self)
+//        } label: {
+//            configuration.label
+//                .staticIf(LabelVisibilityConfigured.self) { label in
+//                    labelsVisibility == .hidden ? nil : configuration.label
+//                }
+//        }
     }
 }
 

Sources/OpenSwiftUI/View/Label/AutomaticLabeledContentStyle.swift renamed to Sources/OpenSwiftUI/View/LabelContent/AutomaticLabeledContentStyle.swift

@@ -96,6 +96,10 @@ extension View {
 // MARK: - ResolvedLabeledContent
 
 struct ResolvedLabeledContent: StyleableView {
+    var configuration: LabeledContentStyleConfiguration
+
+    static let defaultStyleModifier: _LabeledContentStyleModifier<AutomaticLabeledContentStyle> = .init(style: .init())
+
     struct _Body: View {
         var configuration: LabeledContentStyleConfiguration
 
@@ -126,10 +130,6 @@ struct ResolvedLabeledContent: StyleableView {
     var body: _Body {
         _Body(configuration: configuration)
     }
-
-    var configuration: LabeledContentStyleConfiguration
-
-    static let defaultStyleModifier: _LabeledContentStyleModifier<AutomaticLabeledContentStyle> = .init(style: .init())
 }
 
 // MARK: - _LabeledContentStyleModifier

Sources/OpenSwiftUI/View/Label/LabelVisibility.swift renamed to Sources/OpenSwiftUI/View/LabelContent/LabelVisibility.swift

@@ -0,0 +1,58 @@
+//
+//  LeadingTrailingLabeledContentStyle.swift
+//  OpenSwiftUI
+//
+//  Audited for 6.5.4
+//  Status: WIP
+//  ID: 883FC595DC5A078A9D167DD7587DD054 (SwiftUI)
+
+import Foundation
+@_spi(ForOpenSwiftUIOnly)
+import OpenSwiftUICore
+
+// MARK: - LabeledContentUsesLegacyLayout
+
+struct LabeledContentUsesLegacyLayout: ViewInputPredicate {
+    static func evaluate(inputs: _GraphInputs) -> Bool {
+        !isLinkedOnOrAfter(.v6)
+    }
+}
+
+// MARK: - LeadingTrailingLabeledContentStyle
+
+struct LeadingTrailingLabeledContentStyle: LabeledContentStyle {
+    let spacing: CGFloat?
+
+    func makeBody(configuration: Configuration) -> some View {
+        HStack {
+            configuration.label
+                .staticIf(_SemanticFeature_v4.self) { label in
+                    VStack(alignment: .leading, spacing: spacing){
+                        LabelGroup { label }
+                    }
+                }
+            Spacer().layoutPriority(-1)
+            HStack {
+                configuration.content
+            }
+            .defaultForegroundColor(.secondary)
+        }
+        .spacing(Spacing())
+    }
+}
+
+// MARK: - ListLabeledContentPrefersHorizontalLayout
+
+struct ListLabeledContentPrefersHorizontalLayout: ViewInputBoolFlag {}
+
+extension View {
+    func listLabeledContentPrefersHorizontalLayout() -> some View {
+        input(ListLabeledContentPrefersHorizontalLayout.self)
+    }
+}
+
+// MARK: - LeadingTrailingLabeledContentStyle_Phone [TODO]
+
+#if os(iOS) || os(visionOS)
+struct LeadingTrailingLabeledContentStyle_Phone {}
+#endif