Merge pull request #6 from dafurman/concreteNamedViewConformance

Make _ConcreteNamedView conform to NamedView
dafurman · May 8, 2024 · 393aaf3 · 393aaf3
2 parents d8fa37b + d5184db
commit 393aaf3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Sources/AddPreviews/NamedView.swift b/Sources/AddPreviews/NamedView.swift
@@ -11,7 +11,7 @@ extension NamedView {
     public var body: some View { AnyView(view) }
 }
 
-public struct _ConcreteNamedView {
+public struct _ConcreteNamedView: NamedView {
     public let name: String
     public let view: any View
 

diff --git a/Sources/AddPreviewsMacros/AddPreviewsMacro.swift b/Sources/AddPreviewsMacros/AddPreviewsMacro.swift
@@ -88,7 +88,7 @@ extension AddPreviews: ExtensionMacro {
 
 private func iteratorNextDeclaration(viewProperties: [ViewProperty]) -> DeclSyntax {
     var decl = """
-    mutating func next() -> NamedView? {
+    mutating func next() -> (any NamedView)? {
     defer { iterator += 1 }
 
     return switch iterator {

diff --git a/Tests/AddPreviewsTests/AddPreviewsTests.swift b/Tests/AddPreviewsTests/AddPreviewsTests.swift
@@ -55,7 +55,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }
@@ -116,7 +116,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }
@@ -213,7 +213,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }
@@ -375,7 +375,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }
@@ -431,7 +431,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }
@@ -487,7 +487,7 @@ final class AddPreviewsTests: XCTestCase {
 
                 private var iterator = 0
 
-                mutating func next() -> NamedView? {
+                mutating func next() -> (any NamedView)? {
                     defer {
                         iterator += 1
                     }