@nulib/clover 4.5.2 → 4.5.4

package/dist/components/Annotations/Annotations.mjs

@@ -25,7 +25,7 @@ import { EntryThumbnail } from "../../ui/EntryThumbnail.mjs";
 import { useLoaded } from "../../hooks/useLoaded.mjs";
 import { HideToggle } from "../../ui/HideToggle.mjs";
 import { visuallyHidden } from "../../ui/visuallyHidden.mjs";
-import { startingLanguage } from "../../core/language-choice.mjs";
+import { startingLanguage } from "../../i18n/languages.mjs";
 import { useReadingLanguages, covers } from "../../react/readingLanguages.mjs";
 import { LanguageChoice } from "../../ui/LanguageChoice.mjs";
 import { languagesOf, inLanguage } from "./languages.mjs";

package/dist/components/Canvas/AnnotationState.mjs

@@ -65,7 +65,7 @@ function AnnotationState({
     return quiet.length ? [...ownHiddenPages, ...quiet] : ownHiddenPages;
   }, [ownHiddenPages, ownShownPages, ownQuietPages]);
   const hiddenPages = hiddenPagesProp ?? ownPages;
-  const unlistedPages = unlistedPagesProp ?? ownQuietPages;
+  const unlistedPages = unlistedPagesProp ?? NO_PAGES;
   const listed = useCallback(
     (list) => unlistedPages.length ? list.filter(
       (each) => !each.pageId || !unlistedPages.includes(each.pageId)

package/dist/components/Canvas/CanvasView.mjs

@@ -178,7 +178,10 @@ const CanvasBody = (props) => {
   optionsRef.current = options;
   const direction = resolveDirection(viewingDirection);
   const choices = useMemo(() => findChoices(canvases ?? []), [canvases]);
-  const starting = useMemo(() => startingChoices(choices), [choices]);
+  const starting = useMemo(
+    () => startingChoices(choices, language),
+    [choices, language]
+  );
   const [picked, setSelections] = useState({});
   const selections = useMemo(
     () => ({ ...starting, ...picked }),

package/dist/components/Canvas/Connected.mjs

@@ -5,6 +5,7 @@ import CanvasView from "./CanvasView.mjs";
 import { useRangeChapters, applyTarget } from "./fromManifest.mjs";
 import { paintedMedia, canvasCaptions } from "./layout.mjs";
 import { selectDrawnSets, selectUnlistedSets, selectHiddenSets } from "../../core/annotation-sets.mjs";
+import { searchServiceOf } from "../../core/search-service.mjs";
 import { showLink } from "../../core/show-link.mjs";
 import { chaptersOf } from "../../core/ranges.mjs";
 import { hasBehavior } from "../../core/selectors.mjs";
@@ -60,7 +61,8 @@ const ConnectedCanvas = ({
       state.manifest,
       state.addedSets,
       state.hiddenSets,
-      state.shownSets
+      state.shownSets,
+      Boolean(searchServiceOf(state.manifest))
     )
   );
   const hiddenSets = useCloverSelector(

package/dist/components/Canvas/layout.mjs

@@ -5,6 +5,7 @@ import { findImageServiceId } from "../../lib/renderer/sources/imageService.mjs"
 import { parseTime } from "../../lib/time.mjs";
 import { choiceKey as choiceKey$1 } from "../../core/choice-key.mjs";
 import { asArray } from "../../lib/asArray.mjs";
+import { startingLanguage } from "../../i18n/languages.mjs";
 import { isHls } from "../../lib/hls.mjs";
 const TIME_BASED_CANVAS = { width: 1600, height: 900 };
 function arrangeCanvases(canvases, direction) {
@@ -65,7 +66,8 @@ function findChoices(canvases) {
             label: item.label,
             id: item.id,
             ...typeof item.type === "string" ? { type: item.type } : {},
-            ...typeof item.format === "string" ? { format: item.format } : {}
+            ...typeof item.format === "string" ? { format: item.format } : {},
+            ...typeof asArray(item.language)[0] === "string" ? { language: asArray(item.language)[0] } : {}
           }))
         });
       }
@@ -83,10 +85,15 @@ function playsHere(item) {
   if (typeof tester.canPlayType !== "function") return true;
   return tester.canPlayType(item.format) !== "";
 }
-function startingChoices(groups) {
+function startingChoices(groups, language) {
   const chosen = {};
   for (const group of groups) {
-    const first = group.items.findIndex(playsHere);
+    const offered = group.items.filter(playsHere);
+    const tags = [...new Set(offered.flatMap((item) => item.language ?? []))];
+    const tag = tags.length > 1 ? startingLanguage(tags, language) : void 0;
+    const first = group.items.findIndex(
+      (item) => playsHere(item) && (!tag || item.language === tag)
+    );
     if (first > 0) chosen[group.key] = first;
   }
   return chosen;

package/dist/components/Canvas/media/MediaBody.mjs

@@ -11,6 +11,7 @@ import { hasCamera } from "../surface.mjs";
 import { useOptionalClover } from "../../../react/context.mjs";
 import { BodyUnloadable } from "../../../ui/BodyUnloadable.mjs";
 import { languageProps } from "../../../i18n/direction.mjs";
+import { startingLanguage } from "../../../i18n/languages.mjs";
 import { adoptSheet } from "../../../ui/adoptSheet.mjs";
 import __clover_sheet_media from "../../../ui/sheets/media.mjs";
 const SKIP_SECONDS = 10;
@@ -100,7 +101,16 @@ const MediaBody = ({
     }),
     [media.captions, language]
   );
-  const captions = useCaptionTracks(element, own, media.id);
+  const startCaption = useMemo(() => {
+    const tags = media.captions.flatMap((caption2) => caption2.language ?? []);
+    if (tags.length < 2) return 0;
+    const tag = startingLanguage(tags, language);
+    return Math.max(
+      0,
+      media.captions.findIndex((caption2) => caption2.language === tag)
+    );
+  }, [media.captions, language]);
+  const captions = useCaptionTracks(element, own, media.id, startCaption);
   const { active: shown, select } = captions;
   useEffect(() => {
     if (!caption || shown < 0) return;

package/dist/components/Canvas/media/useCaptionTracks.mjs

@@ -17,15 +17,15 @@ function inSystemPlayer(video, type) {
   const pictureInPicture = type !== "leavepictureinpicture" && (video.webkitPresentationMode === "picture-in-picture" || typeof document !== "undefined" && document.pictureInPictureElement === video);
   return fullscreen || pictureInPicture;
 }
-function useCaptionTracks(element, own, key) {
+function useCaptionTracks(element, own, key, start = 0) {
   const ownCount = own.length;
-  const first = ownCount ? 0 : -1;
+  const first = ownCount ? Math.min(Math.max(start, 0), ownCount - 1) : -1;
   const [selection, setSelection] = useState({
     choice: first,
     picked: false,
     key
   });
-  if (selection.key !== key) {
+  if (selection.key !== key || !selection.picked && typeof selection.choice === "number" && selection.choice >= 0 && selection.choice !== first) {
     setSelection({ choice: first, picked: false, key });
   }
   const { choice, picked } = selection;

package/dist/components/Panel/Panel.mjs

@@ -6,7 +6,6 @@ import { AboutActions } from "./AboutActions.mjs";
 import { InPanelContext } from "./ReadingLanguages.mjs";
 import { Tip } from "../../ui/Tip.mjs";
 import { Close } from "../Body/glyphs.mjs";
-import { SEARCH_SET_ID } from "../../core/search-service.mjs";
 import { usePanelSections } from "./sections.mjs";
 import { langWithin } from "../../i18n/config.mjs";
 import { languageToRead } from "../../i18n/languages.mjs";
@@ -16,6 +15,7 @@ import { useClover, useCloverSelector } from "../../react/context.mjs";
 import { Sections } from "../../ui/Sections.mjs";
 import { useContainerName } from "../../i18n/useContainerName.mjs";
 import { languageProps } from "../../i18n/direction.mjs";
+import { SEARCH_SET_ID } from "../../core/search-set-id.mjs";
 const RootMap = lazy(
   () => import("../Map/MapView.mjs").then((module) => ({ default: module.RootMap }))
 );

package/dist/components/Transcript/Transcript.mjs

@@ -10,7 +10,7 @@ import { loadVtt, loadText, parseVtt, paragraphsOf, cueAt } from "../../core/vtt
 import { useCloverTranslation } from "../../i18n/useCloverTranslation.mjs";
 import { join } from "../../lib/classnames.mjs";
 import { playFrom } from "../../lib/time.mjs";
-import { sameLanguage } from "../../i18n/languages.mjs";
+import { startingLanguage, sameLanguage } from "../../i18n/languages.mjs";
 import { languageProps } from "../../i18n/direction.mjs";
 import { useClover, useCloverSelector } from "../../react/context.mjs";
 import { useReadingLanguages, covers } from "../../react/readingLanguages.mjs";
@@ -73,18 +73,25 @@ const Transcript = forwardRef(
     const [choice, setChoice] = useState(0);
     const track = tracks[choice] ?? tracks[0];
     const offered = useReadingLanguages();
-    const rootLanguage = (offered == null ? void 0 : offered.chosen) ?? language;
+    const startLanguage = useMemo(() => {
+      const chosen = (offered == null ? void 0 : offered.chosen) ?? language;
+      if (chosen) return chosen;
+      const tags = tracks.flatMap(
+        (option) => option.language && option.language !== "none" ? [option.language] : []
+      );
+      return tags.length > 1 ? startingLanguage(tags) : void 0;
+    }, [offered == null ? void 0 : offered.chosen, language, tracks]);
     useEffect(() => {
-      if (!rootLanguage) return;
+      if (!startLanguage) return;
       const index = tracks.findIndex(
-        (option) => option.language && option.language !== "none" && sameLanguage(option.language, rootLanguage)
+        (option) => option.language && option.language !== "none" && sameLanguage(option.language, startLanguage)
       );
       if (index < 0) return;
       setChoice(index);
       const file = tracks[index];
       if (isCaptionTrack(file) && clover.captions.get() !== file.id)
         clover.captions.emit(file.id);
-    }, [rootLanguage, tracks, clover]);
+    }, [startLanguage, tracks, clover]);
     useEffect(() => {
       const follow2 = (id2) => {
         const index = tracks.findIndex(

package/dist/core/annotation-sets.mjs

@@ -2,7 +2,7 @@
 import { isRegionText, parseAnnotationTarget } from "./annotations.mjs";
 import { readBodies } from "./annotation-bodies.mjs";
 import { asArray } from "../lib/asArray.mjs";
-import { SEARCH_SET_ID } from "./search-service.mjs";
+import { SEARCH_SET_ID } from "./search-set-id.mjs";
 import { selectSequence, selectCanvas } from "./selectors.mjs";
 const CONTENTS_SET_ID = "contents";
 const regionEntryId = (rangeId, index) => `${rangeId}#region-${index + 1}`;
@@ -234,13 +234,14 @@ function selectHiddenSets(manifest, added, hidden, shown) {
   return ids;
 }
 const unlistedOf = /* @__PURE__ */ new WeakMap();
-function selectUnlistedSets(manifest, added, hidden, shown) {
+const ALWAYS_UNLISTED = [SEARCH_SET_ID, CONTENTS_SET_ID];
+function selectUnlistedSets(manifest, added, hidden, shown, searchable) {
+  if (!searchable) return ALWAYS_UNLISTED;
   const drawnHidden = selectHiddenSets(manifest, added, hidden, shown);
   const cached = unlistedOf.get(drawnHidden);
   if (cached && cached.hidden === hidden) return cached.ids;
   const ids = [
-    SEARCH_SET_ID,
-    CONTENTS_SET_ID,
+    ...ALWAYS_UNLISTED,
     ...drawnHidden.filter((id) => !hidden.includes(id))
   ];
   unlistedOf.set(drawnHidden, { hidden, ids });

package/dist/core/clover.mjs

@@ -4,8 +4,9 @@ import { buildContentState } from "./content-state.mjs";
 import { fetchResource, loadContent, loadManifest } from "./load.mjs";
 import { referencedPages, fetchPage, embedPage } from "./pages.mjs";
 import { selectSequence, selectVisibleCanvases, selectCanvas, canvasOfView, selectPosition, selectStart } from "./selectors.mjs";
-import { searchServiceOf, SEARCH_SET_ID } from "./search-service.mjs";
+import { searchServiceOf } from "./search-service.mjs";
 import { createStore, createChannel } from "./store.mjs";
+import { SEARCH_SET_ID } from "./search-set-id.mjs";
 function navigationOf(clover, position, total) {
   return {
     position,

package/dist/core/language-choice.mjs

@@ -1,12 +1,5 @@
 "use client";
-import { languageToRead } from "../i18n/languages.mjs";
 import { localize } from "./value.mjs";
-function startingLanguage(languages, language, picked) {
-  if (picked && languages.includes(picked)) return picked;
-  if (!languages.length) return void 0;
-  const tag = languageToRead(languages, language);
-  return tag === "none" ? languages[0] : tag;
-}
 const keysOf = (value) => value && typeof value === "object" && !Array.isArray(value) ? Object.keys(value).filter(
   (tag) => tag !== "none" && tag !== "@none" && localize({ [tag]: value[tag] }).text
 ) : [];
@@ -25,6 +18,5 @@ function descriptionLanguages(manifest) {
   return [...new Set(tags.flat())];
 }
 export {
-  descriptionLanguages,
-  startingLanguage
+  descriptionLanguages
 };

package/dist/core/search-service.mjs

@@ -1,6 +1,5 @@
 "use client";
 import { asArray } from "../lib/asArray.mjs";
-const SEARCH_SET_ID = "content-search";
 const VERSION = /\/search\/([0-2])\//;
 function searchServiceOf(manifest) {
   if (!manifest) return null;
@@ -17,6 +16,5 @@ function searchServiceOf(manifest) {
   return found;
 }
 export {
-  SEARCH_SET_ID,
   searchServiceOf
 };

package/dist/core/search-set-id.mjs

@@ -0,0 +1,5 @@
+"use client";
+const SEARCH_SET_ID = "content-search";
+export {
+  SEARCH_SET_ID
+};

package/dist/core/search.mjs

@@ -1,8 +1,8 @@
 "use client";
 import { parseAnnotationTarget } from "./annotations.mjs";
 import { fetchJson } from "./request.mjs";
-import { SEARCH_SET_ID } from "./search-service.mjs";
 import { asArray } from "../lib/asArray.mjs";
+import { SEARCH_SET_ID } from "./search-set-id.mjs";
 const MAX_PAGES = 10;
 async function searchInto(store, service, query, request, signal) {
   var _a, _b;

package/dist/i18n/languages.mjs

@@ -65,6 +65,12 @@ function languageToRead(tags, language) {
   const [first, ...rest] = language ? [language] : readerLanguages();
   return closestLanguage(first, tags, rest) ?? tags[0];
 }
+function startingLanguage(languages, language, picked) {
+  if (picked && languages.includes(picked)) return picked;
+  if (!languages.length) return void 0;
+  const tag = languageToRead(languages, language);
+  return tag === "none" ? languages[0] : tag;
+}
 export {
   baseLanguage,
   closestLanguage,
@@ -74,5 +80,6 @@ export {
   readerLanguages,
   sameLanguage,
   scriptLanguage,
+  startingLanguage,
   visitorLanguages
 };

package/dist/index.d.mts

@@ -312,6 +312,12 @@ export declare function buildContentState({ manifestId, canvasId, type, region,
  * Everything is fetched once, with the request settings, and upgraded to Presentation 4.
  */
 export type IIIFContent = string | Record<string, unknown>;
+/**
+ * The id of a search's hits as an annotation set, so hosts and parts can tell search
+ * hotspots from annotations. A module of its own, so what only needs the id (the
+ * annotation sets a Canvas alone reads) never loads the search service's reader with it.
+ */
+export declare const SEARCH_SET_ID = "content-search";
 /**
  * IIIF Content Search, versions 1 and 2: finding the Manifest's service, asking it, and
  * reading the answer into hits to list and an annotation set to draw.
@@ -348,8 +354,6 @@ export interface SearchResults {
 	/** The hits as an annotation set, so the Canvas draws them where they are. */
 	set: AnnotationSet;
 }
-/** The set's id, so hosts and parts can tell search hotspots from annotations. */
-export declare const SEARCH_SET_ID = "content-search";
 /** The Manifest's Content Search service (2 preferred over 1), or null. */
 export declare function searchServiceOf(manifest: Manifest | null): SearchService | null;
 /**
@@ -1192,8 +1196,8 @@ export interface CloverCanvasProps {
 	/**
 	 * AnnotationPages drawn (while not hidden) but never offered in the annotations menu,
 	 * as the Annotations list leaves them out: a search's hits, which Search lists, and a
-	 * still Canvas's OCR, which a search finds in. Leave it out for the Canvas to keep its
-	 * own OCR out.
+	 * still Canvas's OCR where a search finds in it. Leave it out for the Canvas to offer
+	 * its own OCR, hidden to start, as it has no search.
 	 */
 	unlistedPages?: string[];
 	/** The reader hid AnnotationPages from the picture (`visible` false), or showed them. */

package/dist/index.mjs

@@ -20,7 +20,8 @@ import { Download } from "./components/Download/Download.mjs";
 import { Split, SplitHandle, SplitPane } from "./components/Split/Split.mjs";
 import { Search } from "./components/Search/Search.mjs";
 import { search } from "./core/search.mjs";
-import { SEARCH_SET_ID, searchServiceOf } from "./core/search-service.mjs";
+import { SEARCH_SET_ID } from "./core/search-set-id.mjs";
+import { searchServiceOf } from "./core/search-service.mjs";
 import { CloverMap } from "./components/Map/Map.mjs";
 import { affineTransform, boundsOf, cornersOf, georeferencesOf, navPlaceOf, readGeoreference } from "./core/geo.mjs";
 import { hasMapData } from "./core/geo-detect.mjs";

package/dist/react/readingLanguages.mjs

@@ -1,7 +1,7 @@
 "use client";
 import { useMemo } from "react";
-import { descriptionLanguages, startingLanguage } from "../core/language-choice.mjs";
-import { sameLanguage } from "../i18n/languages.mjs";
+import { descriptionLanguages } from "../core/language-choice.mjs";
+import { startingLanguage, sameLanguage } from "../i18n/languages.mjs";
 import { useClover, useCloverSelector } from "./context.mjs";
 function useReadingLanguages() {
   const { language, chooseLanguage, toggleDrawn } = useClover("About");