UPDATE: TabView Logic

Author: mercen-lee

Sources/OpenTDS/Component/ScrollView/ScrollView+Item.swift

@@ -0,0 +1,6 @@
+import SwiftUI
+
+@available(macOS 11, iOS 14, *)
+public struct TossScrollItem {
+    public var image: Image
+}

Sources/OpenTDS/Component/TabView/TabView+Ext.swift

@@ -1,10 +1,15 @@
 import SwiftUI
 
+@resultBuilder
+struct TossTabViewBuilder {
+    static func buildBlock(_ components: TossTabItem...) -> [TossTabItem] {
+        components
+    }
+}
+
 @available(macOS 11, iOS 14, *)
 public extension View {
-    @ViewBuilder func tossTabItem(_ title: String, _ image: Image) -> TossTabItemView<Self> {
-        TossTabItemView(title: title, image: image) {
-            self
-        }
+    func tossTabItem(_ title: String, _ image: Image) -> TossTabItem {
+        TossTabItem(title: title, image: image, content: AnyView(self))
     }
 }

Sources/OpenTDS/Component/TabView/TabView+Item.swift

@@ -1,37 +1,18 @@
 import SwiftUI
 
 @available(macOS 11, iOS 14, *)
-public struct TossTabItemView<Content: View>: TossTabItemViewProtocol {
+public struct TossTabItem {
 
     public let title: String
     public let image: Image
     public let content: AnyView
 
     public init(title: String,
-         image: Image,
-         @ViewBuilder content: () -> Content)
+                image: Image,
+                content: AnyView)
     {
         self.title = title
         self.image = image
-        self.content = AnyView(content())
+        self.content = content
     }
-    
-    public var body: some View { EmptyView() }
-}
-
-@available(macOS 11, iOS 14, *)
-public struct TossTabItemModifier: ViewModifier {
-    let title: String
-    let image: Image
-    
-    public func body(content: Content) -> some View {
-        content
-    }
-}
-
-@available(macOS 11, iOS 14, *)
-public protocol TossTabItemViewProtocol: View {
-    var title: String { get }
-    var image: Image { get }
-    var content: AnyView { get }
 }

Sources/OpenTDS/Component/TabView/TabView.swift

@@ -18,44 +18,12 @@ public struct TossTabView: View {
 
     @State var selected: Int = 0
 
-    let content: [any TossTabItemViewProtocol]
+    let content: [TossTabItem]
 
-    public init<C0: TossTabItemViewProtocol,
-                C1: TossTabItemViewProtocol>(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
-                                             @ViewBuilder content: @escaping () -> TupleView<(C0, C1)>)
+    public init(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
+                @TossTabViewBuilder content: () -> [TossTabItem])
     {
-        let cv = content().value
-        self.content = [cv.0, cv.1]
-    }
-    
-    public init<C0: TossTabItemViewProtocol,
-                C1: TossTabItemViewProtocol,
-                C2: TossTabItemViewProtocol>(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
-                                             @ViewBuilder content: @escaping () -> TupleView<(C0, C1, C2)>)
-    {
-        let cv = content().value
-        self.content = [cv.0, cv.1, cv.2]
-    }
-    
-    public init<C0: TossTabItemViewProtocol,
-                C1: TossTabItemViewProtocol,
-                C2: TossTabItemViewProtocol,
-                C3: TossTabItemViewProtocol>(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
-                                             @ViewBuilder content: @escaping () -> TupleView<(C0, C1, C2, C3)>)
-    {
-        let cv = content().value
-        self.content = [cv.0, cv.1, cv.2, cv.3]
-    }
-    
-    public init<C0: TossTabItemViewProtocol,
-                C1: TossTabItemViewProtocol,
-                C2: TossTabItemViewProtocol,
-                C3: TossTabItemViewProtocol,
-                C4: TossTabItemViewProtocol>(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
-                                             @ViewBuilder content: @escaping () -> TupleView<(C0, C1, C2, C3, C4)>)
-    {
-        let cv = content().value
-        self.content = [cv.0, cv.1, cv.2, cv.3, cv.4]
+        self.content = content()
     }
 
     public var body: some View {