Skip to content
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.

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

Add lyrics auto scroll #5585

Merged
merged 10 commits into from
Jun 25, 2024
Merged

Conversation

scampower3
Copy link
Member

Changes

Adds autoscrolling to lyrics. Will stop autoscrolling if wheel or up key or down key is used. Can continue autoscrolling by selecting the lyrics line.
Issues

Fixes #5487

@scampower3 scampower3 added the enhancement Improve existing functionality or small fixes label May 22, 2024
@scampower3 scampower3 self-assigned this May 22, 2024
@scampower3 scampower3 requested a review from a team as a code owner May 22, 2024 04:54
@Shadowghost
Copy link
Contributor

Maybe worth a PR against 10.9? IMHO it's a bit weird behaviour to not scroll on timed lyrics

@scampower3 scampower3 changed the base branch from master to release-10.9.z May 22, 2024 05:51
@scampower3 scampower3 changed the base branch from release-10.9.z to master May 22, 2024 05:51
@scampower3 scampower3 force-pushed the lyrics-auto-scroll branch from f0dab2b to 904b8bf Compare May 22, 2024 06:06
@scampower3 scampower3 changed the base branch from master to release-10.9.z May 22, 2024 06:07
@scampower3
Copy link
Member Author

Yeah, I agree. Changed the base to 10.9.z

@scampower3 scampower3 added this to the v10.9.3 milestone May 22, 2024
src/controllers/lyrics.js Outdated Show resolved Hide resolved
src/controllers/lyrics.js Outdated Show resolved Hide resolved
src/controllers/lyrics.js Outdated Show resolved Hide resolved
Copy link
Contributor

@dmitrylyzo dmitrylyzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to work.

There's a conflict between focus scroll and lyrics scroll: when focused element leaves the view when some distant lyrics is active. Tbf, I don't think we should fix it right now (because I don't know yet how 😅 ).
👆 in TV mode

src/controllers/lyrics.js Outdated Show resolved Hide resolved
@scampower3 scampower3 modified the milestones: v10.9.3, v10.10.0 May 22, 2024
@scampower3 scampower3 force-pushed the lyrics-auto-scroll branch from 7fed6fe to fa9b0e6 Compare May 22, 2024 16:36
@jellyfin-bot jellyfin-bot added the merge conflict Conflicts prevent merging label May 22, 2024
@jellyfin-bot

This comment has been minimized.

@scampower3 scampower3 changed the base branch from release-10.9.z to master May 22, 2024 16:36
@jellyfin-bot jellyfin-bot removed the merge conflict Conflicts prevent merging label May 22, 2024
src/controllers/lyrics.js Outdated Show resolved Hide resolved
src/controllers/lyrics.js Outdated Show resolved Hide resolved
scampower3 and others added 2 commits May 23, 2024 22:01
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
Copy link
Contributor

@dmitrylyzo dmitrylyzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Desktop and Mobile display modes work fine.

In TV display mode, this autoFocuser call breaks the instant scroll to the current lyric.

autoFocuser.autoFocus(view);

Called after scrollToElement, selecting the first lyric.

We could try replacing it with focusing the current lyrics (using focusManager).

@thornbill thornbill added feature New feature or request release-highlight A major new feature for the next release and removed enhancement Improve existing functionality or small fixes labels Jun 9, 2024
Copy link

sonarqubecloud bot commented Jun 9, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link
Member

@thornbill thornbill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code changes look fine to me but this could probably use another round of testing. 👍

Copy link
Contributor

@dmitrylyzo dmitrylyzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
webOS 1, 5 - OK
Chrome 124 - OK
Firefox 126 - OK

@thornbill thornbill merged commit cf0d207 into jellyfin:master Jun 25, 2024
11 checks passed
@scampower3 scampower3 deleted the lyrics-auto-scroll branch October 26, 2024 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New feature or request release-highlight A major new feature for the next release
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Synced lyrics doesn't autoscroll
5 participants