Merge pull request #706 from lovegaoshi/dev

fix: scrollto position
lovegaoshi · Jan 4, 2025 · 52fe2fc · 52fe2fc
2 parents 707b432 + c6c5a5f
commit 52fe2fc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/components/playlist/SongList/SongList.tsx b/src/components/playlist/SongList/SongList.tsx
@@ -44,7 +44,10 @@ const PlaylistList = () => {
   const [contentViewHeight, setContentViewHeight] = useState(0);
   const [scrollPositionY, setScrollPositionY] = useState(0);
 
-  useEffect(() => scrollTo(-1, true), [songListScrollCounter]);
+  useEffect(
+    () => scrollTo({ toIndex: -1, reset: true }),
+    [songListScrollCounter],
+  );
 
   useFocusEffect(
     React.useCallback(() => {
@@ -64,7 +67,10 @@ const PlaylistList = () => {
   return (
     <View style={stylesLocal.mainContainer}>
       <View style={[styles.topBarContainer, { top: 10 }]}>
-        <PlaylistInfo onPressed={() => scrollTo()} usePlaylist={usedPlaylist} />
+        <PlaylistInfo
+          onPressed={() => scrollTo({ viewPosition: 0.5 })}
+          usePlaylist={usedPlaylist}
+        />
         <View style={stylesLocal.container}>
           {checking && (
             <IconButton

diff --git a/src/components/playlist/usePlaylistRN.ts b/src/components/playlist/usePlaylistRN.ts
@@ -18,6 +18,12 @@ import { setPlayingList } from '@stores/playingList';
 import { clearPlaylistUninterrupted } from '@utils/RNTPUtils';
 import { execWhenTrue } from '@utils/Utils';
 
+interface ScrollTo {
+  toIndex?: number;
+  reset?: boolean;
+  viewPosition?: number; // toIndex = -1, reset = false, viewPosition = -4
+}
+
 export default (playlist: NoxMedia.Playlist) => {
   const { t } = useTranslation();
   const setSnack = useSnack(state => state.setSnack);
@@ -118,7 +124,11 @@ export default (playlist: NoxMedia.Playlist) => {
     );
   };
 
-  const scrollTo = (toIndex = -1, reset = false) => {
+  const scrollTo = ({
+    toIndex = -1,
+    reset = false,
+    viewPosition = -4,
+  }: ScrollTo) => {
     let currentIndex =
       toIndex < 0
         ? playlist.songList.findIndex(song => song.id === currentPlayingId)
@@ -129,7 +139,7 @@ export default (playlist: NoxMedia.Playlist) => {
         executeFn: () =>
           playlistRef.current?.scrollToIndex({
             index: currentIndex,
-            viewPosition: -4,
+            viewPosition: viewPosition,
             animated: false,
           }),
         // @ts-expect-error detect if flashlist is rendered