mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-07 04:20:12 +02:00
remove scroll shadows from fullscreen player
This commit is contained in:
@@ -103,6 +103,7 @@ interface VirtualizedTableGridProps {
|
||||
enableHeader: boolean;
|
||||
enableHorizontalBorders: boolean;
|
||||
enableRowHoverHighlight: boolean;
|
||||
enableScrollShadow: boolean;
|
||||
enableSelection: boolean;
|
||||
enableVerticalBorders: boolean;
|
||||
getRowHeight: (index: number, cellProps: TableItemProps) => number;
|
||||
@@ -146,6 +147,7 @@ const VirtualizedTableGrid = ({
|
||||
enableHeader,
|
||||
enableHorizontalBorders,
|
||||
enableRowHoverHighlight,
|
||||
enableScrollShadow,
|
||||
enableSelection,
|
||||
enableVerticalBorders,
|
||||
getRowHeight,
|
||||
@@ -429,7 +431,7 @@ const VirtualizedTableGrid = ({
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{enableHeader && showTopShadow && (
|
||||
{enableHeader && enableScrollShadow && showTopShadow && (
|
||||
<div className={styles.itemTableTopScrollShadow} />
|
||||
)}
|
||||
{!!pinnedLeftColumnCount && (
|
||||
@@ -489,7 +491,7 @@ const VirtualizedTableGrid = ({
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{enableHeader && showTopShadow && (
|
||||
{enableHeader && enableScrollShadow && showTopShadow && (
|
||||
<div className={styles.itemTableTopScrollShadow} />
|
||||
)}
|
||||
<div className={styles.itemTableGridContainer} ref={mergedRowRef}>
|
||||
@@ -507,10 +509,10 @@ const VirtualizedTableGrid = ({
|
||||
return getRowHeight(index + pinnedRowCount, cellProps);
|
||||
}}
|
||||
/>
|
||||
{pinnedLeftColumnCount > 0 && showLeftShadow && (
|
||||
{pinnedLeftColumnCount > 0 && enableScrollShadow && showLeftShadow && (
|
||||
<div className={styles.itemTableLeftScrollShadow} />
|
||||
)}
|
||||
{pinnedRightColumnCount > 0 && showRightShadow && (
|
||||
{pinnedRightColumnCount > 0 && enableScrollShadow && showRightShadow && (
|
||||
<div className={styles.itemTableRightScrollShadow} />
|
||||
)}
|
||||
</div>
|
||||
@@ -560,7 +562,7 @@ const VirtualizedTableGrid = ({
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{enableHeader && showTopShadow && (
|
||||
{enableHeader && enableScrollShadow && showTopShadow && (
|
||||
<div className={styles.itemTableTopScrollShadow} />
|
||||
)}
|
||||
<div
|
||||
@@ -607,6 +609,7 @@ const MemoizedVirtualizedTableGrid = memo(VirtualizedTableGrid, (prevProps, next
|
||||
prevProps.enableHeader === nextProps.enableHeader &&
|
||||
prevProps.enableHorizontalBorders === nextProps.enableHorizontalBorders &&
|
||||
prevProps.enableRowHoverHighlight === nextProps.enableRowHoverHighlight &&
|
||||
prevProps.enableScrollShadow === nextProps.enableScrollShadow &&
|
||||
prevProps.enableSelection === nextProps.enableSelection &&
|
||||
prevProps.enableVerticalBorders === nextProps.enableVerticalBorders &&
|
||||
prevProps.getRowHeight === nextProps.getRowHeight &&
|
||||
@@ -695,6 +698,7 @@ interface ItemTableListProps {
|
||||
enableHeader?: boolean;
|
||||
enableHorizontalBorders?: boolean;
|
||||
enableRowHoverHighlight?: boolean;
|
||||
enableScrollShadow?: boolean;
|
||||
enableSelection?: boolean;
|
||||
enableSelectionDialog?: boolean;
|
||||
enableStickyGroupRows?: boolean;
|
||||
@@ -737,6 +741,7 @@ const BaseItemTableList = ({
|
||||
enableHeader = true,
|
||||
enableHorizontalBorders = false,
|
||||
enableRowHoverHighlight = true,
|
||||
enableScrollShadow = true,
|
||||
enableSelection = true,
|
||||
enableStickyGroupRows = false,
|
||||
enableStickyHeader = false,
|
||||
@@ -2386,6 +2391,7 @@ const BaseItemTableList = ({
|
||||
enableHeader={enableHeader}
|
||||
enableHorizontalBorders={enableHorizontalBorders}
|
||||
enableRowHoverHighlight={enableRowHoverHighlight}
|
||||
enableScrollShadow={enableScrollShadow}
|
||||
enableSelection={enableSelection}
|
||||
enableVerticalBorders={enableVerticalBorders}
|
||||
getRowHeight={getRowHeight}
|
||||
|
||||
@@ -39,182 +39,190 @@ import { DragTarget } from '/@/shared/types/drag-and-drop';
|
||||
import { ItemListKey, Play, PlayerQueueType } from '/@/shared/types/types';
|
||||
|
||||
type QueueProps = {
|
||||
enableScrollShadow?: boolean;
|
||||
listKey: ItemListKey;
|
||||
searchTerm: string | undefined;
|
||||
};
|
||||
|
||||
export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, searchTerm }, ref) => {
|
||||
const { table } = useListSettings(listKey) || {};
|
||||
export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(
|
||||
({ enableScrollShadow = true, listKey, searchTerm }, ref) => {
|
||||
const { table } = useListSettings(listKey) || {};
|
||||
|
||||
const isFetching = useIsPlayerFetching();
|
||||
const tableRef = useRef<ItemListHandle>(null);
|
||||
const mergedRef = useMergedRef(ref, tableRef);
|
||||
const { getQueue } = usePlayerActions();
|
||||
const queueType = usePlayerQueueType();
|
||||
const followCurrentSong = useFollowCurrentSong();
|
||||
const isFetching = useIsPlayerFetching();
|
||||
const tableRef = useRef<ItemListHandle>(null);
|
||||
const mergedRef = useMergedRef(ref, tableRef);
|
||||
const { getQueue } = usePlayerActions();
|
||||
const queueType = usePlayerQueueType();
|
||||
const followCurrentSong = useFollowCurrentSong();
|
||||
|
||||
const [debouncedSearchTerm] = useDebouncedValue(searchTerm, 200);
|
||||
const [debouncedSearchTerm] = useDebouncedValue(searchTerm, 200);
|
||||
|
||||
const [data, setData] = useState<QueueSong[]>([]);
|
||||
const [groups, setGroups] = useState<TableGroupHeader[]>([]);
|
||||
const [data, setData] = useState<QueueSong[]>([]);
|
||||
const [groups, setGroups] = useState<TableGroupHeader[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
const setQueue = () => {
|
||||
const queue = getQueue() || { groups: [], items: [] };
|
||||
useEffect(() => {
|
||||
const setQueue = () => {
|
||||
const queue = getQueue() || { groups: [], items: [] };
|
||||
|
||||
setData(queue.items);
|
||||
setData(queue.items);
|
||||
|
||||
if (queueType === PlayerQueueType.PRIORITY && queue.groups && queue.groups.length > 0) {
|
||||
const transformedGroups: TableGroupHeader[] = queue.groups.map((group) => ({
|
||||
itemCount: group.count,
|
||||
render: (): ReactElement => {
|
||||
return (
|
||||
<div className={styles.groupRow}>
|
||||
<Text
|
||||
fw={600}
|
||||
overflow="visible"
|
||||
size="md"
|
||||
style={{
|
||||
textWrap: 'nowrap',
|
||||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{group.name}
|
||||
</Text>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
rowHeight: 40,
|
||||
}));
|
||||
setGroups(transformedGroups);
|
||||
} else {
|
||||
setGroups([]);
|
||||
}
|
||||
};
|
||||
|
||||
const unsub = subscribePlayerQueue(() => {
|
||||
setQueue();
|
||||
});
|
||||
|
||||
const unsubCurrentTrack = subscribeCurrentTrack((e) => {
|
||||
if (followCurrentSong && e.index !== -1) {
|
||||
tableRef.current?.scrollToIndex(e.index, {
|
||||
align: 'center',
|
||||
behavior: 'auto',
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
const handleAutoDJQueueAdded = () => {
|
||||
if (followCurrentSong) {
|
||||
const state = usePlayerStore.getState();
|
||||
let index = state.player.index;
|
||||
|
||||
if (isShuffleEnabled(state)) {
|
||||
index = mapShuffledToQueueIndex(index, state.queue.shuffled);
|
||||
if (
|
||||
queueType === PlayerQueueType.PRIORITY &&
|
||||
queue.groups &&
|
||||
queue.groups.length > 0
|
||||
) {
|
||||
const transformedGroups: TableGroupHeader[] = queue.groups.map((group) => ({
|
||||
itemCount: group.count,
|
||||
render: (): ReactElement => {
|
||||
return (
|
||||
<div className={styles.groupRow}>
|
||||
<Text
|
||||
fw={600}
|
||||
overflow="visible"
|
||||
size="md"
|
||||
style={{
|
||||
textWrap: 'nowrap',
|
||||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{group.name}
|
||||
</Text>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
rowHeight: 40,
|
||||
}));
|
||||
setGroups(transformedGroups);
|
||||
} else {
|
||||
setGroups([]);
|
||||
}
|
||||
};
|
||||
|
||||
if (index !== -1) {
|
||||
// Use setTimeout to ensure the DOM has updated with the new queue items
|
||||
setTimeout(() => {
|
||||
tableRef.current?.scrollToIndex(index, {
|
||||
align: 'center',
|
||||
behavior: 'auto',
|
||||
});
|
||||
}, 0);
|
||||
const unsub = subscribePlayerQueue(() => {
|
||||
setQueue();
|
||||
});
|
||||
|
||||
const unsubCurrentTrack = subscribeCurrentTrack((e) => {
|
||||
if (followCurrentSong && e.index !== -1) {
|
||||
tableRef.current?.scrollToIndex(e.index, {
|
||||
align: 'center',
|
||||
behavior: 'auto',
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
eventEmitter.on('AUTODJ_QUEUE_ADDED', handleAutoDJQueueAdded);
|
||||
const handleAutoDJQueueAdded = () => {
|
||||
if (followCurrentSong) {
|
||||
const state = usePlayerStore.getState();
|
||||
let index = state.player.index;
|
||||
|
||||
setQueue();
|
||||
|
||||
return () => {
|
||||
unsub();
|
||||
unsubCurrentTrack();
|
||||
eventEmitter.off('AUTODJ_QUEUE_ADDED', handleAutoDJQueueAdded);
|
||||
};
|
||||
}, [getQueue, queueType, tableRef, followCurrentSong]);
|
||||
|
||||
const filteredData: QueueSong[] = useMemo(() => {
|
||||
if (debouncedSearchTerm) {
|
||||
const searched = searchLibraryItems(data, debouncedSearchTerm, LibraryItem.SONG);
|
||||
return searched;
|
||||
}
|
||||
|
||||
return data;
|
||||
}, [data, debouncedSearchTerm]);
|
||||
|
||||
const isEmpty = filteredData.length === 0;
|
||||
|
||||
const { handleColumnReordered } = useItemListColumnReorder({
|
||||
itemListKey: listKey,
|
||||
});
|
||||
|
||||
const { handleColumnResized } = useItemListColumnResize({
|
||||
itemListKey: listKey,
|
||||
});
|
||||
|
||||
const currentSong = usePlayerSong();
|
||||
|
||||
const currentSongUniqueId = currentSong?._uniqueId;
|
||||
|
||||
const { focused, ref: containerFocusRef } = useFocusWithin();
|
||||
const player = usePlayer();
|
||||
|
||||
useHotkeys([
|
||||
[
|
||||
'delete',
|
||||
() => {
|
||||
if (focused) {
|
||||
const selectedItems =
|
||||
tableRef.current?.internalState.getSelected() as QueueSong[];
|
||||
|
||||
if (!selectedItems || selectedItems.length === 0) {
|
||||
return;
|
||||
if (isShuffleEnabled(state)) {
|
||||
index = mapShuffledToQueueIndex(index, state.queue.shuffled);
|
||||
}
|
||||
|
||||
player.clearSelected(selectedItems);
|
||||
if (index !== -1) {
|
||||
// Use setTimeout to ensure the DOM has updated with the new queue items
|
||||
setTimeout(() => {
|
||||
tableRef.current?.scrollToIndex(index, {
|
||||
align: 'center',
|
||||
behavior: 'auto',
|
||||
});
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
},
|
||||
],
|
||||
]);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className={styles.container} ref={containerFocusRef}>
|
||||
<LoadingOverlay pos="absolute" visible={isFetching} />
|
||||
<ItemTableList
|
||||
activeRowId={currentSongUniqueId}
|
||||
autoFitColumns={table.autoFitColumns}
|
||||
CellComponent={ItemTableListColumn}
|
||||
columns={table.columns}
|
||||
data={filteredData}
|
||||
enableAlternateRowColors={table.enableAlternateRowColors}
|
||||
enableDrag
|
||||
enableExpansion={false}
|
||||
enableHeader
|
||||
enableHorizontalBorders={table.enableHorizontalBorders}
|
||||
enableRowHoverHighlight={table.enableRowHoverHighlight}
|
||||
enableSelection
|
||||
enableSelectionDialog={false}
|
||||
enableVerticalBorders={table.enableVerticalBorders}
|
||||
getRowId="_uniqueId"
|
||||
groups={groups.length > 0 ? groups : undefined}
|
||||
initialTop={{
|
||||
to: 0,
|
||||
type: 'offset',
|
||||
}}
|
||||
itemType={LibraryItem.QUEUE_SONG}
|
||||
onColumnReordered={handleColumnReordered}
|
||||
onColumnResized={handleColumnResized}
|
||||
ref={mergedRef}
|
||||
size={table.size}
|
||||
/>
|
||||
{isEmpty && <EmptyQueueDropZone />}
|
||||
</div>
|
||||
);
|
||||
});
|
||||
eventEmitter.on('AUTODJ_QUEUE_ADDED', handleAutoDJQueueAdded);
|
||||
|
||||
setQueue();
|
||||
|
||||
return () => {
|
||||
unsub();
|
||||
unsubCurrentTrack();
|
||||
eventEmitter.off('AUTODJ_QUEUE_ADDED', handleAutoDJQueueAdded);
|
||||
};
|
||||
}, [getQueue, queueType, tableRef, followCurrentSong]);
|
||||
|
||||
const filteredData: QueueSong[] = useMemo(() => {
|
||||
if (debouncedSearchTerm) {
|
||||
const searched = searchLibraryItems(data, debouncedSearchTerm, LibraryItem.SONG);
|
||||
return searched;
|
||||
}
|
||||
|
||||
return data;
|
||||
}, [data, debouncedSearchTerm]);
|
||||
|
||||
const isEmpty = filteredData.length === 0;
|
||||
|
||||
const { handleColumnReordered } = useItemListColumnReorder({
|
||||
itemListKey: listKey,
|
||||
});
|
||||
|
||||
const { handleColumnResized } = useItemListColumnResize({
|
||||
itemListKey: listKey,
|
||||
});
|
||||
|
||||
const currentSong = usePlayerSong();
|
||||
|
||||
const currentSongUniqueId = currentSong?._uniqueId;
|
||||
|
||||
const { focused, ref: containerFocusRef } = useFocusWithin();
|
||||
const player = usePlayer();
|
||||
|
||||
useHotkeys([
|
||||
[
|
||||
'delete',
|
||||
() => {
|
||||
if (focused) {
|
||||
const selectedItems =
|
||||
tableRef.current?.internalState.getSelected() as QueueSong[];
|
||||
|
||||
if (!selectedItems || selectedItems.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
player.clearSelected(selectedItems);
|
||||
}
|
||||
},
|
||||
],
|
||||
]);
|
||||
|
||||
return (
|
||||
<div className={styles.container} ref={containerFocusRef}>
|
||||
<LoadingOverlay pos="absolute" visible={isFetching} />
|
||||
<ItemTableList
|
||||
activeRowId={currentSongUniqueId}
|
||||
autoFitColumns={table.autoFitColumns}
|
||||
CellComponent={ItemTableListColumn}
|
||||
columns={table.columns}
|
||||
data={filteredData}
|
||||
enableAlternateRowColors={table.enableAlternateRowColors}
|
||||
enableDrag
|
||||
enableExpansion={false}
|
||||
enableHeader
|
||||
enableHorizontalBorders={table.enableHorizontalBorders}
|
||||
enableRowHoverHighlight={table.enableRowHoverHighlight}
|
||||
enableScrollShadow={enableScrollShadow}
|
||||
enableSelection
|
||||
enableSelectionDialog={false}
|
||||
enableVerticalBorders={table.enableVerticalBorders}
|
||||
getRowId="_uniqueId"
|
||||
groups={groups.length > 0 ? groups : undefined}
|
||||
initialTop={{
|
||||
to: 0,
|
||||
type: 'offset',
|
||||
}}
|
||||
itemType={LibraryItem.QUEUE_SONG}
|
||||
onColumnReordered={handleColumnReordered}
|
||||
onColumnResized={handleColumnResized}
|
||||
ref={mergedRef}
|
||||
size={table.size}
|
||||
/>
|
||||
{isEmpty && <EmptyQueueDropZone />}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
const EmptyQueueDropZone = () => {
|
||||
const playerContext = usePlayer();
|
||||
|
||||
@@ -106,7 +106,11 @@ export const FullScreenPlayerQueue = () => {
|
||||
</Group>
|
||||
{activeTab === 'queue' ? (
|
||||
<div className={styles.queueContainer}>
|
||||
<PlayQueue listKey={ItemListKey.FULL_SCREEN} searchTerm={undefined} />
|
||||
<PlayQueue
|
||||
enableScrollShadow={false}
|
||||
listKey={ItemListKey.FULL_SCREEN}
|
||||
searchTerm={undefined}
|
||||
/>
|
||||
</div>
|
||||
) : activeTab === 'related' ? (
|
||||
<div className={styles.queueContainer}>
|
||||
|
||||
@@ -64,6 +64,7 @@ export const SimilarSongsList = ({ count, song }: SimilarSongsListProps) => {
|
||||
enableHeader
|
||||
enableHorizontalBorders={fullScreenTable?.enableHorizontalBorders}
|
||||
enableRowHoverHighlight={fullScreenTable?.enableRowHoverHighlight}
|
||||
enableScrollShadow={false}
|
||||
enableSelection
|
||||
enableSelectionDialog={false}
|
||||
enableVerticalBorders={fullScreenTable?.enableVerticalBorders}
|
||||
|
||||
Reference in New Issue
Block a user