rename player context hook

This commit is contained in:
jeffvli
2025-11-14 19:54:46 -08:00
parent 9c2ed36b5c
commit ec0590c79a
9 changed files with 18 additions and 24 deletions
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router';
import { getTitlePath } from '/@/renderer/components/item-list/helpers/get-title-path'; import { getTitlePath } from '/@/renderer/components/item-list/helpers/get-title-path';
import { ItemListStateItemWithRequiredProperties } from '/@/renderer/components/item-list/helpers/item-list-state'; import { ItemListStateItemWithRequiredProperties } from '/@/renderer/components/item-list/helpers/item-list-state';
import { DefaultItemControlProps, ItemControls } from '/@/renderer/components/item-list/types'; import { DefaultItemControlProps, ItemControls } from '/@/renderer/components/item-list/types';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { LibraryItem, QueueSong } from '/@/shared/types/domain-types'; import { LibraryItem, QueueSong } from '/@/shared/types/domain-types';
import { Play, TableColumn } from '/@/shared/types/types'; import { Play, TableColumn } from '/@/shared/types/types';
@@ -18,7 +18,7 @@ interface UseDefaultItemListControlsArgs {
} }
export const useDefaultItemListControls = (args?: UseDefaultItemListControlsArgs) => { export const useDefaultItemListControls = (args?: UseDefaultItemListControlsArgs) => {
const player = usePlayerContext(); const player = usePlayer();
const navigate = useNavigate(); const navigate = useNavigate();
const { onColumnReordered, onColumnResized } = args || {}; const { onColumnReordered, onColumnResized } = args || {};
@@ -35,10 +35,7 @@ import {
ItemListHandle, ItemListHandle,
ItemTableListColumnConfig, ItemTableListColumnConfig,
} from '/@/renderer/components/item-list/types'; } from '/@/renderer/components/item-list/types';
import { import { PlayerContext, usePlayer } from '/@/renderer/features/player/context/player-context';
PlayerContext,
usePlayerContext,
} from '/@/renderer/features/player/context/player-context';
import { LibraryItem } from '/@/shared/types/domain-types'; import { LibraryItem } from '/@/shared/types/domain-types';
import { TableColumn } from '/@/shared/types/types'; import { TableColumn } from '/@/shared/types/types';
@@ -584,7 +581,7 @@ export const ItemTableList = ({
const totalItemCount = enableHeader ? data.length + 1 : data.length; const totalItemCount = enableHeader ? data.length + 1 : data.length;
const parsedColumns = useMemo(() => parseTableColumns(columns), [columns]); const parsedColumns = useMemo(() => parseTableColumns(columns), [columns]);
const columnCount = parsedColumns.length; const columnCount = parsedColumns.length;
const playerContext = usePlayerContext(); const playerContext = usePlayer();
const [centerContainerWidth, setCenterContainerWidth] = useState(0); const [centerContainerWidth, setCenterContainerWidth] = useState(0);
const [totalContainerWidth, setTotalContainerWidth] = useState(0); const [totalContainerWidth, setTotalContainerWidth] = useState(0);
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import { SONG_TABLE_COLUMNS } from '/@/renderer/components/item-list/item-table-list/default-columns'; import { SONG_TABLE_COLUMNS } from '/@/renderer/components/item-list/item-table-list/default-columns';
import { ItemListHandle } from '/@/renderer/components/item-list/types'; import { ItemListHandle } from '/@/renderer/components/item-list/types';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { updateSong } from '/@/renderer/features/player/update-remote-song'; import { updateSong } from '/@/renderer/features/player/update-remote-song';
import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu';
import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { SearchInput } from '/@/renderer/features/shared/components/search-input';
@@ -26,7 +26,7 @@ export const PlayQueueListControls = ({
tableRef, tableRef,
}: PlayQueueListOptionsProps) => { }: PlayQueueListOptionsProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const player = usePlayerContext(); const player = usePlayer();
const currentSong = usePlayerSong(); const currentSong = usePlayerSong();
const handleMoveToNext = () => { const handleMoveToNext = () => {
@@ -7,10 +7,7 @@ import { ItemTableList } from '/@/renderer/components/item-list/item-table-list/
import { ItemTableListColumn } from '/@/renderer/components/item-list/item-table-list/item-table-list-column'; import { ItemTableListColumn } from '/@/renderer/components/item-list/item-table-list/item-table-list-column';
import { ItemListHandle } from '/@/renderer/components/item-list/types'; import { ItemListHandle } from '/@/renderer/components/item-list/types';
import { usePlayerEvents } from '/@/renderer/features/player/audio-player/hooks/use-player-events'; import { usePlayerEvents } from '/@/renderer/features/player/audio-player/hooks/use-player-events';
import { import { useIsPlayerFetching, usePlayer } from '/@/renderer/features/player/context/player-context';
useIsPlayerFetching,
usePlayerContext,
} from '/@/renderer/features/player/context/player-context';
import { useDragDrop } from '/@/renderer/hooks/use-drag-drop'; import { useDragDrop } from '/@/renderer/hooks/use-drag-drop';
import { useListSettings, usePlayerQueue } from '/@/renderer/store'; import { useListSettings, usePlayerQueue } from '/@/renderer/store';
import { searchSongs } from '/@/renderer/utils/search-songs'; import { searchSongs } from '/@/renderer/utils/search-songs';
@@ -107,7 +104,7 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
}); });
const EmptyQueueDropZone = () => { const EmptyQueueDropZone = () => {
const playerContext = usePlayerContext(); const playerContext = usePlayer();
const { isDraggedOver, ref } = useDragDrop<HTMLDivElement>({ const { isDraggedOver, ref } = useDragDrop<HTMLDivElement>({
drop: { drop: {
@@ -6,7 +6,7 @@ import styles from './center-controls.module.css';
import { PlayButton, PlayerButton } from '/@/renderer/features/player/components/player-button'; import { PlayButton, PlayerButton } from '/@/renderer/features/player/components/player-button';
import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider'; import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
import { openShuffleAllModal } from '/@/renderer/features/player/components/shuffle-all-modal'; import { openShuffleAllModal } from '/@/renderer/features/player/components/shuffle-all-modal';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
import { import {
usePlayerRepeat, usePlayerRepeat,
@@ -37,7 +37,7 @@ export const CenterControls = () => {
mediaTogglePlayPause, mediaTogglePlayPause,
toggleRepeat, toggleRepeat,
toggleShuffle, toggleShuffle,
} = usePlayerContext(); } = usePlayer();
const handlePlayQueueAdd = usePlayQueueAdd(); const handlePlayQueueAdd = usePlayQueueAdd();
@@ -5,7 +5,7 @@ import styles from './playerbar-slider.module.css';
import { MpvPlayer } from '/@/renderer/features/player/audio-player/mpv-player'; import { MpvPlayer } from '/@/renderer/features/player/audio-player/mpv-player';
import { WebPlayer } from '/@/renderer/features/player/audio-player/web-player'; import { WebPlayer } from '/@/renderer/features/player/audio-player/web-player';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { useRemote } from '/@/renderer/features/remote/hooks/use-remote'; import { useRemote } from '/@/renderer/features/remote/hooks/use-remote';
import { import {
useAppStore, useAppStore,
@@ -36,7 +36,7 @@ export const PlayerbarSlider = ({ ...props }: SliderProps) => {
const { showTimeRemaining } = useAppStore(); const { showTimeRemaining } = useAppStore();
const { setShowTimeRemaining } = useAppStoreActions(); const { setShowTimeRemaining } = useAppStoreActions();
const { mediaSeekToTimestamp } = usePlayerContext(); const { mediaSeekToTimestamp } = usePlayer();
const handleSeekToTimestamp = (timestamp: number) => { const handleSeekToTimestamp = (timestamp: number) => {
mediaSeekToTimestamp(timestamp); mediaSeekToTimestamp(timestamp);
@@ -4,7 +4,7 @@ import { useCallback, useEffect, WheelEvent } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { CustomPlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider'; import { CustomPlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation';
import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation';
import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation';
@@ -78,7 +78,7 @@ export const RightControls = () => {
const speed = usePlayerSpeed(); const speed = usePlayerSpeed();
const volumeWidth = useSettingsStore((state) => state.general.volumeWidth); const volumeWidth = useSettingsStore((state) => state.general.volumeWidth);
const speedPreservePitch = useSettingsStore((state) => state.playback.preservePitch); const speedPreservePitch = useSettingsStore((state) => state.playback.preservePitch);
const { mediaToggleMute, setSpeed, setVolume } = usePlayerContext(); const { mediaToggleMute, setSpeed, setVolume } = usePlayer();
const updateRatingMutation = useSetRating({}); const updateRatingMutation = useSetRating({});
const addToFavoritesMutation = useCreateFavorite({}); const addToFavoritesMutation = useCreateFavorite({});
const removeFromFavoritesMutation = useDeleteFavorite({}); const removeFromFavoritesMutation = useDeleteFavorite({});
@@ -466,7 +466,7 @@ export const PlayerProvider = ({ children }: { children: React.ReactNode }) => {
return <PlayerContext.Provider value={contextValue}>{children}</PlayerContext.Provider>; return <PlayerContext.Provider value={contextValue}>{children}</PlayerContext.Provider>;
}; };
export const usePlayerContext = () => { export const usePlayer = () => {
return useContext(PlayerContext); return useContext(PlayerContext);
}; };
@@ -7,7 +7,7 @@ import { generatePath, Link } from 'react-router';
import styles from './sidebar-playlist-list.module.css'; import styles from './sidebar-playlist-list.module.css';
import { usePlayerContext } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api';
import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form'; import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form';
import { SidebarItem } from '/@/renderer/features/sidebar/components/sidebar-item'; import { SidebarItem } from '/@/renderer/features/sidebar/components/sidebar-item';
@@ -218,7 +218,7 @@ const RowControls = ({
}; };
export const SidebarPlaylistList = () => { export const SidebarPlaylistList = () => {
const player = usePlayerContext(); const player = usePlayer();
const { t } = useTranslation(); const { t } = useTranslation();
const server = useCurrentServer(); const server = useCurrentServer();
@@ -330,7 +330,7 @@ export const SidebarPlaylistList = () => {
}; };
export const SidebarSharedPlaylistList = () => { export const SidebarSharedPlaylistList = () => {
const player = usePlayerContext(); const player = usePlayer();
const { t } = useTranslation(); const { t } = useTranslation();
const server = useCurrentServer(); const server = useCurrentServer();