ADD: Optional Selection Parameter for TabView

OpenToss · Oct 17, 2023 · d01eb94 · d01eb94
1 parent 0f99200
commit d01eb94
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/Sources/OpenTDS/Component/Example/ExampleView.swift b/Sources/OpenTDS/Component/Example/ExampleView.swift
@@ -1,10 +1,15 @@
 import SwiftUI
 
 struct ExampleView: View {
+    @State var selection: Int = 0
     var body: some View {
         TossTabView {
             TossScrollView("a") {
-                Text("View1")
+                Button {
+                    selection = 1
+                } label: {
+                    Text("btn")
+                }
             }
             .toolbarButton {
                 TossToolbarButton(Image(systemName: "house.fill"), action: {

diff --git a/Sources/OpenTDS/Component/TabView/TabView.swift b/Sources/OpenTDS/Component/TabView/TabView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import Combine
 
 /**
     Animated Tab View of Toss.
@@ -16,12 +17,16 @@ import SwiftUI
 @available(macOS 11, iOS 14, *)
 public struct TossTabView: View {
 
-    @State var selected: Int = 0
+    @State var selection: Binding<Int>?
+    @State var selected: Int
 
     let content: [TossTabItem]
 
-    public init(haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
+    public init(selection: Binding<Int>? = nil,
+                haptic: UIImpactFeedbackGenerator.FeedbackStyle? = .light,
                 @TossTabViewBuilder content: () -> [TossTabItem]) {
+        self.selection = selection
+        self.selected = selection?.wrappedValue ?? 0
         self.content = content()
     }
 
@@ -52,6 +57,9 @@ public struct TossTabView: View {
                         TossTabViewButton(content[idx].title,
                                           content[idx].image,
                                           idx == selected) {
+                            if selection != nil {
+                                selection?.wrappedValue = idx
+                            }
                             if selected != idx {
                                 withAnimation(.easeInOut(duration: 0.2)) {
                                     selected = idx
@@ -71,5 +79,12 @@ public struct TossTabView: View {
             }
         }
         .background(TossColor.background.ignoresSafeArea())
+        .onReceive(Just(selection)) { newValue in
+            if let newValue, selected != newValue.wrappedValue {
+                withAnimation(.easeInOut(duration: 0.2)) {
+                    selected = newValue.wrappedValue
+                }
+            }
+        }
     }
 }