Skip to content

A self-hosted media server and file management system

fix: can't un-pause song while focused on a lyric

aminnausin3cf54f041d24
diff --git a/resources/js/components/video/plugins/lyrics/VideoLyricItem.vue b/resources/js/components/video/plugins/lyrics/VideoLyricItem.vue
index ce168297..7bb6d075 100644
--- a/resources/js/components/video/plugins/lyrics/VideoLyricItem.vue
+++ b/resources/js/components/video/plugins/lyrics/VideoLyricItem.vue
@@ -4,7 +4,7 @@ import type { RawLyricItem } from '@/types/types';
import { computed } from 'vue';
import { cn } from '@aminnausin/cedar-ui';
-const emit = defineEmits<(e: 'clicked') => void>();
+const emit = defineEmits<{ clicked: [play?: boolean] }>();
const props = withDefaults(
defineProps<{
@@ -20,11 +20,11 @@ const props = withDefaults(
},
);
-function onClick() {
+function onClick(play = false) {
const selection = globalThis.getSelection();
if (selection && selection.toString().length > 0) return;
- emit('clicked');
+ emit('clicked', play);
}
const distanceClasses = computed(() => {
@@ -54,18 +54,21 @@ const distanceClasses = computed(() => {
:class="cn('w-full transition-colors duration-300 ease-out', { 'bg-neutral-800/40': isActive })"
:id="`lyric-${lyric?.time ?? `-indexed-${index}`}`"
:data-lyric-row="index"
+ :data-active="isActive"
>
<button
:class="
cn(
'pointer-events-auto px-4 py-1 break-normal select-text sm:mx-auto sm:w-4/5 sm:px-0',
- 'drop-shadow-sm transition-[color,opacity,filter,scale] duration-300 ease-out',
+ 'transition-[color,opacity,filter,scale] duration-300 ease-out text-shadow-sm',
+ 'focus:outline-none',
distanceClasses,
{ 'cursor-pointer': lyric.time !== undefined },
- { 'text-yellow-400 opacity-100 drop-shadow-none': isActive },
+ { 'text-yellow-400 opacity-100 text-shadow-none': isActive },
)
"
- @click="onClick"
+ @click="onClick()"
+ @keydown.space.prevent="(event) => !event.repeat && onClick(true)"
>
<span>{{ lyric?.text || '-' }}</span>
</button>
@@ -77,7 +80,17 @@ const distanceClasses = computed(() => {
div:hover {
background-color: color-mix(in oklab, var(--color-neutral-800) 30%, transparent);
}
- button:hover {
+
+ div:focus-within {
+ background-color: color-mix(in oklab, var(--color-neutral-800) 20%, transparent);
+ }
+
+ div[data-active='true']:focus-within {
+ background-color: color-mix(in oklab, var(--color-neutral-800) 50%, transparent);
+ }
+
+ button:hover,
+ button:focus-visible {
opacity: 100%;
filter: blur(0px);
}
diff --git a/resources/js/components/video/plugins/lyrics/VideoLyrics.vue b/resources/js/components/video/plugins/lyrics/VideoLyrics.vue
index 44145e34..cfc498b1 100644
--- a/resources/js/components/video/plugins/lyrics/VideoLyrics.vue
+++ b/resources/js/components/video/plugins/lyrics/VideoLyrics.vue
@@ -66,8 +66,16 @@ const toPercentageTime = (seconds: number): number => {
return (seconds / props.timeDuration) * 100;
};
-const handleClick = (id: string, seconds: number) => {
+const handleClick = (id: string, seconds: number, play?: boolean) => {
if (seconds === activeTime.value) focusScroll(document.getElementById(id));
+
+ const isAtTime = Math.abs((props.player?.currentTime ?? NaN) - seconds) < 0.01;
+
+ if (play && isAtTime && props.isPaused) {
+ emit('play');
+ return;
+ }
+
if (!Number.isNaN(seconds)) emit('seek', seconds);
};
@@ -292,7 +300,11 @@ defineExpose({ scrollToCurrent });
:distance="lyrics.length === 1 && lyrics[0].text === 'No lyrics yet...' ? undefined : activeIndex < 0 ? Infinity : Math.abs(index - activeIndex)"
:title="`${lyric.time}s`"
:is-blur-enabled="useFocusedScroll && isFocusedScroll && activeIndex >= 0"
- @clicked="lyric.time !== undefined ? handleClick(`lyric-${lyric.time}`, lyric.time) : null"
+ @clicked="
+ (play?: boolean) => {
+ lyric.time !== undefined ? handleClick(`lyric-${lyric.time}`, lyric.time, play) : null;
+ }
+ "
/>
<VideoLyricItem
v-if="lyrics.length === 1 && lyrics[0].text === 'No lyrics yet...'"