Skip to content

Fix tvOS episode focus (#1640) #1819

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
3aa49ec6bfc910647fa1c5a013e48eef wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix tvOS episode focus (#1640) #1819

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80e8f19
Fix tvOS episode focus (#1640)
Nov 17, 2025
3e100f0
WIP
JPKribs Nov 25, 2025
d1da66a
Merge branch 'main' into feature/1640-tvos-focus
JPKribs Nov 25, 2025
334b7de
Remove unscroll on season change.
JPKribs Nov 25, 2025
d835a12
Merge remote-tracking branch 'refs/remotes/origin/feature/1640-tvos-f…
JPKribs Nov 25, 2025
3a672a7
Merge branch 'main' into feature/1640-tvos-focus
JPKribs Dec 21, 2025
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
24 changes: 11 additions & 13 deletions ...fin tvOS/Views/ItemView/Components/EpisodeSelector/Components/HStacks/EpisodeHStack.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,24 @@ extension SeriesEpisodeSelector {
SeriesEpisodeSelector.EpisodeCard(episode: episode)
.focused($focusedEpisodeID, equals: episode.id)
.padding(.horizontal, 4)
/// Wait to scroll until we see a `EpisodeCard` in the HStack
.onFirstAppear {
guard let playButtonItem,
!didScrollToPlayButtonItem,
viewModel.state == .content
else { return }

lastFocusedEpisodeID = playButtonItem.id
proxy.scrollTo(id: playButtonItem.unwrappedIDHashOrZero, animated: false)
didScrollToPlayButtonItem = true
}
}
.scrollBehavior(.continuousLeadingEdge)
.insets(horizontal: EdgeInsets.edgePadding)
.itemSpacing(EdgeInsets.edgePadding / 2)
.proxy(proxy)
.onFirstAppear {
guard !didScrollToPlayButtonItem else { return }
didScrollToPlayButtonItem = true

lastFocusedEpisodeID = playButtonItem?.id

DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
guard let playButtonItem else { return }
proxy.scrollTo(id: playButtonItem.unwrappedIDHashOrZero, animated: false)
}
}
}

// MARK: - Determine Which Episode should be Focused

private func getContentFocus() {
switch viewModel.state {
case .content:
Expand Down