Skip to content

[UEPR-477] Focus video on tutorial library choice with keyboard #579

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
adzhindzhi merged 7 commits into from
May 22, 2026
+19 −20
Merged

[UEPR-477] Focus video on tutorial library choice with keyboard #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11de356
fix: always focuses directly on the video play button now
kbangelov May 14, 2026
0fcc899
chore: delete obsolete line of code
kbangelov May 14, 2026
a3c98ea
chore: update snapshot
kbangelov May 14, 2026
546a2ac
Merge branch 'release/UEPR-297-accessibility-improvements' of github.…
adzhindzhi May 21, 2026
7b36b18
fix: utilize wistia js api onReady functionfor focusing the video whe…
adzhindzhi May 21, 2026
968446e
fix: typo and queue cleanup
adzhindzhi May 21, 2026
184ac49
fix: address review points
adzhindzhi May 21, 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
37 changes: 19 additions & 18 deletions 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, useRef, useEffect} from 'react';
import React, {Fragment} from 'react';
import classNames from 'classnames';
import {FormattedMessage} from 'react-intl';
import Draggable from 'react-draggable';
Expand Down Expand Up @@ -99,6 +99,20 @@ class VideoStep extends React.Component {
script2.async = true;
script2.setAttribute('id', 'wistia-video-api');
document.body.appendChild(script2);

// The Wistia API doesn't provide a callback for when the video is ready,
// so we use the global _wq queue that Wistia provides for this purpose.
// See the below for more details.
// https://docs.wistia.com/docs/javascript-player-api#with-standard-embeds
window._wq = window._wq || [];
window._wq.push({
id: this.props.video,
onReady: video => {
if (video) {
video.focus();
}
}});
Comment thread
adzhindzhi marked this conversation as resolved.
Comment thread
adzhindzhi marked this conversation as resolved.

}

// We use the Wistia API here to update or pause the video dynamically:
Expand Down Expand Up @@ -127,6 +141,10 @@ class VideoStep extends React.Component {

const script2 = document.getElementById('wistia-video-api');
script2.parentNode.removeChild(script2);

// Clean up the _wq queue to prevent old callbacks from firing
// if the component is unmounted before the video is ready
window._wq = window._wq.filter(video => video.id !== this.props.video);
}

render () {
Expand Down Expand Up @@ -354,21 +372,6 @@ const Cards = props => {

if (activeDeckId === null) return;

Comment thread
adzhindzhi marked this conversation as resolved.
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 @@ -400,8 +403,6 @@ const Cards = props => {
top: `${menuBarHeight}px`,
left: `${-cardHorizontalDragOffset}px`
}}
ref={cardRef}
tabIndex={-1}
>
<Draggable
bounds="parent"
Expand Down
2 changes: 0 additions & 2 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,7 +3,6 @@
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 @@ -52,7 +51,6 @@ 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