@behindthemusictree/app-kit-ui 24.0.1 → 28.0.2

package/dist/{chunk-BPCFNBFO.js → chunk-5PQWJRDZ.js}

@@ -1,12 +1,14 @@
 import {
   BasePopup_default,
-  InternalErrorPopup
-} from "./chunk-VDXUW7PP.js";
+  InternalErrorPopup,
+  Toast
+} from "./chunk-DKQQLLMY.js";
 
 // src/genre-tree/GenreTreeView.tsx
-import { useCallback as useCallback5, useEffect as useEffect4, useMemo as useMemo6, useRef as useRef4, useState as useState4 } from "react";
+import { useCallback as useCallback6, useDeferredValue, useEffect as useEffect5, useMemo as useMemo7, useRef as useRef4, useState as useState5 } from "react";
+import { useIsMutating } from "@tanstack/react-query";
 import { Plus as Plus2 } from "lucide-react";
-import { IconTextButton, Button, SegmentedControl } from "@behindthemusictree/ui";
+import { IconTextButton, Button, SegmentedControl as SegmentedControl2 } from "@behindthemusictree/ui";
 import {
   GenreTreeWheelSkeleton,
   GenreTreeViewSkeleton
@@ -14,9 +16,9 @@ import {
 import {
   useArtistSearch
 } from "@behindthemusictree/app-kit/genre-tree";
-import { useGenreTreeViewState, useArtist as useArtist2 } from "@behindthemusictree/app-kit/genre-tree";
+import { useGenreTreeViewState, useArtist as useArtist2, useUpdateGenre as useUpdateGenre2, genreUpdateMutationKey } from "@behindthemusictree/app-kit/genre-tree";
 import { usePlayer as usePlayer8 } from "@behindthemusictree/app-kit/player";
-import { usePopup as usePopup4 } from "@behindthemusictree/app-kit/popup";
+import { usePopup as usePopup5 } from "@behindthemusictree/app-kit/popup";
 
 // src/genre-tree/GenreDetailExtras.tsx
 import { Skeleton as Skeleton2 } from "@behindthemusictree/ui";
@@ -25,7 +27,7 @@ import { useFetchGenreOverview } from "@behindthemusictree/app-kit/genre-tree";
 // src/genre-tree/ClampedText.tsx
 import { useLayoutEffect, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-function ClampedText({ children, className = "" }) {
+function ClampedText({ children, className: className2 = "" }) {
   const ref = useRef(null);
   const [expanded, setExpanded] = useState(false);
   const [overflows, setOverflows] = useState(false);
@@ -35,7 +37,7 @@ function ClampedText({ children, className = "" }) {
     setOverflows(element.scrollHeight > element.clientHeight);
   }, [children, expanded]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx("p", { ref, className: `${className} ${expanded ? "" : "line-clamp-3"}`, children }),
+    /* @__PURE__ */ jsx("p", { ref, className: `${className2} ${expanded ? "" : "line-clamp-3"}`, children }),
     (overflows || expanded) && /* @__PURE__ */ jsx(
       "button",
       {
@@ -62,20 +64,6 @@ import { parseWithLog } from "@behindthemusictree/app-kit/transport";
 import { usePlayer } from "@behindthemusictree/app-kit/player";
 import { PlayStates } from "@behindthemusictree/app-kit/player";
 import { usePopup } from "@behindthemusictree/app-kit/popup";
-
-// src/genre-tree/UnplayableReason.tsx
-import { FaYoutube } from "react-icons/fa";
-import { NO_VIDEO_LABEL } from "@behindthemusictree/app-kit/genre-tree";
-import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
-function UnplayableReason({ reason }) {
-  if (reason !== NO_VIDEO_LABEL) return /* @__PURE__ */ jsx2(Fragment2, { children: reason });
-  return /* @__PURE__ */ jsxs2("span", { role: "img", "aria-label": reason, className: "relative inline-flex shrink-0 items-center", children: [
-    /* @__PURE__ */ jsx2(FaYoutube, { size: 16, "aria-hidden": "true" }),
-    /* @__PURE__ */ jsx2("span", { "aria-hidden": "true", className: "absolute left-1/2 top-1/2 h-0.5 w-[130%] -translate-x-1/2 -translate-y-1/2 -rotate-45 rounded bg-current" })
-  ] });
-}
-
-// src/genre-tree/GenrePlaylistTracks.tsx
 import { ErrorCode } from "@behindthemusictree/app-kit/transport";
 import { genrePlaylistQueryKeys } from "@behindthemusictree/app-kit/genre-tree";
 import { libraryEndpoints, libraryQueryKeys } from "@behindthemusictree/app-kit/genre-tree";
@@ -83,23 +71,25 @@ import { isSong, songUnplayableReason, SongDetailedSchema } from "@behindthemusi
 import { useTrackList } from "@behindthemusictree/app-kit/genre-tree";
 
 // src/genre-tree/MusicBrainzRecordingLink.tsx
-import { FaExternalLinkAlt } from "react-icons/fa";
 import { musicBrainzRecordingUrl } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx3 } from "react/jsx-runtime";
-function MusicBrainzRecordingLink({ song }) {
+import { Fragment as Fragment2, jsx as jsx2 } from "react/jsx-runtime";
+function MusicBrainzRecordingLink({
+  song,
+  children,
+  className: className2 = ""
+}) {
   const url = musicBrainzRecordingUrl(song);
-  if (!url) return null;
-  return /* @__PURE__ */ jsx3(
+  if (!url) return /* @__PURE__ */ jsx2(Fragment2, { children });
+  return /* @__PURE__ */ jsx2(
     "a",
     {
       href: url,
       target: "_blank",
       rel: "noopener noreferrer",
       "aria-label": `View ${song.title} on MusicBrainz`,
-      title: "View on MusicBrainz",
-      className: "inline-flex shrink-0 items-center opacity-50 hover:opacity-100 focus-visible:opacity-100",
+      className: className2,
       onClick: (event) => event.stopPropagation(),
-      children: /* @__PURE__ */ jsx3(FaExternalLinkAlt, { size: 10 })
+      children
     }
   );
 }
@@ -107,7 +97,7 @@ function MusicBrainzRecordingLink({ song }) {
 // src/genre-tree/GenrePlaylistTracks.tsx
 import { ArtistNames } from "@behindthemusictree/app-kit/genre-tree";
 import { capitalize, useTrackNoun } from "@behindthemusictree/app-kit/track-noun";
-import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
+import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 var CATALOGUE_PAGE_SIZE = 100;
 var SongPageSchema = PaginatedResponseSchema(SongDetailedSchema).extend({
   overallTotal: z.number().nullable(),
@@ -179,90 +169,89 @@ function GenrePlaylistTracks({
     const started = artist ? playNewTrackListFromArtist(artist, scope, { startSongUuid, ordering: "title", genreUuid }) : playNewTrackListFromGenrePlaylist(genrePlaylist, scope, { startSongUuid });
     started.catch((error) => {
       console.error("Failed to play genre playlist:", error);
-      showPopup(/* @__PURE__ */ jsx4(InternalErrorPopup, { errorCode: ErrorCode.CLIENT_UNKNOWN }));
+      showPopup(/* @__PURE__ */ jsx3(InternalErrorPopup, { errorCode: ErrorCode.CLIENT_UNKNOWN }));
     });
   };
-  return /* @__PURE__ */ jsxs3("div", { className: "gtv-info-panel-children", children: [
-    /* @__PURE__ */ jsxs3("span", { className: "gtv-info-panel-children-title", children: [
+  return /* @__PURE__ */ jsxs2("div", { className: "gtv-info-panel-children", children: [
+    /* @__PURE__ */ jsxs2("span", { className: "gtv-info-panel-children-title", children: [
       capitalize(trackNoun.plural),
       total !== void 0 && ` (${total})`
     ] }),
     renderTracksToolbar?.(),
-    isPending ? /* @__PURE__ */ jsx4(Skeleton, { className: "h-4 w-3/4", "aria-busy": "true" }) : isError && tracks.length === 0 ? /* @__PURE__ */ jsxs3("p", { role: "alert", children: [
+    isPending ? /* @__PURE__ */ jsx3(Skeleton, { className: "h-4 w-3/4", "aria-busy": "true" }) : isError && tracks.length === 0 ? /* @__PURE__ */ jsxs2("p", { role: "alert", children: [
       "Couldn't load ",
       trackNoun.plural,
       ".",
       " ",
-      /* @__PURE__ */ jsx4("button", { type: "button", className: "underline", onClick: () => void refetch(), children: "Retry" })
-    ] }) : tracks.length === 0 ? /* @__PURE__ */ jsx4("p", { children: "\u2014" }) : /* @__PURE__ */ jsxs3("ul", { className: "mt-1 max-h-64 overflow-y-auto text-[0.8125rem] leading-[1.45] [container-type:inline-size]", "aria-label": `${genrePlaylist.name} ${trackNoun.plural}`, children: [
+      /* @__PURE__ */ jsx3("button", { type: "button", className: "underline", onClick: () => void refetch(), children: "Retry" })
+    ] }) : tracks.length === 0 ? /* @__PURE__ */ jsx3("p", { children: "\u2014" }) : /* @__PURE__ */ jsxs2("ul", { className: "mt-1 max-h-64 overflow-y-auto text-[0.8125rem] leading-[1.45] [container-type:inline-size]", "aria-label": `${genrePlaylist.name} ${trackNoun.plural}`, children: [
       tracks.map((track, index) => {
         const label = track.artists?.length ? `${track.title} \u2014 ${track.artists.map((artist2) => artist2.name).join(", ")}` : track.title;
         const isCurrent = playerTrackObject?.track.id === track.uuid;
         const isPlaying = isCurrent && playState === PlayStates.PLAYING;
-        const text = /* @__PURE__ */ jsxs3("span", { className: TEXT_CELL, children: [
-          /* @__PURE__ */ jsx4("span", { className: TITLE_CELL, children: track.title }),
-          track.artists?.length ? /* @__PURE__ */ jsx4("span", { className: SEPARATOR, children: " \u2014 " }) : null,
-          /* @__PURE__ */ jsx4("span", { className: COLUMN_CELL, children: track.artists?.length ? /* @__PURE__ */ jsx4(ArtistNames, { artists: track.artists, renderArtistLink }) : null }),
-          track.album && /* @__PURE__ */ jsx4("span", { className: ALBUM_CELL, children: track.album.name })
+        const text = /* @__PURE__ */ jsxs2("span", { className: TEXT_CELL, children: [
+          /* @__PURE__ */ jsx3("span", { className: TITLE_CELL, children: isSong(track) ? /* @__PURE__ */ jsx3(MusicBrainzRecordingLink, { song: track, className: "hover:underline focus-visible:underline", children: track.title }) : track.title }),
+          track.artists?.length ? /* @__PURE__ */ jsx3("span", { className: SEPARATOR, children: " \u2014 " }) : null,
+          /* @__PURE__ */ jsx3("span", { className: COLUMN_CELL, children: track.artists?.length ? /* @__PURE__ */ jsx3(ArtistNames, { artists: track.artists, renderArtistLink }) : null }),
+          track.album && /* @__PURE__ */ jsx3("span", { className: ALBUM_CELL, children: track.album.name })
         ] });
         const leading = renderSongLeading?.(track, index);
         const actions = renderSongActions?.(track);
-        const unplayableReason = isSong(track) ? songUnplayableReason(track) : null;
-        if (unplayableReason) {
-          return /* @__PURE__ */ jsxs3("li", { className: "flex min-h-8 items-center gap-1 px-1 opacity-50", title: unplayableReason, children: [
+        const isUnplayable = isSong(track) && songUnplayableReason(track) !== null;
+        if (isUnplayable) {
+          return /* @__PURE__ */ jsxs2("li", { className: "flex min-h-8 items-center gap-1 px-1 opacity-50", children: [
             leading,
-            /* @__PURE__ */ jsx4(
+            /* @__PURE__ */ jsx3(
               "button",
               {
                 type: "button",
                 disabled: true,
                 "aria-disabled": "true",
-                "aria-label": `${label} \u2014 ${unplayableReason}`,
+                "aria-label": label,
                 className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-full opacity-0 cursor-not-allowed",
-                children: /* @__PURE__ */ jsx4(FaPlay, { size: 10 })
+                children: /* @__PURE__ */ jsx3(FaPlay, { size: 10 })
               }
             ),
             text,
-            isSong(track) && /* @__PURE__ */ jsx4(MusicBrainzRecordingLink, { song: track }),
-            /* @__PURE__ */ jsx4("span", { className: "shrink-0 text-xs", children: /* @__PURE__ */ jsx4(UnplayableReason, { reason: unplayableReason }) }),
             actions
           ] }, track.uuid);
         }
-        return /* @__PURE__ */ jsxs3(
+        return /* @__PURE__ */ jsxs2(
           "li",
           {
             className: `group flex min-h-8 items-center gap-1 rounded px-1 hover:bg-[var(--color-neutral-100)] ${isCurrent ? "font-medium text-[var(--color-primary)]" : ""}`,
             children: [
               leading,
-              /* @__PURE__ */ jsx4(
+              /* @__PURE__ */ jsx3(
                 "button",
                 {
                   type: "button",
                   "aria-label": `${isPlaying ? "Pause" : "Play"} ${label}`,
                   className: `flex h-6 w-6 shrink-0 items-center justify-center rounded-full cursor-pointer group-hover:opacity-100 focus-visible:opacity-100 ${isCurrent && playState !== PlayStates.STOPPED ? "opacity-100" : "opacity-0 [@media(pointer:coarse)]:opacity-100"}`,
                   onClick: () => isCurrent ? handlePlayPauseAction() : play(track.uuid),
-                  children: isCurrent && playState === PlayStates.LOADING ? /* @__PURE__ */ jsx4(RingLoader, { size: 10 }) : isPlaying ? /* @__PURE__ */ jsx4(FaPause, { size: 10 }) : /* @__PURE__ */ jsx4(FaPlay, { size: 10 })
+                  children: isCurrent && playState === PlayStates.LOADING ? /* @__PURE__ */ jsx3(RingLoader, { size: 10 }) : isPlaying ? /* @__PURE__ */ jsx3(FaPause, { size: 10 }) : /* @__PURE__ */ jsx3(FaPlay, { size: 10 })
                 }
               ),
               text,
-              isSong(track) && /* @__PURE__ */ jsx4(MusicBrainzRecordingLink, { song: track }),
               actions
             ]
           },
           track.uuid
         );
       }),
-      hasNextPage && /* @__PURE__ */ jsx4("li", { ref: sentinelRef, "aria-hidden": "true", className: "h-4" })
+      hasNextPage && /* @__PURE__ */ jsx3("li", { ref: sentinelRef, "aria-hidden": "true", className: "h-4" })
     ] })
   ] });
 }
 
 // src/genre-tree/GenreDetailExtras.tsx
 import { useTrackNoun as useTrackNoun2 } from "@behindthemusictree/app-kit/track-noun";
-import { Fragment as Fragment3, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+import { SiWikidata, SiWikipedia } from "react-icons/si";
+import { Fragment as Fragment3, jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
 function GenreDetailExtras({
   genreUuid,
   genrePlaylist,
+  wikidataId,
   scope,
   getBackendBaseUrl,
   criteriaOverviewSchema,
@@ -281,52 +270,63 @@ function GenreDetailExtras({
     criteriaOverviewSchema
   );
   if (isPending) {
-    return /* @__PURE__ */ jsxs4(Fragment3, { children: [
-      /* @__PURE__ */ jsxs4("div", { className: "gtv-info-panel-children", "aria-busy": "true", "data-testid": "genre-detail-extras-skeleton", children: [
-        /* @__PURE__ */ jsx5("span", { className: "gtv-info-panel-children-title", children: "Summary" }),
-        /* @__PURE__ */ jsx5(Skeleton2, { className: "h-4 w-3/4" })
+    return /* @__PURE__ */ jsxs3(Fragment3, { children: [
+      /* @__PURE__ */ jsxs3("div", { className: "gtv-info-panel-children", "aria-busy": "true", "data-testid": "genre-detail-extras-skeleton", children: [
+        /* @__PURE__ */ jsx4("span", { className: "gtv-info-panel-children-title", children: "Summary" }),
+        /* @__PURE__ */ jsx4(Skeleton2, { className: "h-4 w-3/4" })
       ] }),
       family
     ] });
   }
-  if (!overview) return /* @__PURE__ */ jsx5(Fragment3, { children: family });
-  const { summary, description, summarySourceUrl, essentialSongs } = overview;
-  return /* @__PURE__ */ jsxs4(Fragment3, { children: [
-    description && /* @__PURE__ */ jsx5("div", { className: "px-3.5 py-2.5", children: /* @__PURE__ */ jsx5(ClampedText, { className: "text-[0.8125rem] leading-[1.45] text-[var(--color-text-muted)]", children: description }, genreUuid) }),
-    renderSummary ? renderSummary(overview) : /* @__PURE__ */ jsxs4("div", { className: "gtv-info-panel-children text-[0.8125rem] leading-[1.45] text-[var(--color-text)]", children: [
-      /* @__PURE__ */ jsx5("span", { className: "gtv-info-panel-children-title", children: "Summary" }),
-      /* @__PURE__ */ jsx5(ClampedText, { className: "mt-1", children: summary ?? "\u2014" }, genreUuid),
-      summarySourceUrl && /* @__PURE__ */ jsx5(
-        "a",
-        {
-          href: summarySourceUrl,
-          target: "_blank",
-          rel: "noopener noreferrer",
-          className: "mt-1 inline-block text-xs text-[var(--color-text-muted)] underline hover:text-[var(--color-text)]",
-          children: "Source: Wikipedia"
-        }
-      )
+  if (!overview) return /* @__PURE__ */ jsx4(Fragment3, { children: family });
+  const { summary, summarySourceUrl, essentialSongs } = overview;
+  const wikidataUrl = wikidataId ? `https://www.wikidata.org/wiki/${encodeURIComponent(wikidataId)}` : null;
+  return /* @__PURE__ */ jsxs3(Fragment3, { children: [
+    (summarySourceUrl || wikidataUrl) && /* @__PURE__ */ jsxs3("div", { className: "gtv-info-panel-children text-[0.8125rem] leading-[1.45] text-[var(--color-text)]", children: [
+      /* @__PURE__ */ jsx4("span", { className: "gtv-info-panel-children-title", children: "Links" }),
+      /* @__PURE__ */ jsxs3("div", { className: "mt-1 flex flex-wrap gap-x-3 gap-y-1 text-xs", children: [
+        summarySourceUrl && /* @__PURE__ */ jsxs3(
+          "a",
+          {
+            href: summarySourceUrl,
+            target: "_blank",
+            rel: "noopener noreferrer",
+            className: "inline-flex items-center gap-1.5 text-[var(--color-text-muted)] hover:text-[var(--color-text)]",
+            children: [
+              /* @__PURE__ */ jsx4(SiWikipedia, { "aria-hidden": "true", className: "h-3.5 w-3.5" }),
+              "Wikipedia"
+            ]
+          }
+        ),
+        wikidataUrl && /* @__PURE__ */ jsxs3(
+          "a",
+          {
+            href: wikidataUrl,
+            target: "_blank",
+            rel: "noopener noreferrer",
+            className: "inline-flex items-center gap-1.5 text-[var(--color-text-muted)] hover:text-[var(--color-text)]",
+            children: [
+              /* @__PURE__ */ jsx4(SiWikidata, { "aria-hidden": "true", className: "h-3.5 w-3.5" }),
+              "Wikidata"
+            ]
+          }
+        )
+      ] })
+    ] }),
+    renderSummary ? renderSummary(overview) : /* @__PURE__ */ jsxs3("div", { className: "gtv-info-panel-children text-[0.8125rem] leading-[1.45] text-[var(--color-text)]", children: [
+      /* @__PURE__ */ jsx4("span", { className: "gtv-info-panel-children-title", children: "Summary" }),
+      /* @__PURE__ */ jsx4(ClampedText, { className: "mt-1", children: summary ?? "\u2014" }, genreUuid)
     ] }),
-    renderSummary && summarySourceUrl && /* @__PURE__ */ jsx5(
-      "a",
-      {
-        href: summarySourceUrl,
-        target: "_blank",
-        rel: "noopener noreferrer",
-        className: "mx-3.5 mb-2.5 inline-block text-xs text-[var(--color-text-muted)] underline hover:text-[var(--color-text)]",
-        children: "Source: Wikipedia"
-      }
-    ),
     family,
     renderGenreDetailExtras?.(overview),
-    renderEssentialTracks ? renderEssentialTracks(overview) : essentialSongs && /* @__PURE__ */ jsxs4("div", { className: "gtv-info-panel-children text-[0.8125rem] leading-[1.45] text-[var(--color-text)]", children: [
-      /* @__PURE__ */ jsxs4("span", { className: "gtv-info-panel-children-title", children: [
+    renderEssentialTracks ? renderEssentialTracks(overview) : essentialSongs && /* @__PURE__ */ jsxs3("div", { className: "gtv-info-panel-children text-[0.8125rem] leading-[1.45] text-[var(--color-text)]", children: [
+      /* @__PURE__ */ jsxs3("span", { className: "gtv-info-panel-children-title", children: [
         "Essential ",
         trackNoun.plural
       ] }),
-      essentialSongs.length > 0 ? /* @__PURE__ */ jsx5("ul", { className: "mt-1 divide-y divide-[var(--color-border)]", children: essentialSongs.map((track) => /* @__PURE__ */ jsx5("li", { className: "py-1", children: track.title }, track.uuid)) }) : /* @__PURE__ */ jsx5("p", { className: "mt-1", children: "\u2014" })
+      essentialSongs.length > 0 ? /* @__PURE__ */ jsx4("ul", { className: "mt-1 divide-y divide-[var(--color-border)]", children: essentialSongs.map((track) => /* @__PURE__ */ jsx4("li", { className: "py-1", children: track.title }, track.uuid)) }) : /* @__PURE__ */ jsx4("p", { className: "mt-1", children: "\u2014" })
     ] }),
-    /* @__PURE__ */ jsx5(
+    /* @__PURE__ */ jsx4(
       GenrePlaylistTracks,
       {
         genreUuid,
@@ -383,10 +383,10 @@ function useGenrePlaylistPlayback({
 
 // src/genre-tree/playlist-tree/TreePerRoot.tsx
 import { capitalize as capitalize2, useTrackNoun as useTrackNoun3 } from "@behindthemusictree/app-kit/track-noun";
-import { jsx as jsx6 } from "react/jsx-runtime";
+import { jsx as jsx5 } from "react/jsx-runtime";
 function GenrePlaylistTreePerRoot({
   scope,
-  className,
+  className: className2,
   rootUuid,
   genrePlaylistTreePerRoot,
   handleGenreCreationAction,
@@ -439,7 +439,7 @@ function GenrePlaylistTreePerRoot({
       }
       play(genrePlaylist).catch((error) => {
         console.error("Failed to load genre playlist tracks:", error);
-        showPopup(/* @__PURE__ */ jsx6(InternalErrorPopup, { errorCode: ErrorCode2.CLIENT_UNKNOWN }));
+        showPopup(/* @__PURE__ */ jsx5(InternalErrorPopup, { errorCode: ErrorCode2.CLIENT_UNKNOWN }));
       });
     },
     [
@@ -471,10 +471,10 @@ function GenrePlaylistTreePerRoot({
     if (confirm(`Are you sure you want to delete "${node.name}"?`)) {
     }
   }, []);
-  return /* @__PURE__ */ jsx6(
+  return /* @__PURE__ */ jsx5(
     GenreTree,
     {
-      className,
+      className: className2,
       nodes,
       itemCountLabel: `${capitalize2(trackNoun.singular)} count`,
       rootColor: getGenreTreeColor(rootUuid),
@@ -511,11 +511,23 @@ import {
 import { usePlayer as usePlayer3 } from "@behindthemusictree/app-kit/player";
 import { usePopup as usePopup3 } from "@behindthemusictree/app-kit/popup";
 import { ErrorCode as ErrorCode3 } from "@behindthemusictree/app-kit/transport";
+
+// src/genre-tree/playlist-tree/size-metric.ts
+var hasViewsCount = (genrePlaylists) => genrePlaylists.every((genrePlaylist) => genrePlaylist.viewsCount !== void 0);
+var genrePlaylistSize = (genrePlaylist, metric) => {
+  if (metric === "songs") return genrePlaylist.tracksCount;
+  if (genrePlaylist.viewsCount === void 0) {
+    throw new Error(`Genre playlist ${genrePlaylist.uuid} has no viewsCount to size by views`);
+  }
+  return genrePlaylist.viewsCount;
+};
+
+// src/genre-tree/playlist-tree/TreeWheel.tsx
 import { capitalize as capitalize3, useTrackNoun as useTrackNoun4 } from "@behindthemusictree/app-kit/track-noun";
-import { jsx as jsx7 } from "react/jsx-runtime";
+import { jsx as jsx6 } from "react/jsx-runtime";
 function GenrePlaylistTreeWheel({
   scope,
-  className,
+  className: className2,
   genrePlaylists,
   handleGenreCreationAction,
   handleGenreRenameAction,
@@ -531,6 +543,9 @@ function GenrePlaylistTreeWheel({
   allowWheelRotation,
   showToolbar,
   controlsOrientation,
+  sizeMetric = "songs",
+  floatingControlsLeading,
+  busy,
   defaultViewport,
   onViewportChange,
   playback,
@@ -546,12 +561,12 @@ function GenrePlaylistTreeWheel({
       id: genrePlaylist.uuid,
       parentId: genrePlaylist.parent?.uuid ?? null,
       name: genrePlaylist.name,
-      itemCount: genrePlaylist.tracksCount,
+      itemCount: genrePlaylistSize(genrePlaylist, sizeMetric),
       actionable: Boolean(genrePlaylist.criteria),
       side: genrePlaylist.criteria?.side ?? void 0,
       wikidataId: genrePlaylist.criteria?.wikidataId ?? null
     })),
-    [genrePlaylists]
+    [genrePlaylists, sizeMetric]
   );
   const handlePlayPause = useCallback3(
     (nodeId) => {
@@ -566,7 +581,7 @@ function GenrePlaylistTreeWheel({
       }
       play(genrePlaylist).catch((error) => {
         console.error("Failed to load genre playlist tracks:", error);
-        showPopup(/* @__PURE__ */ jsx7(InternalErrorPopup, { errorCode: ErrorCode3.CLIENT_UNKNOWN }));
+        showPopup(/* @__PURE__ */ jsx6(InternalErrorPopup, { errorCode: ErrorCode3.CLIENT_UNKNOWN }));
       });
     },
     [
@@ -598,12 +613,12 @@ function GenrePlaylistTreeWheel({
     if (confirm(`Are you sure you want to delete "${node.name}"?`)) {
     }
   }, []);
-  return /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsx6(
     GenreTreeWheel,
     {
-      className,
+      className: className2,
       nodes,
-      itemCountLabel: `${capitalize3(trackNoun.singular)} count`,
+      itemCountLabel: sizeMetric === "views" ? "Views" : `${capitalize3(trackNoun.singular)} count`,
       playingNodeId,
       playState: isPlaying ? "playing" : "paused",
       onPlayPause: handlePlayPause,
@@ -621,6 +636,8 @@ function GenrePlaylistTreeWheel({
       allowWheelRotation,
       showToolbar,
       controlsOrientation,
+      floatingControlsLeading,
+      busy,
       defaultViewport,
       onViewportChange,
       ...infoPanelCuration,
@@ -637,11 +654,11 @@ import {
 } from "@behindthemusictree/genre-tree-view";
 import { usePlayer as usePlayer4 } from "@behindthemusictree/app-kit/player";
 import { capitalize as capitalize4, useTrackNoun as useTrackNoun5 } from "@behindthemusictree/app-kit/track-noun";
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 function GenrePlaylistTreeWheelRadialPopCore(props) {
   const {
     scope,
-    className,
+    className: className2,
     genrePlaylists,
     handleGenreCreationAction,
     handleGenreRenameAction,
@@ -657,6 +674,9 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
     allowWheelRotation,
     showToolbar,
     controlsOrientation,
+    sizeMetric = "songs",
+    floatingControlsLeading,
+    busy,
     outline = false,
     defaultViewport,
     onViewportChange,
@@ -664,10 +684,6 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
   } = props;
   const focus = props;
   const infoPanelCuration = {
-    editMode: props.editMode,
-    onEditModeChange: props.onEditModeChange,
-    renderTitleEditor: props.renderTitleEditor,
-    renderParentsEditor: props.renderParentsEditor,
     renderDangerZone: props.renderDangerZone,
     expanded: props.expanded,
     onExpandedChange: props.onExpandedChange,
@@ -684,14 +700,15 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
       id: genrePlaylist.uuid,
       parentId: genrePlaylist.parent?.uuid ?? null,
       name: genrePlaylist.name,
-      itemCount: genrePlaylist.tracksCount,
+      itemCount: genrePlaylistSize(genrePlaylist, sizeMetric),
       actionable: Boolean(genrePlaylist.criteria),
       detached: !genrePlaylist.criteria,
       side: genrePlaylist.criteria?.side ?? void 0,
       wikidataId: genrePlaylist.criteria?.wikidataId ?? null,
-      umbrella: genrePlaylist.isUmbrella
+      umbrella: genrePlaylist.isUmbrella,
+      scene: genrePlaylist.scene ?? void 0
     })),
-    [genrePlaylists]
+    [genrePlaylists, sizeMetric]
   );
   const handlePlayPause = useCallback4(
     (nodeId) => {
@@ -731,9 +748,9 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
     }
   }, []);
   const treeProps = {
-    className,
+    className: className2,
     nodes,
-    itemCountLabel: `${capitalize4(trackNoun.singular)} count`,
+    itemCountLabel: sizeMetric === "views" ? "Views" : `${capitalize4(trackNoun.singular)} count`,
     playingNodeId,
     playState: isPlaying ? "playing" : "paused",
     onPlayPause: handlePlayPause,
@@ -752,12 +769,14 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
     ...infoPanelCuration,
     readOnly
   };
-  return outline ? /* @__PURE__ */ jsx8(GenreTreeOutline, { ...treeProps }) : /* @__PURE__ */ jsx8(
+  return outline ? /* @__PURE__ */ jsx7(GenreTreeOutline, { ...treeProps }) : /* @__PURE__ */ jsx7(
     GenreTreeWheelRadialPopCore,
     {
       ...treeProps,
       allowWheelRotation,
       controlsOrientation,
+      floatingControlsLeading,
+      busy,
       defaultViewport,
       onViewportChange,
       ...focus.onFocusGenreChange ? { focusNodeId: focus.focusGenreUuid, onFocusChange: focus.onFocusGenreChange } : { focusNodeId: void 0, onFocusChange: void 0 }
@@ -767,7 +786,7 @@ function GenrePlaylistTreeWheelRadialPopCore(props) {
 
 // src/genre-tree/GenreTreeWheelHandoff.tsx
 import { useEffect as useEffect2, useRef as useRef3, useState as useState2 } from "react";
-import { jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs4 } from "react/jsx-runtime";
 function GenreTreeWheelHandoff({ skeleton, children, onRevealedChange }) {
   const [revealed, setRevealed] = useState2(false);
   const onRevealedChangeRef = useRef3(onRevealedChange);
@@ -786,8 +805,8 @@ function GenreTreeWheelHandoff({ skeleton, children, onRevealedChange }) {
       cancelAnimationFrame(innerFrame);
     };
   }, []);
-  return /* @__PURE__ */ jsxs5("div", { className: "relative w-full h-full", children: [
-    /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsxs4("div", { className: "relative w-full h-full", children: [
+    /* @__PURE__ */ jsx8(
       "div",
       {
         className: "absolute inset-0 transition-opacity duration-150 ease-out",
@@ -796,15 +815,15 @@ function GenreTreeWheelHandoff({ skeleton, children, onRevealedChange }) {
         children
       }
     ),
-    !revealed && /* @__PURE__ */ jsx9("div", { className: "absolute inset-0", "aria-hidden": "true", children: skeleton })
+    !revealed && /* @__PURE__ */ jsx8("div", { className: "absolute inset-0", "aria-hidden": "true", children: skeleton })
   ] });
 }
 
 // src/genre-tree/GenreSearch.tsx
-import { ArrowLeft, Search, X } from "lucide-react";
+import { ArrowLeft, LoaderCircle, Search, X } from "lucide-react";
 import { Input } from "@behindthemusictree/ui";
 import { useGenreSearch } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
 function GenreSearch({
   genrePlaylists,
   onSelect,
@@ -823,21 +842,22 @@ function GenreSearch({
   });
   const extraItems = query !== "" && query !== selectedName ? extraResults?.items ?? [] : [];
   const label = extraResults ? "Search" : "Search a genre";
+  const loading = query !== "" && query !== selectedName && (extraResults?.loading ?? false);
   const showList = results.length > 0 || extraItems.length > 0;
   const heading = "px-3 pt-2 pb-1 text-xs font-medium uppercase text-[var(--color-text-muted)]";
-  return /* @__PURE__ */ jsxs6("div", { className: "genre-search relative w-[calc(var(--layout-detail-panel-w,25.5rem)-2*var(--layout-panel-inset,1rem))] shrink-0", children: [
-    onPrevious && /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsxs5("div", { className: "genre-search relative w-[calc(var(--layout-detail-panel-w,25.5rem)-2*var(--layout-panel-inset,1rem))] shrink-0 max-md:w-full", children: [
+    onPrevious && /* @__PURE__ */ jsx9(
       "button",
       {
         type: "button",
         "aria-label": "Previous",
         title: "Previous",
-        className: "genre-search-previous absolute left-2 top-1/2 z-10 hidden p-1.5 text-[var(--color-text-muted)] rounded-full -translate-y-1/2 hover:bg-[var(--color-surface-muted)] hover:text-[var(--color-text)]",
+        className: "genre-search-previous absolute left-2 top-1/2 z-10 hidden items-center justify-center p-1.5 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] [@media(pointer:coarse)]:min-w-[var(--layout-touch-target)] text-[var(--color-text-muted)] rounded-full -translate-y-1/2 hover:bg-[var(--color-surface-muted)] hover:text-[var(--color-text)]",
         onClick: onPrevious,
-        children: /* @__PURE__ */ jsx10(ArrowLeft, { "aria-hidden": "true", className: "w-4 h-4" })
+        children: /* @__PURE__ */ jsx9(ArrowLeft, { "aria-hidden": "true", className: "w-4 h-4" })
       }
     ),
-    /* @__PURE__ */ jsx10(
+    /* @__PURE__ */ jsx9(
       Input,
       {
         type: "text",
@@ -848,49 +868,75 @@ function GenreSearch({
         },
         placeholder: placeholder ?? `${label}\u2026`,
         "aria-label": label,
+        "aria-busy": loading,
+        inputMode: "search",
+        enterKeyHint: "search",
+        autoComplete: "off",
         className: "h-[var(--layout-search-h,3rem)] pl-6 pr-20 text-base transition-[padding] duration-200 ease-out motion-reduce:transition-none bg-[var(--color-surface)] border-[var(--color-border)] rounded-full shadow-md"
       }
     ),
-    /* @__PURE__ */ jsxs6("div", { className: "absolute right-3 top-1/2 flex items-center -translate-y-1/2", children: [
-      /* @__PURE__ */ jsx10("span", { className: "p-2 text-[var(--color-text-muted)] pointer-events-none", children: /* @__PURE__ */ jsx10(Search, { "aria-hidden": "true", className: "w-6 h-6" }) }),
-      canClear && /* @__PURE__ */ jsx10(
+    /* @__PURE__ */ jsxs5("div", { className: "absolute right-3 top-1/2 flex items-center -translate-y-1/2", children: [
+      /* @__PURE__ */ jsxs5(
+        "span",
+        {
+          "data-loading": loading,
+          className: "relative p-2 text-[var(--color-text-muted)] pointer-events-none",
+          children: [
+            /* @__PURE__ */ jsx9(
+              Search,
+              {
+                "aria-hidden": "true",
+                className: `w-6 h-6 transition-opacity duration-200 motion-reduce:transition-none ${loading ? "opacity-0" : ""}`
+              }
+            ),
+            /* @__PURE__ */ jsx9(
+              LoaderCircle,
+              {
+                "aria-hidden": "true",
+                className: `absolute inset-2 w-6 h-6 transition-opacity duration-200 motion-reduce:transition-none ${loading ? "opacity-100 delay-300 animate-spin motion-reduce:animate-none" : "opacity-0"}`
+              }
+            )
+          ]
+        }
+      ),
+      canClear && /* @__PURE__ */ jsx9(
         "button",
         {
           type: "button",
           "aria-label": "Clear search",
-          className: "p-2 text-[var(--color-text-muted)] rounded-full hover:bg-[var(--color-surface-muted)] hover:text-[var(--color-text)]",
+          className: "flex items-center justify-center p-2 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] [@media(pointer:coarse)]:min-w-[var(--layout-touch-target)] text-[var(--color-text-muted)] rounded-full hover:bg-[var(--color-surface-muted)] hover:text-[var(--color-text)]",
           onClick: () => {
             clear();
             onQueryChange?.("");
           },
-          children: /* @__PURE__ */ jsx10(X, { "aria-hidden": "true", className: "w-6 h-6" })
+          children: /* @__PURE__ */ jsx9(X, { "aria-hidden": "true", className: "w-6 h-6" })
         }
       )
     ] }),
-    extraResults?.status && /* @__PURE__ */ jsx10("p", { role: "status", "aria-live": "polite", className: "sr-only", children: extraResults.status }),
-    showList && /* @__PURE__ */ jsxs6("ul", { className: "genre-search-results absolute z-40 w-full max-h-64 mt-1 overflow-y-auto bg-[var(--color-surface)] border border-[var(--color-border)] rounded-xl shadow-md", children: [
-      extraResults && results.length > 0 && /* @__PURE__ */ jsx10("li", { className: heading, children: "Genres" }),
-      results.map((genrePlaylist) => /* @__PURE__ */ jsx10("li", { children: /* @__PURE__ */ jsxs6(
+    extraResults?.status && /* @__PURE__ */ jsx9("p", { role: "status", "aria-live": "polite", className: "sr-only", children: extraResults.status }),
+    showList && /* @__PURE__ */ jsxs5("ul", { className: "genre-search-results absolute z-40 w-full max-h-[min(16rem,50dvh)] mt-1 overflow-y-auto bg-[var(--color-surface)] border border-[var(--color-border)] rounded-xl shadow-md", children: [
+      extraResults && results.length > 0 && /* @__PURE__ */ jsx9("li", { className: heading, children: "Genres" }),
+      results.map((genrePlaylist) => /* @__PURE__ */ jsx9("li", { children: /* @__PURE__ */ jsxs5(
         "button",
         {
           type: "button",
-          className: "w-full px-3 py-1.5 text-left hover:bg-[var(--color-surface-muted)]",
+          className: "w-full px-3 py-1.5 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] text-left hover:bg-[var(--color-surface-muted)]",
           onClick: () => {
             select(genrePlaylist);
             onQueryChange?.("");
           },
           children: [
             genrePlaylist.name,
-            genrePlaylist.isUmbrella && /* @__PURE__ */ jsx10("span", { className: "ml-2 text-xs italic text-[var(--color-text-muted)]", children: "umbrella" })
+            genrePlaylist.isUmbrella && /* @__PURE__ */ jsx9("span", { className: "ml-2 text-xs italic text-[var(--color-text-muted)]", children: "umbrella" })
           ]
         }
       ) }, genrePlaylist.uuid)),
-      extraResults && extraItems.length > 0 && /* @__PURE__ */ jsx10("li", { className: heading, children: extraResults.label }),
-      extraItems.map((item) => /* @__PURE__ */ jsx10("li", { children: /* @__PURE__ */ jsx10(
+      extraResults && extraItems.length > 0 && /* @__PURE__ */ jsx9("li", { className: heading, children: extraResults.label }),
+      extraItems.map((item) => /* @__PURE__ */ jsx9("li", { children: /* @__PURE__ */ jsx9(
         "button",
         {
           type: "button",
-          className: "w-full px-3 py-1.5 text-left hover:bg-[var(--color-surface-muted)]",
+          className: "w-full px-3 py-1.5 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] text-left hover:bg-[var(--color-surface-muted)]",
           onClick: () => {
             setQuery("");
             onQueryChange?.("");
@@ -904,8 +950,227 @@ function GenreSearch({
 }
 
 // src/genre-tree/GenreActionBand.tsx
-import { MoveUpRight, Pause, Pencil, Play, Plus, ZoomIn } from "lucide-react";
+import { ArrowLeftRight, MoveUpRight, Pause, Pencil, Play, Plus, ZoomIn } from "lucide-react";
+
+// src/genre-tree/ShareActionButton.tsx
+import { Share2 as Share22 } from "lucide-react";
+import { usePopup as usePopup4 } from "@behindthemusictree/app-kit/popup";
+
+// src/genre-tree/SharePopup.tsx
+import { useCallback as useCallback5, useEffect as useEffect3, useMemo as useMemo5, useState as useState3 } from "react";
+import { Link2, Share2 } from "lucide-react";
+import { FaWhatsapp } from "react-icons/fa";
+import { SiGmail } from "react-icons/si";
+
+// src/genre-tree/ShareDestinationButton.tsx
+import { Fragment as Fragment4, jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
+var className = "group flex min-w-0 flex-1 flex-col items-center justify-center gap-1.5 rounded-xl px-2 py-2 text-xs text-[var(--color-text)] transition-colors hover:bg-[var(--color-surface-muted)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-focus-ring)] disabled:cursor-not-allowed disabled:opacity-50";
+function Contents({ icon, label }) {
+  return /* @__PURE__ */ jsxs6(Fragment4, { children: [
+    /* @__PURE__ */ jsx10("span", { className: "flex h-12 w-12 items-center justify-center rounded-full bg-[var(--color-surface-muted)] transition-colors group-hover:bg-[var(--color-border)]", children: icon }),
+    /* @__PURE__ */ jsx10("span", { className: "max-w-full truncate", children: label })
+  ] });
+}
+function ShareDestinationButton({
+  label,
+  icon,
+  href,
+  onClick,
+  disabled = false,
+  ariaLabel
+}) {
+  if (href) {
+    return /* @__PURE__ */ jsx10("a", { href, target: "_blank", rel: "noopener noreferrer", "aria-label": ariaLabel, className, children: /* @__PURE__ */ jsx10(Contents, { icon, label }) });
+  }
+  return /* @__PURE__ */ jsx10("button", { type: "button", onClick, disabled, "aria-label": ariaLabel, className, children: /* @__PURE__ */ jsx10(Contents, { icon, label }) });
+}
+
+// src/genre-tree/SharePreviewCard.tsx
+import { Music2, UserRound } from "lucide-react";
 import { jsx as jsx11, jsxs as jsxs7 } from "react/jsx-runtime";
+function SharePreviewCard({ target, url }) {
+  const Icon = target.kind === "genre" ? Music2 : UserRound;
+  const typeLabel = target.kind === "genre" ? "Genre" : "Artist";
+  return /* @__PURE__ */ jsx11("div", { className: "rounded-3xl bg-[var(--color-surface-muted)] p-4", children: /* @__PURE__ */ jsxs7("div", { className: "flex min-h-32 overflow-hidden rounded-2xl bg-[var(--color-surface)] shadow-lg", children: [
+    /* @__PURE__ */ jsx11("div", { className: "flex w-28 shrink-0 items-center justify-center bg-[var(--color-primary)]/15 text-[var(--color-primary)]", children: /* @__PURE__ */ jsx11(Icon, { "aria-hidden": "true", className: "h-10 w-10" }) }),
+    /* @__PURE__ */ jsxs7("div", { className: "flex min-w-0 flex-1 flex-col justify-center gap-1 p-4", children: [
+      /* @__PURE__ */ jsx11("span", { className: "text-xs font-medium uppercase tracking-wide text-[var(--color-text-muted)]", children: typeLabel }),
+      /* @__PURE__ */ jsx11("span", { className: "truncate text-base font-semibold text-[var(--color-text)]", title: target.name, children: target.name }),
+      /* @__PURE__ */ jsx11("span", { className: "truncate text-sm text-[var(--color-primary)]", title: url, children: url })
+    ] })
+  ] }) });
+}
+
+// src/genre-tree/SharePopup.tsx
+import { Fragment as Fragment5, jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
+function resolveAbsoluteUrl(url) {
+  try {
+    const parsed = new URL(url, window.location.href);
+    return parsed.protocol === "http:" || parsed.protocol === "https:" ? parsed.href : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function copyText(text) {
+  try {
+    if (navigator.clipboard?.writeText) {
+      await navigator.clipboard.writeText(text);
+      return true;
+    }
+  } catch {
+  }
+  const input = document.createElement("textarea");
+  input.value = text;
+  input.setAttribute("readonly", "");
+  input.style.position = "fixed";
+  input.style.opacity = "0";
+  document.body.append(input);
+  input.select();
+  try {
+    return document.execCommand("copy");
+  } catch {
+    return false;
+  } finally {
+    input.remove();
+  }
+}
+function SharePopup({ target, url, onClose }) {
+  const [absoluteUrl, setAbsoluteUrl] = useState3(url);
+  const [copyStatus, setCopyStatus] = useState3("idle");
+  const [canUseNativeShare, setCanUseNativeShare] = useState3(false);
+  const [shareError, setShareError] = useState3(null);
+  const [toastId, setToastId] = useState3(0);
+  useEffect3(() => {
+    setAbsoluteUrl(resolveAbsoluteUrl(url) ?? "");
+    setCopyStatus("idle");
+    setShareError(null);
+  }, [url]);
+  useEffect3(() => {
+    setCanUseNativeShare(typeof navigator !== "undefined" && typeof navigator.share === "function");
+  }, []);
+  const destinationUrls = useMemo5(() => {
+    if (!absoluteUrl) return null;
+    const message = `${target.name} \u2014 ${absoluteUrl}`;
+    return {
+      whatsapp: `https://wa.me/?text=${encodeURIComponent(message)}`,
+      gmail: `https://mail.google.com/mail/?view=cm&fs=1&su=${encodeURIComponent(`Share: ${target.name}`)}&body=${encodeURIComponent(message)}`
+    };
+  }, [absoluteUrl, target.name]);
+  const handleCopy = async () => {
+    if (!absoluteUrl) {
+      setCopyStatus("failed");
+      return;
+    }
+    setShareError(null);
+    const copied = await copyText(absoluteUrl);
+    setCopyStatus(copied ? "idle" : "failed");
+    if (copied) setToastId((id) => id + 1);
+  };
+  const dismissToast = useCallback5(() => setToastId(0), []);
+  const handleNativeShare = async () => {
+    if (!absoluteUrl || !navigator.share) return;
+    setShareError(null);
+    try {
+      await navigator.share({ title: target.name, url: absoluteUrl });
+    } catch (error) {
+      if (error instanceof Error && error.name === "AbortError") return;
+      setShareError("Could not open the share options.");
+    }
+  };
+  return /* @__PURE__ */ jsxs8(Fragment5, { children: [
+    /* @__PURE__ */ jsx12(
+      BasePopup_default,
+      {
+        title: "Share",
+        onClose,
+        isDismissable: true,
+        trapFocus: true,
+        closeOnEscape: true,
+        closeOnBackdrop: true,
+        className: "!w-full !max-w-[28rem] overflow-hidden !rounded-[2rem] !bg-[var(--color-surface)] shadow-2xl",
+        overlayClassName: "!bg-black/50 p-4 backdrop-blur-[2px]",
+        titleClassName: "!rounded-none !bg-transparent !px-6 !pb-2 !pt-6",
+        titleTextClassName: "!text-xl !font-semibold !text-[var(--color-text)]",
+        closeButtonClassName: "!h-10 !w-10 !rounded-none !border-0 !bg-transparent !p-0 !text-[var(--color-text)] hover:!bg-transparent hover:!text-[var(--color-text)]",
+        contentClassName: "!rounded-none !bg-transparent !px-6 !pb-6 !pt-2",
+        children: /* @__PURE__ */ jsxs8("div", { className: "flex flex-col gap-4", children: [
+          /* @__PURE__ */ jsx12(SharePreviewCard, { target, url: absoluteUrl || url }),
+          /* @__PURE__ */ jsxs8("div", { className: "grid grid-cols-3 gap-1 rounded-3xl bg-[var(--color-surface)] p-3 sm:grid-cols-4", children: [
+            /* @__PURE__ */ jsx12(
+              ShareDestinationButton,
+              {
+                label: "Copy Link",
+                icon: /* @__PURE__ */ jsx12(Link2, { "aria-hidden": "true", className: "h-6 w-6" }),
+                onClick: () => void handleCopy(),
+                ariaLabel: "Copy link",
+                disabled: !absoluteUrl
+              }
+            ),
+            /* @__PURE__ */ jsx12(
+              ShareDestinationButton,
+              {
+                label: "WhatsApp",
+                icon: /* @__PURE__ */ jsx12(FaWhatsapp, { "aria-hidden": "true", className: "h-9 w-9 text-[#25D366]" }),
+                href: destinationUrls?.whatsapp,
+                ariaLabel: `Share ${target.name} via WhatsApp`,
+                disabled: !absoluteUrl
+              }
+            ),
+            /* @__PURE__ */ jsx12(
+              ShareDestinationButton,
+              {
+                label: "Gmail",
+                icon: /* @__PURE__ */ jsx12(SiGmail, { "aria-hidden": "true", className: "h-8 w-8 text-[#EA4335]" }),
+                href: destinationUrls?.gmail,
+                ariaLabel: `Email ${target.name} with Gmail`,
+                disabled: !absoluteUrl
+              }
+            ),
+            canUseNativeShare && /* @__PURE__ */ jsx12(
+              ShareDestinationButton,
+              {
+                label: "More",
+                icon: /* @__PURE__ */ jsx12(Share2, { "aria-hidden": "true", className: "h-6 w-6" }),
+                onClick: () => void handleNativeShare(),
+                ariaLabel: "More sharing options",
+                disabled: !absoluteUrl
+              }
+            )
+          ] }),
+          copyStatus === "failed" && /* @__PURE__ */ jsx12("p", { role: "alert", className: "text-center text-sm text-[var(--color-red-500)]", children: "Could not copy the link." }),
+          shareError && /* @__PURE__ */ jsx12("p", { role: "alert", className: "text-center text-sm text-[var(--color-red-500)]", children: shareError })
+        ] })
+      }
+    ),
+    toastId > 0 && /* @__PURE__ */ jsx12(Toast, { message: "Link copied", onClose: dismissToast }, toastId)
+  ] });
+}
+
+// src/genre-tree/ShareActionButton.tsx
+import { jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
+function ShareActionButton({ target, url }) {
+  const { showPopup, hidePopup } = usePopup4();
+  const openSharePopup = () => {
+    showPopup(/* @__PURE__ */ jsx13(SharePopup, { target, url, onClose: hidePopup }));
+  };
+  return /* @__PURE__ */ jsxs9(
+    "button",
+    {
+      type: "button",
+      onClick: openSharePopup,
+      className: "group flex flex-col items-center gap-1 w-16 text-xs text-center text-[var(--color-text)] focus-visible:outline-none",
+      "aria-label": `Share ${target.name}`,
+      title: `Share ${target.name}`,
+      children: [
+        /* @__PURE__ */ jsx13("span", { className: "flex items-center justify-center w-10 h-10 rounded-full group-focus-visible:ring-2 group-focus-visible:ring-[var(--color-focus-ring)] bg-[var(--color-surface-muted)] transition-colors group-hover:bg-[var(--color-border)]", children: /* @__PURE__ */ jsx13(Share22, { "aria-hidden": "true", className: "w-5 h-5" }) }),
+        "Share"
+      ]
+    }
+  );
+}
+
+// src/genre-tree/GenreActionBand.tsx
+import { jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 function GenreActionBand({
   node,
   onPlayPause,
@@ -914,7 +1179,12 @@ function GenreActionBand({
   onAddChild,
   onRename,
   onChangeParent,
-  additionalActions
+  side,
+  onToggleSide,
+  toggleSideDisabledReason,
+  additionalActions,
+  shareTarget,
+  shareUrl
 }) {
   const items = [];
   const adminItems = [];
@@ -922,7 +1192,7 @@ function GenreActionBand({
     items.push({
       key: "play-pause",
       label: isPlaying ? "Pause" : "Play",
-      icon: isPlaying ? /* @__PURE__ */ jsx11(Pause, { "aria-hidden": "true", className: "w-5 h-5" }) : /* @__PURE__ */ jsx11(Play, { "aria-hidden": "true", className: "w-5 h-5" }),
+      icon: isPlaying ? /* @__PURE__ */ jsx14(Pause, { "aria-hidden": "true", className: "w-5 h-5" }) : /* @__PURE__ */ jsx14(Play, { "aria-hidden": "true", className: "w-5 h-5" }),
       onClick: onPlayPause
     });
   }
@@ -930,18 +1200,28 @@ function GenreActionBand({
     items.push({
       key: "zoom-in",
       label: "Focus",
-      icon: /* @__PURE__ */ jsx11(ZoomIn, { "aria-hidden": "true", className: "w-5 h-5" }),
+      icon: /* @__PURE__ */ jsx14(ZoomIn, { "aria-hidden": "true", className: "w-5 h-5" }),
       onClick: onZoomIn
     });
   }
   if (onAddChild) {
-    adminItems.push({ key: "add-child", label: "Add", icon: /* @__PURE__ */ jsx11(Plus, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onAddChild });
+    adminItems.push({ key: "add-child", label: "Add", icon: /* @__PURE__ */ jsx14(Plus, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onAddChild });
   }
   if (onRename) {
-    adminItems.push({ key: "rename", label: "Rename", icon: /* @__PURE__ */ jsx11(Pencil, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onRename });
+    adminItems.push({ key: "rename", label: "Rename", icon: /* @__PURE__ */ jsx14(Pencil, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onRename });
   }
   if (onChangeParent) {
-    adminItems.push({ key: "change-parent", label: "Parent", icon: /* @__PURE__ */ jsx11(MoveUpRight, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onChangeParent });
+    adminItems.push({ key: "change-parent", label: "Parent", icon: /* @__PURE__ */ jsx14(MoveUpRight, { "aria-hidden": "true", className: "w-5 h-5" }), onClick: onChangeParent });
+  }
+  if (onToggleSide) {
+    adminItems.push({
+      key: "toggle-side",
+      label: side === "pop" ? "Make core" : "Make pop",
+      icon: /* @__PURE__ */ jsx14(ArrowLeftRight, { "aria-hidden": "true", className: "w-5 h-5" }),
+      onClick: onToggleSide,
+      disabled: !!toggleSideDisabledReason,
+      title: toggleSideDisabledReason
+    });
   }
   for (const action of additionalActions?.(node) ?? []) {
     items.push({
@@ -952,31 +1232,35 @@ function GenreActionBand({
       disabled: action.enabled ? !action.enabled(node) : false
     });
   }
-  if (items.length === 0 && adminItems.length === 0) return null;
-  const renderItems = (list) => list.map((item) => /* @__PURE__ */ jsxs7(
+  if (items.length === 0 && (!shareTarget || !shareUrl) && adminItems.length === 0) return null;
+  const renderItems = (list) => list.map((item) => /* @__PURE__ */ jsxs10(
     "button",
     {
       type: "button",
       disabled: item.disabled,
+      title: item.title,
       onClick: item.onClick,
       className: "group flex flex-col items-center gap-1 w-16 text-xs text-center text-[var(--color-text)] focus-visible:outline-none disabled:opacity-50",
       children: [
-        /* @__PURE__ */ jsx11("span", { className: "flex items-center justify-center w-10 h-10 rounded-full group-focus-visible:ring-2 group-focus-visible:ring-[var(--color-focus-ring)] bg-[var(--color-surface-muted)] transition-colors group-hover:bg-[var(--color-border)] group-disabled:group-hover:bg-[var(--color-surface-muted)]", children: item.icon }),
+        /* @__PURE__ */ jsx14("span", { className: "flex items-center justify-center w-10 h-10 rounded-full group-focus-visible:ring-2 group-focus-visible:ring-[var(--color-focus-ring)] bg-[var(--color-surface-muted)] transition-colors group-hover:bg-[var(--color-border)] group-disabled:group-hover:bg-[var(--color-surface-muted)]", children: item.icon }),
         item.label
       ]
     },
     item.key
   ));
-  return /* @__PURE__ */ jsxs7("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: [
-    items.length > 0 && /* @__PURE__ */ jsx11("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: renderItems(items) }),
-    adminItems.length > 0 && /* @__PURE__ */ jsxs7(
+  return /* @__PURE__ */ jsxs10("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: [
+    (items.length > 0 || shareTarget && shareUrl) && /* @__PURE__ */ jsxs10("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: [
+      renderItems(items),
+      shareTarget && shareUrl && /* @__PURE__ */ jsx14(ShareActionButton, { target: shareTarget, url: shareUrl })
+    ] }),
+    adminItems.length > 0 && /* @__PURE__ */ jsxs10(
       "section",
       {
         "aria-label": "Admin actions",
         className: `px-3.5 py-3 ${items.length > 0 ? "border-t border-[var(--color-border)]" : ""}`,
         children: [
-          /* @__PURE__ */ jsx11("h3", { className: "mb-2 text-xs font-semibold uppercase tracking-wide text-[var(--color-text-muted)]", children: "Admin" }),
-          /* @__PURE__ */ jsx11("div", { className: "flex flex-wrap gap-1", children: renderItems(adminItems) })
+          /* @__PURE__ */ jsx14("h3", { className: "mb-2 text-xs font-semibold uppercase tracking-wide text-[var(--color-text-muted)]", children: "Admin" }),
+          /* @__PURE__ */ jsx14("div", { className: "flex flex-wrap gap-1", children: renderItems(adminItems) })
         ]
       }
     )
@@ -986,14 +1270,14 @@ function GenreActionBand({
 // src/genre-tree/PanelEdgeTab.tsx
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import { twMerge } from "tailwind-merge";
-import { jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
 var buttonClassName = "flex h-12 w-full items-center justify-center p-0 text-[var(--color-text-muted)] hover:bg-[var(--color-surface-muted)] hover:text-[var(--color-text)] focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-[var(--color-primary)]";
-function PanelEdgeTab({ side, edge, center, controls, className }) {
+function PanelEdgeTab({ side, edge, center, controls, className: className2 }) {
   if (!edge && !center) return null;
   const isLeft = side === "left";
   const EdgeIcon = isLeft ? ChevronLeft : ChevronRight;
   const CenterIcon = isLeft ? ChevronRight : ChevronLeft;
-  const renderButton = (action, icon) => /* @__PURE__ */ jsx12(
+  const renderButton = (action, icon) => /* @__PURE__ */ jsx15(
     "button",
     {
       type: "button",
@@ -1006,20 +1290,20 @@ function PanelEdgeTab({ side, edge, center, controls, className }) {
       children: icon
     }
   );
-  const edgeButton = edge && renderButton(edge, /* @__PURE__ */ jsx12(EdgeIcon, { "aria-hidden": "true", className: "h-5 w-5" }));
-  const centerButton = center && renderButton(center, /* @__PURE__ */ jsx12(CenterIcon, { "aria-hidden": "true", className: "h-5 w-5" }));
+  const edgeButton = edge && renderButton(edge, /* @__PURE__ */ jsx15(EdgeIcon, { "aria-hidden": "true", className: "h-5 w-5" }));
+  const centerButton = center && renderButton(center, /* @__PURE__ */ jsx15(CenterIcon, { "aria-hidden": "true", className: "h-5 w-5" }));
   const buttons = isLeft ? [edgeButton, centerButton] : [centerButton, edgeButton];
-  return /* @__PURE__ */ jsxs8(
+  return /* @__PURE__ */ jsxs11(
     "div",
     {
       className: twMerge(
         "panel-edge-tab flex w-[var(--layout-edge-tab-w)] flex-col overflow-hidden bg-[var(--color-surface)] shadow-[0_1px_2px_rgba(60,64,67,0.3),0_2px_6px_2px_rgba(60,64,67,0.15)] [clip-path:inset(-0.5rem_-0.5rem_-0.5rem_0)]",
         isLeft ? "rounded-r-lg" : "rounded-l-lg [clip-path:inset(-0.5rem_0_-0.5rem_-0.5rem)]",
-        className
+        className2
       ),
       children: [
         buttons[0],
-        buttons[0] && buttons[1] && /* @__PURE__ */ jsx12("div", { role: "presentation", className: "h-px shrink-0 bg-[var(--color-border)]" }),
+        buttons[0] && buttons[1] && /* @__PURE__ */ jsx15("div", { role: "presentation", className: "h-px shrink-0 bg-[var(--color-border)]" }),
         buttons[1]
       ]
     }
@@ -1027,45 +1311,60 @@ function PanelEdgeTab({ side, edge, center, controls, className }) {
 }
 
 // src/genre-tree/ChangeParentPopup.tsx
-import { useEffect as useEffect3, useMemo as useMemo5 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo6 } from "react";
 import {
   getReparentCandidates,
   useUpdateGenre
 } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";
 function ChangeParentPopup({
   genrePlaylist,
   genrePlaylists,
   scope,
   getBackendBaseUrl,
-  onClose
+  onClose,
+  onParentChanged
 }) {
   const { mutate, isPending, formErrors } = useUpdateGenre(scope, getBackendBaseUrl);
-  const candidates = useMemo5(
+  const candidates = useMemo6(
     () => getReparentCandidates(genrePlaylists, genrePlaylist.uuid),
     [genrePlaylists, genrePlaylist.uuid]
   );
-  useEffect3(() => {
+  const handleSelect = (newParent) => {
+    const genre = genrePlaylist.criteria.uuid;
+    const parentPlaylistUuid = genrePlaylist.parent?.uuid;
+    const from = parentPlaylistUuid ? genrePlaylists.find(({ uuid }) => uuid === parentPlaylistUuid)?.criteria?.uuid ?? null : null;
+    mutate(
+      { uuid: genre, data: { parent: newParent.criteria.uuid } },
+      {
+        onSuccess: () => {
+          onClose();
+          onParentChanged?.({ genre, from, to: newParent.criteria.uuid });
+        }
+      }
+    );
+  };
+  useEffect4(() => {
     const handleKeyDown = (event) => {
       if (event.key === "Escape") onClose();
     };
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [onClose]);
-  return /* @__PURE__ */ jsxs9(BasePopup_default, { title: `Change parent of ${genrePlaylist.name}`, onClose, showCancelButton: true, fitContent: true, children: [
-    /* @__PURE__ */ jsxs9("p", { className: "mb-3 text-sm text-[var(--color-text-muted)]", children: [
+  return /* @__PURE__ */ jsxs12(BasePopup_default, { title: `Change parent of ${genrePlaylist.name}`, onClose, showCancelButton: true, fitContent: true, children: [
+    /* @__PURE__ */ jsxs12("p", { className: "mb-3 text-sm text-[var(--color-text-muted)]", children: [
       "Current parent: ",
       genrePlaylist.parent?.name ?? "none"
     ] }),
-    /* @__PURE__ */ jsx13("div", { "aria-busy": isPending, className: isPending ? "pointer-events-none opacity-60" : void 0, children: /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsx16("div", { "aria-busy": isPending, className: isPending ? "pointer-events-none opacity-60" : void 0, children: /* @__PURE__ */ jsx16(
       GenreSearch,
       {
         genrePlaylists: candidates,
-        onSelect: (newParent) => mutate({ uuid: genrePlaylist.criteria.uuid, data: { parent: newParent.criteria.uuid } }, { onSuccess: onClose }),
+        onSelect: handleSelect,
         placeholder: "Search a new parent\u2026"
       }
     ) }),
-    formErrors.length > 0 && /* @__PURE__ */ jsx13("p", { role: "alert", className: "mt-3 text-sm text-[var(--color-red-500)]", children: formErrors.map(({ message }) => message).join(" ") })
+    formErrors.length > 0 && /* @__PURE__ */ jsx16("p", { role: "alert", className: "mt-3 text-sm text-[var(--color-red-500)]", children: formErrors.map(({ message }) => message).join(" ") })
   ] });
 }
 
@@ -1077,29 +1376,29 @@ import { useArtist } from "@behindthemusictree/app-kit/genre-tree";
 import { FieldList } from "@behindthemusictree/ui";
 
 // src/genre-tree/artist/ArtistLinks.tsx
-import { Globe, Share2 } from "lucide-react";
+import { Globe, Share2 as Share23 } from "lucide-react";
 import {
   SiBandcamp,
   SiDiscogs,
   SiMusicbrainz,
   SiSoundcloud,
   SiSpotify,
-  SiWikidata,
-  SiWikipedia,
+  SiWikidata as SiWikidata2,
+  SiWikipedia as SiWikipedia2,
   SiYoutube
 } from "react-icons/si";
 import { Chip } from "@behindthemusictree/ui";
-import { jsx as jsx14 } from "react/jsx-runtime";
+import { jsx as jsx17 } from "react/jsx-runtime";
 var LINK_KINDS = {
   official: { label: "Official website", Icon: Globe },
-  wikipedia: { label: "Wikipedia", Icon: SiWikipedia },
-  wikidata: { label: "Wikidata", Icon: SiWikidata },
+  wikipedia: { label: "Wikipedia", Icon: SiWikipedia2 },
+  wikidata: { label: "Wikidata", Icon: SiWikidata2 },
   spotify: { label: "Spotify", Icon: SiSpotify },
   youtube: { label: "YouTube", Icon: SiYoutube },
   bandcamp: { label: "Bandcamp", Icon: SiBandcamp },
   soundcloud: { label: "SoundCloud", Icon: SiSoundcloud },
   discogs: { label: "Discogs", Icon: SiDiscogs },
-  social: { label: "Social", Icon: Share2 }
+  social: { label: "Social", Icon: Share23 }
 };
 function socialLabel(url) {
   try {
@@ -1126,7 +1425,7 @@ function artistLinks(artist) {
   return links;
 }
 function ArtistLinks({ links }) {
-  return /* @__PURE__ */ jsx14("ul", { className: "flex flex-wrap gap-1.5", children: links.map(({ key, url, Icon, label }) => /* @__PURE__ */ jsx14("li", { children: /* @__PURE__ */ jsx14(Chip, { href: url, icon: /* @__PURE__ */ jsx14(Icon, { className: "h-3.5 w-3.5 shrink-0", "aria-hidden": "true" }), children: label }) }, key)) });
+  return /* @__PURE__ */ jsx17("ul", { className: "flex flex-wrap gap-1.5", children: links.map(({ key, url, Icon, label }) => /* @__PURE__ */ jsx17("li", { children: /* @__PURE__ */ jsx17(Chip, { href: url, icon: /* @__PURE__ */ jsx17(Icon, { className: "h-3.5 w-3.5 shrink-0", "aria-hidden": "true" }), children: label }) }, key)) });
 }
 
 // src/genre-tree/artist/formatYears.ts
@@ -1137,7 +1436,7 @@ function formatYears(beginYear, endYear, ended) {
 }
 
 // src/genre-tree/artist/ArtistHeader.tsx
-import { jsx as jsx15 } from "react/jsx-runtime";
+import { jsx as jsx18 } from "react/jsx-runtime";
 var countryNames = new Intl.DisplayNames(["en"], { type: "region" });
 function ArtistHeader({ artist }) {
   const fields = [];
@@ -1147,35 +1446,35 @@ function ArtistHeader({ artist }) {
   const years = formatYears(artist.beginYear, artist.endYear, artist.ended);
   if (years) fields.push({ label: "Active", value: years });
   const links = artistLinks(artist);
-  if (links.length > 0) fields.push({ label: "Links", value: /* @__PURE__ */ jsx15(ArtistLinks, { links }) });
+  if (links.length > 0) fields.push({ label: "Links", value: /* @__PURE__ */ jsx18(ArtistLinks, { links }) });
   if (fields.length === 0) return null;
-  return /* @__PURE__ */ jsx15(FieldList, { items: fields });
+  return /* @__PURE__ */ jsx18(FieldList, { items: fields });
 }
 
 // src/genre-tree/artist/ArtistPhoto.tsx
-import { jsx as jsx16, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx19, jsxs as jsxs13 } from "react/jsx-runtime";
 function ExternalLink({ href, children }) {
-  return /* @__PURE__ */ jsx16("a", { href, target: "_blank", rel: "noopener noreferrer", className: "underline-offset-2 hover:underline", children });
+  return /* @__PURE__ */ jsx19("a", { href, target: "_blank", rel: "noopener noreferrer", className: "underline-offset-2 hover:underline", children });
 }
 function ArtistPhoto({ image, name }) {
-  return /* @__PURE__ */ jsxs10("figure", { className: "flex flex-col gap-1.5 px-6 py-2.5", children: [
-    /* @__PURE__ */ jsx16("img", { src: image.url, alt: name, className: "h-64 w-full object-contain bg-[var(--color-surface-muted)] rounded" }),
-    /* @__PURE__ */ jsxs10("figcaption", { className: "text-xs text-[var(--color-text-muted)]", children: [
+  return /* @__PURE__ */ jsxs13("figure", { className: "flex flex-col gap-1.5 px-6 py-2.5", children: [
+    /* @__PURE__ */ jsx19("img", { src: image.url, alt: name, className: "h-64 w-full object-contain bg-[var(--color-surface-muted)] rounded" }),
+    /* @__PURE__ */ jsxs13("figcaption", { className: "text-xs text-[var(--color-text-muted)]", children: [
       "Photo: ",
-      /* @__PURE__ */ jsx16(ExternalLink, { href: image.pageUrl, children: image.author ?? "Wikimedia Commons" }),
+      /* @__PURE__ */ jsx19(ExternalLink, { href: image.pageUrl, children: image.author ?? "Wikimedia Commons" }),
       ",",
       " ",
-      image.licenseUrl ? /* @__PURE__ */ jsx16(ExternalLink, { href: image.licenseUrl, children: image.license }) : image.license
+      image.licenseUrl ? /* @__PURE__ */ jsx19(ExternalLink, { href: image.licenseUrl, children: image.license }) : image.license
     ] })
   ] });
 }
 
 // src/genre-tree/artist/ArtistMembers.tsx
 import { PanelGroup, PanelSection } from "@behindthemusictree/ui";
-import { jsx as jsx17, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs14 } from "react/jsx-runtime";
 function MembershipList({ title, memberships, renderArtistLink }) {
   if (memberships.length === 0) return null;
-  return /* @__PURE__ */ jsx17(PanelGroup, { title, children: /* @__PURE__ */ jsx17("ul", { children: memberships.map((membership, index) => {
+  return /* @__PURE__ */ jsx20(PanelGroup, { title, children: /* @__PURE__ */ jsx20("ul", { children: memberships.map((membership, index) => {
     const details = [
       formatYears(membership.beginYear, membership.endYear, membership.ended),
       ...membership.roles
@@ -1183,9 +1482,9 @@ function MembershipList({ title, memberships, renderArtistLink }) {
     const detailsText = details.filter(Boolean).join(" \xB7 ");
     return (
       // A member can have several periods in the same group.
-      /* @__PURE__ */ jsxs11("li", { className: "truncate py-0.5", title: detailsText || void 0, children: [
-        /* @__PURE__ */ jsx17("span", { className: "font-medium text-[var(--color-text)]", children: renderArtistLink(membership.artist) }),
-        detailsText && /* @__PURE__ */ jsxs11("span", { className: "text-[var(--color-text-muted)]", children: [
+      /* @__PURE__ */ jsxs14("li", { className: "truncate py-0.5", title: detailsText || void 0, children: [
+        /* @__PURE__ */ jsx20("span", { className: "font-medium text-[var(--color-text)]", children: renderArtistLink(membership.artist) }),
+        detailsText && /* @__PURE__ */ jsxs14("span", { className: "text-[var(--color-text-muted)]", children: [
           " \u2014 ",
           detailsText
         ] })
@@ -1196,9 +1495,9 @@ function MembershipList({ title, memberships, renderArtistLink }) {
 function ArtistMembers({ title, memberships, renderArtistLink }) {
   if (memberships.length === 0) return null;
   const isCurrent = (membership) => !membership.ended && membership.endYear === null;
-  return /* @__PURE__ */ jsxs11(PanelSection, { title, children: [
-    /* @__PURE__ */ jsx17(MembershipList, { title: "Current", memberships: memberships.filter(isCurrent), renderArtistLink }),
-    /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs14(PanelSection, { title, children: [
+    /* @__PURE__ */ jsx20(MembershipList, { title: "Current", memberships: memberships.filter(isCurrent), renderArtistLink }),
+    /* @__PURE__ */ jsx20(
       MembershipList,
       {
         title: "Past",
@@ -1211,7 +1510,7 @@ function ArtistMembers({ title, memberships, renderArtistLink }) {
 
 // src/genre-tree/artist/ArtistDiscography.tsx
 import { PanelGroup as PanelGroup2, PanelSection as PanelSection2 } from "@behindthemusictree/ui";
-import { jsx as jsx18, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs15 } from "react/jsx-runtime";
 var GROUPS = ["Albums", "EPs", "Singles", "Live", "Compilations", "Other"];
 var PRIMARY_GROUPS = { album: "Albums", ep: "EPs", single: "Singles" };
 function discographyGroup({ primaryType, secondaryTypes }) {
@@ -1231,18 +1530,18 @@ function byYear(a, b) {
 function ArtistDiscography({ albums }) {
   if (albums.length === 0) return null;
   const sorted = [...albums].sort(byYear);
-  return /* @__PURE__ */ jsx18(PanelSection2, { title: "Discography", children: GROUPS.map((group) => {
+  return /* @__PURE__ */ jsx21(PanelSection2, { title: "Discography", children: GROUPS.map((group) => {
     const groupAlbums = sorted.filter((album) => discographyGroup(album) === group);
     if (groupAlbums.length === 0) return null;
-    return /* @__PURE__ */ jsx18(PanelGroup2, { title: group, children: /* @__PURE__ */ jsx18("ul", { children: groupAlbums.map((album) => /* @__PURE__ */ jsxs12("li", { className: "grid grid-cols-[2.5rem_minmax(0,1fr)] gap-2 py-0.5", children: [
-      /* @__PURE__ */ jsx18("span", { className: "tabular-nums text-[var(--color-text-muted)]", children: album.year ?? "\u2014" }),
-      /* @__PURE__ */ jsx18("span", { className: "truncate text-[var(--color-text)]", title: album.name, children: album.name })
+    return /* @__PURE__ */ jsx21(PanelGroup2, { title: group, children: /* @__PURE__ */ jsx21("ul", { children: groupAlbums.map((album) => /* @__PURE__ */ jsxs15("li", { className: "grid grid-cols-[2.5rem_minmax(0,1fr)] gap-2 py-0.5", children: [
+      /* @__PURE__ */ jsx21("span", { className: "tabular-nums text-[var(--color-text-muted)]", children: album.year ?? "\u2014" }),
+      /* @__PURE__ */ jsx21("span", { className: "truncate text-[var(--color-text)]", title: album.name, children: album.name })
     ] }, album.uuid)) }) }, group);
   }) });
 }
 
 // src/genre-tree/artist/ArtistSongs.tsx
-import { useState as useState3 } from "react";
+import { useState as useState4 } from "react";
 import { keepPreviousData } from "@tanstack/react-query";
 import { Play as Play2 } from "lucide-react";
 import { Pagination, PanelSection as PanelSection3, Skeleton as Skeleton3 } from "@behindthemusictree/ui";
@@ -1263,41 +1562,49 @@ import { useTrackList as useTrackList3 } from "@behindthemusictree/app-kit/genre
 import { FaPlay as FaPlay2, FaPause as FaPause2 } from "react-icons/fa";
 import { usePlayer as usePlayer5 } from "@behindthemusictree/app-kit/player";
 import { PlayStates as PlayStates2 } from "@behindthemusictree/app-kit/player";
-import { RingLoader as RingLoader2 } from "@behindthemusictree/ui";
-import { jsx as jsx19, jsxs as jsxs13 } from "react/jsx-runtime";
-function TrackPositionPlayPause({ position, uuid, handlePlayPauseClick }) {
-  const { playerTrackObject, playState } = usePlayer5();
+import { jsx as jsx22, jsxs as jsxs16 } from "react/jsx-runtime";
+function TrackPositionPlayPause({
+  position,
+  uuid,
+  handlePlayPauseClick,
+  isSelected = false
+}) {
+  const { playerTrackObject, playbackConfirmedTrackId, playState, isLoading: isPlayerLoading } = usePlayer5();
   const isThisTrack = playerTrackObject?.track.id === uuid;
-  return /* @__PURE__ */ jsxs13(
+  const isConfirmedPlayable = playbackConfirmedTrackId === uuid;
+  const isAwaitingPlayback = (isSelected || isThisTrack) && !isConfirmedPlayable && !(isThisTrack && playerTrackObject?.loadError) && (!isThisTrack || isPlayerLoading || playState === PlayStates2.LOADING || playState === PlayStates2.PLAYING);
+  const isPlaying = isThisTrack && isConfirmedPlayable && playState === PlayStates2.PLAYING;
+  const isPaused = isThisTrack && isConfirmedPlayable && playState === PlayStates2.PAUSED;
+  const isCurrentTrackActive = isPlaying || isPaused;
+  return /* @__PURE__ */ jsxs16(
     "div",
     {
-      className: "track-position-play-pause flex items-center justify-center text-lg w-16 cursor-pointer",
+      className: "track-position-play-pause relative flex items-center justify-center gap-2 text-lg w-16 cursor-pointer",
       style: { minWidth: "4rem", maxWidth: "4rem" },
       onClick: handlePlayPauseClick,
       children: [
-        /* @__PURE__ */ jsx19("div", { className: "group-hover:hidden", children: /* @__PURE__ */ jsx19("div", { children: isThisTrack && playState !== PlayStates2.STOPPED ? /* @__PURE__ */ jsxs13("div", { className: "flex space-x-1 items-end", children: [
-          /* @__PURE__ */ jsx19(
-            "div",
-            {
-              className: `w-playingbar bg-[var(--color-green-500)] h-3 origin-bottom ${playState === PlayStates2.PLAYING ? "animate-scale-pulse" : ""}`
-            }
-          ),
-          /* @__PURE__ */ jsx19(
-            "div",
-            {
-              className: `w-playingbar bg-[var(--color-green-500)] h-4 origin-bottom ${playState === PlayStates2.PLAYING ? "animate-scale-pulse delay-200" : ""}`,
-              style: { animationDelay: "0.2s" }
-            }
-          ),
-          /* @__PURE__ */ jsx19(
-            "div",
-            {
-              className: `w-playingbar bg-[var(--color-green-500)] h-3 origin-bottom ${playState === PlayStates2.PLAYING ? "animate-scale-pulse delay-400" : ""}`,
-              style: { animationDelay: "0.3s" }
-            }
-          )
-        ] }) : position }) }),
-        /* @__PURE__ */ jsx19("div", { className: "hidden group-hover:flex items-center justify-center", children: isThisTrack && playState === PlayStates2.LOADING ? /* @__PURE__ */ jsx19(RingLoader2, { size: 16 }) : isThisTrack && playState === PlayStates2.PLAYING ? /* @__PURE__ */ jsx19(FaPause2, {}) : /* @__PURE__ */ jsx19(FaPlay2, {}) })
+        /* @__PURE__ */ jsx22("div", { className: "track-position-play-pause__status group-hover:hidden flex items-center justify-center", children: isAwaitingPlayback ? /* @__PURE__ */ jsx22("span", { className: "track-position-play-pause__spinner", role: "status", "aria-label": "Loading track" }) : isCurrentTrackActive ? /* @__PURE__ */ jsxs16(
+          "span",
+          {
+            className: "track-position-play-pause__bars",
+            "data-playing": isPlaying,
+            role: "img",
+            "aria-label": isPlaying ? "Playing" : "Paused",
+            children: [
+              /* @__PURE__ */ jsx22("span", { className: "track-position-play-pause__bar" }),
+              /* @__PURE__ */ jsx22("span", { className: "track-position-play-pause__bar" }),
+              /* @__PURE__ */ jsx22("span", { className: "track-position-play-pause__bar" })
+            ]
+          }
+        ) : position }),
+        /* @__PURE__ */ jsx22(
+          "div",
+          {
+            className: `hidden group-hover:flex items-center justify-center ${isCurrentTrackActive ? "" : "absolute inset-0"}`,
+            "aria-hidden": "true",
+            children: isAwaitingPlayback ? /* @__PURE__ */ jsx22("span", { className: "track-position-play-pause__spinner" }) : isPlaying ? /* @__PURE__ */ jsx22(FaPause2, {}) : /* @__PURE__ */ jsx22(FaPlay2, {})
+          }
+        )
       ]
     }
   );
@@ -1306,7 +1613,7 @@ function TrackPositionPlayPause({ position, uuid, handlePlayPauseClick }) {
 // src/genre-tree/track-list-sidebar/TrackItem.tsx
 import { isSong as isSong2, songUnplayableReason as songUnplayableReason2 } from "@behindthemusictree/app-kit/genre-tree";
 import { ArtistNames as ArtistNames2 } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx20, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx23, jsxs as jsxs17 } from "react/jsx-runtime";
 function TrackItem({
   track,
   position,
@@ -1315,25 +1622,26 @@ function TrackItem({
   renderArtistLink
 }) {
   const { handlePlayPauseAction, playerTrackObject, loadTrackForPlayer } = usePlayer6();
-  const { trackList, toTrackAtPosition } = useTrackList3();
+  const { trackList, selectedTrack, toTrackAtPosition, runtimeUnplayableTrackIds } = useTrackList3();
   const scope = trackList?.origin?.scope ?? null;
-  const unplayableReason = isSong2(track) ? songUnplayableReason2(track) : null;
+  const isCurrentTrack = playerTrackObject?.track.id === track.uuid;
+  const hasPlaybackError = isCurrentTrack && !!playerTrackObject?.loadError;
+  const isUnplayable = hasPlaybackError || runtimeUnplayableTrackIds?.has(track.uuid) === true || isSong2(track) && songUnplayableReason2(track) !== null;
   const handlePlayPauseClick = (event) => {
     event.stopPropagation();
-    if (playerTrackObject && playerTrackObject.track.id === track.uuid) {
+    if (isCurrentTrack) {
       handlePlayPauseAction();
     } else if (scope != null) {
       toTrackAtPosition(position);
       loadTrackForPlayer(track.uuid);
     }
   };
-  return /* @__PURE__ */ jsxs14(
+  return /* @__PURE__ */ jsxs17(
     "div",
     {
-      className: `track-item flex h-14 text-[var(--color-text)] ${unplayableReason ? "opacity-50" : "hover:bg-[var(--color-surface-muted)] group"}`,
-      title: unplayableReason ?? void 0,
+      className: `track-item flex h-14 text-[var(--color-text)] ${isUnplayable ? "opacity-50" : "hover:bg-[var(--color-surface-muted)] group"}`,
       children: [
-        unplayableReason ? /* @__PURE__ */ jsx20(
+        isUnplayable ? /* @__PURE__ */ jsx23(
           "div",
           {
             className: "flex items-center justify-center text-lg w-16",
@@ -1341,18 +1649,21 @@ function TrackItem({
             "aria-disabled": "true",
             children: position
           }
-        ) : /* @__PURE__ */ jsx20(TrackPositionPlayPause, { position, uuid: track.uuid, handlePlayPauseClick }),
-        /* @__PURE__ */ jsxs14("div", { className: "title-artist-container flex flex-col items-start justify-center min-w-0 flex-1", children: [
-          /* @__PURE__ */ jsxs14("div", { className: "flex max-w-full items-center gap-2", children: [
-            /* @__PURE__ */ jsx20("div", { className: "title text-lg font-bold text-[var(--color-text)] max-w-full truncate", children: track.title }),
-            isSong2(track) && /* @__PURE__ */ jsx20(MusicBrainzRecordingLink, { song: track })
-          ] }),
-          track.artists && track.artists.length > 0 ? /* @__PURE__ */ jsx20("div", { className: "artist text-base max-w-full truncate text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx20(ArtistNames2, { artists: track.artists, renderArtistLink }) }) : "",
-          unplayableReason && /* @__PURE__ */ jsx20("div", { className: "text-xs", children: /* @__PURE__ */ jsx20(UnplayableReason, { reason: unplayableReason }) })
+        ) : /* @__PURE__ */ jsx23(
+          TrackPositionPlayPause,
+          {
+            position,
+            uuid: track.uuid,
+            handlePlayPauseClick,
+            isSelected: selectedTrack?.uuid === track.uuid
+          }
+        ),
+        /* @__PURE__ */ jsxs17("div", { className: "title-artist-container flex flex-col items-start justify-center min-w-0 flex-1", children: [
+          /* @__PURE__ */ jsx23("div", { className: "flex max-w-full items-center gap-2", children: /* @__PURE__ */ jsx23("div", { className: "title text-lg font-bold text-[var(--color-text)] max-w-full truncate", children: isSong2(track) ? /* @__PURE__ */ jsx23(MusicBrainzRecordingLink, { song: track, className: "hover:underline focus-visible:underline", children: track.title }) : track.title }) }),
+          track.artists && track.artists.length > 0 ? /* @__PURE__ */ jsx23("div", { className: "artist text-base max-w-full truncate text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx23(ArtistNames2, { artists: track.artists, renderArtistLink }) }) : ""
         ] }),
-        /* @__PURE__ */ jsx20("div", { className: "album-name items-start justify-center w-1/3 min-w-0 ml-2 max-w-full truncate text-[var(--color-text-muted)]", children: track.album ? track.album.name : "" }),
-        /* @__PURE__ */ jsx20("div", { className: "genre-name-container flex items-center justify-end w-1/6 min-w-0 shrink-0", children: track.genre ? /* @__PURE__ */ jsx20("div", { className: "genre-name font-bold p-1 border border-[var(--color-text-muted)] text-xs max-w-full truncate", children: track.genre.name }) : "" }),
-        renderDuration && /* @__PURE__ */ jsx20(
+        /* @__PURE__ */ jsx23("div", { className: "genre-name-container flex items-center justify-start w-[21.6%] min-w-0 shrink-0", children: track.genre ? /* @__PURE__ */ jsx23("div", { className: "genre-name max-w-full whitespace-normal break-words p-1 text-xs font-bold", children: track.genre.name }) : "" }),
+        renderDuration && /* @__PURE__ */ jsx23(
           "div",
           {
             className: "duration flex text-base w-16 items-center justify-center",
@@ -1360,22 +1671,22 @@ function TrackItem({
             children: renderDuration(track)
           }
         ),
-        renderActions && /* @__PURE__ */ jsx20("div", { className: "edit flex text-base w-6 items-center justify-center mr-2 cursor-pointer", children: renderActions(track) })
+        renderActions && /* @__PURE__ */ jsx23("div", { className: "edit flex text-base w-6 items-center justify-center mr-2 cursor-pointer", children: renderActions(track) })
       ]
     }
   );
 }
 
 // src/genre-tree/artist/ArtistSongs.tsx
-import { Fragment as Fragment4, jsx as jsx21, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx24, jsxs as jsxs18 } from "react/jsx-runtime";
 var SongPageSchema2 = PaginatedResponseSchema2(SongDetailedSchema2);
 var SORTS = [
   { ordering: "title", label: "Title" },
   { ordering: "-albumYear", label: "Year" }
 ];
 function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink }) {
-  const [page, setPage] = useState3(1);
-  const [ordering, setOrdering] = useState3("title");
+  const [page, setPage] = useState4(1);
+  const [ordering, setOrdering] = useState4("title");
   const { fetch } = useFetchWrapper2(getBackendBaseUrl);
   const { playNewTrackListFromArtist } = useTrackList4();
   const { playerTrackObject } = usePlayer7();
@@ -1400,21 +1711,21 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink }) {
     event.stopPropagation();
     void play(song.uuid);
   };
-  return /* @__PURE__ */ jsx21(PanelSection3, { title: "Songs", children: isPending ? /* @__PURE__ */ jsx21(Skeleton3, { className: "h-14", "aria-busy": "true" }) : isError ? /* @__PURE__ */ jsx21("p", { className: "text-red-600", children: "Could not load songs." }) : data.results.length === 0 ? /* @__PURE__ */ jsx21("p", { className: "text-[var(--color-text-muted)]", children: "No songs yet." }) : /* @__PURE__ */ jsxs15(Fragment4, { children: [
-    /* @__PURE__ */ jsxs15("div", { className: "flex flex-wrap items-center justify-between gap-2 mb-2", children: [
-      /* @__PURE__ */ jsxs15(
+  return /* @__PURE__ */ jsx24(PanelSection3, { title: "Songs", children: isPending ? /* @__PURE__ */ jsx24(Skeleton3, { className: "h-14", "aria-busy": "true" }) : isError ? /* @__PURE__ */ jsx24("p", { className: "text-red-600", children: "Could not load songs." }) : data.results.length === 0 ? /* @__PURE__ */ jsx24("p", { className: "text-[var(--color-text-muted)]", children: "No songs yet." }) : /* @__PURE__ */ jsxs18(Fragment6, { children: [
+    /* @__PURE__ */ jsxs18("div", { className: "flex flex-wrap items-center justify-between gap-2 mb-2", children: [
+      /* @__PURE__ */ jsxs18(
         "button",
         {
           type: "button",
           onClick: () => void play(),
           className: "flex w-fit items-center gap-1.5 px-3 py-1 text-xs font-medium bg-gray-900 text-white rounded-full hover:bg-gray-700",
           children: [
-            /* @__PURE__ */ jsx21(Play2, { className: "h-3.5 w-3.5", "aria-hidden": "true" }),
+            /* @__PURE__ */ jsx24(Play2, { className: "h-3.5 w-3.5", "aria-hidden": "true" }),
             "Play all"
           ]
         }
       ),
-      /* @__PURE__ */ jsx21("div", { role: "group", "aria-label": "Sort songs by", className: "flex gap-1 text-xs", children: SORTS.map((sort) => /* @__PURE__ */ jsx21(
+      /* @__PURE__ */ jsx24("div", { role: "group", "aria-label": "Sort songs by", className: "flex gap-1 text-xs", children: SORTS.map((sort) => /* @__PURE__ */ jsx24(
         "button",
         {
           type: "button",
@@ -1429,7 +1740,7 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink }) {
         sort.ordering
       )) })
     ] }),
-    /* @__PURE__ */ jsx21("ul", { className: "overflow-hidden mb-2 bg-zinc-950 rounded-lg", children: data.results.map((song, index) => /* @__PURE__ */ jsx21("li", { onClickCapture: (event) => handleRowClickCapture(event, song), children: /* @__PURE__ */ jsx21(
+    /* @__PURE__ */ jsx24("ul", { className: "overflow-hidden mb-2 bg-zinc-950 rounded-lg", children: data.results.map((song, index) => /* @__PURE__ */ jsx24("li", { onClickCapture: (event) => handleRowClickCapture(event, song), children: /* @__PURE__ */ jsx24(
       TrackItem,
       {
         track: song,
@@ -1437,15 +1748,17 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink }) {
         renderArtistLink
       }
     ) }, song.uuid)) }),
-    /* @__PURE__ */ jsx21(Pagination, { currentPage: page, totalPages: data.totalPages, onPageChange: setPage })
+    /* @__PURE__ */ jsx24(Pagination, { currentPage: page, totalPages: data.totalPages, onPageChange: setPage })
   ] }) });
 }
 
 // src/genre-tree/artist/useArtistPanel.tsx
-import { Fragment as Fragment5, jsx as jsx22, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx25, jsxs as jsxs19 } from "react/jsx-runtime";
 function useArtistPanel({
   uuid,
+  scope,
   getBackendBaseUrl,
+  getShareUrl,
   renderArtistLink,
   expanded,
   onExpandedChange,
@@ -1460,38 +1773,41 @@ function useArtistPanel({
       return {
         ...panel,
         title: "Artist",
-        content: /* @__PURE__ */ jsxs16("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-4 w-32" }),
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-4 w-24" }),
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-16 mt-2.5" }),
-          /* @__PURE__ */ jsx22(Skeleton4, { className: "h-16" })
+        content: /* @__PURE__ */ jsxs19("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-4 w-32" }),
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-4 w-24" }),
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-16 mt-2.5" }),
+          /* @__PURE__ */ jsx25(Skeleton4, { className: "h-16" })
         ] })
       };
     case "not-found":
       return {
         ...panel,
         title: "Artist not found",
-        content: /* @__PURE__ */ jsx22("p", { className: "px-6 py-2.5 text-[var(--color-text-muted)]", children: "This artist does not exist." })
+        content: /* @__PURE__ */ jsx25("p", { className: "px-6 py-2.5 text-[var(--color-text-muted)]", children: "This artist does not exist." })
       };
     case "error":
       return {
         ...panel,
         title: "Artist",
-        content: /* @__PURE__ */ jsx22("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this artist." })
+        content: /* @__PURE__ */ jsx25("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this artist." })
       };
     case "success": {
       const { artist } = result;
+      const shareTarget = scope ? { kind: "artist", uuid: artist.uuid, name: artist.name, scope } : void 0;
+      const shareUrl = shareTarget ? getShareUrl?.(shareTarget) : void 0;
       return {
         ...panel,
         title: artist.name,
-        content: /* @__PURE__ */ jsxs16(Fragment5, { children: [
-          artist.image && /* @__PURE__ */ jsx22(ArtistPhoto, { image: artist.image, name: artist.name }),
-          /* @__PURE__ */ jsx22(ArtistHeader, { artist }),
-          /* @__PURE__ */ jsx22(ArtistMembers, { title: "Members", memberships: artist.members, renderArtistLink }),
-          /* @__PURE__ */ jsx22(ArtistMembers, { title: "Member of", memberships: artist.memberOf, renderArtistLink }),
-          artist.tracksCount > 0 && /* @__PURE__ */ jsx22(
+        content: /* @__PURE__ */ jsxs19(Fragment7, { children: [
+          shareUrl && /* @__PURE__ */ jsx25("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: /* @__PURE__ */ jsx25("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: shareTarget && /* @__PURE__ */ jsx25(ShareActionButton, { target: shareTarget, url: shareUrl }) }) }),
+          artist.image && /* @__PURE__ */ jsx25(ArtistPhoto, { image: artist.image, name: artist.name }),
+          /* @__PURE__ */ jsx25(ArtistHeader, { artist }),
+          /* @__PURE__ */ jsx25(ArtistMembers, { title: "Members", memberships: artist.members, renderArtistLink }),
+          /* @__PURE__ */ jsx25(ArtistMembers, { title: "Member of", memberships: artist.memberOf, renderArtistLink }),
+          artist.tracksCount > 0 && /* @__PURE__ */ jsx25(
             ArtistSongs,
             {
               artist: { uuid: artist.uuid, name: artist.name },
@@ -1500,14 +1816,36 @@ function useArtistPanel({
             }
           )
         ] }),
-        extraContent: artist.albums.length > 0 ? /* @__PURE__ */ jsx22(ArtistDiscography, { albums: artist.albums }) : void 0
+        extraContent: artist.albums.length > 0 ? /* @__PURE__ */ jsx25(ArtistDiscography, { albums: artist.albums }) : void 0
       };
     }
   }
 }
 
+// src/genre-tree/SizeMetricToggle.tsx
+import { MdMusicNote, MdVisibility } from "react-icons/md";
+import { SegmentedControl } from "@behindthemusictree/ui";
+import { jsx as jsx26 } from "react/jsx-runtime";
+function SizeMetricToggle({
+  value,
+  onChange
+}) {
+  return /* @__PURE__ */ jsx26(
+    SegmentedControl,
+    {
+      "aria-label": "Size nodes by",
+      value,
+      onChange,
+      options: [
+        { value: "songs", label: /* @__PURE__ */ jsx26(MdMusicNote, { size: 18, "aria-hidden": true }), "aria-label": "Size by songs", title: "Node size by song count" },
+        { value: "views", label: /* @__PURE__ */ jsx26(MdVisibility, { size: 18, "aria-hidden": true }), "aria-label": "Size by views", title: "Node size by song views" }
+      ]
+    }
+  );
+}
+
 // src/genre-tree/GenreTreeView.tsx
-import { Fragment as Fragment6, jsx as jsx23, jsxs as jsxs17 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx27, jsxs as jsxs20 } from "react/jsx-runtime";
 var PREVIOUS_BUTTON_CSS = `
 .genre-tree-view .search-overlay .gtv-info-panel-previous { display: none; }
 .genre-tree-view:has(.search-overlay .gtv-info-panel-previous) .genre-search input { padding-left: 2.75rem; }
@@ -1529,7 +1867,7 @@ function GenreNodeActionBand({ genrePlaylist, scope, playback, ...bandProps }) {
       console.error("Failed to load genre playlist tracks:", error);
     });
   };
-  return /* @__PURE__ */ jsx23(
+  return /* @__PURE__ */ jsx27(
     GenreActionBand,
     {
       ...bandProps,
@@ -1544,6 +1882,7 @@ function GenreTreeView({
   scope,
   handleGenreCreationAction,
   handleGenreRenameAction,
+  onParentChanged,
   getBackendBaseUrl,
   additionalActions,
   viewMode: controlledViewMode,
@@ -1552,18 +1891,22 @@ function GenreTreeView({
   defaultViewport,
   onViewportChange,
   readOnly = false,
-  className,
+  className: className2,
   showDisplayOptions = true,
   showAddRoot = true,
   allowWheelRotation: controlledAllowWheelRotation,
   criteriaOverviewSchema,
   renderGenreDetailExtras,
   controlsOrientation = "horizontal",
+  floatingControlsLeading,
+  sizeMetric: controlledSizeMetric,
+  onSizeMetricChange,
   renderArtistLink,
   artistUuid: controlledArtistUuid,
   onArtistUuidChange,
   artistExpanded: controlledArtistExpanded,
   onArtistExpandedChange,
+  getShareUrl,
   artistSearch = true,
   onArtistSelect,
   artistSearchBaseUrl,
@@ -1572,10 +1915,6 @@ function GenreTreeView({
   renderSongLeading,
   renderSongActions,
   renderTracksToolbar,
-  editMode,
-  onEditModeChange,
-  renderTitleEditor,
-  renderParentsEditor,
   renderDangerZone,
   expanded,
   onExpandedChange,
@@ -1585,15 +1924,25 @@ function GenreTreeView({
   placement = "default",
   ...focus
 }) {
-  const [internalArtistUuid, setInternalArtistUuid] = useState4(null);
+  const getShareUrlRef = useRef4(getShareUrl);
+  getShareUrlRef.current = getShareUrl;
+  const [internalArtistUuid, setInternalArtistUuid] = useState5(null);
   const isArtistControlled = controlledArtistUuid !== void 0;
   const artistUuid = isArtistControlled ? controlledArtistUuid : internalArtistUuid;
+  const [internalSizeMetric, setInternalSizeMetric] = useState5("songs");
+  const sizeMetric = controlledSizeMetric ?? internalSizeMetric;
+  const deferredSizeMetric = useDeferredValue(sizeMetric);
+  const changeSizeMetric = (metric) => {
+    if (controlledSizeMetric === void 0) setInternalSizeMetric(metric);
+    onSizeMetricChange?.(metric);
+  };
   const changeArtist = (uuid) => {
     if (!isArtistControlled) setInternalArtistUuid(uuid);
     onArtistUuidChange?.(uuid);
   };
   const {
     isLoading,
+    isFetching: isTreeFetching,
     genrePlaylistByNodeId,
     visibleGenrePlaylists,
     groupedGenrePlaylistsByRoot,
@@ -1618,23 +1967,31 @@ function GenreTreeView({
     criteriaOverviewSchema,
     artistUuid
   });
+  const isGenreUpdating = useIsMutating({ mutationKey: genreUpdateMutationKey }) > 0;
+  const { mutate: updateGenre } = useUpdateGenre2(scope, getBackendBaseUrl);
+  const busy = deferredSizeMetric !== sizeMetric || isTreeFetching || isGenreUpdating;
+  const isArtistFiltered = artistUuid !== null;
+  const canSizeByViews = !isArtistFiltered && hasViewsCount(visibleGenrePlaylists);
   const artistResult = useArtist2(artistUuid, artistSearchBaseUrl ?? getBackendBaseUrl);
   const filterArtistName = artistResult.status === "success" ? artistResult.artist.name : null;
-  const filterArtist = useMemo6(
+  const filterArtist = useMemo7(
     () => artistUuid !== null && filterArtistName !== null ? { uuid: artistUuid, name: filterArtistName } : null,
     [artistUuid, filterArtistName]
   );
+  const hasSelectedGenreNode = selectedGenrePlaylist !== void 0 && visibleGenrePlaylists.some(({ uuid }) => uuid === selectedGenrePlaylist.uuid);
   const playback = useGenrePlaylistPlayback({ scope, genrePlaylists: visibleGenrePlaylists, artist: filterArtist });
   const openArtist = (uuid) => {
     if (selectedNodeId !== null) clearSelection();
     changeArtist(uuid);
   };
-  const [expandedArtistUuid, setExpandedArtistUuid] = useState4(null);
+  const [expandedArtistUuid, setExpandedArtistUuid] = useState5(null);
   const artistBaseUrl = artistSearchBaseUrl ?? getBackendBaseUrl;
   const artistPanel = useArtistPanel({
     uuid: artistUuid,
+    scope,
     getBackendBaseUrl: artistBaseUrl,
-    renderArtistLink: renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx23("button", { type: "button", onClick: () => openArtist(artist.uuid), className: "hover:underline", children: artist.name })),
+    getShareUrl: getShareUrlRef.current,
+    renderArtistLink: renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx27("button", { type: "button", onClick: () => openArtist(artist.uuid), className: "hover:underline", children: artist.name })),
     expanded: controlledArtistExpanded ?? (artistUuid !== null && expandedArtistUuid === artistUuid),
     onExpandedChange: (on) => {
       if (controlledArtistExpanded === void 0) setExpandedArtistUuid(on ? artistUuid : null);
@@ -1642,10 +1999,10 @@ function GenreTreeView({
     },
     onClose: () => changeArtist(null)
   });
-  const builtInArtistPanel = overlayPanel || selectedNodeId !== null ? void 0 : artistPanel;
+  const builtInArtistPanel = overlayPanel || hasSelectedGenreNode ? void 0 : artistPanel;
   const activeOverlayPanel = overlayPanel ?? (builtInArtistPanel && { ...builtInArtistPanel, hideTitle: true, hideClose: true });
-  const [uncontrolledCollapsed, setUncontrolledCollapsed] = useState4(false);
-  const [uncontrolledExpanded, setUncontrolledExpanded] = useState4(false);
+  const [uncontrolledCollapsed, setUncontrolledCollapsed] = useState5(false);
+  const [uncontrolledExpanded, setUncontrolledExpanded] = useState5(false);
   const isCollapsed = collapsed ?? uncontrolledCollapsed;
   const isExpanded = expanded ?? uncontrolledExpanded;
   const changeCollapsed = (next) => {
@@ -1656,11 +2013,11 @@ function GenreTreeView({
     setUncontrolledExpanded(next);
     onExpandedChange?.(next);
   };
-  useEffect4(() => {
+  useEffect5(() => {
     setUncontrolledCollapsed(false);
   }, [selectedNodeId, artistUuid]);
-  const isDetailHidden = isCollapsed || !selectedNodeId && !activeOverlayPanel;
-  useEffect4(() => {
+  const isDetailHidden = isCollapsed || !hasSelectedGenreNode && !activeOverlayPanel;
+  useEffect5(() => {
     if (placement !== "regions" || !isDetailHidden) return void 0;
     const root = document.documentElement;
     root.style.setProperty("--layout-left-w", "0px");
@@ -1672,10 +2029,6 @@ function GenreTreeView({
   const detailExpanded = detailOverlay ? !!detailOverlay.expanded : isExpanded;
   const onDetailExpandedChange = detailOverlay ? detailOverlay.onExpandedChange : changeExpanded;
   const infoPanelCuration = {
-    editMode,
-    onEditModeChange,
-    renderTitleEditor,
-    renderParentsEditor,
     renderDangerZone,
     expanded: placement === "regions" ? isExpanded : expanded,
     onExpandedChange: placement === "regions" ? changeExpanded : onExpandedChange,
@@ -1683,29 +2036,38 @@ function GenreTreeView({
     hideExpandButton: placement === "regions" ? true : void 0,
     overlayPanel: detailOverlay ? { ...detailOverlay, collapsed: isCollapsed, hideExpandButton: true } : activeOverlayPanel
   };
-  const [isWheelRevealed, setIsWheelRevealed] = useState4(false);
+  const [isWheelRevealed, setIsWheelRevealed] = useState5(false);
   const usesHandoff = viewMode === "wheel" || viewMode === "pop-core";
   const isTreeReady = !isLoading && (!usesHandoff || isWheelRevealed);
   const rootRef = useRef4(null);
   const handlePrevious = () => {
     rootRef.current?.querySelector(".search-overlay .gtv-info-panel-previous")?.click();
   };
-  const { showPopup, hidePopup } = usePopup4();
-  const [searchText, setSearchText] = useState4("");
+  useEffect5(() => {
+    if (!isTreeReady || viewMode !== "pop-core" || !hasSelectedGenreNode || !selectedGenrePlaylist) return;
+    const root = rootRef.current;
+    const centerChip = root?.querySelector(".gtv-wheel-center-node .gtv-wheel-chip");
+    if (!centerChip || centerChip.getAttribute("aria-label") !== selectedGenrePlaylist.name) return;
+    const panelTitle = root?.querySelector(".gtv-info-panel-title");
+    if (panelTitle?.textContent?.trim().startsWith(selectedGenrePlaylist.name)) return;
+    centerChip.click();
+  }, [hasSelectedGenreNode, isTreeReady, selectedGenrePlaylist, viewMode]);
+  const { showPopup, hidePopup } = usePopup5();
+  const [searchText, setSearchText] = useState5("");
   const artistSearchResult = useArtistSearch(artistBaseUrl, artistSearch ? searchText : "");
   const artistExtraResults = artistSearch ? {
     label: "Artists",
     items: artistSearchResult.artists.map((artist) => ({
       key: artist.uuid,
-      content: /* @__PURE__ */ jsxs17(Fragment6, { children: [
-        /* @__PURE__ */ jsxs17("span", { className: "block truncate font-medium", children: [
+      content: /* @__PURE__ */ jsxs20(Fragment8, { children: [
+        /* @__PURE__ */ jsxs20("span", { className: "block truncate font-medium", children: [
           artist.name,
-          artist.disambiguation && /* @__PURE__ */ jsxs17("span", { className: "font-normal text-[var(--color-neutral-500)]", children: [
+          artist.disambiguation && /* @__PURE__ */ jsxs20("span", { className: "font-normal text-[var(--color-neutral-500)]", children: [
             " \xB7 ",
             artist.disambiguation
           ] })
         ] }),
-        artist.matchedAlias && /* @__PURE__ */ jsxs17("span", { className: "block truncate text-xs text-[var(--color-neutral-500)]", children: [
+        artist.matchedAlias && /* @__PURE__ */ jsxs20("span", { className: "block truncate text-xs text-[var(--color-neutral-500)]", children: [
           "also known as ",
           artist.matchedAlias
         ] })
@@ -1715,7 +2077,8 @@ function GenreTreeView({
         onArtistSelect?.(artist);
       }
     })),
-    status: artistSearchResult.isError ? "Search failed" : artistSearchResult.settled && artistSearchResult.artists.length === 0 ? "No artists found" : ""
+    status: artistSearchResult.isError ? "Search failed" : artistSearchResult.settled && artistSearchResult.artists.length === 0 ? "No artists found" : "",
+    loading: artistSearchResult.pending
   } : void 0;
   const handleSelectedNodeChange = (node) => {
     selectNode(node);
@@ -1732,49 +2095,70 @@ function GenreTreeView({
   };
   const zoomInRef = useRef4(void 0);
   zoomInRef.current = canZoomIn ? handleGenreSearchZoomIn : void 0;
-  const renderInfoPanelBody = useCallback5(
+  const renderInfoPanelBody = useCallback6(
     (node, { toolbar, ancestors, family }) => {
       const genrePlaylist = genrePlaylistByNodeId.get(node.id);
       const criteria = genrePlaylist?.criteria;
-      if (!genrePlaylist || !criteria) return { primary: /* @__PURE__ */ jsxs17(Fragment6, { children: [
+      if (!genrePlaylist || !criteria) return { primary: /* @__PURE__ */ jsxs20(Fragment8, { children: [
         toolbar,
         family
       ] }), aside: ancestors };
       const genreUuid = criteria.uuid;
+      const parentPlaylist = visibleGenrePlaylists.find(({ uuid }) => uuid === genrePlaylist.parent?.uuid);
+      const canToggleSide = !readOnly && parentPlaylist !== void 0 && parentPlaylist.parent === null;
+      const side = criteria.side ?? "core";
+      const shareTarget = {
+        kind: "genre",
+        genrePlaylistUuid: genrePlaylist.uuid,
+        name: criteria.name,
+        scope,
+        artistUuid
+      };
+      const shareUrl = getShareUrlRef.current?.(shareTarget) ?? void 0;
+      const popSibling = canToggleSide && side === "core" ? visibleGenrePlaylists.find(
+        (sibling) => sibling.parent?.uuid === parentPlaylist.uuid && sibling.uuid !== genrePlaylist.uuid && sibling.criteria?.side === "pop"
+      ) : void 0;
       return {
-        primary: /* @__PURE__ */ jsxs17(Fragment6, { children: [
+        primary: /* @__PURE__ */ jsxs20(Fragment8, { children: [
           toolbar,
-          /* @__PURE__ */ jsx23(
+          /* @__PURE__ */ jsx27(
             GenreNodeActionBand,
             {
               node,
               genrePlaylist,
               scope,
+              shareTarget: shareUrl ? shareTarget : void 0,
+              shareUrl,
               onZoomIn: zoomInRef.current,
               onAddChild: readOnly ? void 0 : () => handleGenreCreationAction(criteria),
               onRename: readOnly ? void 0 : () => handleGenreRenameAction(criteria),
               onChangeParent: readOnly ? void 0 : () => showPopup(
-                /* @__PURE__ */ jsx23(
+                /* @__PURE__ */ jsx27(
                   ChangeParentPopup,
                   {
                     genrePlaylist: { ...genrePlaylist, criteria },
                     genrePlaylists: visibleGenrePlaylists,
                     scope,
                     getBackendBaseUrl,
-                    onClose: hidePopup
+                    onClose: hidePopup,
+                    onParentChanged
                   }
                 )
               ),
+              side,
+              onToggleSide: canToggleSide ? () => updateGenre({ uuid: genreUuid, data: { side: side === "pop" ? "core" : "pop" } }) : void 0,
+              toggleSideDisabledReason: popSibling ? `${popSibling.name} is already the pop side of ${parentPlaylist?.name}` : void 0,
               additionalActions,
               playback
             }
           ),
-          /* @__PURE__ */ jsx23(
+          /* @__PURE__ */ jsx27(
             GenreDetailExtras,
             {
               family,
               genreUuid,
               genrePlaylist,
+              wikidataId: criteria.wikidataId,
               scope,
               getBackendBaseUrl,
               criteriaOverviewSchema,
@@ -1801,7 +2185,9 @@ function GenreTreeView({
       handleGenreRenameAction,
       showPopup,
       hidePopup,
+      onParentChanged,
       visibleGenrePlaylists,
+      updateGenre,
       playback,
       filterArtist,
       scope,
@@ -1818,7 +2204,7 @@ function GenreTreeView({
   );
   const isRotationControlled = controlledAllowWheelRotation !== void 0;
   const allowWheelRotation = controlledAllowWheelRotation ?? internalAllowWheelRotation;
-  const detailTab = placement === "regions" && (selectedNodeId || detailOverlay) ? /* @__PURE__ */ jsx23(
+  const detailTab = placement === "regions" && (hasSelectedGenreNode || detailOverlay) ? /* @__PURE__ */ jsx27(
     PanelEdgeTab,
     {
       side: "left",
@@ -1826,25 +2212,14 @@ function GenreTreeView({
       center: detailExpanded ? null : isCollapsed ? { label: "Show panel", onClick: () => changeCollapsed(false) } : onDetailExpandedChange ? { label: "Extend panel", onClick: () => onDetailExpandedChange(true) } : null
     }
   ) : null;
-  const actions = /* @__PURE__ */ jsxs17(Fragment6, { children: [
-    !isLoading && /* @__PURE__ */ jsx23(
-      GenreSearch,
-      {
-        genrePlaylists: visibleGenrePlaylists,
-        onSelect: handleGenreSearchSelect,
-        selectedName: selectedGenrePlaylist?.name ?? builtInArtistPanel?.title ?? null,
-        onClear: builtInArtistPanel ? () => changeArtist(null) : handleGenreSearchClear,
-        onPrevious: handlePrevious,
-        onQueryChange: artistSearch ? setSearchText : void 0,
-        extraResults: artistExtraResults
-      }
-    ),
-    !isLoading && filterArtist && /* @__PURE__ */ jsxs17("span", { className: "inline-flex items-center overflow-hidden rounded-full bg-[var(--color-neutral-100)] text-sm", children: [
-      /* @__PURE__ */ jsx23(
+  const renderArtistFilter = () => {
+    if (isLoading || !filterArtist) return null;
+    return /* @__PURE__ */ jsxs20("span", { className: "inline-flex items-center overflow-hidden rounded-full bg-[var(--color-neutral-100)] text-sm", children: [
+      /* @__PURE__ */ jsx27(
         "button",
         {
           type: "button",
-          className: "py-1 pl-3 pr-2 hover:underline",
+          className: "py-1 pl-3 pr-2 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] hover:underline",
           "aria-label": `Show artist ${filterArtist.name}`,
           onClick: () => {
             if (selectedNodeId !== null) clearSelection();
@@ -1852,86 +2227,174 @@ function GenreTreeView({
           children: filterArtist.name
         }
       ),
-      /* @__PURE__ */ jsx23(
+      /* @__PURE__ */ jsx27(
         "button",
         {
           type: "button",
-          className: "py-1 pl-1 pr-3 hover:text-[var(--color-text)]",
+          className: "py-1 pl-1 pr-3 [@media(pointer:coarse)]:min-h-[var(--layout-touch-target)] hover:text-[var(--color-text)]",
           "aria-label": `Clear artist filter ${filterArtist.name}`,
           onClick: () => changeArtist(null),
           children: "\xD7"
         }
       )
-    ] }),
-    !isLoading && !isControlled && /* @__PURE__ */ jsx23(
-      SegmentedControl,
-      {
-        "aria-label": "Tree view mode",
-        value: viewMode,
-        onChange: setViewMode,
-        options: [
-          { value: "pop-core", label: "Pop/Core", disabled: !canShowPopCore, title: canShowPopCore ? void 0 : NO_POP_ROOT_TITLE },
-          { value: "wheel", label: "Wheel" },
-          { value: "stacked", label: "Stacked" },
-          { value: "outline", label: "Outline", disabled: !canShowPopCore, title: canShowPopCore ? void 0 : NO_POP_ROOT_TITLE }
-        ]
-      }
-    ),
-    !isLoading && showDisplayOptions && /* @__PURE__ */ jsx23(
-      "div",
+    ] });
+  };
+  const actions = /* @__PURE__ */ jsxs20(Fragment8, { children: [
+    !isLoading && /* @__PURE__ */ jsx27(
+      GenreSearch,
       {
-        className: "flex items-center gap-1",
-        role: "group",
-        "aria-label": "Tree display options",
-        children: !isRotationControlled && viewMode !== "stacked" && viewMode !== "outline" && /* @__PURE__ */ jsx23(
-          Button,
-          {
-            variant: allowWheelRotation ? "default" : "outline",
-            size: "sm",
-            onClick: toggleWheelRotation,
-            children: "Rotation"
-          }
-        )
+        genrePlaylists: visibleGenrePlaylists,
+        onSelect: handleGenreSearchSelect,
+        selectedName: selectedGenrePlaylist?.name ?? builtInArtistPanel?.title ?? null,
+        onClear: builtInArtistPanel ? () => changeArtist(null) : handleGenreSearchClear,
+        onPrevious: handlePrevious,
+        onQueryChange: artistSearch ? setSearchText : void 0,
+        extraResults: artistExtraResults
       }
     ),
-    !isLoading && !readOnly && showAddRoot && /* @__PURE__ */ jsx23(
-      IconTextButton,
-      {
-        icon: Plus2,
-        text: "Add root",
-        onClick: () => handleGenreCreationAction(null)
-      }
-    )
+    !isLoading && filterArtist && /* @__PURE__ */ jsx27("div", { className: "hidden w-full justify-center max-md:flex", children: renderArtistFilter() }),
+    /* @__PURE__ */ jsxs20("div", { className: "contents max-md:flex max-md:w-full max-md:items-center max-md:gap-2 max-md:overflow-x-auto max-md:[scrollbar-width:none] max-md:[&>*]:shrink-0", children: [
+      !isLoading && !isControlled && /* @__PURE__ */ jsx27(
+        SegmentedControl2,
+        {
+          "aria-label": "Tree view mode",
+          value: viewMode,
+          onChange: setViewMode,
+          options: [
+            { value: "pop-core", label: "Pop/Core", disabled: !canShowPopCore, title: canShowPopCore ? void 0 : NO_POP_ROOT_TITLE },
+            { value: "wheel", label: "Wheel" },
+            { value: "stacked", label: "Stacked" },
+            { value: "outline", label: "Outline", disabled: !canShowPopCore, title: canShowPopCore ? void 0 : NO_POP_ROOT_TITLE }
+          ]
+        }
+      ),
+      !isLoading && showDisplayOptions && /* @__PURE__ */ jsx27(
+        "div",
+        {
+          className: "flex items-center gap-1",
+          role: "group",
+          "aria-label": "Tree display options",
+          children: !isRotationControlled && viewMode !== "stacked" && viewMode !== "outline" && /* @__PURE__ */ jsx27(
+            Button,
+            {
+              variant: allowWheelRotation ? "default" : "outline",
+              size: "sm",
+              onClick: toggleWheelRotation,
+              children: "Rotation"
+            }
+          )
+        }
+      ),
+      !isLoading && !readOnly && showAddRoot && /* @__PURE__ */ jsx27(
+        IconTextButton,
+        {
+          icon: Plus2,
+          text: "Add root",
+          onClick: () => handleGenreCreationAction(null)
+        }
+      )
+    ] })
   ] });
-  return /* @__PURE__ */ jsxs17(
+  return /* @__PURE__ */ jsxs20(
     "div",
     {
       ref: rootRef,
-      className: ["genre-tree-view relative flex flex-col h-full", placement === "regions" && REGIONS_CLASS, className].filter(Boolean).join(" "),
+      className: ["genre-tree-view relative flex flex-col h-full", placement === "regions" && REGIONS_CLASS, className2].filter(Boolean).join(" "),
       children: [
-        /* @__PURE__ */ jsx23("style", { children: PREVIOUS_BUTTON_CSS }),
-        /* @__PURE__ */ jsx23(
+        /* @__PURE__ */ jsx27("style", { children: PREVIOUS_BUTTON_CSS }),
+        /* @__PURE__ */ jsx27(
           "div",
           {
-            className: `actions-container absolute z-30 flex items-center gap-2 ${placement === "regions" ? "left-[calc(var(--layout-gutter)+var(--layout-panel-inset))] top-[calc(var(--layout-gutter)+var(--layout-panel-inset))]" : "left-5 top-5"}`,
+            className: `actions-container absolute z-30 flex items-center gap-2 ${placement === "regions" ? "left-[calc(var(--layout-gutter)+var(--layout-panel-inset))] top-[calc(var(--layout-gutter)+var(--layout-panel-inset))] max-md:right-[calc(var(--layout-gutter)+var(--layout-panel-inset))] max-md:top-[var(--layout-band-top)] max-md:flex-col max-md:items-stretch" : "left-5 top-5"}`,
             children: actions
           }
         ),
-        detailTab && /* @__PURE__ */ jsx23(
+        !isLoading && filterArtist && /* @__PURE__ */ jsx27(
           "div",
           {
-            className: `absolute top-1/2 z-30 -translate-y-1/2 transition-[opacity,visibility] duration-150 ease-out ${isTreeReady ? "opacity-100" : "pointer-events-none invisible opacity-0"} ${detailExpanded ? "right-[calc(var(--layout-center-right)-var(--layout-edge-tab-w))]" : isCollapsed ? "left-0" : "left-[calc(var(--layout-gutter)+var(--layout-left-w))]"}`,
+            className: `absolute left-1/2 z-30 hidden -translate-x-1/2 md:block ${placement === "regions" ? "top-[calc(var(--layout-gutter)+var(--layout-panel-inset))]" : "top-5"}`,
+            children: renderArtistFilter()
+          }
+        ),
+        detailTab && /* @__PURE__ */ jsx27(
+          "div",
+          {
+            className: `absolute top-1/2 z-30 -translate-y-1/2 max-md:hidden transition-[opacity,visibility] duration-150 ease-out ${isTreeReady ? "opacity-100" : "pointer-events-none invisible opacity-0"} ${detailExpanded ? "right-[calc(var(--layout-center-right)-var(--layout-edge-tab-w))]" : isCollapsed ? "left-0" : "left-[calc(var(--layout-gutter)+var(--layout-left-w))]"}`,
             children: detailTab
           }
         ),
-        /* @__PURE__ */ jsx23("div", { className: "content-container flex-1 min-h-0 flex flex-row gap-4", children: /* @__PURE__ */ jsx23("div", { className: "tree-view-container flex-1 min-w-0 flex flex-col h-full", children: isLoading ? /* @__PURE__ */ jsx23(GenreTreeViewSkeleton, { viewMode }) : viewMode === "wheel" ? (
-          // The info panel's top edge aligns with the tree's; the search bar floats `--layout-panel-inset` below it,
-          // and the header inset (the bar's height plus that inset) extends the header's fill behind the bar,
-          // Google Maps style; the 8px bottom padding mirrors the inset above the bar, and the hidden title's height is zeroed.
-          // The panel's own Zoom in button is hidden: the search bar carries it.
-          /* @__PURE__ */ jsx23("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem))] [&_.gtv-info-panel-header]:pb-2 [&_.gtv-info-panel-title--hidden]:h-0 [&_.gtv-toolbar]:hidden", children: /* @__PURE__ */ jsx23(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx23(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx23(
-            GenrePlaylistTreeWheel,
+        /* @__PURE__ */ jsx27("div", { className: "content-container flex-1 min-h-0 flex flex-row gap-4", children: /* @__PURE__ */ jsxs20("div", { className: "tree-view-container relative flex-1 min-w-0 flex flex-col h-full", children: [
+          !isLoading && viewMode === "outline" && floatingControlsLeading && /* @__PURE__ */ jsx27("div", { className: "absolute bottom-3 right-3 z-10", children: floatingControlsLeading }),
+          isLoading ? /* @__PURE__ */ jsx27(GenreTreeViewSkeleton, { viewMode }) : viewMode === "wheel" ? (
+            // The info panel's top edge aligns with the tree's; the search bar floats `--layout-panel-inset` below it,
+            // and the header inset (the bar's height plus that inset) extends the header's fill behind the bar,
+            // Google Maps style; the 8px bottom padding mirrors the inset above the bar, and the hidden title's height is zeroed.
+            // The panel's own Zoom in button is hidden: the search bar carries it.
+            /* @__PURE__ */ jsx27("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem))] [&_.gtv-info-panel-header]:pb-2 [&_.gtv-info-panel-title--hidden]:h-0 [&_.gtv-toolbar]:hidden", children: /* @__PURE__ */ jsx27(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx27(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx27(
+              GenrePlaylistTreeWheel,
+              {
+                scope,
+                genrePlaylists: visibleGenrePlaylists,
+                handleGenreCreationAction,
+                handleGenreRenameAction,
+                additionalActions,
+                onSelectedNodeChange: handleSelectedNodeChange,
+                hideInfoPanelClose: true,
+                hideInfoPanelTitle: true,
+                onNodeHover: handleNodeHover,
+                renderInfoPanelBody,
+                playback,
+                selectedNodeId,
+                readOnly,
+                allowWheelRotation,
+                controlsOrientation,
+                sizeMetric: isArtistFiltered || !canSizeByViews ? "songs" : deferredSizeMetric,
+                busy,
+                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs20("div", { className: "flex items-center gap-2", children: [
+                  floatingControlsLeading,
+                  canSizeByViews && /* @__PURE__ */ jsx27(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
+                ] }) : void 0,
+                defaultViewport,
+                onViewportChange,
+                ...infoPanelCuration
+              }
+            ) }) })
+          ) : viewMode === "pop-core" ? (
+            // Same as the wheel: the header inset extends its fill behind the floating search bar, Google Maps style.
+            /* @__PURE__ */ jsx27("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem))] [&_.gtv-info-panel-header]:pb-2 [&_.gtv-info-panel-title--hidden]:h-0 [&_.gtv-toolbar]:hidden [&_.gtv-info-panel-zoom-in]:hidden", children: /* @__PURE__ */ jsx27(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx27(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx27(
+              GenrePlaylistTreeWheelRadialPopCore,
+              {
+                scope,
+                genrePlaylists: visibleGenrePlaylists,
+                handleGenreCreationAction,
+                handleGenreRenameAction,
+                additionalActions,
+                onSelectedNodeChange: handleSelectedNodeChange,
+                hideInfoPanelClose: true,
+                hideInfoPanelTitle: true,
+                onNodeHover: handleNodeHover,
+                renderInfoPanelBody,
+                playback,
+                selectedNodeId,
+                readOnly,
+                allowWheelRotation,
+                controlsOrientation,
+                sizeMetric: isArtistFiltered || !canSizeByViews ? "songs" : deferredSizeMetric,
+                busy,
+                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs20("div", { className: "flex items-center gap-2", children: [
+                  floatingControlsLeading,
+                  canSizeByViews && /* @__PURE__ */ jsx27(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
+                ] }) : void 0,
+                defaultViewport,
+                onViewportChange,
+                ...infoPanelCuration,
+                ...focus
+              }
+            ) }) })
+          ) : viewMode === "outline" ? /* @__PURE__ */ jsx27("div", { className: "tree-container flex-1 min-h-0 w-full overflow-y-auto relative [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem)+0.75rem)] [&_.gtv-toolbar]:hidden", children: /* @__PURE__ */ jsx27(
+            GenrePlaylistTreeWheelRadialPopCore,
             {
+              outline: true,
               scope,
               genrePlaylists: visibleGenrePlaylists,
               handleGenreCreationAction,
@@ -1945,94 +2408,45 @@ function GenreTreeView({
               playback,
               selectedNodeId,
               readOnly,
-              allowWheelRotation,
-              controlsOrientation,
-              defaultViewport,
-              onViewportChange,
               ...infoPanelCuration
             }
-          ) }) })
-        ) : viewMode === "pop-core" ? (
-          // Same as the wheel: the header inset extends its fill behind the floating search bar, Google Maps style.
-          /* @__PURE__ */ jsx23("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem))] [&_.gtv-info-panel-header]:pb-2 [&_.gtv-info-panel-title--hidden]:h-0 [&_.gtv-toolbar]:hidden [&_.gtv-info-panel-zoom-in]:hidden", children: /* @__PURE__ */ jsx23(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx23(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx23(
-            GenrePlaylistTreeWheelRadialPopCore,
-            {
-              scope,
-              genrePlaylists: visibleGenrePlaylists,
-              handleGenreCreationAction,
-              handleGenreRenameAction,
-              additionalActions,
-              onSelectedNodeChange: handleSelectedNodeChange,
-              hideInfoPanelClose: true,
-              hideInfoPanelTitle: true,
-              onNodeHover: handleNodeHover,
-              renderInfoPanelBody,
-              playback,
-              selectedNodeId,
-              readOnly,
-              allowWheelRotation,
-              controlsOrientation,
-              defaultViewport,
-              onViewportChange,
-              ...infoPanelCuration,
-              ...focus
+          ) }) : /* @__PURE__ */ jsx27("div", { className: "tree-container relative flex flex-col gap-4 w-full pt-14 overflow-x-auto overflow-y-auto text-[var(--color-text)] [&_.gtv-toolbar]:hidden", children: Object.entries(groupedGenrePlaylistsByRoot).map(
+            ([uuid, genrePlaylistTreePerRoot], rootIndex) => {
+              return /* @__PURE__ */ jsx27(
+                "div",
+                {
+                  className: "tree-per-root-container relative shrink-0 h-[28rem] mt-2 mr-16 p-2 bg-[var(--color-neutral-100)] rounded-lg",
+                  children: /* @__PURE__ */ jsx27("div", { className: "graph-container relative z-10 h-full", children: /* @__PURE__ */ jsx27(
+                    GenrePlaylistTreePerRoot,
+                    {
+                      scope,
+                      rootUuid: uuid,
+                      genrePlaylistTreePerRoot,
+                      handleGenreCreationAction,
+                      handleGenreRenameAction,
+                      additionalActions,
+                      onSelectedNodeChange: handleSelectedNodeChange,
+                      hideInfoPanelClose: true,
+                      hideInfoPanelTitle: true,
+                      onNodeHover: handleNodeHover,
+                      renderInfoPanelBody,
+                      playback,
+                      selectedNodeId: uuid === selectedGenrePlaylist?.root.uuid ? selectedNodeId : null,
+                      readOnly,
+                      wheelZoom: "modifier",
+                      controlsOrientation,
+                      defaultViewport: uuid === selectedGenrePlaylist?.root.uuid ? defaultViewport : void 0,
+                      onViewportChange: uuid === selectedGenrePlaylist?.root.uuid ? onViewportChange : void 0,
+                      ...infoPanelCuration,
+                      overlayPanel: rootIndex === 0 ? activeOverlayPanel : void 0
+                    }
+                  ) })
+                },
+                uuid
+              );
             }
-          ) }) })
-        ) : viewMode === "outline" ? /* @__PURE__ */ jsx23("div", { className: "tree-container flex-1 min-h-0 w-full overflow-y-auto relative [--gtv-info-panel-header-inset:calc(var(--layout-search-h,2.5rem)+var(--layout-panel-inset,0.5rem)+0.75rem)] [&_.gtv-toolbar]:hidden", children: /* @__PURE__ */ jsx23(
-          GenrePlaylistTreeWheelRadialPopCore,
-          {
-            outline: true,
-            scope,
-            genrePlaylists: visibleGenrePlaylists,
-            handleGenreCreationAction,
-            handleGenreRenameAction,
-            additionalActions,
-            onSelectedNodeChange: handleSelectedNodeChange,
-            hideInfoPanelClose: true,
-            hideInfoPanelTitle: true,
-            onNodeHover: handleNodeHover,
-            renderInfoPanelBody,
-            playback,
-            selectedNodeId,
-            readOnly,
-            ...infoPanelCuration
-          }
-        ) }) : /* @__PURE__ */ jsx23("div", { className: "tree-container relative flex flex-col gap-4 w-full pt-14 overflow-x-auto overflow-y-auto text-[var(--color-text)] [&_.gtv-toolbar]:hidden", children: Object.entries(groupedGenrePlaylistsByRoot).map(
-          ([uuid, genrePlaylistTreePerRoot], rootIndex) => {
-            return /* @__PURE__ */ jsx23(
-              "div",
-              {
-                className: "tree-per-root-container relative shrink-0 h-[28rem] mt-2 mr-16 p-2 bg-[var(--color-neutral-100)] rounded-lg",
-                children: /* @__PURE__ */ jsx23("div", { className: "graph-container relative z-10 h-full", children: /* @__PURE__ */ jsx23(
-                  GenrePlaylistTreePerRoot,
-                  {
-                    scope,
-                    rootUuid: uuid,
-                    genrePlaylistTreePerRoot,
-                    handleGenreCreationAction,
-                    handleGenreRenameAction,
-                    additionalActions,
-                    onSelectedNodeChange: handleSelectedNodeChange,
-                    hideInfoPanelClose: true,
-                    hideInfoPanelTitle: true,
-                    onNodeHover: handleNodeHover,
-                    renderInfoPanelBody,
-                    playback,
-                    selectedNodeId: uuid === selectedGenrePlaylist?.root.uuid ? selectedNodeId : null,
-                    readOnly,
-                    wheelZoom: "modifier",
-                    controlsOrientation,
-                    defaultViewport: uuid === selectedGenrePlaylist?.root.uuid ? defaultViewport : void 0,
-                    onViewportChange: uuid === selectedGenrePlaylist?.root.uuid ? onViewportChange : void 0,
-                    ...infoPanelCuration,
-                    overlayPanel: rootIndex === 0 ? activeOverlayPanel : void 0
-                  }
-                ) })
-              },
-              uuid
-            );
-          }
-        ) }) }) })
+          ) })
+        ] }) })
       ]
     }
   );
@@ -2047,24 +2461,35 @@ import {
 } from "@behindthemusictree/genre-tree-view";
 
 // src/genre-tree/track-list-sidebar/TrackListSidebar.tsx
-import { useEffect as useEffect5, useRef as useRef5 } from "react";
+import { useEffect as useEffect6, useLayoutEffect as useLayoutEffect2, useRef as useRef5 } from "react";
+import { ListMusic } from "lucide-react";
 import { useTrackList as useTrackList5 } from "@behindthemusictree/app-kit/genre-tree";
-import { useTrackListSidebarVisibility } from "@behindthemusictree/app-kit/genre-tree";
 import { TrackListOriginType as TrackListOriginType2 } from "@behindthemusictree/app-kit/genre-tree";
 import { useTrackNoun as useTrackNoun6 } from "@behindthemusictree/app-kit/track-noun";
-import { jsx as jsx24, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx28, jsxs as jsxs21 } from "react/jsx-runtime";
+var useBrowserLayoutEffect = typeof window === "undefined" ? useEffect6 : useLayoutEffect2;
 function TrackListSidebar({
-  className = "",
+  className: className2 = "",
   renderDuration,
   renderActions,
   layout = "fixed",
+  isCollapsed = false,
+  onExpand,
+  onMinimize,
   renderArtistLink
 }) {
-  const { trackList, loadMore } = useTrackList5();
+  const { trackList, loadMore, autoAdvanceScrollRequest } = useTrackList5();
   const trackNoun = useTrackNoun6();
+  const trackListRef = useRef5(null);
+  const previousOriginRef = useRef5(trackList?.origin ?? null);
+  const handledAutoAdvanceRequestIdRef = useRef5(null);
+  const shouldFollowPlaybackRef = useRef5(true);
+  const programmaticScrollTopRef = useRef5(null);
+  const userScrollIntentRef = useRef5(false);
+  const userScrollIntentTimerRef = useRef5(null);
   const loadMoreSentinelRef = useRef5(null);
   const hasMore = !!trackList && trackList.nextPage !== null;
-  useEffect5(() => {
+  useEffect6(() => {
     const sentinel = loadMoreSentinelRef.current;
     if (!hasMore || !sentinel) return;
     const observer = new IntersectionObserver((entries) => {
@@ -2075,44 +2500,115 @@ function TrackListSidebar({
     observer.observe(sentinel);
     return () => observer.disconnect();
   }, [hasMore, loadMore]);
-  const { hideTrackListSidebar } = useTrackListSidebarVisibility();
-  const positionClasses = layout === "inline" ? "relative w-full flex h-full flex-col" : "fixed right-0 w-[50rem]";
-  return trackList ? /* @__PURE__ */ jsxs18(
+  useBrowserLayoutEffect(() => {
+    const origin = trackList?.origin ?? null;
+    if (previousOriginRef.current === origin) return;
+    previousOriginRef.current = origin;
+    handledAutoAdvanceRequestIdRef.current = null;
+    shouldFollowPlaybackRef.current = true;
+    programmaticScrollTopRef.current = null;
+    if (trackListRef.current) trackListRef.current.scrollTop = 0;
+  }, [trackList?.origin]);
+  useEffect6(() => {
+    const list = trackListRef.current;
+    if (!isCollapsed && list?.scrollTop === 0) shouldFollowPlaybackRef.current = true;
+  }, [isCollapsed]);
+  useEffect6(
+    () => () => {
+      if (userScrollIntentTimerRef.current !== null) clearTimeout(userScrollIntentTimerRef.current);
+    },
+    []
+  );
+  useBrowserLayoutEffect(() => {
+    if (!autoAdvanceScrollRequest || handledAutoAdvanceRequestIdRef.current === autoAdvanceScrollRequest.id) {
+      return;
+    }
+    if (isCollapsed) return;
+    const list = trackListRef.current;
+    if (!list) return;
+    if (list.scrollTop <= 1) shouldFollowPlaybackRef.current = true;
+    if (!shouldFollowPlaybackRef.current) {
+      handledAutoAdvanceRequestIdRef.current = autoAdvanceScrollRequest.id;
+      return;
+    }
+    const row = Array.from(list.querySelectorAll("[data-track-uuid]")).find(
+      (element) => element.dataset.trackUuid === autoAdvanceScrollRequest.trackUuid
+    );
+    if (!row) return;
+    handledAutoAdvanceRequestIdRef.current = autoAdvanceScrollRequest.id;
+    const rowTop = row.getBoundingClientRect().top - list.getBoundingClientRect().top;
+    const targetScrollTop = list.scrollTop + rowTop;
+    programmaticScrollTopRef.current = targetScrollTop;
+    list.scrollTop = targetScrollTop;
+    programmaticScrollTopRef.current = list.scrollTop;
+  }, [autoAdvanceScrollRequest, isCollapsed, trackList]);
+  const markUserScrollIntent = () => {
+    userScrollIntentRef.current = true;
+    if (userScrollIntentTimerRef.current !== null) clearTimeout(userScrollIntentTimerRef.current);
+    userScrollIntentTimerRef.current = setTimeout(() => {
+      userScrollIntentRef.current = false;
+      userScrollIntentTimerRef.current = null;
+    }, 250);
+  };
+  const handleTrackListScroll = (event) => {
+    const list = event.currentTarget;
+    if (userScrollIntentRef.current) {
+      userScrollIntentRef.current = false;
+      if (userScrollIntentTimerRef.current !== null) clearTimeout(userScrollIntentTimerRef.current);
+      userScrollIntentTimerRef.current = null;
+      programmaticScrollTopRef.current = null;
+      shouldFollowPlaybackRef.current = list.scrollTop <= 1;
+      return;
+    }
+    const programmaticScrollTop = programmaticScrollTopRef.current;
+    if (programmaticScrollTop !== null) {
+      if (Math.abs(list.scrollTop - programmaticScrollTop) <= 1) programmaticScrollTopRef.current = null;
+      return;
+    }
+  };
+  const positionClasses = layout === "inline" ? "relative w-full flex h-full flex-col" : "fixed right-0 w-[50rem] flex flex-col";
+  return trackList ? /* @__PURE__ */ jsxs21(
     "div",
     {
       "data-theme": "dark",
-      className: `track-list-sidebar ${positionClasses} rounded-2xl bg-[var(--color-surface)] pb-1 ${className}`,
-      style: layout === "fixed" ? {
-        bottom: "79px"
-        /* Match player height exactly */
-      } : void 0,
+      className: `track-list-sidebar ${positionClasses} rounded-2xl bg-[var(--color-surface)] pb-1 ${className2}`,
+      style: layout === "fixed" ? { top: "63.5px", maxHeight: "calc(100vh - 63.5px - 79px)" } : void 0,
       children: [
-        /* @__PURE__ */ jsxs18("div", { className: "header flex h-16 px-4 py-2 text-[var(--color-text)]", children: [
-          /* @__PURE__ */ jsxs18("div", { className: "origin flex text-xl ", children: [
-            /* @__PURE__ */ jsx24("div", { className: "from h-auto flex flex-col justify-center items-center mr-2", children: "From" }),
-            /* @__PURE__ */ jsx24("div", { className: "name-container flex flex-col justify-center items-center text-[var(--color-text)] font-bold pr-2 max-w-[27.5rem]", children: /* @__PURE__ */ jsx24("div", { className: "name max-w-full truncate", children: trackList.origin.label }) })
+        /* @__PURE__ */ jsxs21("div", { className: "header flex h-16 items-center px-4 py-2 text-[var(--color-text)]", children: [
+          /* @__PURE__ */ jsxs21("div", { className: "min-w-0 flex flex-1 flex-col justify-center", children: [
+            /* @__PURE__ */ jsxs21("div", { className: "origin flex text-xl", children: [
+              /* @__PURE__ */ jsx28("div", { className: "from h-auto flex flex-col justify-center items-center mr-2", children: "From" }),
+              /* @__PURE__ */ jsx28("div", { className: "name-container flex flex-col justify-center items-center text-[var(--color-text)] font-bold pr-2 max-w-[27.5rem]", children: /* @__PURE__ */ jsx28("div", { className: "name max-w-full truncate", children: trackList.origin.label }) })
+            ] }),
+            /* @__PURE__ */ jsxs21("div", { className: "info flex items-center text-sm text-[var(--color-text-muted)]", children: [
+              trackList.origin.type === TrackListOriginType2.GENRE_PLAYLIST ? "Genre \u2022 " : trackList.origin.type === TrackListOriginType2.ARTIST ? "Artist \u2022 " : `${trackNoun.singular} playlist \u2022 `,
+              `${trackList.total} ${trackList.total > 1 ? trackNoun.plural : trackNoun.singular}`
+            ] })
           ] }),
-          /* @__PURE__ */ jsxs18("div", { className: "info flex flex-col justify-center items-center pt-1 mr-2 text-[var(--color-text-muted)]", children: [
-            trackList.origin.type === TrackListOriginType2.GENRE_PLAYLIST ? "\u2022 Genre playlist \u2022 " : trackList.origin.type === TrackListOriginType2.ARTIST ? "\u2022 Artist \u2022 " : `\u2022 ${trackNoun.singular} playlist \u2022 `,
-            `${trackList.total} ${trackList.total > 1 ? trackNoun.plural : trackNoun.singular} \u2022`
-          ] }),
-          /* @__PURE__ */ jsx24(
+          (isCollapsed && onExpand || !isCollapsed && onMinimize) && /* @__PURE__ */ jsx28(
             "button",
             {
               type: "button",
-              "aria-label": "Close track list",
-              className: "flex-grow flex flex-col items-end justify-center h-full p-3 cursor-pointer text-inherit",
-              onClick: hideTrackListSidebar,
-              children: "\u2715"
+              "aria-label": isCollapsed ? "Show tracks" : "Hide tracks",
+              title: isCollapsed ? "Show tracks" : "Hide tracks",
+              "aria-expanded": !isCollapsed,
+              className: `ml-2 flex h-8 w-8 shrink-0 items-center justify-center rounded-md hover:bg-[var(--color-surface-muted)] ${isCollapsed ? "text-[var(--color-text-muted)]" : "text-white"}`,
+              onClick: isCollapsed ? onExpand : onMinimize,
+              children: /* @__PURE__ */ jsx28(ListMusic, { "aria-hidden": "true", className: "h-5 w-5" })
             }
           )
         ] }),
-        /* @__PURE__ */ jsxs18(
+        !isCollapsed && /* @__PURE__ */ jsxs21(
           "ul",
           {
-            className: layout === "inline" ? "track-list flex-1 min-h-0 overflow-auto list-none p-0 m-0" : "track-list overflow-auto max-h-[calc(100vh-63.5px-79px-56px-3.5px)] list-none p-0 m-0",
+            ref: trackListRef,
+            onScroll: handleTrackListScroll,
+            onWheel: markUserScrollIntent,
+            onTouchMove: markUserScrollIntent,
+            onPointerDown: markUserScrollIntent,
+            className: layout === "inline" ? "track-list flex-1 min-h-0 overflow-auto list-none p-0 m-0" : "track-list flex-1 min-h-0 overflow-auto list-none p-0 m-0",
             children: [
-              trackList.tracks.map((track, index) => /* @__PURE__ */ jsx24("li", { children: /* @__PURE__ */ jsx24(
+              trackList.tracks.map((track, index) => /* @__PURE__ */ jsx28("li", { "data-track-uuid": track.uuid, children: /* @__PURE__ */ jsx28(
                 TrackItem,
                 {
                   track,
@@ -2122,7 +2618,7 @@ function TrackListSidebar({
                   renderArtistLink
                 }
               ) }, track.uuid)),
-              hasMore && /* @__PURE__ */ jsx24("li", { ref: loadMoreSentinelRef, "aria-hidden": "true", className: "h-px" })
+              hasMore && /* @__PURE__ */ jsx28("li", { ref: loadMoreSentinelRef, "aria-hidden": "true", className: "h-px" })
             ]
           }
         )
@@ -2132,47 +2628,167 @@ function TrackListSidebar({
 }
 
 // src/genre-tree/PlayerPanel.tsx
-import { useState as useState5 } from "react";
-import { X as X2 } from "lucide-react";
+import { useEffect as useEffect7, useState as useState6 } from "react";
 import { twMerge as twMerge2 } from "tailwind-merge";
 import {
-  usePlayer as usePlayer9,
+  usePlayer as usePlayer10,
   PlayerVideoSurface
 } from "@behindthemusictree/app-kit/player";
 import {
-  useTrackListSidebarVisibility as useTrackListSidebarVisibility2
+  useTrackListSidebarVisibility
 } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx25, jsxs as jsxs19 } from "react/jsx-runtime";
+
+// src/genre-tree/PlayerControls.tsx
+import { Pause as Pause2, Play as Play3, SkipBack, SkipForward, Volume2, VolumeX } from "lucide-react";
+import { formatTime, useTrackList as useTrackList6 } from "@behindthemusictree/app-kit/genre-tree";
+import { PlayStates as PlayStates3, useCurrentTime, usePlayer as usePlayer9 } from "@behindthemusictree/app-kit/player";
+import { jsx as jsx29, jsxs as jsxs22 } from "react/jsx-runtime";
+function PlayerControls() {
+  const {
+    duration,
+    handlePlayPauseAction,
+    isLoading,
+    playState,
+    playerTrackObject,
+    seekTo,
+    setVolume,
+    volume
+  } = usePlayer9();
+  const { hasNextTrack, hasPreviousTrack, playNextTrack, playPreviousTrack } = useTrackList6();
+  const currentTime = useCurrentTime();
+  const isBusy = isLoading || playState === PlayStates3.LOADING;
+  const isReady = !!playerTrackObject?.isReady && !isBusy && !playerTrackObject.loadError;
+  const safeDuration = Number.isFinite(duration) && duration > 0 ? duration : 0;
+  const safeCurrentTime = Number.isFinite(currentTime) ? Math.max(0, Math.min(currentTime, safeDuration)) : 0;
+  const isPlaying = playState === PlayStates3.PLAYING;
+  return /* @__PURE__ */ jsxs22(
+    "section",
+    {
+      "aria-label": "Player controls",
+      className: "player-controls flex shrink-0 flex-col gap-2 border-b border-zinc-800 px-3 py-2 text-zinc-200",
+      children: [
+        /* @__PURE__ */ jsxs22("div", { className: "flex min-w-0 items-center gap-2 text-xs tabular-nums text-zinc-400", children: [
+          /* @__PURE__ */ jsx29("span", { "aria-label": "Elapsed time", children: formatTime(safeCurrentTime) }),
+          /* @__PURE__ */ jsx29(
+            "input",
+            {
+              "aria-label": "Seek",
+              className: "h-1 min-w-0 flex-1 cursor-pointer accent-white disabled:cursor-not-allowed disabled:opacity-40",
+              type: "range",
+              min: 0,
+              max: safeDuration,
+              step: 0.1,
+              value: safeCurrentTime,
+              disabled: !isReady || safeDuration <= 0,
+              onChange: (event) => seekTo(Number(event.currentTarget.value))
+            }
+          ),
+          /* @__PURE__ */ jsx29("span", { "aria-label": "Duration", children: formatTime(safeDuration) })
+        ] }),
+        /* @__PURE__ */ jsxs22("div", { className: "grid min-h-9 grid-cols-[1fr_auto_1fr] items-center gap-3", children: [
+          /* @__PURE__ */ jsxs22("div", { className: "col-start-2 flex items-center justify-center gap-2", children: [
+            /* @__PURE__ */ jsx29(
+              "button",
+              {
+                type: "button",
+                "aria-label": "Previous track",
+                title: "Previous track",
+                disabled: !isReady || !hasPreviousTrack,
+                onClick: playPreviousTrack,
+                className: "flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-zinc-300 hover:bg-zinc-800 hover:text-white disabled:cursor-not-allowed disabled:opacity-40",
+                children: /* @__PURE__ */ jsx29(SkipBack, { "aria-hidden": "true", className: "h-4 w-4" })
+              }
+            ),
+            /* @__PURE__ */ jsx29(
+              "button",
+              {
+                type: "button",
+                "aria-label": isPlaying ? "Pause" : "Play",
+                title: isPlaying ? "Pause" : "Play",
+                disabled: !isReady,
+                onClick: handlePlayPauseAction,
+                className: "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-white text-zinc-950 hover:bg-zinc-200 disabled:cursor-not-allowed disabled:opacity-40",
+                children: isPlaying ? /* @__PURE__ */ jsx29(Pause2, { "aria-hidden": "true", className: "h-4 w-4", fill: "currentColor" }) : /* @__PURE__ */ jsx29(Play3, { "aria-hidden": "true", className: "h-4 w-4", fill: "currentColor" })
+              }
+            ),
+            /* @__PURE__ */ jsx29(
+              "button",
+              {
+                type: "button",
+                "aria-label": "Next track",
+                title: "Next track",
+                disabled: !isReady || !hasNextTrack,
+                onClick: playNextTrack,
+                className: "flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-zinc-300 hover:bg-zinc-800 hover:text-white disabled:cursor-not-allowed disabled:opacity-40",
+                children: /* @__PURE__ */ jsx29(SkipForward, { "aria-hidden": "true", className: "h-4 w-4" })
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxs22("label", { className: "col-start-3 flex w-[4.2rem] shrink-0 items-center gap-[0.35rem] justify-self-end text-zinc-400 sm:w-[4.9rem]", children: [
+            volume === 0 ? /* @__PURE__ */ jsx29(VolumeX, { "aria-hidden": "true", className: "h-[0.7rem] w-[0.7rem] shrink-0" }) : /* @__PURE__ */ jsx29(Volume2, { "aria-hidden": "true", className: "h-[0.7rem] w-[0.7rem] shrink-0" }),
+            /* @__PURE__ */ jsx29("span", { className: "sr-only", children: "Volume" }),
+            /* @__PURE__ */ jsx29(
+              "input",
+              {
+                "aria-label": "Volume",
+                className: "h-[3px] min-w-0 flex-1 cursor-pointer accent-white disabled:cursor-not-allowed disabled:opacity-40",
+                type: "range",
+                min: 0,
+                max: 100,
+                step: 1,
+                value: volume,
+                disabled: !isReady,
+                onChange: (event) => setVolume(Number(event.currentTarget.value))
+              }
+            )
+          ] })
+        ] })
+      ]
+    }
+  );
+}
+
+// src/genre-tree/PlayerPanel.tsx
+import { jsx as jsx30, jsxs as jsxs23 } from "react/jsx-runtime";
 var PANEL_ID = "player-panel";
-var iconButtonClassName = "flex h-6 w-6 shrink-0 items-center justify-center p-0 rounded-md hover:bg-white/10";
 var DEFAULT_EXTENDED_WIDTH = "calc(100vw - var(--layout-center-left) - var(--layout-gutter))";
 function PlayerPanel({
-  className,
+  className: className2,
   isVisible = true,
-  onClose,
   expanded,
   onExpandedChange,
   extendedWidth = DEFAULT_EXTENDED_WIDTH,
   renderArtistLink
 }) {
-  const { playerTrackObject } = usePlayer9();
-  const { toggleTrackListSidebar, isTrackListSidebarVisible } = useTrackListSidebarVisibility2();
-  const [uncontrolledExtended, setUncontrolledExtended] = useState5(false);
+  const { playerTrackObject } = usePlayer10();
+  const { toggleTrackListSidebar, isTrackListSidebarVisible } = useTrackListSidebarVisibility();
+  const [lastLoadedTrackTitle, setLastLoadedTrackTitle] = useState6("");
+  const loadedTrackTitle = playerTrackObject?.track.title;
+  useEffect7(() => {
+    if (loadedTrackTitle) setLastLoadedTrackTitle(loadedTrackTitle);
+  }, [loadedTrackTitle]);
+  const [uncontrolledExtended, setUncontrolledExtended] = useState6(false);
   const isExtendRequested = expanded ?? uncontrolledExtended;
   const setIsExtendRequested = (next) => {
     setUncontrolledExtended(next);
     onExpandedChange?.(next);
   };
   const isExtended = isExtendRequested && isTrackListSidebarVisible;
-  const tabEdge = !isTrackListSidebarVisible ? null : isExtended ? {
-    label: "Shrink song list panel",
-    onClick: () => setIsExtendRequested(false)
-  } : { label: "Hide song list", onClick: toggleTrackListSidebar };
-  const tabCenter = !isTrackListSidebarVisible ? { label: "Show song list", onClick: toggleTrackListSidebar } : isExtended ? null : {
-    label: "Extend song list panel",
-    onClick: () => setIsExtendRequested(true)
+  const hideSongList = () => {
+    setIsExtendRequested(false);
+    if (isTrackListSidebarVisible) toggleTrackListSidebar();
   };
-  return /* @__PURE__ */ jsxs19(
+  const tabEdge = isTrackListSidebarVisible && isExtended ? {
+    label: "Shrink player panel",
+    onClick: () => setIsExtendRequested(false),
+    expanded: true
+  } : null;
+  const tabCenter = isTrackListSidebarVisible && !isExtended ? {
+    label: "Extend player panel",
+    onClick: () => setIsExtendRequested(true),
+    expanded: false
+  } : null;
+  return /* @__PURE__ */ jsxs23(
     "div",
     {
       id: PANEL_ID,
@@ -2181,11 +2797,11 @@ function PlayerPanel({
         !isExtended && "w-[var(--layout-right-w)]",
         isTrackListSidebarVisible && "h-[calc(100vh-var(--layout-band-top)-3.5rem)]",
         !isVisible && "hidden",
-        className
+        className2
       ),
       style: isExtended ? { width: extendedWidth } : void 0,
       children: [
-        /* @__PURE__ */ jsx25(
+        /* @__PURE__ */ jsx30(
           PanelEdgeTab,
           {
             side: "right",
@@ -2195,7 +2811,7 @@ function PlayerPanel({
             className: "absolute right-full top-1/2 -translate-y-1/2"
           }
         ),
-        /* @__PURE__ */ jsxs19(
+        /* @__PURE__ */ jsxs23(
           "div",
           {
             className: twMerge2(
@@ -2203,29 +2819,21 @@ function PlayerPanel({
               isExtended ? "flex-row" : "flex-col"
             ),
             children: [
-              /* @__PURE__ */ jsxs19("div", { className: "flex w-[var(--layout-right-w)] shrink-0 flex-col", children: [
-                /* @__PURE__ */ jsxs19("div", { className: "flex shrink-0 items-center justify-between gap-2 border-b border-zinc-800 p-2", children: [
-                  /* @__PURE__ */ jsx25("span", { className: "min-w-0 truncate text-sm font-semibold", children: playerTrackObject?.track?.title }),
-                  /* @__PURE__ */ jsx25("div", { className: "flex shrink-0 items-center gap-1", children: /* @__PURE__ */ jsx25(
-                    "button",
-                    {
-                      type: "button",
-                      onClick: onClose,
-                      className: iconButtonClassName,
-                      "aria-label": "Close player",
-                      children: /* @__PURE__ */ jsx25(X2, { size: 16 })
-                    }
-                  ) })
+              /* @__PURE__ */ jsxs23("div", { className: "flex w-[var(--layout-right-w)] shrink-0 flex-col", children: [
+                /* @__PURE__ */ jsx30("div", { className: "flex shrink-0 items-center justify-between gap-2 border-b border-zinc-800 p-2", children: /* @__PURE__ */ jsx30("span", { className: "min-w-0 truncate text-sm font-semibold", children: loadedTrackTitle || lastLoadedTrackTitle }) }),
+                /* @__PURE__ */ jsxs23("div", { className: "relative w-full shrink-0", children: [
+                  /* @__PURE__ */ jsx30(PlayerVideoSurface, { className: "aspect-video w-full bg-black" }),
+                  playerTrackObject?.loadError && /* @__PURE__ */ jsx30("span", { className: "absolute bottom-2 left-2 right-2 text-xs text-red-400", children: playerTrackObject.loadError })
                 ] }),
-                /* @__PURE__ */ jsxs19("div", { className: "relative w-full shrink-0", children: [
-                  /* @__PURE__ */ jsx25(PlayerVideoSurface, { className: "aspect-video w-full bg-black" }),
-                  playerTrackObject?.loadError && /* @__PURE__ */ jsx25("span", { className: "absolute bottom-2 left-2 right-2 text-xs text-red-400", children: playerTrackObject.loadError })
-                ] })
+                /* @__PURE__ */ jsx30(PlayerControls, {})
               ] }),
-              isTrackListSidebarVisible && /* @__PURE__ */ jsx25(
+              /* @__PURE__ */ jsx30(
                 TrackListSidebar,
                 {
                   layout: "inline",
+                  isCollapsed: !isTrackListSidebarVisible,
+                  onExpand: toggleTrackListSidebar,
+                  onMinimize: hideSongList,
                   className: twMerge2(
                     "min-h-0 min-w-0 flex-1",
                     isExtended && "border-l border-zinc-800"
@@ -2245,11 +2853,11 @@ function PlayerPanel({
 import { v4 as uuidv4 } from "uuid";
 import { AiFillStar, AiOutlineStar } from "react-icons/ai";
 import { FORM_RATING_NULL_VALUE } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx26, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx31, jsxs as jsxs24 } from "react/jsx-runtime";
 function Rating({ rating, handleChange }) {
   const instanceId = uuidv4();
-  return /* @__PURE__ */ jsx26("div", { className: "flex items-center", children: [...Array(6)].map((_, i) => /* @__PURE__ */ jsxs20("div", { className: `relative ${i === 0 ? "mr-4" : "mr-1"}`, children: [
-    /* @__PURE__ */ jsx26(
+  return /* @__PURE__ */ jsx31("div", { className: "flex items-center", children: [...Array(6)].map((_, i) => /* @__PURE__ */ jsxs24("div", { className: `relative ${i === 0 ? "mr-4" : "mr-1"}`, children: [
+    /* @__PURE__ */ jsx31(
       "input",
       {
         id: `star-${instanceId}-${i}`,
@@ -2261,16 +2869,16 @@ function Rating({ rating, handleChange }) {
         onChange: handleChange
       }
     ),
-    /* @__PURE__ */ jsx26("label", { htmlFor: `star-${instanceId}-${i}`, className: "cursor-pointer", children: i === 0 ? /* @__PURE__ */ jsxs20("div", { className: "flex", children: [
-      /* @__PURE__ */ jsx26(
+    /* @__PURE__ */ jsx31("label", { htmlFor: `star-${instanceId}-${i}`, className: "cursor-pointer", children: i === 0 ? /* @__PURE__ */ jsxs24("div", { className: "flex", children: [
+      /* @__PURE__ */ jsx31(
         AiOutlineStar,
         {
           className: `w-7 h-7 absolute top-0 left-0 ${rating === FORM_RATING_NULL_VALUE ? "text-[var(--color-accent-rating)]" : "text-[var(--color-text-muted)]"}`
         }
       ),
-      /* @__PURE__ */ jsx26("span", { className: "flex-grow w-8" }),
+      /* @__PURE__ */ jsx31("span", { className: "flex-grow w-8" }),
       " "
-    ] }) : /* @__PURE__ */ jsx26(
+    ] }) : /* @__PURE__ */ jsx31(
       AiFillStar,
       {
         className: `w-7 h-7 absolute top-0 left-0 ${(rating ?? -1) >= i ? "text-[var(--color-accent-rating)]" : "text-[var(--color-text-muted)]"}`
@@ -2294,4 +2902,4 @@ export {
   GenreTreeViewSkeleton2 as GenreTreeViewSkeleton,
   GenreTreeOutlineSkeleton
 };
-//# sourceMappingURL=chunk-BPCFNBFO.js.map
+//# sourceMappingURL=chunk-5PQWJRDZ.js.map