Skip to content

fix(player): pass playerBarNavigationAction to sidebar playlist views #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsibog wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(player): pass playerBarNavigationAction to sidebar playlist views #439

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1046b9
fix(player): pass playerBarNavigationAction to sidebar playlist views
tsibog Aug 13, 2026
03ea506
chore: retrigger CI (flaky HistoryViewModelTests)
tsibog Aug 13, 2026
231cc1d
fix(player): pass playerBarNavigationAction to sidebar playlist views
tsibog Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions Sources/Kaset/Views/MainWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,22 +665,35 @@ struct MainWindow: View { // swiftlint:disable:this type_body_length
)
}

private func pinnedItemNavigationPath(for contentId: String) -> Binding<NavigationPath> {
Binding(
get: { self.pinnedNavigationPaths[contentId, default: NavigationPath()] },
set: { self.pinnedNavigationPaths[contentId] = $0 }
)
}

private func pinnedItemPlayerBarNavigationAction(for contentId: String) -> PlayerBarNavigationAction {
PlayerBarNavigationAction(
openArtist: { self.pinnedNavigationPaths[contentId, default: NavigationPath()].append($0) },
openAlbum: { self.pinnedNavigationPaths[contentId, default: NavigationPath()].append($0) }
)
}

private func viewForSidebarPinnedItem(
_ item: SidebarPinnedItem,
client: any YTMusicClientProtocol
) -> some View {
NavigationStack(path: Binding(
get: { self.pinnedNavigationPaths[item.contentId, default: NavigationPath()] },
set: { self.pinnedNavigationPaths[item.contentId] = $0 }
)) {
let playerBarNavigationAction = self.pinnedItemPlayerBarNavigationAction(for: item.contentId)
return NavigationStack(path: self.pinnedItemNavigationPath(for: item.contentId)) {
Group {
if !self.usesLegacyMacOS15UI, #available(macOS 26.0, *) {
PlaylistDetailView(
playlist: item.playlistRoute,
viewModel: PlaylistDetailViewModel(
playlist: item.playlistRoute,
client: client
)
),
playerBarNavigationAction: playerBarNavigationAction
)
.environment(\.libraryViewModel, self.libraryViewModel)
} else {
Expand All @@ -689,13 +702,18 @@ struct MainWindow: View { // swiftlint:disable:this type_body_length
viewModel: PlaylistDetailViewModel(
playlist: item.playlistRoute,
client: client
)
),
playerBarNavigationAction: playerBarNavigationAction
)
.environment(\.libraryViewModel, self.libraryViewModel)
}
}
.id(item.contentId)
.navigationDestinations(client: client)
.navigationDestinations(
client: client,
playerBarNavigationAction: playerBarNavigationAction
)
.playerBarMusicNavigation(path: self.pinnedItemNavigationPath(for: item.contentId))
}
.environment(\.libraryViewModel, self.libraryViewModel)
.environment(\.onPlaylistDeleted) {
Expand Down
Loading