mirror of
https://github.com/Dvorinka/swingmusic-extended.git
synced 2026-06-04 20:43:04 +00:00
fix indices on album page
+ fix playing on album page + fix songItem responsiveness on all virtual scroll pages
This commit is contained in:
committed by
Mungai Njoroge
parent
9cde9d0aa4
commit
f0df274b31
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="album-virtual-scroller v-scroll-page">
|
||||
<div class="album-virtual-scroller v-scroll-page" :class="{ isSmall }">
|
||||
<RecycleScroller
|
||||
class="scroller"
|
||||
:items="scrollerItems"
|
||||
@@ -10,29 +10,32 @@
|
||||
<component
|
||||
:is="item.component"
|
||||
v-bind="item.props"
|
||||
@playThis="playFromAlbum(item.props.index - item.props.track.disc - 1)"
|
||||
@playThis="
|
||||
playFromAlbum(item.props.track.index - item.props.track.disc)
|
||||
"
|
||||
/>
|
||||
</RecycleScroller>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {
|
||||
onBeforeRouteLeave,
|
||||
onBeforeRouteUpdate,
|
||||
RouteLocationNormalized,
|
||||
} from "vue-router";
|
||||
import { computed } from "@vue/reactivity";
|
||||
import {
|
||||
onBeforeRouteLeave,
|
||||
onBeforeRouteUpdate,
|
||||
RouteLocationNormalized
|
||||
} from "vue-router";
|
||||
|
||||
import { Track } from "@/interfaces";
|
||||
import { createTrackProps } from "@/utils";
|
||||
|
||||
import useQueueStore from "@/stores/queue";
|
||||
import useAlbumStore from "@/stores/pages/album";
|
||||
import useQueueStore from "@/stores/queue";
|
||||
|
||||
import AlbumDiscBar from "@/components/AlbumView/AlbumDiscBar.vue";
|
||||
import Header from "@/components/AlbumView/Header.vue";
|
||||
import SongItem from "@/components/shared/SongItem.vue";
|
||||
import AlbumDiscBar from "@/components/AlbumView/AlbumDiscBar.vue";
|
||||
import { isSmall } from "@/stores/content-width";
|
||||
|
||||
const album = useAlbumStore();
|
||||
const queue = useQueueStore();
|
||||
@@ -40,7 +43,7 @@ const queue = useQueueStore();
|
||||
interface ScrollerItem {
|
||||
id: string;
|
||||
component: typeof Header | typeof SongItem;
|
||||
props: Record<string, unknown>;
|
||||
props: any;
|
||||
size: number;
|
||||
}
|
||||
|
||||
@@ -54,7 +57,7 @@ class songItem {
|
||||
this.id = Math.random();
|
||||
this.props = track.is_album_disc_number
|
||||
? { album_disc: track }
|
||||
: createTrackProps(track);
|
||||
: { ...createTrackProps(track), hide_album: true, index: track.track };
|
||||
this.component = track.is_album_disc_number ? AlbumDiscBar : SongItem;
|
||||
}
|
||||
}
|
||||
@@ -100,8 +103,13 @@ onBeforeRouteLeave(() => {
|
||||
<style lang="scss">
|
||||
.album-virtual-scroller {
|
||||
height: 100%;
|
||||
|
||||
.scroller {
|
||||
padding-bottom: $content-padding-bottom;
|
||||
}
|
||||
|
||||
.songlist-item {
|
||||
grid-template-columns: 1.5rem 1.5fr 1fr 2.5rem 2.5rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="folder-view v-scroll-page">
|
||||
<div class="folder-view v-scroll-page" :class="{ isSmall, isMedium }">
|
||||
<DynamicScroller
|
||||
:items="scrollerItems"
|
||||
:min-item-size="64"
|
||||
@@ -32,6 +32,7 @@ import { Track } from "@/interfaces";
|
||||
import useQueueStore from "@/stores/queue";
|
||||
import useLoaderStore from "@/stores/loader";
|
||||
import useFolderStore from "@/stores/pages/folder";
|
||||
import { isSmall, isMedium } from "@/stores/content-width";
|
||||
|
||||
import SongItem from "@/components/shared/SongItem.vue";
|
||||
import FolderList from "@/components/FolderView/FolderList.vue";
|
||||
@@ -41,18 +42,18 @@ const folder = useFolderStore();
|
||||
const queue = useQueueStore();
|
||||
|
||||
interface ScrollerItem {
|
||||
id: string;
|
||||
id: string | number;
|
||||
component: typeof FolderList | typeof SongItem;
|
||||
props: any;
|
||||
}
|
||||
|
||||
class songItem {
|
||||
id: string;
|
||||
id: number;
|
||||
props: any;
|
||||
component = SongItem;
|
||||
|
||||
constructor(track: Track) {
|
||||
this.id = track.trackid;
|
||||
this.id = Math.random();
|
||||
this.props = {
|
||||
track,
|
||||
index: track.index + 1,
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<div class="playlist-virtual-scroller v-scroll-page">
|
||||
<div
|
||||
class="playlist-virtual-scroller v-scroll-page"
|
||||
:class="{ isSmall, isMedium }"
|
||||
>
|
||||
<RecycleScroller
|
||||
class="scroller"
|
||||
:items="scrollerItems"
|
||||
@@ -22,6 +25,7 @@ import { onBeforeRouteLeave } from "vue-router";
|
||||
|
||||
import useQueueStore from "@/stores/queue";
|
||||
import usePlaylistStore from "@/stores/pages/playlist";
|
||||
import { isSmall, isMedium } from "@/stores/content-width";
|
||||
|
||||
import Header from "@/components/PlaylistView/Header.vue";
|
||||
import SongItem from "@/components/shared/SongItem.vue";
|
||||
@@ -81,7 +85,7 @@ onBeforeRouteLeave(() => {
|
||||
.playlist-virtual-scroller {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
|
||||
.scroller {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
Reference in New Issue
Block a user