@behindthemusictree/app-kit-ui 35.0.0 → 37.0.0

package/dist/{chunk-YC3WBUVO.js → chunk-FTYMRCJS.js}

@@ -483,6 +483,7 @@ function SearchBox({
   groups,
   onPicked,
   onClear,
+  clearLabel,
   leading,
   className: className2,
   onFocus
@@ -514,6 +515,7 @@ function SearchBox({
       status,
       loading,
       onClear,
+      clearLabel,
       leading,
       inputClassName: "focus-visible:ring-0"
     }
@@ -614,6 +616,8 @@ function GenreSearch({
   onSelect,
   selectedName = null,
   onClear,
+  showClear,
+  clearLabel,
   onPrevious,
   placeholder,
   onQueryChange,
@@ -661,7 +665,8 @@ function GenreSearch({
         if (groupKey !== "genres") setQuery("");
         onQueryChange?.("");
       },
-      onClear: canClear ? () => {
+      clearLabel,
+      onClear: showClear ?? canClear ? () => {
         clear();
         onQueryChange?.("");
       } : void 0,
@@ -1096,7 +1101,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";
@@ -1174,7 +1179,7 @@ function GenrePlaylistTracks({
   const trackNoun = useTrackNoun();
   const uuid = genrePlaylist?.uuid;
   const genreName = selectedGenreName ?? genrePlaylist?.name ?? "Genre";
-  const { fetch } = useFetchWrapper(getBackendBaseUrl);
+  const { fetchBound } = usePlaybackFetch(getBackendBaseUrl);
   const playback = usePlaybackContext();
   const { data, isPending, isError, refetch, hasNextPage, isFetchingNextPage, fetchNextPage } = useInfiniteQuery({
     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] : []],
@@ -1183,7 +1188,7 @@ function GenrePlaylistTracks({
         if (!uuid) throw new Error("Personal genre has no playlist");
         return fetchGenrePlaylistTracksPage(uuid, scope, Number(pageParam));
       }
-      const response = await fetch(
+      const response = await fetchBound(
         libraryEndpoints.reference.songs.list(),
         true,
         false,
@@ -1195,7 +1200,9 @@ function GenrePlaylistTracks({
     },
     initialPageParam: scope === "me" ? 1 : "",
     getNextPageParam: (lastPage) => lastPage.nextPage ?? void 0,
-    enabled: playback.ready && (scope !== "me" || uuid !== void 0 && 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(() => {
@@ -1514,10 +1521,12 @@ function useGenreDetailContent({
     };
   }, [detail, scope]);
   if (isError) return {
+    name: null,
     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 {
+    name: null,
     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" }),
@@ -1539,6 +1548,7 @@ function useGenreDetailContent({
   );
   const ancestors = /* @__PURE__ */ jsx20(GenreNodeAncestors, { ancestorNodes: view.ancestorNodes, onSelectNode: selectGenre });
   return {
+    name: detail.name,
     title: detail.name,
     headerAccent: { background: view.fill, color: ACCENT_TEXT_COLOR },
     aside: expanded ? ancestors : void 0,
@@ -1580,7 +1590,7 @@ function GenreDetailPanel({
   onExpandedChange,
   edgeTab,
   extras,
-  headerClassName
+  titleInSearch
 }) {
   const panel = useGenreDetailContent({
     genreUuid,
@@ -1603,7 +1613,7 @@ function GenreDetailPanel({
       onExpandedChange,
       edgeTab,
       aside: panel.aside,
-      headerClassName,
+      titleInSearch,
       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
     }
@@ -1852,7 +1862,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";
@@ -1988,12 +1998,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
@@ -2439,6 +2449,8 @@ function GenreTreeView({
   };
   const {
     isLoading,
+    isError,
+    refetch,
     isFetching: isTreeFetching,
     genrePlaylistByNodeId,
     visibleGenrePlaylists,
@@ -2571,7 +2583,7 @@ function GenreTreeView({
   }, [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),
@@ -2602,7 +2614,6 @@ function GenreTreeView({
     if (node !== null && songUuid !== null) changeSong(null);
     selectNode(node);
   };
-  const handleGenreSearchClear = clearSelection;
   const handleGenreSearchSelect = (genrePlaylist2) => {
     reopenPanel();
     if (songUuid !== null) changeSong(null);
@@ -2685,7 +2696,7 @@ function GenreTreeView({
       expanded: overlayPanel.expanded ?? false,
       onExpandedChange: overlayPanel.onExpandedChange,
       onClose: overlayPanel.onClose,
-      compact: false
+      titleInSearch: false
     };
   } else if (selectedGenreUuid) {
     activePanel = {
@@ -2695,7 +2706,7 @@ function GenreTreeView({
       expanded: isExpanded,
       onExpandedChange: changeExpanded,
       onClose: clearSelection,
-      compact: false,
+      titleInSearch: true,
       headerAccent: relations ? { background: relations.fill, color: relations.textColor } : genreContent.headerAccent
     };
   } else if (builtInPanel) {
@@ -2706,7 +2717,7 @@ function GenreTreeView({
       expanded: builtInPanel.expanded,
       onExpandedChange: builtInPanel.onExpandedChange,
       onClose: builtInPanel.onClose,
-      compact: true
+      titleInSearch: true
     };
   }
   const isPanelShown = activePanel !== null && (selectedGenreUuid !== null || isTreeReady);
@@ -2751,7 +2762,7 @@ function GenreTreeView({
     ] });
   };
   const actions = /* @__PURE__ */ jsxs26(Fragment14, { children: [
-    !isLoading && /* @__PURE__ */ jsx34(
+    !isLoading && !isError && /* @__PURE__ */ jsx34(
       GenreTreeSearch,
       {
         artistBaseUrl,
@@ -2774,17 +2785,19 @@ function GenreTreeView({
           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,
+        selectedName: selectedGenreUuid ? genreContent.name : typeof builtInPanel?.title === "string" ? builtInPanel.title : null,
+        onClear: activePanel?.onClose,
+        showClear: activePanel?.titleInSearch ?? false,
+        clearLabel: "Close panel",
         onPrevious: handlePrevious,
         onQueryChange: onSearchQueryChange,
         onFocus: onSearchFocus,
         extraGroups: extraSearchGroups
       }
     ),
-    !isLoading && filterArtist && /* @__PURE__ */ jsx34("div", { className: "hidden w-full justify-center max-md:flex", children: renderArtistFilter() }),
+    !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 && !isControlled && /* @__PURE__ */ jsx34(
+      !isLoading && !isError && !isControlled && /* @__PURE__ */ jsx34(
         SegmentedControl2,
         {
           "aria-label": "Tree view mode",
@@ -2798,7 +2811,7 @@ function GenreTreeView({
           ]
         }
       ),
-      !isLoading && showDisplayOptions && /* @__PURE__ */ jsx34(
+      !isLoading && !isError && showDisplayOptions && /* @__PURE__ */ jsx34(
         "div",
         {
           className: "flex items-center gap-1",
@@ -2815,7 +2828,7 @@ function GenreTreeView({
           )
         }
       ),
-      !isLoading && !readOnly && showAddRoot && /* @__PURE__ */ jsx34(
+      !isLoading && !isError && !readOnly && showAddRoot && /* @__PURE__ */ jsx34(
         IconTextButton,
         {
           icon: Plus2,
@@ -2838,7 +2851,7 @@ function GenreTreeView({
             children: actions
           }
         ),
-        !isLoading && filterArtist && /* @__PURE__ */ jsx34(
+        !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"}`,
@@ -2846,8 +2859,12 @@ function GenreTreeView({
           }
         ),
         /* @__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 && viewMode === "outline" && floatingControlsLeading && /* @__PURE__ */ jsx34("div", { className: "absolute bottom-3 right-3 z-10", children: floatingControlsLeading }),
-          isLoading ? /* @__PURE__ */ jsx34(GenreTreeViewSkeleton, { viewMode }) : viewMode === "wheel" ? (
+          !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.
@@ -2961,8 +2978,7 @@ function GenreTreeView({
               ref: panelRef,
               side: "left",
               title: activePanel?.title ?? "",
-              hideTitle: activePanel?.compact,
-              hideClose: activePanel?.compact,
+              titleInSearch: activePanel?.titleInSearch,
               headerAccent: activePanel?.headerAccent,
               headerActions: expandButton,
               onClose: activePanel?.onClose ?? noop,
@@ -2971,7 +2987,7 @@ function GenreTreeView({
               onExpandedChange: activePanel?.onExpandedChange,
               aside: activePanel?.aside,
               edgeTab: detailTab,
-              headerClassName: "pt-[calc(var(--layout-search-h)+var(--layout-panel-inset)+0.5rem)]",
+              headerClassName: activePanel?.titleInSearch ? void 0 : "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
@@ -3453,4 +3469,4 @@ export {
   GenreTreeViewSkeleton2 as GenreTreeViewSkeleton,
   GenreTreeOutlineSkeleton
 };
-//# sourceMappingURL=chunk-YC3WBUVO.js.map
+//# sourceMappingURL=chunk-FTYMRCJS.js.map