Skip to content
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: show multiple media cards and hide card for the active tab
- Replace single-card design with per-tab MediaCard components so each
  playing/paused tab gets its own card in the sidebar
- Filter out the currently focused tab so the card only appears for
  background media tabs
- Extract MediaCard as a standalone memo'd component with its own state
  • Loading branch information
iamEvanYT committed Mar 15, 2026
commit 10eee662c444b70b9933c47920e90f0aafa97cb7
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,43 @@ import { cn, craftActiveFaviconURL } from "@/lib/utils";
import { Pause, Play, SkipBack, SkipForward, Volume2, VolumeX } from "lucide-react";
import { memo, useCallback, useMemo, useState } from "react";
import { AnimatePresence, motion } from "motion/react";
import { useTabs } from "@/components/providers/tabs-provider";
import { useFocusedTabId, useTabs } from "@/components/providers/tabs-provider";
import type { TabData } from "~/types/tabs";

/**
* Derives the "primary" media tab from all tabs in the window.
* Priority: first tab with mediaPlaybackState "playing", then first audible
* (non-muted) tab, then first paused tab (has metadata), then first muted tab.
* Returns all tabs that have media activity (playing, paused, audible, or muted),
* excluding the currently focused tab (the one the user is looking at).
* Sorted by priority: playing > audible > paused > muted.
*/
function usePrimaryMediaTab(): TabData | null {
function useMediaTabs(): TabData[] {
const { tabsData } = useTabs();
const focusedTabId = useFocusedTabId();

return useMemo(() => {
if (!tabsData?.tabs) return null;
if (!tabsData?.tabs) return [];

let playingTab: TabData | null = null;
let audibleTab: TabData | null = null;
let pausedTab: TabData | null = null;
let mutedTab: TabData | null = null;
const playing: TabData[] = [];
const audible: TabData[] = [];
const paused: TabData[] = [];
const muted: TabData[] = [];

for (const tab of tabsData.tabs) {
if (tab.mediaPlaybackState === "playing" && !playingTab) {
playingTab = tab;
}
if (tab.audible && !audibleTab) {
audibleTab = tab;
}
if (tab.mediaPlaybackState === "paused" && !pausedTab) {
pausedTab = tab;
}
if (tab.muted && !tab.audible && !mutedTab) {
mutedTab = tab;
// Skip the tab the user is currently viewing
if (tab.id === focusedTabId) continue;

if (tab.mediaPlaybackState === "playing") {
playing.push(tab);
} else if (tab.audible) {
audible.push(tab);
} else if (tab.mediaPlaybackState === "paused") {
paused.push(tab);
} else if (tab.muted) {
muted.push(tab);
}
}

// Prefer tab with "playing" mediaSession state, then audible, then paused, then muted
return playingTab ?? audibleTab ?? pausedTab ?? mutedTab ?? null;
}, [tabsData]);
}

/**
* Returns all tabs that are currently producing audio, paused with metadata, or muted.
*/
function useMediaTabCount(): number {
const { tabsData } = useTabs();

return useMemo(() => {
if (!tabsData?.tabs) return 0;
return tabsData.tabs.filter(
(tab) => tab.audible || tab.muted || tab.mediaPlaybackState === "playing" || tab.mediaPlaybackState === "paused"
).length;
}, [tabsData]);
return [...playing, ...audible, ...paused, ...muted];
}, [tabsData, focusedTabId]);
}

// --- MediaControlButton --- //
Expand Down Expand Up @@ -86,160 +72,145 @@ function MediaControlButton({
);
}

// --- GlobalMediaControls --- //
// --- MediaCard --- //

export const GlobalMediaControls = memo(function GlobalMediaControls() {
const mediaTab = usePrimaryMediaTab();
const mediaTabCount = useMediaTabCount();
const MediaCard = memo(function MediaCard({ tab }: { tab: TabData }) {
const [faviconError, setFaviconError] = useState(false);

// Reset favicon error when the tab's favicon changes
const [prevFavicon, setPrevFavicon] = useState(tab.faviconURL);
if (tab.faviconURL !== prevFavicon) {
setPrevFavicon(tab.faviconURL);
setFaviconError(false);
}

const handlePlayPause = useCallback(
(e: React.MouseEvent) => {
e.stopPropagation();
if (!mediaTab) return;
flow.tabs.mediaPlayPause(mediaTab.id);
flow.tabs.mediaPlayPause(tab.id);
},
[mediaTab]
[tab.id]
);

const handlePrevTrack = useCallback(
(e: React.MouseEvent) => {
e.stopPropagation();
if (!mediaTab) return;
flow.tabs.mediaPreviousTrack(mediaTab.id);
flow.tabs.mediaPreviousTrack(tab.id);
},
[mediaTab]
[tab.id]
);

const handleNextTrack = useCallback(
(e: React.MouseEvent) => {
e.stopPropagation();
if (!mediaTab) return;
flow.tabs.mediaNextTrack(mediaTab.id);
flow.tabs.mediaNextTrack(tab.id);
},
[mediaTab]
[tab.id]
);

const handleToggleMute = useCallback(
(e: React.MouseEvent) => {
e.stopPropagation();
if (!mediaTab) return;
flow.tabs.setTabMuted(mediaTab.id, !mediaTab.muted);
flow.tabs.setTabMuted(tab.id, !tab.muted);
},
[mediaTab]
[tab.id, tab.muted]
);

const handleSwitchToTab = useCallback(() => {
if (!mediaTab) return;
flow.tabs.switchToTab(mediaTab.id);
}, [mediaTab]);

// Determine display values
const displayTitle = useMemo(() => {
if (!mediaTab) return "";
// Use media metadata title if available, otherwise tab title
return mediaTab.mediaTitle || mediaTab.title;
}, [mediaTab]);

const displayArtist = useMemo(() => {
if (!mediaTab) return null;
return mediaTab.mediaArtist || null;
}, [mediaTab]);

const isPlaying = mediaTab?.mediaPlaybackState === "playing" || (mediaTab?.audible && !mediaTab?.muted);

// Reset favicon error when the media tab changes
const currentTabId = mediaTab?.id;
const [prevTabId, setPrevTabId] = useState<number | undefined>(undefined);
if (currentTabId !== prevTabId) {
setPrevTabId(currentTabId);
setFaviconError(false);
}
flow.tabs.switchToTab(tab.id);
}, [tab.id]);

const displayTitle = tab.mediaTitle || tab.title;
const displayArtist = tab.mediaArtist || null;
const isPlaying = tab.mediaPlaybackState === "playing" || (tab.audible && !tab.muted);

return (
<AnimatePresence>
{mediaTab && (
<motion.div
key="global-media-controls"
initial={{ opacity: 0, height: 0, marginTop: 0 }}
animate={{ opacity: 1, height: "auto", marginTop: 8 }}
exit={{ opacity: 0, height: 0, marginTop: 0 }}
transition={{ duration: 0.3, ease: [0.22, 1, 0.36, 1] }}
className="shrink-0 overflow-hidden"
<motion.div
key={tab.id}
initial={{ opacity: 0, height: 0, marginTop: 0 }}
animate={{ opacity: 1, height: "auto", marginTop: 8 }}
exit={{ opacity: 0, height: 0, marginTop: 0 }}
transition={{ duration: 0.3, ease: [0.22, 1, 0.36, 1] }}
className="shrink-0 overflow-hidden"
>
<div
className={cn(
"w-full rounded-xl overflow-hidden",
"border border-black/10 dark:border-white/15",
"bg-black/5 dark:bg-white/10"
)}
>
{/* Top row: favicon + title */}
<div
className={cn(
"flex items-center gap-2 px-2.5 pt-2 pb-1",
"cursor-pointer",
"hover:bg-black/5 dark:hover:bg-white/5",
"transition-colors duration-100"
)}
onClick={handleSwitchToTab}
>
<div
className={cn(
"w-full rounded-xl overflow-hidden",
"border border-black/10 dark:border-white/15",
"bg-black/5 dark:bg-white/10"
)}
>
{/* Top row: favicon + title + mute button */}
<div
className={cn(
"flex items-center gap-2 px-2.5 pt-2 pb-1",
"cursor-pointer",
"hover:bg-black/5 dark:hover:bg-white/5",
"transition-colors duration-100"
)}
onClick={handleSwitchToTab}
>
{/* Favicon */}
<div className="size-4 shrink-0">
{mediaTab.faviconURL && !faviconError ? (
<img
src={craftActiveFaviconURL(mediaTab.id, mediaTab.faviconURL)}
alt=""
className="size-full rounded-sm object-contain overflow-hidden"
style={{ userSelect: "none", WebkitUserDrag: "none" } as React.CSSProperties}
onError={() => setFaviconError(true)}
/>
) : (
<div className="size-full bg-gray-300 dark:bg-gray-300/30 rounded-sm" />
)}
</div>

{/* Title + Artist */}
<div className="flex-1 min-w-0">
<div className="truncate text-xs font-medium text-black/90 dark:text-white/90">{displayTitle}</div>
{displayArtist && (
<div className="truncate text-[10px] text-black/50 dark:text-white/50">{displayArtist}</div>
)}
</div>

{/* Tab count badge */}
{mediaTabCount > 1 && (
<span className="shrink-0 text-[10px] font-medium text-black/40 dark:text-white/40">
+{mediaTabCount - 1}
</span>
)}
</div>

{/* Bottom row: playback controls */}
<div className="flex items-center justify-center gap-1 px-2 pb-2 pt-0.5">
<MediaControlButton icon={SkipBack} onClick={handlePrevTrack} label="Previous track" size="size-3" />
<MediaControlButton
icon={isPlaying ? Pause : Play}
onClick={handlePlayPause}
label={isPlaying ? "Pause" : "Play"}
size="size-4"
{/* Favicon */}
<div className="size-4 shrink-0">
{tab.faviconURL && !faviconError ? (
<img
src={craftActiveFaviconURL(tab.id, tab.faviconURL)}
alt=""
className="size-full rounded-sm object-contain overflow-hidden"
style={{ userSelect: "none", WebkitUserDrag: "none" } as React.CSSProperties}
onError={() => setFaviconError(true)}
/>
<MediaControlButton icon={SkipForward} onClick={handleNextTrack} label="Next track" size="size-3" />

{/* Spacer */}
<div className="flex-1" />
) : (
<div className="size-full bg-gray-300 dark:bg-gray-300/30 rounded-sm" />
)}
</div>

{/* Mute toggle */}
<MediaControlButton
icon={mediaTab.muted ? VolumeX : Volume2}
onClick={handleToggleMute}
label={mediaTab.muted ? "Unmute" : "Mute"}
size="size-3.5"
/>
</div>
{/* Title + Artist */}
<div className="flex-1 min-w-0">
<div className="truncate text-xs font-medium text-black/90 dark:text-white/90">{displayTitle}</div>
{displayArtist && (
<div className="truncate text-[10px] text-black/50 dark:text-white/50">{displayArtist}</div>
)}
</div>
</motion.div>
)}
</div>

{/* Bottom row: playback controls */}
<div className="flex items-center justify-center gap-1 px-2 pb-2 pt-0.5">
<MediaControlButton icon={SkipBack} onClick={handlePrevTrack} label="Previous track" size="size-3" />
<MediaControlButton
icon={isPlaying ? Pause : Play}
onClick={handlePlayPause}
label={isPlaying ? "Pause" : "Play"}
size="size-4"
/>
<MediaControlButton icon={SkipForward} onClick={handleNextTrack} label="Next track" size="size-3" />

{/* Spacer */}
<div className="flex-1" />

{/* Mute toggle */}
<MediaControlButton
icon={tab.muted ? VolumeX : Volume2}
onClick={handleToggleMute}
label={tab.muted ? "Unmute" : "Mute"}
size="size-3.5"
/>
</div>
</div>
</motion.div>
);
});

// --- GlobalMediaControls --- //

export const GlobalMediaControls = memo(function GlobalMediaControls() {
const mediaTabs = useMediaTabs();

return (
<AnimatePresence>
{mediaTabs.map((tab) => (
<MediaCard key={tab.id} tab={tab} />
))}
</AnimatePresence>
);
});
Loading