Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions packages/app/src/components/MediaRow/ModernMediaRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const ModernMediaRow = ({
const keyPrefix = rowId || title || rowIndex || '';

useEffect(() => {
const el = rowElementRef.current;
const el = document.querySelector(`[data-row-index="${rowIndex}"]`) || rowElementRef.current;
registerRowRef?.(rowIndex, el);
return () => registerRowRef?.(rowIndex, null);
}, [rowIndex, registerRowRef]);
Expand Down Expand Up @@ -100,10 +100,10 @@ const ModernMediaRow = ({

const handleBlur = useCallback((e) => {
const nextTarget = e.relatedTarget;
const rowNode = rowElementRef.current;
if (rowNode && nextTarget && rowNode.contains(nextTarget)) return;
const rowNode = document.querySelector(`[data-row-index="${rowIndex}"]`) || rowElementRef.current;
if (rowNode && nextTarget && typeof rowNode.contains === 'function' && rowNode.contains(nextTarget)) return;
setFocusedItemId(null);
}, []);
}, [rowIndex]);

const handleFocusedChange = useCallback((itemId) => {
setFocusedItemId(itemId || null);
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/views/Browse/Browse.js
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ const Browse = ({
api.getResumeItems(),
api.getNextUp(),
api.getUserConfiguration().catch(() => null),
api.getRandomItems(settings.featuredContentType, settings.featuredItemCount),
api.getRandomItems(settings.featuredContentType, settings.featuredItemCount).catch(() => null),
settings.mergeContinueWatchingNextUp ? api.getItems({
IncludeItemTypes: 'Episode',
Filters: 'IsPlayed',
Expand Down
Loading