fix: Fix unable Scroll to Top

Team-B1ND · Apr 4, 2024 · 6e964a2 · 6e964a2
1 parent ad2b045
commit 6e964a2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/Source/DDS/Component/ScrollView/ScrollView.swift b/Source/DDS/Component/ScrollView/ScrollView.swift
@@ -37,6 +37,7 @@ public struct DodamScrollView<C: View>: DodamNavigationViewProtocol {
         )
     }
 
+    @Environment(\.tabViewIdx) var tabViewIdx: Int?
     @State private var topInset: CGFloat!
     @State private var blueOpacity: CGFloat = 0
 
@@ -60,7 +61,7 @@ public struct DodamScrollView<C: View>: DodamNavigationViewProtocol {
                             }
                     }
                 )
-                .id(-1)
+                .id("ScrollToTop-\(tabViewIdx ?? -1)")
         }
         .mask(alignment: .bottom) {
             VStack(spacing: 0) {

diff --git a/Source/DDS/Component/TabView/TabView.swift b/Source/DDS/Component/TabView/TabView.swift
@@ -34,6 +34,7 @@ public struct DodamTabView: View {
                     ForEach(contents.indices, id: \.self) { idx in
                         if loadedViews.contains(idx) {
                             contents[idx].content
+                                .environment(\.tabViewIdx, idx)
                                 .opacity(selected == idx ? 1 : 0)
                         }
                     }
@@ -54,7 +55,10 @@ public struct DodamTabView: View {
                                         selected = idx
                                     } else {
                                         withAnimation(.spring) {
-                                            scrollViewProxy.scrollTo(-1, anchor: .top)
+                                            scrollViewProxy.scrollTo(
+                                                "ScrollToTop-\(idx)",
+                                                anchor: .top
+                                            )
                                         }
                                     }
                                 } label: {

diff --git a/Source/DDS/Component/TabView/TabViewIdxEnvironment.swift b/Source/DDS/Component/TabView/TabViewIdxEnvironment.swift
@@ -0,0 +1,18 @@
+import SwiftUI
+
+@available(macOS 12, iOS 15, *)
+private struct TabViewIdxEnvironmentKey: EnvironmentKey {
+
+    static var defaultValue: Int?
+}
+
+@available(macOS 12, iOS 15, *)
+public extension EnvironmentValues {
+
+    var tabViewIdx: Int? {
+        get { self [TabViewIdxEnvironmentKey.self] }
+        set {
+            self [TabViewIdxEnvironmentKey.self] = newValue
+        }
+    }
+}