Skip to content

[UEPR-477] Tips Library - Focus after item select #449

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

Merged
KManolov3 merged 4 commits into from
Feb 24, 2026
Merged

[UEPR-477] Tips Library - Focus after item select #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f41560
chore: changed focus to video or image on tutorial select
kbangelov Feb 17, 2026
3e04ec4
chore: line was not tabbed correctly
kbangelov Feb 17, 2026
030f9fd
chore: snapshot update
kbangelov Feb 18, 2026
002e9d2
chore: only focus on video, not image
kbangelov Feb 19, 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
19 changes: 18 additions & 1 deletion packages/scratch-gui/src/components/cards/cards.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React, {Fragment} from 'react';
import React, {Fragment, useRef, useEffect} from 'react';
import classNames from 'classnames';
import {FormattedMessage} from 'react-intl';
import Draggable from 'react-draggable';
Expand Down Expand Up @@ -354,6 +354,21 @@ const Cards = props => {

if (activeDeckId === null) return;

const cardRef = useRef(null);

useEffect(() => {
// Only focus if there’s an actual tutorial step (image/video)
const steps = content[activeDeckId]?.steps;
const isTutorialStep = steps?.[step]?.video;

if (isTutorialStep && cardRef.current) {
// Defer focus to next animation frame for layout stability
requestAnimationFrame(() => {
cardRef.current.focus();
});
}
}, [activeDeckId, step, content]);

// Tutorial cards need to calculate their own dragging bounds
// to allow for dragging the cards off the left, right and bottom
// edges of the workspace.
Expand Down Expand Up @@ -385,6 +400,8 @@ const Cards = props => {
top: `${menuBarHeight}px`,
left: `${-cardHorizontalDragOffset}px`
}}
ref={cardRef}
tabIndex={-1}
>
<Draggable
bounds="parent"
Expand Down
2 changes: 2 additions & 0 deletions packages/scratch-gui/test/unit/components/__snapshots__/cards.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
exports[`Cards component showVideos=false shows the title image/name instead of video step 1`] = `
<div
style="width: 1824px; height: 977px; top: 48px; left: -400px;"
tabindex="-1"
>
<div
class="react-draggable"
Expand Down Expand Up @@ -51,6 +52,7 @@ exports[`Cards component showVideos=false shows the title image/name instead of
exports[`Cards component showVideos=true shows the video step 1`] = `
<div
style="width: 1824px; height: 977px; top: 48px; left: -400px;"
tabindex="-1"
>
<div
class="react-draggable"
Expand Down
Loading