Skip to content

Fix focus and navigation for ThumbnailNavigation #4196

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

Fix focus and navigation for ThumbnailNavigation #4196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee60e2
Remove interfering onKeyUp handler from ThumbnailCanvasGrouping
marlo-longley Oct 15, 2025
7af6a1b
Force focus on ThumbnailNavigation during canvas re-rendering
marlo-longley Oct 17, 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
1 change: 0 additions & 1 deletion src/components/ThumbnailCanvasGrouping.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export class ThumbnailCanvasGrouping extends PureComponent {
role="button"
data-canvas-id={currentGroupings[0].id}
data-canvas-index={currentGroupings[0].index}
onKeyUp={this.setCanvas}
onClick={this.setCanvas}
tabIndex={-1}
sx={theme => ({
Expand Down
11 changes: 11 additions & 0 deletions src/components/ThumbnailNavigation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ export function ThumbnailNavigation({
gridRef.current?.scrollToItem(index, 'center');
}, [canvasIndex, view]);

// Prevent loss of focus when navigating thumbnails
const paperRef = useRef(null);

useEffect(() => {
if (paperRef.current && document.activeElement !== paperRef.current) {
paperRef.current.focus();
}
}, [canvasIndex]);

/** */
const handleKeyDown = (e) => {
let nextKey = 'ArrowRight';
Expand Down Expand Up @@ -166,6 +175,7 @@ export function ThumbnailNavigation({
tabIndex={0}
onKeyDown={handleKeyDown}
role="grid"
ref={paperRef}
>
<div role="row" style={{ height: '100%', width: '100%' }}>
{ canvasGroupings.length > 0 && (
Expand All @@ -183,6 +193,7 @@ export function ThumbnailNavigation({
layout={(position === 'far-bottom') ? 'horizontal' : 'vertical'}
itemData={itemData}
ref={gridRef}
itemKey={(index) => index}
>
{ThumbnailCanvasGrouping}
</List>
Expand Down