nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-26 15:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix jukebox on null playlist

Browse Source
This commit is contained in:
dank074 2022-11-15 22:39:27 -06:00
parent 6cef3564cf
commit da281a170b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/room/widgets/furniture/playlist-editor/DiskInventoryView.tsx
View File

@ -57,13 +57,13 @@ export const DiskInventoryView: FC<DiskInventoryViewProps> = props =>
{ {
const diskId = diskInventory.getKey(index); const diskId = diskInventory.getKey(index);
const songId = diskInventory.getWithIndex(index); const songId = diskInventory.getWithIndex(index);
const songData = GetNitroInstance().soundManager.musicController?.getSongInfo(songId); const songInfo = GetNitroInstance().soundManager.musicController?.getSongInfo(songId);
return ( return (
<LayoutGridItem key={ index } itemActive={ (selectedItem === index) } onClick={ () => setSelectedItem(prev => prev === index ? -1 : index) } classNames={ [ 'text-black' ] }> <LayoutGridItem key={ index } itemActive={ (selectedItem === index) } onClick={ () => setSelectedItem(prev => prev === index ? -1 : index) } classNames={ [ 'text-black' ] }>
<div className="disk-image flex-shrink-0 mb-n2" style={ { backgroundColor: GetDiskColor(songData?.songData) } }> <div className="disk-image flex-shrink-0 mb-n2" style={ { backgroundColor: GetDiskColor(songInfo?.songData) } }>
</div> </div>
<Text truncate fullWidth className="text-center">{ songData?.name }</Text> <Text truncate fullWidth className="text-center">{ songInfo?.name }</Text>
{ (selectedItem === index) && { (selectedItem === index) &&
<Flex position="absolute" className="bottom-0 mb-1 bg-secondary p-1 rounded" alignItems="center" justifyContent="center" gap={ 2 }> <Flex position="absolute" className="bottom-0 mb-1 bg-secondary p-1 rounded" alignItems="center" justifyContent="center" gap={ 2 }>
<Button onClick={ event => previewSong(event, songId) } variant="light"> <Button onClick={ event => previewSong(event, songId) } variant="light">

2
src/components/room/widgets/furniture/playlist-editor/SongPlaylistView.tsx
View File

@ -66,7 +66,7 @@ export const SongPlaylistView: FC<SongPlaylistViewProps> = props =>
<Flex column> <Flex column>
<Text bold display="block">{ LocalizeText('playlist.editor.text.now.playing.in.your.room') }</Text> <Text bold display="block">{ LocalizeText('playlist.editor.text.now.playing.in.your.room') }</Text>
<Text> <Text>
{ playlist[currentPlayingIndex].name + ' - ' + playlist[currentPlayingIndex].creator } { playlist[currentPlayingIndex]?.name + ' - ' + playlist[currentPlayingIndex]?.creator }
</Text> </Text>
</Flex> </Flex>

3
src/hooks/rooms/widgets/furniture/useFurniturePlaylistEditorWidget.ts
View File

@ -45,7 +45,7 @@ const useFurniturePlaylistEditorWidgetState = () =>
return; return;
} }
if(roomSession.isRoomOwner || (roomSession.controllerLevel >= RoomControllerLevel.GUEST) || GetSessionDataManager().isModerator) SendMessageComposer(new FurnitureMultiStateComposer(event.objectId, -2)); if(roomSession.isRoomOwner || (roomSession.controllerLevel >= RoomControllerLevel.GUEST) || GetSessionDataManager().isModerator) SendMessageComposer(new FurnitureMultiStateComposer(event.objectId, -2));
}); });
@ -58,7 +58,6 @@ const useFurniturePlaylistEditorWidgetState = () =>
useSoundEvent<NowPlayingEvent>(NowPlayingEvent.NPE_SONG_CHANGED, event => useSoundEvent<NowPlayingEvent>(NowPlayingEvent.NPE_SONG_CHANGED, event =>
{ {
console.log(event);
setCurrentPlayingIndex(event.position); setCurrentPlayingIndex(event.position);
}); });