Add support for setting and observing the selected tab

david-swift · Apr 13, 2024 · 23fd02d · 23fd02d
1 parent eca4865
commit 23fd02d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/Sources/SettingsKit/Components/SettingsKitScene.swift b/Sources/SettingsKit/Components/SettingsKitScene.swift
@@ -24,6 +24,8 @@ struct SettingsKitScene<Content>: Scene where Content: Scene {
     var design: SettingsWindowDesign
     /// The filter in the sidebar design.
     @State private var search = ""
+    /// The binding controlling the selection.
+    var selectedTab: Binding<String>?
 
     /// The scene.
     var body: some Scene {
@@ -38,6 +40,17 @@ struct SettingsKitScene<Content>: Scene where Content: Scene {
                     }
                 }
                 .symbolVariant(symbolVariant)
+                .onChange(of: selectedTab?.wrappedValue) { newValue in
+                    if let newValue {
+                        model.selectedTab = newValue
+                    }
+                }
+                .onAppear {
+                    model.selectedTab = selectedTab?.wrappedValue ?? ""
+                }
+                .onChange(of: model.selectedTab) { newValue in
+                    selectedTab?.wrappedValue = newValue
+                }
             }
         }
     }

diff --git a/Sources/SettingsKit/Model/Extensions/SwiftUI/Scene.swift b/Sources/SettingsKit/Model/Extensions/SwiftUI/Scene.swift
@@ -12,7 +12,9 @@ extension Scene {
 
     /// Adds the settings to a scene.
     /// - Parameters:
+    ///   - design: Whether the default or sidebar design is used.
     ///   - symbolVariant: The way symbols should be displayed.
+    ///   - selectedTab: The currently selected tab.
     ///   - settings: The settings tabs in the settings window.
     /// - Returns: The scene with the settings.
     ///
@@ -30,6 +32,7 @@ extension Scene {
     public func settings(
         design: SettingsWindowDesign = .default,
         symbolVariant: SymbolVariants = .none,
+        selectedTab: Binding<String>? = nil,
         @ArrayBuilder<SettingsTab> _ settings: () -> [SettingsTab]
     ) -> some Scene {
         let (settings, standardID) = getSettings(settings())
@@ -38,7 +41,8 @@ extension Scene {
             settings: settings,
             standardID: standardID,
             symbolVariant: symbolVariant,
-            design: design
+            design: design,
+            selectedTab: selectedTab
         )
     }
 

diff --git a/Tests/TestApp/TestApp.xcodeproj/project.pbxproj b/Tests/TestApp/TestApp.xcodeproj/project.pbxproj
@@ -331,6 +331,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = TestApp/TestApp.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"TestApp/Preview Content\"";
@@ -370,6 +371,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = TestApp/TestApp.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"TestApp/Preview Content\"";

diff --git a/Tests/TestApp/TestApp/TestAppApp.swift b/Tests/TestApp/TestApp/TestAppApp.swift
@@ -18,13 +18,19 @@ struct TestAppApp: App {
     /// Whether the sidebar design should be used for the settings window.
     @AppStorage("sidebar-design")
     var sidebarDesign = false
+    /// The currently selected tab.
+    @AppStorage("tab")
+    var selectedTab = ""
 
     /// The main view of the test app.
     var body: some Scene {
         Window("Window", id: "Window") {
             ContentView()
+            Button("Select Test") {
+                selectedTab = "test"
+            }
         }
-        .settings(design: sidebarDesign ? .sidebar : .default) {
+        .settings(design: sidebarDesign ? .sidebar : .default, selectedTab: $selectedTab) {
             for settingsTab in appModel.allSettings {
                 settingsTab
             }