From 153f634a088c1b218db43f4f72606a9440992f04 Mon Sep 17 00:00:00 2001
From: aarbit <aarbit@gmail.com>
Date: Fri, 19 Jul 2024 23:40:35 -0500
Subject: [PATCH] Adds ability to select a specific track within an album, and
 fixes info view not keeping position between albums.

---
 src/App.tsx                         |  7 ++++++-
 src/components/AlbumInfoDisplay.tsx |  6 ++++--
 src/components/AlbumPlayer.tsx      | 13 +++++++------
 src/components/TrackListing.tsx     |  6 ++++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index acb0a86..26b1e28 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,6 +12,7 @@ function App() {
   const [albums, setAlbums] = useState(Array<AlbumMetadata>)
   const [selectedAlbum, setSelectedAlbum] = useState("")
   const [albumInfo, setAlbumInfo] = useState<AlbumInfo>()
+  const [isShowAlbumInfo, setIsShowAlbumInfo] = useState(false)
 
   useEffect(() => {
     let fetched = fetch(`${hostName}/album`)
@@ -41,10 +42,14 @@ function App() {
     setSelectedAlbum(event.currentTarget.id)
   }
 
+  function handleAlbumInfoAdjust() {
+    setIsShowAlbumInfo(!isShowAlbumInfo)
+  }
+
   return (
       <div className={"gallery"}>
         <PhotoContainer imageList={albums} albumClickHandler={handleAlbumClick}/>
-        {albumInfo ? <AlbumPlayer albumHash={selectedAlbum} albumInfo={albumInfo} key={selectedAlbum}/> : <div></div> }
+        {albumInfo ? <AlbumPlayer handleAlbumInfoAdjust={handleAlbumInfoAdjust} isShowAlbumInfo={isShowAlbumInfo} albumHash={selectedAlbum} albumInfo={albumInfo} key={selectedAlbum}/> : <div></div> }
       </div>
   )
 }
diff --git a/src/components/AlbumInfoDisplay.tsx b/src/components/AlbumInfoDisplay.tsx
index e305e10..d204bd8 100644
--- a/src/components/AlbumInfoDisplay.tsx
+++ b/src/components/AlbumInfoDisplay.tsx
@@ -1,9 +1,11 @@
 import {AlbumInfo} from "../models/AlbumInfo.ts";
 import TrackListing from "./TrackListing.tsx";
+import React from "react";
 
 interface AlbumInfoDisplayProps {
   albumInfo: AlbumInfo,
-  trackNumber: number
+  trackNumber: number,
+  trackClickHandler: (event: React.MouseEvent<HTMLElement>, trackNumber: number) => void
 }
 export default function AlbumInfoDisplay(props: Readonly<AlbumInfoDisplayProps>) {
   let isVarious = props.albumInfo.albumArtist.startsWith("Various")
@@ -11,7 +13,7 @@ export default function AlbumInfoDisplay(props: Readonly<AlbumInfoDisplayProps>)
   return (
       <div>
         <div className={`album-title`}>{!isVarious && `${props.albumInfo.albumArtist} - `}{props.albumInfo.albumTitle}</div>
-        <TrackListing trackList={props.albumInfo.trackList} isOneArtist={isOneArtist} trackNumber={props.trackNumber}/>
+        <TrackListing trackClickHandler={props.trackClickHandler} trackList={props.albumInfo.trackList} isOneArtist={isOneArtist} trackNumber={props.trackNumber}/>
       </div>
   )
 }
\ No newline at end of file
diff --git a/src/components/AlbumPlayer.tsx b/src/components/AlbumPlayer.tsx
index 70d1dc5..2a84352 100644
--- a/src/components/AlbumPlayer.tsx
+++ b/src/components/AlbumPlayer.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useState} from "react";
+import React, {useEffect, useState} from "react";
 import hostName from "../Config.ts";
 import {AlbumInfo} from "../models/AlbumInfo.ts";
 import AlbumInfoDisplay from "./AlbumInfoDisplay.tsx";
@@ -9,12 +9,13 @@ import minimize from '/minimize-2.svg'
 interface AlbumPlayerProps {
   albumHash: string,
   albumInfo: AlbumInfo
+  handleAlbumInfoAdjust: () => void,
+  isShowAlbumInfo: boolean
 }
 
 export default function AlbumPlayer(props: Readonly<AlbumPlayerProps>) {
   const [trackNum, setTrackNum] = useState<number>(0)
   const [isAlbumOver, setIsAlbumOver] = useState(false)
-  const [isShowAlbumInfo, setIsShowAlbumInfo] = useState(false)
 
   let album = props.albumInfo
 
@@ -30,16 +31,16 @@ export default function AlbumPlayer(props: Readonly<AlbumPlayerProps>) {
     }
   }
 
-  function handleAlbumInfoAdjust() {
-    setIsShowAlbumInfo(!isShowAlbumInfo)
+  function handleTrackClick(_: React.MouseEvent<HTMLElement>, trackNumber: number) {
+    setTrackNum(trackNumber)
   }
 
   if(props.albumHash && album) {
     console.log(album)
     return (
         <div className={"player-container"}>
-          <div className={`expander`} onClick={handleAlbumInfoAdjust} id={"maximizer"}>{isShowAlbumInfo ? <img src={minimize} alt={'minimize song text'}/> : <img src={maximize} alt={'show full album information'}/>}</div>
-          <div>{isShowAlbumInfo ? <AlbumInfoDisplay albumInfo={props.albumInfo} trackNumber={trackNum} /> : <TrackInfoDisplay artist={album.trackList[trackNum].trackArtist} track={album.trackList[trackNum].trackTitle} />}</div>
+          <div className={`expander`} onClick={props.handleAlbumInfoAdjust} id={"maximizer"}>{props.isShowAlbumInfo ? <img src={minimize} alt={'minimize song text'}/> : <img src={maximize} alt={'show full album information'}/>}</div>
+          <div>{props.isShowAlbumInfo ? <AlbumInfoDisplay albumInfo={props.albumInfo} trackNumber={trackNum} trackClickHandler={handleTrackClick} /> : <TrackInfoDisplay artist={album.trackList[trackNum].trackArtist} track={album.trackList[trackNum].trackTitle} />}</div>
           <audio title={album.trackList[trackNum].trackTitle} controls={true} autoPlay={true} preload={"metadata"}
                  src={`${hostName}/music/album/${props.albumHash}/track/${trackNum}`}
                  onEnded={handleNextTrack} />
diff --git a/src/components/TrackListing.tsx b/src/components/TrackListing.tsx
index 9fd00a0..ed09df1 100644
--- a/src/components/TrackListing.tsx
+++ b/src/components/TrackListing.tsx
@@ -1,9 +1,11 @@
 import {AlbumTrackInfo} from "../models/AlbumTrackInfo.ts";
+import React from "react";
 
 interface TrackListingProps {
   trackList: AlbumTrackInfo[],
   isOneArtist: boolean,
-  trackNumber: number
+  trackNumber: number,
+  trackClickHandler: (event: React.MouseEvent<HTMLElement>, trackNumber: number) => void
 }
 export default function TrackListing(props: Readonly<TrackListingProps>) {
   return (
@@ -12,7 +14,7 @@ export default function TrackListing(props: Readonly<TrackListingProps>) {
           let rawKeyString = `${track.trackNumber}${track.trackArtist}${track.trackTitle}`
           let isCurrentTrack = index===props.trackNumber
           return (
-              <div key={rawKeyString} className={ isCurrentTrack ? `bold-title` : ``}>{track.trackNumber}. {!props.isOneArtist && `${track.trackArtist} - `}{track.trackTitle}</div>
+              <div onClick={(e) => props.trackClickHandler(e, index)} key={rawKeyString} className={ isCurrentTrack ? `bold-title` : ``}>{track.trackNumber}. {!props.isOneArtist && `${track.trackArtist} - `}{track.trackTitle}</div>
           )
         })}
       </div>