alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-07-07 04:53:01 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix(tv): only defer subtitle selection when it navigates

Browse Source 
The close-first + runAfterInteractions pattern is needed only in the player,
where selecting a subtitle can navigate (replacePlayer for a burn-in switch
while transcoding). On the item detail page the selection just updates state, so
deferring it until after the modal is dismissed re-renders the page after focus
returns and yanks TV focus — leaving navigation stuck. Gate the deferral behind
deferApplyUntilDismissed (set by the in-player caller only); the detail page runs
the selection before closing, preserving focus.
This commit is contained in:
Gauvain
2026-07-07 00:33:09 +02:00
parent 461d055c7a
commit 5221ed1963
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/(auth)/tv-subtitle-modal.tsx
View File

@@ -646,16 +646,23 @@ export default function TVSubtitleModal() {
const handleTrackSelect = useCallback(
(option: { setTrack?: () => void }) => {
// Close FIRST, apply after the modal route is dismissed: setTrack can
// trigger replacePlayer (burn-in switches while transcoding), and a
// router.replace fired while this modal is the active route targets the
// MODAL instead of the player screen — the navigation is swallowed and
// the selection silently no-ops (same trap as the setParams note in
// Controls.tv's handleOpenSubtitleSheet).
if (modalState?.deferApplyUntilDismissed) {
// Player: setTrack can navigate (replacePlayer for a burn-in switch
// while transcoding); a router.replace fired while this modal is the
// active route targets the MODAL and is swallowed. Close FIRST, apply
// after dismissal.
handleClose();
InteractionManager.runAfterInteractions(() => option.setTrack?.());
return;
}
// Detail page: setTrack only updates state. Run it BEFORE closing so the
// re-render happens while the modal is up; deferring it until after
// dismissal re-renders the detail page after focus returns and yanks TV
// focus, leaving navigation stuck.
option.setTrack?.();
handleClose();
InteractionManager.runAfterInteractions(() => option.setTrack?.());
},
[handleClose],
[handleClose, modalState?.deferApplyUntilDismissed],
);
const handleDownload = useCallback(