@behindthemusictree/app-kit-ui 34.1.0 → 36.0.0

package/dist/{chunk-JP7PID7L.js → chunk-RTXLUHJY.js}

@@ -5,14 +5,12 @@ import {
 } from "./chunk-DKQQLLMY.js";
 
 // src/genre-tree/GenreTreeView.tsx
-import { useCallback as useCallback6, useDeferredValue as useDeferredValue2, useEffect as useEffect5, useMemo as useMemo7, useRef as useRef3, useState as useState9 } from "react";
+import { useCallback as useCallback6, useDeferredValue as useDeferredValue2, useEffect as useEffect5, useMemo as useMemo8, useRef as useRef3, useState as useState9 } from "react";
 import { useIsMutating } from "@tanstack/react-query";
 import { Plus as Plus2 } from "lucide-react";
-import { Maximize2, Minimize2 } from "lucide-react";
-import { IconTextButton, IconButton, Button, SegmentedControl as SegmentedControl2, DetailPanel, useObscuredInset } from "@behindthemusictree/ui";
+import { Maximize2 as Maximize22, Minimize2 as Minimize22 } from "lucide-react";
+import { IconTextButton, IconButton as IconButton2, Button, SegmentedControl as SegmentedControl2, DetailPanel as DetailPanel2, useObscuredInset } from "@behindthemusictree/ui";
 import {
-  GenreNodeAncestors,
-  GenreNodeFamily,
   GenreTreeWheelSkeleton,
   GenreTreeViewSkeleton,
   useGenreNodeRelations
@@ -683,6 +681,7 @@ function GenreTreeSearch({
   artistSearch,
   songSearch,
   SearchGroups,
+  onSelectGenre,
   extraGroups = [],
   onQueryChange,
   onFocus,
@@ -708,9 +707,30 @@ function GenreTreeSearch({
       extraGroups: [...extraGroups, ...hostGroups, artistGroup, songGroup].filter((group) => group !== void 0)
     }
   );
-  return SearchGroups ? /* @__PURE__ */ jsx9(SearchGroups, { query: deferredQuery, focused, children: render }) : render([]);
+  return SearchGroups ? /* @__PURE__ */ jsx9(SearchGroups, { query: deferredQuery, focused, onSelectGenre, children: render }) : render([]);
 }
 
+// src/genre-tree/GenreDetailPanel.tsx
+import { useMemo as useMemo6 } from "react";
+import {
+  ACCENT_TEXT_COLOR,
+  GenreNodeAncestors,
+  GenreNodeFamily,
+  getGenreTreeColor as getGenreTreeColor2,
+  TEXT_COLOR,
+  tintSurface
+} from "@behindthemusictree/genre-tree-view";
+import { DetailPanel, IconButton, Skeleton as Skeleton3 } from "@behindthemusictree/ui";
+import { Maximize2, Minimize2 } from "lucide-react";
+import {
+  useFetchGenreDetail,
+  genreMusicCount as genreMusicCount2,
+  GenrePlaylistSummarySchema,
+  GenreCatalogueCountsSchema as GenreCatalogueCountsSchema3,
+  CriteriaMinimumSchema,
+  GenreUuidSchema
+} from "@behindthemusictree/app-kit/genre-tree";
+
 // src/genre-tree/GenreInfoPanelBody.tsx
 import {
   genreMusicCount,
@@ -1076,7 +1096,7 @@ import { z } from "zod";
 import { FaPlay, FaPause } from "react-icons/fa";
 import { PanelSection, RingLoader, Skeleton } from "@behindthemusictree/ui";
 import { useSession } from "@behindthemusictree/app-kit/auth";
-import { usePlaybackContext, useFetchWrapper } from "@behindthemusictree/app-kit/transport";
+import { usePlaybackContext, usePlaybackFetch } from "@behindthemusictree/app-kit/transport";
 import { PaginatedResponseSchema } from "@behindthemusictree/app-kit/transport";
 import { parseWithLog } from "@behindthemusictree/app-kit/transport";
 import { usePlayer as usePlayer4 } from "@behindthemusictree/app-kit/player";
@@ -1136,6 +1156,7 @@ var nextCursor = (next) => {
 function GenrePlaylistTracks({
   genreUuid,
   genrePlaylist,
+  genreName: selectedGenreName,
   selection,
   scope,
   getBackendBaseUrl,
@@ -1151,14 +1172,18 @@ function GenrePlaylistTracks({
   const { playerTrackObject, playState, handlePlayPauseAction } = usePlayer4();
   const { showPopup } = usePopup4();
   const trackNoun = useTrackNoun();
-  const { uuid } = genrePlaylist;
-  const { fetch } = useFetchWrapper(getBackendBaseUrl);
+  const uuid = genrePlaylist?.uuid;
+  const genreName = selectedGenreName ?? genrePlaylist?.name ?? "Genre";
+  const { fetchBound } = usePlaybackFetch(getBackendBaseUrl);
   const playback = usePlaybackContext();
   const { data, isPending, isError, refetch, hasNextPage, isFetchingNextPage, fetchNextPage } = useInfiniteQuery({
-    queryKey: [...scope === "me" ? genrePlaylistQueryKeys.me.tracks(uuid) : artist ? [...libraryQueryKeys.reference.songs.byGenre(getBackendBaseUrl(), genreUuid, selection), "artist", artist.uuid] : libraryQueryKeys.reference.songs.byGenre(getBackendBaseUrl(), genreUuid, selection), ...playback.key ? [playback.key] : []],
+    queryKey: [...scope === "me" ? uuid ? genrePlaylistQueryKeys.me.tracks(uuid) : ["missing-personal-genre-playlist", genreUuid] : artist ? [...libraryQueryKeys.reference.songs.byGenre(getBackendBaseUrl(), genreUuid, selection), "artist", artist.uuid] : libraryQueryKeys.reference.songs.byGenre(getBackendBaseUrl(), genreUuid, selection), ...playback.key ? [playback.key] : []],
     queryFn: async ({ pageParam }) => {
-      if (scope === "me") return fetchGenrePlaylistTracksPage(uuid, scope, Number(pageParam));
-      const response = await fetch(
+      if (scope === "me") {
+        if (!uuid) throw new Error("Personal genre has no playlist");
+        return fetchGenrePlaylistTracksPage(uuid, scope, Number(pageParam));
+      }
+      const response = await fetchBound(
         libraryEndpoints.reference.songs.list(),
         true,
         false,
@@ -1170,7 +1195,9 @@ function GenrePlaylistTracks({
     },
     initialPageParam: scope === "me" ? 1 : "",
     getNextPageParam: (lastPage) => lastPage.nextPage ?? void 0,
-    enabled: playback.ready && (scope !== "me" || sessionRestored && !!session?.accessToken)
+    enabled: playback.ready && (scope !== "me" || uuid !== void 0 && sessionRestored && !!session?.accessToken),
+    retry: (failureCount, error) => failureCount < 1 && error instanceof DOMException && error.name === "AbortError",
+    retryDelay: 0
   });
   const [sentinel, setSentinel] = useState6(null);
   useEffect3(() => {
@@ -1192,7 +1219,7 @@ function GenrePlaylistTracks({
       ordering: "title",
       genreUuid,
       ...selection && { selection }
-    }) : scope === "reference" ? playNewTrackListFromGenreCatalogue({ uuid: genreUuid, name: genrePlaylist.name }, scope, { startSongUuid, ...selection && { selection } }) : playNewTrackListFromGenrePlaylist(genrePlaylist, scope, { startSongUuid });
+    }) : scope === "reference" ? playNewTrackListFromGenreCatalogue({ uuid: genreUuid, name: genreName }, scope, { startSongUuid, ...selection && { selection } }) : genrePlaylist ? playNewTrackListFromGenrePlaylist(genrePlaylist, scope, { startSongUuid }) : Promise.reject(new Error("Personal genre has no playlist"));
     started.catch((error) => {
       console.error("Failed to play genre playlist:", error);
       showPopup(/* @__PURE__ */ jsx17(InternalErrorPopup, { errorCode: ErrorCode3.CLIENT_UNKNOWN }));
@@ -1200,13 +1227,13 @@ function GenrePlaylistTracks({
   };
   return /* @__PURE__ */ jsx17(PanelSection, { title: `${capitalize(trackNoun.plural)}${total !== void 0 ? ` (${total})` : ""}`, children: /* @__PURE__ */ jsxs12("div", { children: [
     renderTracksToolbar?.(),
-    isPending ? /* @__PURE__ */ jsx17(Skeleton, { className: "h-4 w-3/4", "aria-busy": "true" }) : isError && tracks.length === 0 ? /* @__PURE__ */ jsxs12("p", { role: "alert", children: [
+    scope === "me" && !genrePlaylist ? /* @__PURE__ */ jsx17("p", { children: "\u2014" }) : isPending ? /* @__PURE__ */ jsx17(Skeleton, { className: "h-4 w-3/4", "aria-busy": "true" }) : isError && tracks.length === 0 ? /* @__PURE__ */ jsxs12("p", { role: "alert", children: [
       "Couldn't load ",
       trackNoun.plural,
       ".",
       " ",
       /* @__PURE__ */ jsx17("button", { type: "button", className: "underline", onClick: () => void refetch(), children: "Retry" })
-    ] }) : tracks.length === 0 ? /* @__PURE__ */ jsx17("p", { children: "\u2014" }) : /* @__PURE__ */ jsxs12("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.length === 0 ? /* @__PURE__ */ jsx17("p", { children: "\u2014" }) : /* @__PURE__ */ jsxs12("ul", { className: "mt-1 max-h-64 overflow-y-auto text-[0.8125rem] leading-[1.45] [container-type:inline-size]", "aria-label": `${genreName} ${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;
@@ -1273,6 +1300,7 @@ import { Fragment as Fragment8, jsx as jsx18, jsxs as jsxs13 } from "react/jsx-r
 function GenreDetailExtras({
   genreUuid,
   genrePlaylist,
+  genreName,
   selection,
   wikidataId,
   scope,
@@ -1340,6 +1368,7 @@ function GenreDetailExtras({
       {
         genreUuid,
         genrePlaylist,
+        genreName,
         selection,
         scope,
         getBackendBaseUrl,
@@ -1381,6 +1410,7 @@ function GenreInfoPanelBody({
   genreUuid,
   genrePlaylist,
   catalogue,
+  countsContext,
   wikidataId,
   scope,
   getBackendBaseUrl,
@@ -1389,7 +1419,7 @@ function GenreInfoPanelBody({
   extras
 }) {
   const noun = useTrackNoun3();
-  const summary = scope === "reference" ? GenreCatalogueCountsSchema2.parse(genrePlaylist) : void 0;
+  const summary = scope === "reference" ? GenreCatalogueCountsSchema2.parse(genrePlaylist ?? catalogue) : void 0;
   const selection = summary ? defaultGenreMusicSelection2(summary) : void 0;
   const describeCounts = (counts) => {
     const scopes = counts.genreAndSubgenresTracksCount;
@@ -1397,17 +1427,19 @@ function GenreInfoPanelBody({
   };
   return /* @__PURE__ */ jsxs14(Fragment9, { children: [
     toolbar,
-    /* @__PURE__ */ jsx19(GenreNodeActionBand, { ...band, genrePlaylist, playback }),
+    genrePlaylist ? /* @__PURE__ */ jsx19(GenreNodeActionBand, { ...band, genrePlaylist, playback }) : /* @__PURE__ */ jsx19(GenreActionBand, { ...band }),
     summary && catalogue && /* @__PURE__ */ jsxs14("div", { className: "px-3.5 py-3 text-sm text-[var(--color-text)]", children: [
       /* @__PURE__ */ jsxs14("p", { children: [
         "Catalogue ",
         noun.plural,
+        countsContext ? ` (${countsContext})` : "",
         ": ",
         describeCounts(catalogue)
       ] }),
-      /* @__PURE__ */ jsxs14("p", { children: [
+      genrePlaylist && /* @__PURE__ */ jsxs14("p", { children: [
         "Playlist ",
         noun.plural,
+        countsContext ? ` (${countsContext})` : "",
         ": ",
         describeCounts(summary)
       ] })
@@ -1420,6 +1452,7 @@ function GenreInfoPanelBody({
         family,
         genreUuid,
         genrePlaylist,
+        genreName: band.node.name,
         selection,
         wikidataId,
         scope,
@@ -1429,13 +1462,163 @@ function GenreInfoPanelBody({
   ] });
 }
 
+// src/genre-tree/GenreDetailPanel.tsx
+import { Fragment as Fragment10, jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
+var RELATIVE_ITEM_COUNT = 1;
+function toNode(genre, parentId) {
+  return {
+    id: genre.uuid,
+    parentId,
+    name: genre.name,
+    itemCount: RELATIVE_ITEM_COUNT,
+    side: genre.side ?? void 0,
+    wikidataId: genre.wikidataId
+  };
+}
+function useGenreDetailContent({
+  genreUuid,
+  scope,
+  getBackendBaseUrl,
+  onSelectGenre,
+  extras,
+  band,
+  playback: hostPlayback,
+  trailing,
+  genrePlaylist: hostPlaylist,
+  expanded
+}) {
+  const { data: detail, isPending, isError } = useFetchGenreDetail(genreUuid, scope, getBackendBaseUrl);
+  const defaultPlayback = useGenrePlaylistPlayback({ scope, genrePlaylists: [], artist: extras?.artist });
+  const playback = hostPlayback ?? defaultPlayback;
+  const view = useMemo6(() => {
+    if (!detail) return null;
+    const rootColor = getGenreTreeColor2(detail.root.wikidataId);
+    const relative = (genre, parentId) => ({
+      node: toNode(genre, parentId),
+      fill: tintSurface(rootColor),
+      textColor: TEXT_COLOR
+    });
+    const ancestors2 = [...detail.ascendants].sort((a, b) => b.degree - a.degree);
+    return {
+      node: {
+        id: detail.uuid,
+        parentId: detail.parent?.uuid ?? null,
+        name: detail.name,
+        itemCount: scope === "reference" ? genreMusicCount2(detail.criteriaPlaylist ? GenrePlaylistSummarySchema.parse(detail.criteriaPlaylist) : GenreCatalogueCountsSchema3.parse(detail.catalogue)) : detail.tracksCount,
+        wikidataId: detail.wikidataId
+      },
+      fill: rootColor,
+      parentNode: detail.parent ? relative(detail.parent, null) : null,
+      childNodes: detail.children.map((child) => relative(child, detail.uuid)),
+      ancestorNodes: ancestors2.map(
+        ({ ascendant }, index) => relative(ascendant, index === 0 ? null : ancestors2[index - 1].ascendant.uuid)
+      )
+    };
+  }, [detail, scope]);
+  if (isError) return {
+    title: "Genre unavailable",
+    content: /* @__PURE__ */ jsx20("p", { role: "alert", className: "p-4 text-sm text-[var(--color-text)]", children: "This genre could not be loaded." })
+  };
+  if (isPending || !detail || !view) return {
+    title: "Loading genre\u2026",
+    content: /* @__PURE__ */ jsxs15("div", { className: "flex flex-col gap-3 p-4", "aria-busy": "true", "data-testid": "genre-detail-panel-skeleton", children: [
+      /* @__PURE__ */ jsx20(Skeleton3, { className: "h-6 w-2/3" }),
+      /* @__PURE__ */ jsx20(Skeleton3, { className: "h-4 w-full" }),
+      /* @__PURE__ */ jsx20(Skeleton3, { className: "h-4 w-3/4" })
+    ] })
+  };
+  const selectGenre = (nodeId) => onSelectGenre(GenreUuidSchema.parse(nodeId));
+  const family = /* @__PURE__ */ jsx20(
+    GenreNodeFamily,
+    {
+      node: view.node,
+      fill: view.fill,
+      textColor: ACCENT_TEXT_COLOR,
+      parentNode: view.parentNode,
+      childNodes: view.childNodes,
+      onSelectNode: selectGenre
+    }
+  );
+  const ancestors = /* @__PURE__ */ jsx20(GenreNodeAncestors, { ancestorNodes: view.ancestorNodes, onSelectNode: selectGenre });
+  return {
+    title: detail.name,
+    headerAccent: { background: view.fill, color: ACCENT_TEXT_COLOR },
+    aside: expanded ? ancestors : void 0,
+    content: /* @__PURE__ */ jsxs15(Fragment10, { children: [
+      /* @__PURE__ */ jsx20(
+        GenreInfoPanelBody,
+        {
+          family: /* @__PURE__ */ jsxs15(Fragment10, { children: [
+            family,
+            !expanded && ancestors
+          ] }),
+          genreUuid: detail.uuid,
+          genrePlaylist: hostPlaylist ?? (detail.criteriaPlaylist === null ? null : scope === "reference" ? { ...GenrePlaylistSummarySchema.parse(detail.criteriaPlaylist), criteria: CriteriaMinimumSchema.parse(detail) } : { ...detail.criteriaPlaylist, criteria: CriteriaMinimumSchema.parse(detail), tracksCount: detail.tracksCount }),
+          catalogue: detail.catalogue,
+          countsContext: !hostPlaylist && extras?.artist ? "all artists" : void 0,
+          wikidataId: detail.wikidataId,
+          scope,
+          getBackendBaseUrl,
+          playback,
+          band: { node: view.node, ...band, shareTarget: band?.shareTarget?.kind === "genre" ? { ...band.shareTarget, name: detail.name } : band?.shareTarget },
+          extras
+        }
+      ),
+      trailing
+    ] })
+  };
+}
+function GenreDetailPanel({
+  genreUuid,
+  scope,
+  getBackendBaseUrl,
+  onClose,
+  onSelectGenre,
+  onZoomIn,
+  shareUrl,
+  shareTarget,
+  collapsed,
+  expanded,
+  onExpandedChange,
+  edgeTab,
+  extras,
+  headerClassName
+}) {
+  const panel = useGenreDetailContent({
+    genreUuid,
+    scope,
+    getBackendBaseUrl,
+    onSelectGenre,
+    extras,
+    expanded,
+    band: { onZoomIn, shareUrl, shareTarget: shareUrl ? shareTarget : void 0 }
+  });
+  return /* @__PURE__ */ jsx20(
+    DetailPanel,
+    {
+      side: "left",
+      title: panel.title,
+      headerAccent: panel.headerAccent,
+      onClose,
+      collapsed,
+      expanded,
+      onExpandedChange,
+      edgeTab,
+      aside: panel.aside,
+      headerClassName,
+      headerActions: onExpandedChange ? /* @__PURE__ */ jsx20(IconButton, { "aria-label": expanded ? "Shrink panel" : "Extend panel", onClick: () => onExpandedChange(!expanded), children: expanded ? /* @__PURE__ */ jsx20(Minimize2, { "aria-hidden": "true", className: "h-4 w-4" }) : /* @__PURE__ */ jsx20(Maximize2, { "aria-hidden": "true", className: "h-4 w-4" }) }) : void 0,
+      children: panel.content
+    }
+  );
+}
+
 // src/genre-tree/ChangeParentPopup.tsx
-import { useEffect as useEffect4, useMemo as useMemo6 } from "react";
+import { useEffect as useEffect4, useMemo as useMemo7 } from "react";
 import {
   getReparentCandidates,
   useUpdateGenre
 } from "@behindthemusictree/app-kit/genre-tree";
-import { jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs16 } from "react/jsx-runtime";
 function ChangeParentPopup({
   genrePlaylist,
   genrePlaylists,
@@ -1445,7 +1628,7 @@ function ChangeParentPopup({
   onParentChanged
 }) {
   const { mutate, isPending, formErrors } = useUpdateGenre(scope, getBackendBaseUrl);
-  const candidates = useMemo6(
+  const candidates = useMemo7(
     () => getReparentCandidates(genrePlaylists, genrePlaylist.uuid),
     [genrePlaylists, genrePlaylist.uuid]
   );
@@ -1470,12 +1653,12 @@ function ChangeParentPopup({
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [onClose]);
-  return /* @__PURE__ */ jsxs15(BasePopup_default, { title: `Change parent of ${genrePlaylist.name}`, onClose, showCancelButton: true, fitContent: true, children: [
-    /* @__PURE__ */ jsxs15("p", { className: "mb-3 text-sm text-[var(--color-text-muted)]", children: [
+  return /* @__PURE__ */ jsxs16(BasePopup_default, { title: `Change parent of ${genrePlaylist.name}`, onClose, showCancelButton: true, fitContent: true, children: [
+    /* @__PURE__ */ jsxs16("p", { className: "mb-3 text-sm text-[var(--color-text-muted)]", children: [
       "Current parent: ",
       genrePlaylist.parent?.name ?? "none"
     ] }),
-    /* @__PURE__ */ jsx20("div", { "aria-busy": isPending, className: isPending ? "pointer-events-none opacity-60" : void 0, children: /* @__PURE__ */ jsx20(
+    /* @__PURE__ */ jsx21("div", { "aria-busy": isPending, className: isPending ? "pointer-events-none opacity-60" : void 0, children: /* @__PURE__ */ jsx21(
       GenreSearch,
       {
         genrePlaylists: candidates,
@@ -1483,12 +1666,12 @@ function ChangeParentPopup({
         placeholder: "Search a new parent\u2026"
       }
     ) }),
-    formErrors.length > 0 && /* @__PURE__ */ jsx20("p", { role: "alert", className: "mt-3 text-sm text-[var(--color-red-500)]", children: formErrors.map(({ message }) => message).join(" ") })
+    formErrors.length > 0 && /* @__PURE__ */ jsx21("p", { role: "alert", className: "mt-3 text-sm text-[var(--color-red-500)]", children: formErrors.map(({ message }) => message).join(" ") })
   ] });
 }
 
 // src/genre-tree/artist/useArtistPanel.tsx
-import { Skeleton as Skeleton4 } from "@behindthemusictree/ui";
+import { Skeleton as Skeleton5 } from "@behindthemusictree/ui";
 import { useArtist } from "@behindthemusictree/app-kit/genre-tree";
 
 // src/genre-tree/artist/ArtistHeader.tsx
@@ -1507,7 +1690,7 @@ import {
   SiYoutube
 } from "react-icons/si";
 import { Chip } from "@behindthemusictree/ui";
-import { jsx as jsx21 } from "react/jsx-runtime";
+import { jsx as jsx22 } from "react/jsx-runtime";
 var LINK_KINDS = {
   official: { label: "Official website", Icon: Globe },
   wikipedia: { label: "Wikipedia", Icon: SiWikipedia2 },
@@ -1544,7 +1727,7 @@ function artistLinks(artist) {
   return links;
 }
 function ArtistLinks({ links }) {
-  return /* @__PURE__ */ jsx21("ul", { className: "flex flex-wrap gap-1.5", children: links.map(({ key, url, Icon, label }) => /* @__PURE__ */ jsx21("li", { children: /* @__PURE__ */ jsx21(Chip, { href: url, icon: /* @__PURE__ */ jsx21(Icon, { className: "h-3.5 w-3.5 shrink-0", "aria-hidden": "true" }), children: label }) }, key)) });
+  return /* @__PURE__ */ jsx22("ul", { className: "flex flex-wrap gap-1.5", children: links.map(({ key, url, Icon, label }) => /* @__PURE__ */ jsx22("li", { children: /* @__PURE__ */ jsx22(Chip, { href: url, icon: /* @__PURE__ */ jsx22(Icon, { className: "h-3.5 w-3.5 shrink-0", "aria-hidden": "true" }), children: label }) }, key)) });
 }
 
 // src/genre-tree/artist/formatYears.ts
@@ -1555,7 +1738,7 @@ function formatYears(beginYear, endYear, ended) {
 }
 
 // src/genre-tree/artist/ArtistHeader.tsx
-import { jsx as jsx22 } from "react/jsx-runtime";
+import { jsx as jsx23 } from "react/jsx-runtime";
 var countryNames = new Intl.DisplayNames(["en"], { type: "region" });
 function ArtistHeader({ artist }) {
   const fields = [];
@@ -1565,35 +1748,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__ */ jsx22(ArtistLinks, { links }) });
+  if (links.length > 0) fields.push({ label: "Links", value: /* @__PURE__ */ jsx23(ArtistLinks, { links }) });
   if (fields.length === 0) return null;
-  return /* @__PURE__ */ jsx22(FieldList, { items: fields });
+  return /* @__PURE__ */ jsx23(FieldList, { items: fields });
 }
 
 // src/genre-tree/artist/ArtistPhoto.tsx
-import { jsx as jsx23, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx24, jsxs as jsxs17 } from "react/jsx-runtime";
 function ExternalLink({ href, children }) {
-  return /* @__PURE__ */ jsx23("a", { href, target: "_blank", rel: "noopener noreferrer", className: "underline-offset-2 hover:underline", children });
+  return /* @__PURE__ */ jsx24("a", { href, target: "_blank", rel: "noopener noreferrer", className: "underline-offset-2 hover:underline", children });
 }
 function ArtistPhoto({ image, name }) {
-  return /* @__PURE__ */ jsxs16("figure", { className: "flex flex-col gap-1.5 px-6 py-2.5", children: [
-    /* @__PURE__ */ jsx23("img", { src: image.url, alt: name, className: "h-64 w-full object-contain bg-[var(--color-surface-muted)] rounded" }),
-    /* @__PURE__ */ jsxs16("figcaption", { className: "text-xs text-[var(--color-text-muted)]", children: [
+  return /* @__PURE__ */ jsxs17("figure", { className: "flex flex-col gap-1.5 px-6 py-2.5", children: [
+    /* @__PURE__ */ jsx24("img", { src: image.url, alt: name, className: "h-64 w-full object-contain bg-[var(--color-surface-muted)] rounded" }),
+    /* @__PURE__ */ jsxs17("figcaption", { className: "text-xs text-[var(--color-text-muted)]", children: [
       "Photo: ",
-      /* @__PURE__ */ jsx23(ExternalLink, { href: image.pageUrl, children: image.author ?? "Wikimedia Commons" }),
+      /* @__PURE__ */ jsx24(ExternalLink, { href: image.pageUrl, children: image.author ?? "Wikimedia Commons" }),
       ",",
       " ",
-      image.licenseUrl ? /* @__PURE__ */ jsx23(ExternalLink, { href: image.licenseUrl, children: image.license }) : image.license
+      image.licenseUrl ? /* @__PURE__ */ jsx24(ExternalLink, { href: image.licenseUrl, children: image.license }) : image.license
     ] })
   ] });
 }
 
 // src/genre-tree/artist/ArtistMembers.tsx
 import { PanelGroup, PanelSection as PanelSection3 } from "@behindthemusictree/ui";
-import { jsx as jsx24, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx25, jsxs as jsxs18 } from "react/jsx-runtime";
 function MembershipList({ title, memberships, renderArtistLink }) {
   if (memberships.length === 0) return null;
-  return /* @__PURE__ */ jsx24(PanelGroup, { title, children: /* @__PURE__ */ jsx24("ul", { children: memberships.map((membership, index) => {
+  return /* @__PURE__ */ jsx25(PanelGroup, { title, children: /* @__PURE__ */ jsx25("ul", { children: memberships.map((membership, index) => {
     const details = [
       formatYears(membership.beginYear, membership.endYear, membership.ended),
       ...membership.roles
@@ -1601,9 +1784,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__ */ jsxs17("li", { className: "truncate py-0.5", title: detailsText || void 0, children: [
-        /* @__PURE__ */ jsx24("span", { className: "font-medium text-[var(--color-text)]", children: renderArtistLink(membership.artist) }),
-        detailsText && /* @__PURE__ */ jsxs17("span", { className: "text-[var(--color-text-muted)]", children: [
+      /* @__PURE__ */ jsxs18("li", { className: "truncate py-0.5", title: detailsText || void 0, children: [
+        /* @__PURE__ */ jsx25("span", { className: "font-medium text-[var(--color-text)]", children: renderArtistLink(membership.artist) }),
+        detailsText && /* @__PURE__ */ jsxs18("span", { className: "text-[var(--color-text-muted)]", children: [
           " \u2014 ",
           detailsText
         ] })
@@ -1614,9 +1797,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__ */ jsxs17(PanelSection3, { title, children: [
-    /* @__PURE__ */ jsx24(MembershipList, { title: "Current", memberships: memberships.filter(isCurrent), renderArtistLink }),
-    /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsxs18(PanelSection3, { title, children: [
+    /* @__PURE__ */ jsx25(MembershipList, { title: "Current", memberships: memberships.filter(isCurrent), renderArtistLink }),
+    /* @__PURE__ */ jsx25(
       MembershipList,
       {
         title: "Past",
@@ -1629,7 +1812,7 @@ function ArtistMembers({ title, memberships, renderArtistLink }) {
 
 // src/genre-tree/artist/ArtistDiscography.tsx
 import { PanelGroup as PanelGroup2, PanelSection as PanelSection4 } from "@behindthemusictree/ui";
-import { jsx as jsx25, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx26, jsxs as jsxs19 } 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 }) {
@@ -1649,12 +1832,12 @@ function byYear(a, b) {
 function ArtistDiscography({ albums }) {
   if (albums.length === 0) return null;
   const sorted = [...albums].sort(byYear);
-  return /* @__PURE__ */ jsx25(PanelSection4, { title: "Discography", children: GROUPS.map((group) => {
+  return /* @__PURE__ */ jsx26(PanelSection4, { title: "Discography", children: GROUPS.map((group) => {
     const groupAlbums = sorted.filter((album) => discographyGroup(album) === group);
     if (groupAlbums.length === 0) return null;
-    return /* @__PURE__ */ jsx25(PanelGroup2, { title: group, children: /* @__PURE__ */ jsx25("ul", { children: groupAlbums.map((album) => /* @__PURE__ */ jsxs18("li", { className: "grid grid-cols-[2.5rem_minmax(0,1fr)] gap-2 py-0.5", children: [
-      /* @__PURE__ */ jsx25("span", { className: "tabular-nums text-[var(--color-text-muted)]", children: album.year ?? "\u2014" }),
-      /* @__PURE__ */ jsx25("span", { className: "truncate text-[var(--color-text)]", title: album.name, children: album.name })
+    return /* @__PURE__ */ jsx26(PanelGroup2, { title: group, children: /* @__PURE__ */ jsx26("ul", { children: groupAlbums.map((album) => /* @__PURE__ */ jsxs19("li", { className: "grid grid-cols-[2.5rem_minmax(0,1fr)] gap-2 py-0.5", children: [
+      /* @__PURE__ */ jsx26("span", { className: "tabular-nums text-[var(--color-text-muted)]", children: album.year ?? "\u2014" }),
+      /* @__PURE__ */ jsx26("span", { className: "truncate text-[var(--color-text)]", title: album.name, children: album.name })
     ] }, album.uuid)) }) }, group);
   }) });
 }
@@ -1663,7 +1846,7 @@ function ArtistDiscography({ albums }) {
 import { useState as useState7 } from "react";
 import { keepPreviousData } from "@tanstack/react-query";
 import { Play as Play2 } from "lucide-react";
-import { Pagination, PanelSection as PanelSection5, Skeleton as Skeleton3 } from "@behindthemusictree/ui";
+import { Pagination, PanelSection as PanelSection5, Skeleton as Skeleton4 } from "@behindthemusictree/ui";
 import { usePlayer as usePlayer8 } from "@behindthemusictree/app-kit/player";
 import {
   SongDetailedSchema as SongDetailedSchema2,
@@ -1671,7 +1854,7 @@ import {
   songUnplayableReason as songUnplayableReason3,
   useTrackList as useTrackList4
 } from "@behindthemusictree/app-kit/genre-tree";
-import { PaginatedResponseSchema as PaginatedResponseSchema2, useFetchWrapper as useFetchWrapper2, useQueryWithParse } from "@behindthemusictree/app-kit/transport";
+import { PaginatedResponseSchema as PaginatedResponseSchema2, usePlaybackQuery } from "@behindthemusictree/app-kit/transport";
 
 // src/genre-tree/track-list-sidebar/TrackItem.tsx
 import { usePlayer as usePlayer7 } from "@behindthemusictree/app-kit/player";
@@ -1681,7 +1864,7 @@ import { useTrackList as useTrackList3 } from "@behindthemusictree/app-kit/genre
 import { FaPlay as FaPlay2, FaPause as FaPause2 } from "react-icons/fa";
 import { usePlayer as usePlayer6 } from "@behindthemusictree/app-kit/player";
 import { PlayStates as PlayStates2 } from "@behindthemusictree/app-kit/player";
-import { jsx as jsx26, jsxs as jsxs19 } from "react/jsx-runtime";
+import { jsx as jsx27, jsxs as jsxs20 } from "react/jsx-runtime";
 function TrackPositionPlayPause({
   position,
   uuid,
@@ -1695,14 +1878,14 @@ function TrackPositionPlayPause({
   const isPlaying = isThisTrack && isConfirmedPlayable && playState === PlayStates2.PLAYING;
   const isPaused = isThisTrack && isConfirmedPlayable && playState === PlayStates2.PAUSED;
   const isCurrentTrackActive = isPlaying || isPaused;
-  return /* @__PURE__ */ jsxs19(
+  return /* @__PURE__ */ jsxs20(
     "div",
     {
       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__ */ jsx26("div", { className: "track-position-play-pause__status group-hover:hidden flex items-center justify-center", children: isAwaitingPlayback ? /* @__PURE__ */ jsx26("span", { className: "track-position-play-pause__spinner", role: "status", "aria-label": "Loading track" }) : isCurrentTrackActive ? /* @__PURE__ */ jsxs19(
+        /* @__PURE__ */ jsx27("div", { className: "track-position-play-pause__status group-hover:hidden flex items-center justify-center", children: isAwaitingPlayback ? /* @__PURE__ */ jsx27("span", { className: "track-position-play-pause__spinner", role: "status", "aria-label": "Loading track" }) : isCurrentTrackActive ? /* @__PURE__ */ jsxs20(
           "span",
           {
             className: "track-position-play-pause__bars",
@@ -1710,18 +1893,18 @@ function TrackPositionPlayPause({
             role: "img",
             "aria-label": isPlaying ? "Playing" : "Paused",
             children: [
-              /* @__PURE__ */ jsx26("span", { className: "track-position-play-pause__bar" }),
-              /* @__PURE__ */ jsx26("span", { className: "track-position-play-pause__bar" }),
-              /* @__PURE__ */ jsx26("span", { className: "track-position-play-pause__bar" })
+              /* @__PURE__ */ jsx27("span", { className: "track-position-play-pause__bar" }),
+              /* @__PURE__ */ jsx27("span", { className: "track-position-play-pause__bar" }),
+              /* @__PURE__ */ jsx27("span", { className: "track-position-play-pause__bar" })
             ]
           }
         ) : position }),
-        /* @__PURE__ */ jsx26(
+        /* @__PURE__ */ jsx27(
           "div",
           {
             className: `hidden group-hover:flex items-center justify-center ${isCurrentTrackActive ? "" : "absolute inset-0"}`,
             "aria-hidden": "true",
-            children: isAwaitingPlayback ? /* @__PURE__ */ jsx26("span", { className: "track-position-play-pause__spinner" }) : isPlaying ? /* @__PURE__ */ jsx26(FaPause2, {}) : /* @__PURE__ */ jsx26(FaPlay2, {})
+            children: isAwaitingPlayback ? /* @__PURE__ */ jsx27("span", { className: "track-position-play-pause__spinner" }) : isPlaying ? /* @__PURE__ */ jsx27(FaPause2, {}) : /* @__PURE__ */ jsx27(FaPlay2, {})
           }
         )
       ]
@@ -1732,7 +1915,7 @@ function TrackPositionPlayPause({
 // 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 jsx27, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx28, jsxs as jsxs21 } from "react/jsx-runtime";
 function TrackItem({
   track,
   position,
@@ -1756,12 +1939,12 @@ function TrackItem({
       loadTrackForPlayer(track.uuid);
     }
   };
-  return /* @__PURE__ */ jsxs20(
+  return /* @__PURE__ */ jsxs21(
     "div",
     {
       className: `track-item flex h-14 text-[var(--color-text)] ${isUnplayable ? "opacity-50" : "hover:bg-[var(--color-surface-muted)] group"}`,
       children: [
-        isUnplayable ? /* @__PURE__ */ jsx27(
+        isUnplayable ? /* @__PURE__ */ jsx28(
           "div",
           {
             className: "flex items-center justify-center text-lg w-16",
@@ -1769,7 +1952,7 @@ function TrackItem({
             "aria-disabled": "true",
             children: position
           }
-        ) : /* @__PURE__ */ jsx27(
+        ) : /* @__PURE__ */ jsx28(
           TrackPositionPlayPause,
           {
             position,
@@ -1778,12 +1961,12 @@ function TrackItem({
             isSelected: selectedTrack?.uuid === track.uuid
           }
         ),
-        /* @__PURE__ */ jsxs20("div", { className: "title-artist-container flex flex-col items-start justify-center min-w-0 flex-1", children: [
-          /* @__PURE__ */ jsx27("div", { className: "flex max-w-full items-center gap-2", children: /* @__PURE__ */ jsx27("div", { className: "title text-lg font-bold text-[var(--color-text)] max-w-full truncate", children: renderSongLink ? renderSongLink(track) : isSong2(track) ? /* @__PURE__ */ jsx27(MusicBrainzRecordingLink, { song: track, className: "hover:underline focus-visible:underline", children: track.title }) : track.title }) }),
-          track.artists && track.artists.length > 0 ? /* @__PURE__ */ jsx27("div", { className: "artist text-base max-w-full truncate text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx27(ArtistNames2, { artists: track.artists, renderArtistLink }) }) : ""
+        /* @__PURE__ */ jsxs21("div", { className: "title-artist-container flex flex-col items-start justify-center min-w-0 flex-1", children: [
+          /* @__PURE__ */ jsx28("div", { className: "flex max-w-full items-center gap-2", children: /* @__PURE__ */ jsx28("div", { className: "title text-lg font-bold text-[var(--color-text)] max-w-full truncate", children: renderSongLink ? renderSongLink(track) : isSong2(track) ? /* @__PURE__ */ jsx28(MusicBrainzRecordingLink, { song: track, className: "hover:underline focus-visible:underline", children: track.title }) : track.title }) }),
+          track.artists && track.artists.length > 0 ? /* @__PURE__ */ jsx28("div", { className: "artist text-base max-w-full truncate text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx28(ArtistNames2, { artists: track.artists, renderArtistLink }) }) : ""
         ] }),
-        /* @__PURE__ */ jsx27("div", { className: "genre-name-container flex items-center justify-start w-[21.6%] min-w-0 shrink-0", children: track.genre ? /* @__PURE__ */ jsx27("div", { className: "genre-name max-w-full whitespace-normal break-words p-1 text-xs font-bold", children: track.genre.name }) : "" }),
-        renderDuration && /* @__PURE__ */ jsx27(
+        /* @__PURE__ */ jsx28("div", { className: "genre-name-container flex items-center justify-start w-[21.6%] min-w-0 shrink-0", children: track.genre ? /* @__PURE__ */ jsx28("div", { className: "genre-name max-w-full whitespace-normal break-words p-1 text-xs font-bold", children: track.genre.name }) : "" }),
+        renderDuration && /* @__PURE__ */ jsx28(
           "div",
           {
             className: "duration flex text-base w-16 items-center justify-center",
@@ -1791,14 +1974,14 @@ function TrackItem({
             children: renderDuration(track)
           }
         ),
-        renderActions && /* @__PURE__ */ jsx27("div", { className: "edit flex text-base w-6 items-center justify-center mr-2 cursor-pointer", children: renderActions(track) })
+        renderActions && /* @__PURE__ */ jsx28("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 Fragment10, jsx as jsx28, jsxs as jsxs21 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx29, jsxs as jsxs22 } from "react/jsx-runtime";
 var SongPageSchema2 = PaginatedResponseSchema2(SongDetailedSchema2);
 var SORTS = [
   { ordering: "title", label: "Title" },
@@ -1807,12 +1990,12 @@ var SORTS = [
 function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink, renderSongLink }) {
   const [page, setPage] = useState7(1);
   const [ordering, setOrdering] = useState7("title");
-  const { fetch } = useFetchWrapper2(getBackendBaseUrl);
   const { playNewTrackListFromArtist } = useTrackList4();
   const { playerTrackObject } = usePlayer8();
-  const { data, isPending, isError } = useQueryWithParse({
+  const { data, isPending, isError } = usePlaybackQuery({
+    getBackendBaseUrl,
     queryKey: ["referenceSongs", "artist", artist.uuid, ordering, page],
-    queryFn: () => fetch(libraryEndpoints2.reference.songs.list(), true, false, void 0, {
+    queryFn: (fetchBound) => fetchBound(libraryEndpoints2.reference.songs.list(), true, false, void 0, {
       artist: artist.uuid,
       ordering,
       page
@@ -1831,21 +2014,21 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink, renderSongLi
     event.stopPropagation();
     void play(song.uuid);
   };
-  return /* @__PURE__ */ jsx28(PanelSection5, { title: "Songs", children: isPending ? /* @__PURE__ */ jsx28(Skeleton3, { className: "h-14", "aria-busy": "true" }) : isError ? /* @__PURE__ */ jsx28("p", { className: "text-red-600", children: "Could not load songs." }) : data.results.length === 0 ? /* @__PURE__ */ jsx28("p", { className: "text-[var(--color-text-muted)]", children: "No songs yet." }) : /* @__PURE__ */ jsxs21(Fragment10, { children: [
-    /* @__PURE__ */ jsxs21("div", { className: "flex flex-wrap items-center justify-between gap-2 mb-2", children: [
-      /* @__PURE__ */ jsxs21(
+  return /* @__PURE__ */ jsx29(PanelSection5, { title: "Songs", children: isPending ? /* @__PURE__ */ jsx29(Skeleton4, { className: "h-14", "aria-busy": "true" }) : isError ? /* @__PURE__ */ jsx29("p", { className: "text-red-600", children: "Could not load songs." }) : data.results.length === 0 ? /* @__PURE__ */ jsx29("p", { className: "text-[var(--color-text-muted)]", children: "No songs yet." }) : /* @__PURE__ */ jsxs22(Fragment11, { children: [
+    /* @__PURE__ */ jsxs22("div", { className: "flex flex-wrap items-center justify-between gap-2 mb-2", children: [
+      /* @__PURE__ */ jsxs22(
         "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__ */ jsx28(Play2, { className: "h-3.5 w-3.5", "aria-hidden": "true" }),
+            /* @__PURE__ */ jsx29(Play2, { className: "h-3.5 w-3.5", "aria-hidden": "true" }),
             "Play all"
           ]
         }
       ),
-      /* @__PURE__ */ jsx28("div", { role: "group", "aria-label": "Sort songs by", className: "flex gap-1 text-xs", children: SORTS.map((sort) => /* @__PURE__ */ jsx28(
+      /* @__PURE__ */ jsx29("div", { role: "group", "aria-label": "Sort songs by", className: "flex gap-1 text-xs", children: SORTS.map((sort) => /* @__PURE__ */ jsx29(
         "button",
         {
           type: "button",
@@ -1860,7 +2043,7 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink, renderSongLi
         sort.ordering
       )) })
     ] }),
-    /* @__PURE__ */ jsx28("ul", { className: "overflow-hidden mb-2 bg-zinc-950 rounded-lg", children: data.results.map((song, index) => /* @__PURE__ */ jsx28("li", { onClickCapture: (event) => handleRowClickCapture(event, song), children: /* @__PURE__ */ jsx28(
+    /* @__PURE__ */ jsx29("ul", { className: "overflow-hidden mb-2 bg-zinc-950 rounded-lg", children: data.results.map((song, index) => /* @__PURE__ */ jsx29("li", { onClickCapture: (event) => handleRowClickCapture(event, song), children: /* @__PURE__ */ jsx29(
       TrackItem,
       {
         track: song,
@@ -1869,12 +2052,12 @@ function ArtistSongs({ artist, getBackendBaseUrl, renderArtistLink, renderSongLi
         renderSongLink
       }
     ) }, song.uuid)) }),
-    /* @__PURE__ */ jsx28(Pagination, { currentPage: page, totalPages: data.totalPages, onPageChange: setPage })
+    /* @__PURE__ */ jsx29(Pagination, { currentPage: page, totalPages: data.totalPages, onPageChange: setPage })
   ] }) });
 }
 
 // src/genre-tree/artist/useArtistPanel.tsx
-import { Fragment as Fragment11, jsx as jsx29, jsxs as jsxs22 } from "react/jsx-runtime";
+import { Fragment as Fragment12, jsx as jsx30, jsxs as jsxs23 } from "react/jsx-runtime";
 function useArtistPanel({
   uuid,
   scope,
@@ -1895,26 +2078,26 @@ function useArtistPanel({
       return {
         ...panel,
         title: "Artist",
-        content: /* @__PURE__ */ jsxs22("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-4 w-32" }),
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-4 w-24" }),
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-16 mt-2.5" }),
-          /* @__PURE__ */ jsx29(Skeleton4, { className: "h-16" })
+        content: /* @__PURE__ */ jsxs23("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-4 w-32" }),
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-4 w-24" }),
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-16 mt-2.5" }),
+          /* @__PURE__ */ jsx30(Skeleton5, { className: "h-16" })
         ] })
       };
     case "not-found":
       return {
         ...panel,
         title: "Artist not found",
-        content: /* @__PURE__ */ jsx29("p", { className: "px-6 py-2.5 text-[var(--color-text-muted)]", children: "This artist does not exist." })
+        content: /* @__PURE__ */ jsx30("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__ */ jsx29("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this artist." })
+        content: /* @__PURE__ */ jsx30("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this artist." })
       };
     case "success": {
       const { artist } = result;
@@ -1923,13 +2106,13 @@ function useArtistPanel({
       return {
         ...panel,
         title: artist.name,
-        content: /* @__PURE__ */ jsxs22(Fragment11, { children: [
-          shareUrl && /* @__PURE__ */ jsx29("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: /* @__PURE__ */ jsx29("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: shareTarget && /* @__PURE__ */ jsx29(ShareActionButton, { target: shareTarget, url: shareUrl }) }) }),
-          artist.image && /* @__PURE__ */ jsx29(ArtistPhoto, { image: artist.image, name: artist.name }),
-          /* @__PURE__ */ jsx29(ArtistHeader, { artist }),
-          /* @__PURE__ */ jsx29(ArtistMembers, { title: "Members", memberships: artist.members, renderArtistLink }),
-          /* @__PURE__ */ jsx29(ArtistMembers, { title: "Member of", memberships: artist.memberOf, renderArtistLink }),
-          artist.tracksCount > 0 && /* @__PURE__ */ jsx29(
+        content: /* @__PURE__ */ jsxs23(Fragment12, { children: [
+          shareUrl && /* @__PURE__ */ jsx30("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: /* @__PURE__ */ jsx30("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: shareTarget && /* @__PURE__ */ jsx30(ShareActionButton, { target: shareTarget, url: shareUrl }) }) }),
+          artist.image && /* @__PURE__ */ jsx30(ArtistPhoto, { image: artist.image, name: artist.name }),
+          /* @__PURE__ */ jsx30(ArtistHeader, { artist }),
+          /* @__PURE__ */ jsx30(ArtistMembers, { title: "Members", memberships: artist.members, renderArtistLink }),
+          /* @__PURE__ */ jsx30(ArtistMembers, { title: "Member of", memberships: artist.memberOf, renderArtistLink }),
+          artist.tracksCount > 0 && /* @__PURE__ */ jsx30(
             ArtistSongs,
             {
               artist: { uuid: artist.uuid, name: artist.name },
@@ -1939,14 +2122,14 @@ function useArtistPanel({
             }
           )
         ] }),
-        extraContent: artist.albums.length > 0 ? /* @__PURE__ */ jsx29(ArtistDiscography, { albums: artist.albums }) : void 0
+        extraContent: artist.albums.length > 0 ? /* @__PURE__ */ jsx30(ArtistDiscography, { albums: artist.albums }) : void 0
       };
     }
   }
 }
 
 // src/genre-tree/song/useSongPanel.tsx
-import { Skeleton as Skeleton6 } from "@behindthemusictree/ui";
+import { Skeleton as Skeleton7 } from "@behindthemusictree/ui";
 import {
   useSong
 } from "@behindthemusictree/app-kit/genre-tree";
@@ -1954,7 +2137,7 @@ import {
 // src/genre-tree/song/SongPanelContent.tsx
 import { useState as useState8 } from "react";
 import { Pause as Pause2, Play as Play3 } from "lucide-react";
-import { FieldList as FieldList2, PanelSection as PanelSection6, Skeleton as Skeleton5 } from "@behindthemusictree/ui";
+import { FieldList as FieldList2, PanelSection as PanelSection6, Skeleton as Skeleton6 } from "@behindthemusictree/ui";
 import { PlayStates as PlayStates3, usePlayer as usePlayer9 } from "@behindthemusictree/app-kit/player";
 import {
   ArtistNames as ArtistNames3,
@@ -1963,7 +2146,7 @@ import {
   useSongHistory,
   useTrackList as useTrackList5
 } from "@behindthemusictree/app-kit/genre-tree";
-import { Fragment as Fragment12, jsx as jsx30, jsxs as jsxs23 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx31, jsxs as jsxs24 } from "react/jsx-runtime";
 var numberFormat = new Intl.NumberFormat("en");
 var dateFormat = new Intl.DateTimeFormat("en", { dateStyle: "medium" });
 var externalLink = "text-[var(--color-primary)] hover:underline focus-visible:underline";
@@ -1971,32 +2154,32 @@ function SongHistory({ uuid, getBackendBaseUrl }) {
   const [open, setOpen] = useState8(false);
   const history = useSongHistory(uuid, getBackendBaseUrl, open);
   let body = null;
-  if (history.status === "loading") body = /* @__PURE__ */ jsx30(Skeleton5, { className: "h-10", "aria-busy": "true" });
-  else if (history.status === "error") body = /* @__PURE__ */ jsx30("p", { className: "text-red-600", children: "Could not load the history." });
+  if (history.status === "loading") body = /* @__PURE__ */ jsx31(Skeleton6, { className: "h-10", "aria-busy": "true" });
+  else if (history.status === "error") body = /* @__PURE__ */ jsx31("p", { className: "text-red-600", children: "Could not load the history." });
   else if (history.status === "success")
-    body = history.entries.length === 0 ? /* @__PURE__ */ jsx30("p", { className: "text-[var(--color-text-muted)]", children: "No changes yet." }) : /* @__PURE__ */ jsx30("ul", { className: "divide-y divide-[var(--color-border)]", children: history.entries.map((entry) => /* @__PURE__ */ jsxs23("li", { className: "py-1.5 text-sm", children: [
-      /* @__PURE__ */ jsx30("span", { className: "font-medium", children: entry.action }),
-      entry.oldValue !== null || entry.newValue !== null ? /* @__PURE__ */ jsxs23("span", { className: "text-[var(--color-text-muted)]", children: [
+    body = history.entries.length === 0 ? /* @__PURE__ */ jsx31("p", { className: "text-[var(--color-text-muted)]", children: "No changes yet." }) : /* @__PURE__ */ jsx31("ul", { className: "divide-y divide-[var(--color-border)]", children: history.entries.map((entry) => /* @__PURE__ */ jsxs24("li", { className: "py-1.5 text-sm", children: [
+      /* @__PURE__ */ jsx31("span", { className: "font-medium", children: entry.action }),
+      entry.oldValue !== null || entry.newValue !== null ? /* @__PURE__ */ jsxs24("span", { className: "text-[var(--color-text-muted)]", children: [
         " ",
         "\u2014 ",
         entry.oldValue ?? "none",
         " \u2192 ",
         entry.newValue ?? "none"
       ] }) : null,
-      /* @__PURE__ */ jsxs23("span", { className: "block text-xs text-[var(--color-text-muted)]", children: [
+      /* @__PURE__ */ jsxs24("span", { className: "block text-xs text-[var(--color-text-muted)]", children: [
         entry.actorPseudo ?? "Anonymous",
         " \xB7 ",
         dateFormat.format(new Date(entry.createdOn))
       ] })
     ] }, entry.uuid)) });
-  return /* @__PURE__ */ jsxs23(
+  return /* @__PURE__ */ jsxs24(
     "details",
     {
       onToggle: (event) => setOpen(event.currentTarget.open),
       className: "px-6 pb-2.5 mt-2.5 border-t border-[var(--color-border)]",
       children: [
-        /* @__PURE__ */ jsx30("summary", { className: "mt-2.5 cursor-pointer text-[0.6875rem] font-semibold uppercase text-[var(--color-text-muted)]", children: "History" }),
-        /* @__PURE__ */ jsx30("div", { className: "mt-1.5", children: body })
+        /* @__PURE__ */ jsx31("summary", { className: "mt-2.5 cursor-pointer text-[0.6875rem] font-semibold uppercase text-[var(--color-text-muted)]", children: "History" }),
+        /* @__PURE__ */ jsx31("div", { className: "mt-1.5", children: body })
       ]
     }
   );
@@ -2022,13 +2205,13 @@ function SongPanelContent({
     const path = genrePath.length > 0 ? genrePath : null;
     fields.push({
       label: "Genre",
-      value: path ? /* @__PURE__ */ jsx30("span", { className: "flex flex-wrap items-center gap-x-1", children: path.map((genrePlaylist, index) => /* @__PURE__ */ jsxs23("span", { children: [
-        index > 0 && /* @__PURE__ */ jsx30("span", { "aria-hidden": "true", children: "\u203A " }),
-        /* @__PURE__ */ jsx30("button", { type: "button", onClick: () => onSelectGenre(genrePlaylist), className: "hover:underline", children: genrePlaylist.name })
+      value: path ? /* @__PURE__ */ jsx31("span", { className: "flex flex-wrap items-center gap-x-1", children: path.map((genrePlaylist, index) => /* @__PURE__ */ jsxs24("span", { children: [
+        index > 0 && /* @__PURE__ */ jsx31("span", { "aria-hidden": "true", children: "\u203A " }),
+        /* @__PURE__ */ jsx31("button", { type: "button", onClick: () => onSelectGenre(genrePlaylist), className: "hover:underline", children: genrePlaylist.name })
       ] }, genrePlaylist.uuid)) }) : song.genre.name
     });
   } else {
-    fields.push({ label: "Genre", value: /* @__PURE__ */ jsx30("span", { className: "text-[var(--color-text-muted)]", children: "No genre" }) });
+    fields.push({ label: "Genre", value: /* @__PURE__ */ jsx31("span", { className: "text-[var(--color-text-muted)]", children: "No genre" }) });
   }
   if (song.firstReleaseYear) fields.push({ label: "First released", value: song.firstReleaseYear });
   const viewCount = song.youtubeVideo?.viewCount;
@@ -2038,11 +2221,11 @@ function SongPanelContent({
   const links = [];
   if (musicBrainzUrl)
     links.push(
-      /* @__PURE__ */ jsx30("a", { href: musicBrainzUrl, target: "_blank", rel: "noopener noreferrer", className: externalLink, children: "MusicBrainz" }, "mb")
+      /* @__PURE__ */ jsx31("a", { href: musicBrainzUrl, target: "_blank", rel: "noopener noreferrer", className: externalLink, children: "MusicBrainz" }, "mb")
     );
   if (song.youtubeVideo)
     links.push(
-      /* @__PURE__ */ jsx30(
+      /* @__PURE__ */ jsx31(
         "a",
         {
           href: `https://www.youtube.com/watch?v=${encodeURIComponent(song.youtubeVideo.id)}`,
@@ -2057,33 +2240,33 @@ function SongPanelContent({
   if (links.length > 0)
     fields.push({
       label: "Links",
-      value: /* @__PURE__ */ jsx30("span", { className: "flex gap-3", children: links })
+      value: /* @__PURE__ */ jsx31("span", { className: "flex gap-3", children: links })
     });
-  return /* @__PURE__ */ jsxs23(Fragment12, { children: [
-    /* @__PURE__ */ jsx30("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: /* @__PURE__ */ jsxs23("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: [
-      unplayableReason ? /* @__PURE__ */ jsx30("p", { className: "flex items-center px-2.5 text-sm text-[var(--color-text-muted)]", children: unplayableReason }) : /* @__PURE__ */ jsxs23(
+  return /* @__PURE__ */ jsxs24(Fragment13, { children: [
+    /* @__PURE__ */ jsx31("div", { className: "genre-action-band border-b border-[var(--color-border)]", children: /* @__PURE__ */ jsxs24("div", { className: "flex flex-wrap gap-1 px-3.5 py-3", children: [
+      unplayableReason ? /* @__PURE__ */ jsx31("p", { className: "flex items-center px-2.5 text-sm text-[var(--color-text-muted)]", children: unplayableReason }) : /* @__PURE__ */ jsxs24(
         "button",
         {
           type: "button",
           onClick: () => isCurrent ? handlePlayPauseAction() : playNewTrackListFromTrackUuid(song, scope),
           className: "group flex flex-col items-center gap-1 w-16 text-xs text-center text-[var(--color-text)] focus-visible:outline-none",
           children: [
-            /* @__PURE__ */ jsx30("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: isPlaying ? /* @__PURE__ */ jsx30(Pause2, { "aria-hidden": "true", className: "w-5 h-5" }) : /* @__PURE__ */ jsx30(Play3, { "aria-hidden": "true", className: "w-5 h-5" }) }),
+            /* @__PURE__ */ jsx31("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: isPlaying ? /* @__PURE__ */ jsx31(Pause2, { "aria-hidden": "true", className: "w-5 h-5" }) : /* @__PURE__ */ jsx31(Play3, { "aria-hidden": "true", className: "w-5 h-5" }) }),
             isPlaying ? "Pause" : "Play"
           ]
         }
       ),
-      shareUrl && /* @__PURE__ */ jsx30(ShareActionButton, { target: shareTarget, url: shareUrl })
+      shareUrl && /* @__PURE__ */ jsx31(ShareActionButton, { target: shareTarget, url: shareUrl })
     ] }) }),
-    song.artists && song.artists.length > 0 && /* @__PURE__ */ jsx30("p", { className: "px-6 pt-2.5 text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx30(ArtistNames3, { artists: song.artists, renderArtistLink }) }),
-    /* @__PURE__ */ jsx30(FieldList2, { items: fields }),
-    song.essentialGenres && song.essentialGenres.length > 0 && /* @__PURE__ */ jsx30(PanelSection6, { title: "Essential in", children: /* @__PURE__ */ jsx30("ul", { children: song.essentialGenres.map((genre) => /* @__PURE__ */ jsx30("li", { className: "py-0.5", children: genre.name }, genre.uuid)) }) }),
-    /* @__PURE__ */ jsx30(SongHistory, { uuid: song.uuid, getBackendBaseUrl })
+    song.artists && song.artists.length > 0 && /* @__PURE__ */ jsx31("p", { className: "px-6 pt-2.5 text-[var(--color-text-muted)]", children: /* @__PURE__ */ jsx31(ArtistNames3, { artists: song.artists, renderArtistLink }) }),
+    /* @__PURE__ */ jsx31(FieldList2, { items: fields }),
+    song.essentialGenres && song.essentialGenres.length > 0 && /* @__PURE__ */ jsx31(PanelSection6, { title: "Essential in", children: /* @__PURE__ */ jsx31("ul", { children: song.essentialGenres.map((genre) => /* @__PURE__ */ jsx31("li", { className: "py-0.5", children: genre.name }, genre.uuid)) }) }),
+    /* @__PURE__ */ jsx31(SongHistory, { uuid: song.uuid, getBackendBaseUrl })
   ] });
 }
 
 // src/genre-tree/song/useSongPanel.tsx
-import { jsx as jsx31, jsxs as jsxs24 } from "react/jsx-runtime";
+import { jsx as jsx32, jsxs as jsxs25 } from "react/jsx-runtime";
 function useSongPanel({
   uuid,
   scope,
@@ -2105,24 +2288,24 @@ function useSongPanel({
       return {
         ...panel,
         title: "Song",
-        content: /* @__PURE__ */ jsxs24("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
-          /* @__PURE__ */ jsx31(Skeleton6, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx31(Skeleton6, { className: "h-4 w-32" }),
-          /* @__PURE__ */ jsx31(Skeleton6, { className: "h-3 w-16" }),
-          /* @__PURE__ */ jsx31(Skeleton6, { className: "h-4 w-24" })
+        content: /* @__PURE__ */ jsxs25("div", { "aria-busy": "true", className: "flex flex-col gap-2.5 px-6 py-2.5", children: [
+          /* @__PURE__ */ jsx32(Skeleton7, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx32(Skeleton7, { className: "h-4 w-32" }),
+          /* @__PURE__ */ jsx32(Skeleton7, { className: "h-3 w-16" }),
+          /* @__PURE__ */ jsx32(Skeleton7, { className: "h-4 w-24" })
         ] })
       };
     case "not-found":
       return {
         ...panel,
         title: "Song not found",
-        content: /* @__PURE__ */ jsx31("p", { className: "px-6 py-2.5 text-[var(--color-text-muted)]", children: "This song does not exist." })
+        content: /* @__PURE__ */ jsx32("p", { className: "px-6 py-2.5 text-[var(--color-text-muted)]", children: "This song does not exist." })
       };
     case "error":
       return {
         ...panel,
         title: "Song",
-        content: /* @__PURE__ */ jsx31("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this song." })
+        content: /* @__PURE__ */ jsx32("p", { className: "px-6 py-2.5 text-red-600", children: "Could not load this song." })
       };
     case "success": {
       const { song } = result;
@@ -2130,7 +2313,7 @@ function useSongPanel({
       return {
         ...panel,
         title: song.title,
-        content: /* @__PURE__ */ jsx31(
+        content: /* @__PURE__ */ jsx32(
           SongPanelContent,
           {
             song,
@@ -2150,12 +2333,12 @@ function useSongPanel({
 // src/genre-tree/SizeMetricToggle.tsx
 import { MdMusicNote, MdVisibility } from "react-icons/md";
 import { SegmentedControl } from "@behindthemusictree/ui";
-import { jsx as jsx32 } from "react/jsx-runtime";
+import { jsx as jsx33 } from "react/jsx-runtime";
 function SizeMetricToggle({
   value,
   onChange
 }) {
-  return /* @__PURE__ */ jsx32(
+  return /* @__PURE__ */ jsx33(
     SegmentedControl,
     {
       variant: "floating",
@@ -2163,15 +2346,15 @@ function SizeMetricToggle({
       value,
       onChange,
       options: [
-        { value: "songs", label: /* @__PURE__ */ jsx32(MdMusicNote, { size: 18, "aria-hidden": true }), "aria-label": "Size by songs", title: "Node size by song count" },
-        { value: "views", label: /* @__PURE__ */ jsx32(MdVisibility, { size: 18, "aria-hidden": true }), "aria-label": "Size by views", title: "Node size by song views" }
+        { value: "songs", label: /* @__PURE__ */ jsx33(MdMusicNote, { size: 18, "aria-hidden": true }), "aria-label": "Size by songs", title: "Node size by song count" },
+        { value: "views", label: /* @__PURE__ */ jsx33(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 Fragment13, jsx as jsx33, jsxs as jsxs25 } from "react/jsx-runtime";
+import { Fragment as Fragment14, jsx as jsx34, jsxs as jsxs26 } from "react/jsx-runtime";
 var NO_POP_ROOT_TITLE = "This genre tree has no 'Mainstream Pop' root yet";
 var REGIONS_CLASS = "[--gtv-center-left:var(--layout-center-left)] [--gtv-center-right:var(--layout-center-right)] [--gtv-center-top:var(--layout-band-top)]";
 var noop = () => {
@@ -2184,8 +2367,8 @@ function GenreTreeView({
   getBackendBaseUrl,
   additionalActions,
   viewMode: controlledViewMode,
-  selectedNodeId: controlledSelectedNodeId,
-  onSelectedNodeIdChange,
+  selectedGenreUuid: controlledSelectedGenreUuid,
+  onSelectedGenreUuidChange,
   defaultViewport,
   viewportRestore,
   onViewportChange,
@@ -2258,10 +2441,14 @@ function GenreTreeView({
   };
   const {
     isLoading,
+    isError,
+    refetch,
     isFetching: isTreeFetching,
     genrePlaylistByNodeId,
     visibleGenrePlaylists,
     groupedGenrePlaylistsByRoot,
+    selectedGenreUuid,
+    selectGenre,
     selectedNodeId,
     selectedGenrePlaylist,
     selectNode,
@@ -2278,8 +2465,8 @@ function GenreTreeView({
     scope,
     getBackendBaseUrl,
     viewMode: controlledViewMode,
-    selectedNodeId: controlledSelectedNodeId,
-    onSelectedNodeIdChange,
+    selectedGenreUuid: controlledSelectedGenreUuid,
+    onSelectedGenreUuidChange,
     criteriaOverviewSchema,
     artistUuid
   });
@@ -2300,25 +2487,25 @@ function GenreTreeView({
   const canSizeByViews = !isArtistFiltered && hasViewsCount(visibleGenrePlaylists);
   const artistResult = useArtist2(artistUuid, artistSearchBaseUrl ?? getBackendBaseUrl);
   const filterArtistName = artistResult.status === "success" ? artistResult.artist.name : null;
-  const filterArtist = useMemo7(
+  const filterArtist = useMemo8(
     () => 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();
+    if (selectedGenreUuid !== null) clearSelection();
     if (songUuid !== null) changeSong(null);
     changeArtist(uuid);
   };
   const openSong = (uuid) => {
-    if (selectedNodeId !== null) clearSelection();
+    if (selectedGenreUuid !== null) clearSelection();
     changeSong(uuid);
   };
   const openSongRef = useRef3(openSong);
   openSongRef.current = openSong;
   const resolvedRenderSongLink = useCallback6(
-    (song) => renderSongLink ? renderSongLink(song) : /* @__PURE__ */ jsx33("button", { type: "button", onClick: () => openSongRef.current(song.uuid), className: "hover:underline", children: song.title }),
+    (song) => renderSongLink ? renderSongLink(song) : /* @__PURE__ */ jsx34("button", { type: "button", onClick: () => openSongRef.current(song.uuid), className: "hover:underline", children: song.title }),
     [renderSongLink]
   );
   const [expandedSongUuid, setExpandedSongUuid] = useState9(null);
@@ -2330,7 +2517,7 @@ function GenreTreeView({
     scope,
     getBackendBaseUrl: artistBaseUrl,
     getShareUrl: getShareUrlRef.current,
-    renderArtistLink: renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx33("button", { type: "button", onClick: () => openArtist(artist.uuid), className: "hover:underline", children: artist.name })),
+    renderArtistLink: renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx34("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);
@@ -2339,7 +2526,7 @@ function GenreTreeView({
     renderSongLink: resolvedRenderSongLink,
     onClose: () => changeArtist(null)
   });
-  const resolvedRenderArtistLink = renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx33("button", { type: "button", onClick: () => openArtist(artist.uuid), className: "hover:underline", children: artist.name }));
+  const resolvedRenderArtistLink = renderArtistLink ?? ((artist) => artist.isSpecialPurpose ? artist.name : /* @__PURE__ */ jsx34("button", { type: "button", onClick: () => openArtist(artist.uuid), className: "hover:underline", children: artist.name }));
   const getGenrePath = (genre) => {
     const path = [];
     let current = visibleGenrePlaylists.find((playlist) => playlist.criteria?.uuid === genre.uuid);
@@ -2357,9 +2544,9 @@ function GenreTreeView({
     getShareUrl: getShareUrlRef.current,
     renderArtistLink: resolvedRenderArtistLink,
     getGenrePath,
-    onSelectGenre: (genrePlaylist) => {
+    onSelectGenre: (genrePlaylist2) => {
       changeSong(null);
-      selectGenrePlaylist(genrePlaylist);
+      selectGenrePlaylist(genrePlaylist2);
     },
     expanded: controlledSongExpanded ?? (songUuid !== null && expandedSongUuid === songUuid),
     onExpandedChange: (on) => {
@@ -2368,8 +2555,8 @@ function GenreTreeView({
     },
     onClose: () => changeSong(null)
   });
-  const builtInSongPanel = overlayPanel || hasSelectedGenreNode ? void 0 : songPanel;
-  const builtInArtistPanel = overlayPanel || hasSelectedGenreNode || builtInSongPanel ? void 0 : artistPanel;
+  const builtInSongPanel = overlayPanel || selectedGenreUuid !== null ? void 0 : songPanel;
+  const builtInArtistPanel = overlayPanel || selectedGenreUuid !== null || builtInSongPanel ? void 0 : artistPanel;
   const builtInPanel = builtInSongPanel ?? builtInArtistPanel;
   const [uncontrolledCollapsed, setUncontrolledCollapsed] = useState9(false);
   const [uncontrolledExpanded, setUncontrolledExpanded] = useState9(false);
@@ -2385,10 +2572,10 @@ function GenreTreeView({
   };
   useEffect5(() => {
     setUncontrolledCollapsed(false);
-  }, [selectedNodeId, artistUuid, songUuid]);
+  }, [selectedGenreUuid, artistUuid, songUuid]);
   const [isWheelRevealed, setIsWheelRevealed] = useState9(false);
   const usesHandoff = viewMode === "wheel" || viewMode === "pop-core";
-  const isTreeReady = !isLoading && (!usesHandoff || isWheelRevealed);
+  const isTreeReady = !isLoading && !isError && (!usesHandoff || isWheelRevealed);
   const [resolveStyle, setResolveStyle] = useState9(null);
   const handleNodeStyleResolverChange = useCallback6(
     (resolver) => setResolveStyle(() => resolver),
@@ -2398,140 +2585,99 @@ function GenreTreeView({
   const obscuredInset = useObscuredInset(panelRef);
   const hostPanel = { obscuredInset, onNodeStyleResolverChange: handleNodeStyleResolverChange };
   const nodeMetric = isArtistFiltered || !canSizeByViews ? "songs" : deferredSizeMetric;
-  const treeNodes = useMemo7(() => toTreeNodes(visibleGenrePlaylists, nodeMetric), [visibleGenrePlaylists, nodeMetric]);
+  const treeNodes = useMemo8(() => toTreeNodes(visibleGenrePlaylists, nodeMetric), [visibleGenrePlaylists, nodeMetric]);
   const relations = useGenreNodeRelations(
     treeNodes,
     !overlayPanel && hasSelectedGenreNode ? selectedNodeId : null,
     resolveStyle
   );
-  const [selectionHistory, setSelectionHistory] = useState9({
-    current: selectedNodeId,
-    previous: null
-  });
-  if (selectionHistory.current !== selectedNodeId) {
-    setSelectionHistory({
-      current: selectedNodeId,
-      previous: selectionHistory.current ?? selectionHistory.previous
-    });
+  const [selectionHistory, setSelectionHistory] = useState9({ current: selectedGenreUuid, previous: null });
+  if (selectionHistory.current !== selectedGenreUuid) {
+    setSelectionHistory({ current: selectedGenreUuid, previous: selectionHistory.current ?? selectionHistory.previous });
   }
-  const previousPlaylist = selectionHistory.previous !== null && selectionHistory.previous !== selectedNodeId ? genrePlaylistByNodeId.get(selectionHistory.previous) : void 0;
-  const handlePrevious = previousPlaylist && visibleGenrePlaylists.includes(previousPlaylist) ? () => handleGenreSearchSelect(previousPlaylist) : void 0;
+  const handlePrevious = selectionHistory.previous ? () => selectGenre(selectionHistory.previous) : void 0;
   const { showPopup, hidePopup } = usePopup5();
+  const reopenPanel = () => {
+    setUncontrolledCollapsed(false);
+    onCollapsedChange?.(false);
+  };
   const handleSelectedNodeChange = (node) => {
+    reopenPanel();
     if (node !== null && songUuid !== null) changeSong(null);
     selectNode(node);
   };
   const handleGenreSearchClear = clearSelection;
-  const handleGenreSearchSelect = (genrePlaylist) => {
+  const handleGenreSearchSelect = (genrePlaylist2) => {
+    reopenPanel();
     if (songUuid !== null) changeSong(null);
-    selectGenrePlaylist(genrePlaylist);
+    selectGenrePlaylist(genrePlaylist2);
   };
   const selectedUuid = selectedGenrePlaylist?.uuid;
-  const selectedChildren = selectedUuid ? visibleGenrePlaylists.filter((genrePlaylist) => genrePlaylist.parent?.uuid === selectedUuid) : [];
+  const selectedChildren = selectedUuid ? visibleGenrePlaylists.filter((genrePlaylist2) => genrePlaylist2.parent?.uuid === selectedUuid) : [];
   const canZoomIn = viewMode === "pop-core" && focus.onFocusGenreChange !== void 0 && selectedUuid !== void 0 && focus.focusGenreUuid !== selectedUuid && selectedChildren.length > 0 && selectedChildren.filter((child) => child.criteria?.side === "pop").length <= 1;
   const handleGenreSearchZoomIn = () => {
     if (selectedUuid) focus.onFocusGenreChange?.(selectedUuid, "zoom-in");
   };
   const zoomInRef = useRef3(void 0);
   zoomInRef.current = canZoomIn ? handleGenreSearchZoomIn : void 0;
-  const selectGenreFromPanel = (nodeId) => {
-    const genrePlaylist = genrePlaylistByNodeId.get(nodeId);
-    if (genrePlaylist) handleGenreSearchSelect(genrePlaylist);
-  };
-  const renderGenreBody = (relation) => {
-    const { node } = relation;
-    const family = /* @__PURE__ */ jsx33(
-      GenreNodeFamily,
-      {
-        node,
-        fill: relation.fill,
-        textColor: relation.textColor,
-        parentNode: relation.parentNode,
-        childNodes: relation.childNodes,
-        onSelectNode: selectGenreFromPanel
-      }
-    );
-    const ancestors = /* @__PURE__ */ jsx33(GenreNodeAncestors, { ancestorNodes: relation.ancestorNodes, onSelectNode: selectGenreFromPanel });
-    const genrePlaylist = genrePlaylistByNodeId.get(node.id);
-    const criteria = genrePlaylist?.criteria;
-    if (!genrePlaylist || !criteria) return { primary: /* @__PURE__ */ jsxs25(Fragment13, { children: [
-      family,
-      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__ */ jsxs25(Fragment13, { children: [
-        /* @__PURE__ */ jsx33(
-          GenreInfoPanelBody,
+  const genrePlaylist = selectedGenrePlaylist;
+  const criteria = genrePlaylist?.criteria;
+  const parentPlaylist = visibleGenrePlaylists.find(({ uuid }) => uuid === genrePlaylist?.parent?.uuid);
+  const canToggleSide = !readOnly && criteria !== void 0 && criteria !== null && parentPlaylist !== void 0 && parentPlaylist.parent === null;
+  const side = criteria?.side ?? "core";
+  const popSibling = canToggleSide && side === "core" ? visibleGenrePlaylists.find((sibling) => sibling.parent?.uuid === parentPlaylist.uuid && sibling.uuid !== genrePlaylist?.uuid && sibling.criteria?.side === "pop") : void 0;
+  const shareTarget = selectedGenreUuid ? { kind: "genre", genreUuid: selectedGenreUuid, name: criteria?.name ?? "Genre", scope, artistUuid } : void 0;
+  const shareUrl = shareTarget ? getShareUrlRef.current?.(shareTarget) ?? void 0 : void 0;
+  const genreContent = useGenreDetailContent({
+    genreUuid: selectedGenreUuid,
+    scope,
+    getBackendBaseUrl,
+    onSelectGenre: (uuid) => {
+      reopenPanel();
+      selectGenre(uuid);
+    },
+    expanded: isExpanded,
+    playback,
+    genrePlaylist: selectedGenrePlaylist,
+    band: {
+      ...relations ? { node: relations.node } : {},
+      shareTarget: shareUrl ? shareTarget : void 0,
+      shareUrl,
+      onZoomIn: zoomInRef.current,
+      onAddChild: readOnly || !criteria ? void 0 : () => handleGenreCreationAction(criteria),
+      onRename: readOnly || !criteria ? void 0 : () => handleGenreRenameAction(criteria),
+      onChangeParent: readOnly || !genrePlaylist || !criteria ? void 0 : () => showPopup(
+        /* @__PURE__ */ jsx34(
+          ChangeParentPopup,
           {
-            family: /* @__PURE__ */ jsxs25(Fragment13, { children: [
-              family,
-              ancestors
-            ] }),
-            genreUuid,
-            genrePlaylist,
-            catalogue: genrePlaylist.catalogue,
-            wikidataId: criteria.wikidataId,
+            genrePlaylist: { ...genrePlaylist, criteria },
+            genrePlaylists: visibleGenrePlaylists,
             scope,
             getBackendBaseUrl,
-            playback,
-            band: {
-              node,
-              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__ */ jsx33(
-                  ChangeParentPopup,
-                  {
-                    genrePlaylist: { ...genrePlaylist, criteria },
-                    genrePlaylists: visibleGenrePlaylists,
-                    scope,
-                    getBackendBaseUrl,
-                    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
-            },
-            extras: {
-              criteriaOverviewSchema,
-              renderGenreDetailExtras,
-              renderArtistLink,
-              renderSongLink: resolvedRenderSongLink,
-              artist: filterArtist,
-              renderSummary,
-              renderEssentialTracks,
-              renderSongLeading,
-              renderSongActions,
-              renderTracksToolbar
-            }
+            onClose: hidePopup,
+            onParentChanged
           }
-        ),
-        renderDangerZone?.(node)
-      ] })
-    };
-  };
+        )
+      ),
+      side,
+      onToggleSide: canToggleSide && criteria ? () => updateGenre({ uuid: criteria.uuid, data: { side: side === "pop" ? "core" : "pop" } }) : void 0,
+      toggleSideDisabledReason: popSibling ? `${popSibling.name} is already the pop side of ${parentPlaylist?.name}` : void 0,
+      additionalActions
+    },
+    extras: {
+      criteriaOverviewSchema,
+      renderGenreDetailExtras,
+      renderArtistLink,
+      renderSongLink: resolvedRenderSongLink,
+      artist: filterArtist,
+      renderSummary,
+      renderEssentialTracks,
+      renderSongLeading,
+      renderSongActions,
+      renderTracksToolbar
+    },
+    trailing: relations ? renderDangerZone?.(relations.node) : void 0
+  });
   const isRotationControlled = controlledAllowWheelRotation !== void 0;
   const allowWheelRotation = controlledAllowWheelRotation ?? internalAllowWheelRotation;
   let activePanel = null;
@@ -2545,16 +2691,16 @@ function GenreTreeView({
       onClose: overlayPanel.onClose,
       compact: false
     };
-  } else if (relations) {
-    const { primary } = renderGenreBody(relations);
+  } else if (selectedGenreUuid) {
     activePanel = {
-      title: relations.node.name,
-      content: primary,
+      title: genreContent.title,
+      content: genreContent.content,
+      aside: genreContent.aside,
       expanded: isExpanded,
       onExpandedChange: changeExpanded,
       onClose: clearSelection,
-      compact: true,
-      headerAccent: { background: relations.fill, color: relations.textColor }
+      compact: false,
+      headerAccent: relations ? { background: relations.fill, color: relations.textColor } : genreContent.headerAccent
     };
   } else if (builtInPanel) {
     activePanel = {
@@ -2567,36 +2713,36 @@ function GenreTreeView({
       compact: true
     };
   }
-  const isPanelShown = isTreeReady && activePanel !== null;
+  const isPanelShown = activePanel !== null && (selectedGenreUuid !== null || isTreeReady);
   const detailTab = placement === "regions" && activePanel?.onExpandedChange ? {
     edge: activePanel.expanded ? { label: "Shrink panel", onClick: () => activePanel.onExpandedChange?.(false) } : isCollapsed ? null : { label: "Hide panel", onClick: () => changeCollapsed(true) },
     center: activePanel.expanded ? null : isCollapsed ? { label: "Show panel", onClick: () => changeCollapsed(false) } : activePanel.onExpandedChange ? { label: "Extend panel", onClick: () => activePanel.onExpandedChange?.(true) } : null
   } : void 0;
-  const expandButton = placement === "default" && activePanel?.onExpandedChange ? /* @__PURE__ */ jsx33(
-    IconButton,
+  const expandButton = placement === "default" && activePanel?.onExpandedChange ? /* @__PURE__ */ jsx34(
+    IconButton2,
     {
       "aria-label": activePanel.expanded ? "Shrink panel" : "Extend panel",
       style: activePanel.headerAccent && { color: "inherit" },
       onClick: () => activePanel.onExpandedChange?.(!activePanel.expanded),
-      children: activePanel.expanded ? /* @__PURE__ */ jsx33(Minimize2, { "aria-hidden": "true", className: "h-4 w-4" }) : /* @__PURE__ */ jsx33(Maximize2, { "aria-hidden": "true", className: "h-4 w-4" })
+      children: activePanel.expanded ? /* @__PURE__ */ jsx34(Minimize22, { "aria-hidden": "true", className: "h-4 w-4" }) : /* @__PURE__ */ jsx34(Maximize22, { "aria-hidden": "true", className: "h-4 w-4" })
     }
   ) : null;
   const renderArtistFilter = () => {
     if (isLoading || !filterArtist) return null;
-    return /* @__PURE__ */ jsxs25("span", { className: "inline-flex items-center overflow-hidden rounded-full bg-[var(--color-neutral-100)] text-sm", children: [
-      /* @__PURE__ */ jsx33(
+    return /* @__PURE__ */ jsxs26("span", { className: "inline-flex items-center overflow-hidden rounded-full bg-[var(--color-neutral-100)] text-sm", children: [
+      /* @__PURE__ */ jsx34(
         "button",
         {
           type: "button",
           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();
+            if (selectedGenreUuid !== null) clearSelection();
           },
           children: filterArtist.name
         }
       ),
-      /* @__PURE__ */ jsx33(
+      /* @__PURE__ */ jsx34(
         "button",
         {
           type: "button",
@@ -2608,8 +2754,8 @@ function GenreTreeView({
       )
     ] });
   };
-  const actions = /* @__PURE__ */ jsxs25(Fragment13, { children: [
-    !isLoading && /* @__PURE__ */ jsx33(
+  const actions = /* @__PURE__ */ jsxs26(Fragment14, { children: [
+    !isLoading && !isError && /* @__PURE__ */ jsx34(
       GenreTreeSearch,
       {
         artistBaseUrl,
@@ -2627,7 +2773,12 @@ function GenreTreeView({
         SearchGroups,
         genrePlaylists: visibleGenrePlaylists,
         onSelect: handleGenreSearchSelect,
-        selectedName: selectedGenrePlaylist?.name ?? (typeof builtInPanel?.title === "string" ? builtInPanel.title : null),
+        onSelectGenre: (uuid) => {
+          reopenPanel();
+          if (songUuid) changeSong(null);
+          selectGenre(uuid);
+        },
+        selectedName: (selectedGenreUuid ? genreContent.title : null) ?? (typeof builtInPanel?.title === "string" ? builtInPanel.title : null),
         onClear: builtInSongPanel ? () => changeSong(null) : builtInArtistPanel ? () => changeArtist(null) : handleGenreSearchClear,
         onPrevious: handlePrevious,
         onQueryChange: onSearchQueryChange,
@@ -2635,9 +2786,9 @@ function GenreTreeView({
         extraGroups: extraSearchGroups
       }
     ),
-    !isLoading && filterArtist && /* @__PURE__ */ jsx33("div", { className: "hidden w-full justify-center max-md:flex", children: renderArtistFilter() }),
-    /* @__PURE__ */ jsxs25("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__ */ jsx33(
+    !isLoading && !isError && filterArtist && /* @__PURE__ */ jsx34("div", { className: "hidden w-full justify-center max-md:flex", children: renderArtistFilter() }),
+    /* @__PURE__ */ jsxs26("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 && !isError && !isControlled && /* @__PURE__ */ jsx34(
         SegmentedControl2,
         {
           "aria-label": "Tree view mode",
@@ -2651,13 +2802,13 @@ function GenreTreeView({
           ]
         }
       ),
-      !isLoading && showDisplayOptions && /* @__PURE__ */ jsx33(
+      !isLoading && !isError && showDisplayOptions && /* @__PURE__ */ jsx34(
         "div",
         {
           className: "flex items-center gap-1",
           role: "group",
           "aria-label": "Tree display options",
-          children: !isRotationControlled && viewMode !== "stacked" && viewMode !== "outline" && /* @__PURE__ */ jsx33(
+          children: !isRotationControlled && viewMode !== "stacked" && viewMode !== "outline" && /* @__PURE__ */ jsx34(
             Button,
             {
               variant: allowWheelRotation ? "default" : "outline",
@@ -2668,7 +2819,7 @@ function GenreTreeView({
           )
         }
       ),
-      !isLoading && !readOnly && showAddRoot && /* @__PURE__ */ jsx33(
+      !isLoading && !isError && !readOnly && showAddRoot && /* @__PURE__ */ jsx34(
         IconTextButton,
         {
           icon: Plus2,
@@ -2678,34 +2829,38 @@ function GenreTreeView({
       )
     ] })
   ] });
-  return /* @__PURE__ */ jsxs25(
+  return /* @__PURE__ */ jsxs26(
     "div",
     {
       "data-left-panel": isPanelShown && !isCollapsed ? void 0 : "hidden",
       className: ["genre-tree-view relative flex flex-col h-full", placement === "regions" && REGIONS_CLASS, className2].filter(Boolean).join(" "),
       children: [
-        /* @__PURE__ */ jsx33(
+        /* @__PURE__ */ jsx34(
           "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))] 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
           }
         ),
-        !isLoading && filterArtist && /* @__PURE__ */ jsx33(
+        !isLoading && !isError && filterArtist && /* @__PURE__ */ jsx34(
           "div",
           {
             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()
           }
         ),
-        /* @__PURE__ */ jsx33("div", { className: "content-container flex-1 min-h-0 flex flex-row gap-4", children: /* @__PURE__ */ jsxs25("div", { className: "tree-view-container relative flex-1 min-w-0 flex flex-col h-full", children: [
-          !isLoading && viewMode === "outline" && floatingControlsLeading && /* @__PURE__ */ jsx33("div", { className: "absolute bottom-3 right-3 z-10", children: floatingControlsLeading }),
-          isLoading ? /* @__PURE__ */ jsx33(GenreTreeViewSkeleton, { viewMode }) : viewMode === "wheel" ? (
+        /* @__PURE__ */ jsx34("div", { className: "content-container flex-1 min-h-0 flex flex-row gap-4", children: /* @__PURE__ */ jsxs26("div", { className: "tree-view-container relative flex-1 min-w-0 flex flex-col h-full", children: [
+          !isLoading && !isError && viewMode === "outline" && floatingControlsLeading && /* @__PURE__ */ jsx34("div", { className: "absolute bottom-3 right-3 z-10", children: floatingControlsLeading }),
+          isLoading ? /* @__PURE__ */ jsx34(GenreTreeViewSkeleton, { viewMode }) : isError ? /* @__PURE__ */ jsxs26("p", { role: "alert", className: "m-auto text-center", children: [
+            "Couldn't load the genre tree.",
+            " ",
+            /* @__PURE__ */ jsx34("button", { type: "button", className: "underline", onClick: refetch, children: "Retry" })
+          ] }) : 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__ */ jsx33("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 ", children: /* @__PURE__ */ jsx33(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx33(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx33(
+            /* @__PURE__ */ jsx34("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 ", children: /* @__PURE__ */ jsx34(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx34(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx34(
               GenrePlaylistTreeWheel,
               {
                 scope,
@@ -2722,9 +2877,9 @@ function GenreTreeView({
                 allowWheelRotation,
                 sizeMetric: isArtistFiltered || !canSizeByViews ? "songs" : deferredSizeMetric,
                 busy,
-                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs25("div", { className: "flex items-center gap-2", children: [
+                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs26("div", { className: "flex items-center gap-2", children: [
                   floatingControlsLeading,
-                  canSizeByViews && /* @__PURE__ */ jsx33(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
+                  canSizeByViews && /* @__PURE__ */ jsx34(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
                 ] }) : void 0,
                 defaultViewport,
                 viewportRestore,
@@ -2733,7 +2888,7 @@ function GenreTreeView({
             ) }) })
           ) : viewMode === "pop-core" ? (
             // Same as the wheel: the header inset extends its fill behind the floating search bar, Google Maps style.
-            /* @__PURE__ */ jsx33("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 ", children: /* @__PURE__ */ jsx33(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx33(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx33(
+            /* @__PURE__ */ jsx34("div", { className: "tree-container search-overlay relative flex-1 w-full min-h-0 ", children: /* @__PURE__ */ jsx34(GenreTreeWheelHandoff, { skeleton: /* @__PURE__ */ jsx34(GenreTreeWheelSkeleton, {}), onRevealedChange: setIsWheelRevealed, children: /* @__PURE__ */ jsx34(
               GenrePlaylistTreeWheelRadialPopCore,
               {
                 scope,
@@ -2750,9 +2905,9 @@ function GenreTreeView({
                 allowWheelRotation,
                 sizeMetric: isArtistFiltered || !canSizeByViews ? "songs" : deferredSizeMetric,
                 busy,
-                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs25("div", { className: "flex items-center gap-2", children: [
+                floatingControlsLeading: floatingControlsLeading || canSizeByViews ? /* @__PURE__ */ jsxs26("div", { className: "flex items-center gap-2", children: [
                   floatingControlsLeading,
-                  canSizeByViews && /* @__PURE__ */ jsx33(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
+                  canSizeByViews && /* @__PURE__ */ jsx34(SizeMetricToggle, { value: sizeMetric, onChange: changeSizeMetric })
                 ] }) : void 0,
                 defaultViewport,
                 viewportRestore,
@@ -2760,7 +2915,7 @@ function GenreTreeView({
                 ...focus
               }
             ) }) })
-          ) : viewMode === "outline" ? /* @__PURE__ */ jsx33("div", { className: "tree-container flex-1 min-h-0 w-full overflow-y-auto relative", children: /* @__PURE__ */ jsx33(
+          ) : viewMode === "outline" ? /* @__PURE__ */ jsx34("div", { className: "tree-container flex-1 min-h-0 w-full overflow-y-auto relative", children: /* @__PURE__ */ jsx34(
             GenrePlaylistTreeWheelRadialPopCore,
             {
               outline: true,
@@ -2776,13 +2931,13 @@ function GenreTreeView({
               selectedNodeId,
               readOnly
             }
-          ) }) : /* @__PURE__ */ jsx33("div", { className: "tree-container relative flex flex-col gap-4 w-full pt-14 overflow-x-auto overflow-y-auto text-[var(--color-text)]", children: Object.entries(groupedGenrePlaylistsByRoot).map(
+          ) }) : /* @__PURE__ */ jsx34("div", { className: "tree-container relative flex flex-col gap-4 w-full pt-14 overflow-x-auto overflow-y-auto text-[var(--color-text)]", children: Object.entries(groupedGenrePlaylistsByRoot).map(
             ([uuid, genrePlaylistTreePerRoot]) => {
-              return /* @__PURE__ */ jsx33(
+              return /* @__PURE__ */ jsx34(
                 "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__ */ jsx33("div", { className: "graph-container relative z-10 h-full", children: /* @__PURE__ */ jsx33(
+                  children: /* @__PURE__ */ jsx34("div", { className: "graph-container relative z-10 h-full", children: /* @__PURE__ */ jsx34(
                     GenrePlaylistTreePerRoot,
                     {
                       scope,
@@ -2808,8 +2963,8 @@ function GenreTreeView({
               );
             }
           ) }),
-          /* @__PURE__ */ jsx33(
-            DetailPanel,
+          /* @__PURE__ */ jsx34(
+            DetailPanel2,
             {
               ref: panelRef,
               side: "left",
@@ -2819,13 +2974,13 @@ function GenreTreeView({
               headerAccent: activePanel?.headerAccent,
               headerActions: expandButton,
               onClose: activePanel?.onClose ?? noop,
-              collapsed: isCollapsed || !isTreeReady || !activePanel,
+              collapsed: isCollapsed || !isPanelShown,
               expanded: activePanel?.expanded,
               onExpandedChange: activePanel?.onExpandedChange,
               aside: activePanel?.aside,
               edgeTab: detailTab,
-              headerClassName: activePanel?.compact ? "pt-[calc(var(--layout-search-h)+var(--layout-panel-inset)+0.5rem)]" : void 0,
-              children: activePanel?.aside && !activePanel.expanded ? /* @__PURE__ */ jsxs25(Fragment13, { children: [
+              headerClassName: "pt-[calc(var(--layout-search-h)+var(--layout-panel-inset)+0.5rem)]",
+              children: activePanel?.aside && !activePanel.expanded ? /* @__PURE__ */ jsxs26(Fragment14, { children: [
                 activePanel.content,
                 activePanel.aside
               ] }) : activePanel?.content
@@ -2837,145 +2992,6 @@ function GenreTreeView({
   );
 }
 
-// src/genre-tree/GenreDetailPanel.tsx
-import { useMemo as useMemo8 } from "react";
-import {
-  ACCENT_TEXT_COLOR,
-  GenreNodeAncestors as GenreNodeAncestors2,
-  GenreNodeFamily as GenreNodeFamily2,
-  getGenreTreeColor as getGenreTreeColor2,
-  TEXT_COLOR,
-  tintSurface
-} from "@behindthemusictree/genre-tree-view";
-import { DetailPanel as DetailPanel2, IconButton as IconButton2, Skeleton as Skeleton7 } from "@behindthemusictree/ui";
-import { Maximize2 as Maximize22, Minimize2 as Minimize22 } from "lucide-react";
-import {
-  useFetchGenreDetail,
-  genreMusicCount as genreMusicCount2,
-  GenrePlaylistSummarySchema
-} from "@behindthemusictree/app-kit/genre-tree";
-import { Fragment as Fragment14, jsx as jsx34, jsxs as jsxs26 } from "react/jsx-runtime";
-var RELATIVE_ITEM_COUNT = 1;
-function toNode(genre, parentId) {
-  return {
-    id: genre.uuid,
-    parentId,
-    name: genre.name,
-    itemCount: RELATIVE_ITEM_COUNT,
-    side: genre.side ?? void 0,
-    wikidataId: genre.wikidataId
-  };
-}
-function GenreDetailPanel({
-  genreUuid,
-  scope,
-  getBackendBaseUrl,
-  onClose,
-  onSelectGenre,
-  onZoomIn,
-  shareUrl,
-  shareTarget,
-  collapsed,
-  expanded,
-  onExpandedChange,
-  edgeTab,
-  extras
-}) {
-  const { data: detail, isPending, isError } = useFetchGenreDetail(genreUuid, scope, getBackendBaseUrl);
-  const playback = useGenrePlaylistPlayback({ scope, genrePlaylists: [] });
-  const view = useMemo8(() => {
-    if (!detail) return null;
-    const rootColor = getGenreTreeColor2(detail.root.wikidataId);
-    const relative = (genre, parentId) => ({
-      node: toNode(genre, parentId),
-      fill: tintSurface(rootColor),
-      textColor: TEXT_COLOR
-    });
-    const ancestors2 = [...detail.ascendants].sort((a, b) => b.degree - a.degree);
-    return {
-      node: {
-        id: detail.uuid,
-        parentId: detail.parent?.uuid ?? null,
-        name: detail.name,
-        itemCount: scope === "reference" ? genreMusicCount2(GenrePlaylistSummarySchema.parse(detail.criteriaPlaylist)) : detail.tracksCount,
-        wikidataId: detail.wikidataId
-      },
-      fill: rootColor,
-      parentNode: detail.parent ? relative(detail.parent, null) : null,
-      childNodes: detail.children.map((child) => relative(child, detail.uuid)),
-      ancestorNodes: ancestors2.map(
-        ({ ascendant }, index) => relative(ascendant, index === 0 ? null : ancestors2[index - 1].ascendant.uuid)
-      )
-    };
-  }, [detail, scope]);
-  if (isError) {
-    return /* @__PURE__ */ jsx34("div", { role: "alert", className: "p-4 text-sm text-[var(--color-text)]", children: "This genre could not be loaded." });
-  }
-  if (isPending || !detail || !view) {
-    return /* @__PURE__ */ jsxs26("div", { className: "flex flex-col gap-3 p-4", "aria-busy": "true", "data-testid": "genre-detail-panel-skeleton", children: [
-      /* @__PURE__ */ jsx34(Skeleton7, { className: "h-6 w-2/3" }),
-      /* @__PURE__ */ jsx34(Skeleton7, { className: "h-4 w-full" }),
-      /* @__PURE__ */ jsx34(Skeleton7, { className: "h-4 w-3/4" })
-    ] });
-  }
-  const selectGenre = (nodeId) => onSelectGenre(nodeId);
-  const family = /* @__PURE__ */ jsx34(
-    GenreNodeFamily2,
-    {
-      node: view.node,
-      fill: view.fill,
-      textColor: ACCENT_TEXT_COLOR,
-      parentNode: view.parentNode,
-      childNodes: view.childNodes,
-      onSelectNode: selectGenre
-    }
-  );
-  const ancestors = /* @__PURE__ */ jsx34(GenreNodeAncestors2, { ancestorNodes: view.ancestorNodes, onSelectNode: selectGenre });
-  return /* @__PURE__ */ jsxs26(
-    DetailPanel2,
-    {
-      side: "left",
-      title: view.node.name,
-      headerAccent: { background: view.fill, color: ACCENT_TEXT_COLOR },
-      headerActions: onExpandedChange ? /* @__PURE__ */ jsx34(
-        IconButton2,
-        {
-          "aria-label": expanded ? "Shrink panel" : "Extend panel",
-          style: { color: "inherit" },
-          onClick: () => onExpandedChange(!expanded),
-          children: expanded ? /* @__PURE__ */ jsx34(Minimize22, { "aria-hidden": "true", className: "h-4 w-4" }) : /* @__PURE__ */ jsx34(Maximize22, { "aria-hidden": "true", className: "h-4 w-4" })
-        }
-      ) : void 0,
-      onClose,
-      collapsed,
-      expanded,
-      onExpandedChange,
-      edgeTab,
-      children: [
-        /* @__PURE__ */ jsx34(
-          GenreInfoPanelBody,
-          {
-            family: /* @__PURE__ */ jsxs26(Fragment14, { children: [
-              family,
-              ancestors
-            ] }),
-            genreUuid: detail.uuid,
-            genrePlaylist: scope === "reference" ? GenrePlaylistSummarySchema.parse(detail.criteriaPlaylist) : { ...detail.criteriaPlaylist, tracksCount: detail.tracksCount },
-            catalogue: detail.catalogue,
-            wikidataId: detail.wikidataId,
-            scope,
-            getBackendBaseUrl,
-            playback,
-            band: { node: view.node, onZoomIn, shareUrl, shareTarget: shareUrl ? shareTarget : void 0 },
-            extras
-          }
-        ),
-        !expanded && ancestors
-      ]
-    }
-  );
-}
-
 // src/genre-tree/index.ts
 import {
   GenreTreeSkeleton,
@@ -3433,10 +3449,10 @@ export {
   GenreSearch,
   GenreNodeActionBand,
   GenreInfoPanelBody,
+  GenreDetailPanel,
   TrackPositionPlayPause,
   TrackItem,
   GenreTreeView,
-  GenreDetailPanel,
   TrackListSidebar,
   PlayerPanel,
   Rating,
@@ -3445,4 +3461,4 @@ export {
   GenreTreeViewSkeleton2 as GenreTreeViewSkeleton,
   GenreTreeOutlineSkeleton
 };
-//# sourceMappingURL=chunk-JP7PID7L.js.map
+//# sourceMappingURL=chunk-RTXLUHJY.js.map