Fix NSToolbar preserving the visual state of previous selected pane on macOS Sonoma (#113)

Co-authored-by: Sindre Sorhus <[email protected]>

Author: francisfeng

Sources/Settings/SettingsTabViewController.swift

@@ -144,6 +144,13 @@ final class SettingsTabViewController: NSViewController, SettingsStyleController
 			to: toViewController,
 			options: options
 		) { [self] in
+			if
+		   		isAnimated,
+		   		let toolbarItemStyleViewController = settingsStyleController as? ToolbarItemStyleViewController
+		   	{
+				toolbarItemStyleViewController.refreshPreviousSelectedItem()
+			}
+
 			activeChildViewConstraints = toViewController.view.constrainToSuperviewBounds()
 		}
 	}

Sources/Settings/ToolbarItemStyleViewController.swift

@@ -6,6 +6,7 @@ final class ToolbarItemStyleViewController: NSObject, SettingsStyleController {
 	let panes: [SettingsPane]
 	var isKeepingWindowCentered: Bool { centerToolbarItems }
 	weak var delegate: SettingsStyleControllerDelegate?
+	private var previousSelectedItemIdentifier: NSToolbarItem.Identifier?
 
 	init(panes: [SettingsPane], toolbar: NSToolbar, centerToolbarItems: Bool) {
 		self.panes = panes
@@ -54,4 +55,22 @@ final class ToolbarItemStyleViewController: NSObject, SettingsStyleController {
 	func selectTab(index: Int) {
 		toolbar.selectedItemIdentifier = panes[index].toolbarItemIdentifier
 	}
+  
+	public func refreshPreviousSelectedItem() {
+		// On macOS Sonoma, sometimes NSToolbar would preserve the
+		// visual selected state of previous selected toolbar item during
+		// view animation.
+		// AppKit doesn’t seem to offer a way to refresh toolbar items.
+		// So we manually “refresh” it.
+		if
+			#available(macOS 14, *),
+			let previousSelectedItemIdentifier,
+			let index = toolbar.items.firstIndex(where: { $0.itemIdentifier == previousSelectedItemIdentifier })
+		{
+			toolbar.removeItem(at: index)
+			toolbar.insertItem(withItemIdentifier: previousSelected, at: index)
+		}
+
+		previousSelectedItemIdentifier = toolbar.selectedItemIdentifier
+	}
 }

readme.md

@@ -339,6 +339,7 @@ You might also like Sindre's [apps](https://sindresorhus.com/apps).
 - [The Archive](https://zettelkasten.de/the-archive/) - Note-taking app by [Christian Tietze](https://github.com/DivineDominion)
 - [Word Counter](https://wordcounterapp.com) - Measuring writer's productivity by [Christian Tietze](https://github.com/DivineDominion)
 - [Medis](https://getmedis.com) - A Redis GUI by [Zihua Li](https://github.com/luin)
+- [OK JSON](https://okjson.app) - A scriptable JSON formatter by [Francis Feng](https://github.com/francisfeng)
 
 Want to tell the world about your app that is using this package? Open a PR!