@nulib/clover 4.6.0 → 4.6.1

package/dist/components/Canvas/CanvasView.mjs

@@ -1,6 +1,6 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
-import React, { useRef, useState, useMemo, useEffect, useCallback, useLayoutEffect, Suspense, lazy } from "react";
+import React, { useState, useRef, useMemo, useEffect, useCallback, useLayoutEffect, Suspense, lazy } from "react";
 import Caption, { hasInformation, captionLabelId } from "../Body/Caption.mjs";
 import Controls, { NO_LIMITS } from "./Controls.mjs";
 import { findChoices, startingChoices, animationFrames, canvasScene, paintedType, placeholderStill, frameKey, canvasSize, canvasRectToWorld } from "./layout.mjs";
@@ -100,7 +100,10 @@ const ANNOTATION_KEYS = {
 const CanvasView = (props) => {
   var _a;
   const hasSource = Boolean((_a = props.canvases) == null ? void 0 : _a.length) || toSceneImages(props.body, props.src).length > 0;
-  if (!hasSource) return null;
+  const [kept, setKept] = useState(false);
+  const keep = hasSource || kept && props.manifestId === "loading";
+  if (keep !== kept) setKept(keep);
+  if (!keep) return null;
   return /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(CanvasBody, { ...props }) });
 };
 const CanvasBody = (props) => {
@@ -559,15 +562,26 @@ ${canvases.map((canvas) => canvas.id).join("|")}` : null;
     if (exitFocused.current && lost) (_a2 = hostRef.current) == null ? void 0 : _a2.focus();
     exitFocused.current = false;
   }, [fullscreenExit]);
+  const flushed = useRef(false);
+  useLayoutEffect(() => {
+    var _a2;
+    if (shownCanvases.current === null || shownCanvases.current === canvasKey)
+      return;
+    (_a2 = surfaceRef.current) == null ? void 0 : _a2.clear();
+    drawnScene.current = null;
+    flushed.current = true;
+    setStatus("loading");
+  }, [canvasKey]);
   useEffect(() => {
     const surface2 = surfaceRef.current;
     if (showPlaceholder) placeholderShown.current = true;
     if (!surface2 || !nearViewport || showPlaceholder) return;
-    const moved = shownCanvases.current !== null && shownCanvases.current !== canvasKey;
+    const moved = flushed.current || shownCanvases.current !== null && shownCanvases.current !== canvasKey;
     if (!surface2.isOpen || moved) setStatus("loading");
     const fit = mediaOnly || placeholderShown.current && surface2.isOpen || moved;
     shownCanvases.current = canvasKey;
     placeholderShown.current = false;
+    flushed.current = false;
     surface2.setImages(images, { world: world ?? void 0, fit });
   }, [imagesKey, instanceId, mediaElement, nearViewport, showPlaceholder]);
   const shownManifest = useRef(manifestId);
@@ -580,7 +594,7 @@ ${canvases.map((canvas) => canvas.id).join("|")}` : null;
     setCleared(true);
     setStatus("loading");
   }, [manifestId]);
-  const loading = status === "loading" && images.length > 0 && nearViewport && !showPlaceholder;
+  const loading = status === "loading" && (images.length > 0 || manifestId === "loading") && nearViewport && !showPlaceholder;
   return /* @__PURE__ */ jsx(HostLanguageContext.Provider, { value: root.hostLanguage, children: /* @__PURE__ */ jsxs(
     "figure",
     {

package/dist/components/Canvas/Connected.mjs

@@ -219,7 +219,7 @@ const ConnectedCanvas = ({
     }),
     [options, request, autoplay, loop]
   );
-  if (!canvases.length) return null;
+  if (!canvases.length && manifestId !== "loading") return null;
   return /* @__PURE__ */ jsx(
     CanvasView,
     {

package/dist/components/Canvas/LoadedCanvas.mjs

@@ -11,6 +11,7 @@ import { readPage, pageLabel } from "../../core/annotation-sets.mjs";
 import { loadContent } from "../../core/load.mjs";
 import { useLoaded } from "../../hooks/useLoaded.mjs";
 const loadRanges = () => import("../../core/ranges.mjs");
+const NONE = [];
 function LoadedCanvas({
   iiifContent,
   onAnnotationLink,
@@ -26,11 +27,18 @@ function LoadedCanvas({
   const key = typeof iiifContent === "string" ? iiifContent : String((iiifContent == null ? void 0 : iiifContent.id) ?? "");
   const [followed, setFollowed] = useState(null);
   const link = (followed == null ? void 0 : followed.key) === key ? followed : null;
-  useEffect(() => {
-    let live = true;
+  const wanted = `${key}
+${(link == null ? void 0 : link.manifestId) ?? ""}
+${(link == null ? void 0 : link.canvasId) ?? ""}`;
+  const [loadingFor, setLoadingFor] = useState(wanted);
+  if (loadingFor !== wanted) {
+    setLoadingFor(wanted);
     setView(
       (current) => current.state === "ready" ? { ...current, next: true } : { state: "loading" }
     );
+  }
+  useEffect(() => {
+    let live = true;
     (async () => {
       var _a2;
       const content = await loadContent((link == null ? void 0 : link.manifestId) ?? iiifContent, {
@@ -39,8 +47,8 @@ function LoadedCanvas({
       const canvases = (content.manifest.items ?? []).filter(
         (each) => of ? each.type === of : each.type !== "Scene"
       );
-      const wanted = (link == null ? void 0 : link.canvasId) ?? ((_a2 = content.target) == null ? void 0 : _a2.canvasId);
-      const canvas = canvases.find((each) => each.id === wanted) ?? canvases[0];
+      const wanted2 = (link == null ? void 0 : link.canvasId) ?? ((_a2 = content.target) == null ? void 0 : _a2.canvasId);
+      const canvas = canvases.find((each) => each.id === wanted2) ?? canvases[0];
       if (!canvas) throw new Error(`It has no ${of ?? "Canvas"} to show.`);
       if (live) setView({ state: "ready", content, canvas });
     })().catch((error) => {
@@ -54,7 +62,7 @@ function LoadedCanvas({
       live = false;
     };
   }, [key, link == null ? void 0 : link.manifestId, link == null ? void 0 : link.canvasId, request, of]);
-  const ready = view.state === "ready" ? view : null;
+  const ready = view.state === "ready" && !view.next ? view : null;
   const [annotations, setAnnotations] = useState([]);
   const given = Boolean(props.annotations);
   useEffect(() => {
@@ -123,12 +131,24 @@ function LoadedCanvas({
     props.language,
     (ranges == null ? void 0 : ranges.chaptersOf) ?? null
   );
+  if (view.state === "ready" && view.next)
+    return /* @__PURE__ */ jsx(
+      CanvasView,
+      {
+        ...props,
+        manifestId: "loading",
+        canvases: NONE,
+        placeholder,
+        onReady: handleReady,
+        onMediaElement: handleMediaElement
+      }
+    );
   if (view.state === "ready")
     return /* @__PURE__ */ jsx(
       CanvasView,
       {
         ...props,
-        manifestId: view.next ? "loading" : view.content.manifest.id,
+        manifestId: view.content.manifest.id,
         canvases: [view.canvas],
         label: props.label ?? view.canvas.label ?? view.content.manifest.label,
         partOf: props.partOf ?? view.content.manifest.label,

package/dist/components/Canvas/Placeholder.mjs

@@ -127,7 +127,7 @@ const Placeholder = ({
                   [vertical ? "height" : "width"]: `${shares[index] / total * 100}%`
                 }
               },
-              index
+              `${index} ${JSON.stringify(still.source)}`
             ))
           }
         )

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

@@ -62,8 +62,8 @@ function PlayerFace({
     const source = thumbnailSource({ thumbnail });
     return source ? { source } : null;
   }, [shown, canvas, language]);
-  const src = useThumbnail(art == null ? void 0 : art.source, ART_SIZE, request, true);
-  const ground = useThumbnail(art == null ? void 0 : art.source, GROUND_SIZE, request, true);
+  const src = useThumbnail(art == null ? void 0 : art.source, ART_SIZE, request, canvas.id);
+  const ground = useThumbnail(art == null ? void 0 : art.source, GROUND_SIZE, request, canvas.id);
   const [loaded, setLoaded] = useState();
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(

package/dist/components/CollectionSelect/CollectionSelect.mjs

@@ -3,6 +3,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { forwardRef, useState, useEffect, useRef } from "react";
 import { useUniqueId } from "../../ui/useUniqueId.mjs";
 import { itemsOfCollection } from "../../core/items.mjs";
+import { selectShownId } from "../../core/selectors.mjs";
 import { localize } from "../../core/value.mjs";
 import { useCloverTranslation } from "../../i18n/useCloverTranslation.mjs";
 import { join } from "../../lib/classnames.mjs";
@@ -24,7 +25,8 @@ const CollectionSelect = forwardRef(
     const { t, langOf } = useCloverTranslation();
     const { clover, language } = useClover("CollectionSelect");
     const collection = useCloverSelector((state) => state.collection);
-    const shown = useCloverSelector((state) => {
+    const shown = useCloverSelector((state) => selectShownId(state) ?? "");
+    const loaded = useCloverSelector((state) => {
       var _a;
       return ((_a = state.manifest) == null ? void 0 : _a.id) ?? "";
     });
@@ -35,9 +37,9 @@ const CollectionSelect = forwardRef(
     const asked = useRef(null);
     useEffect(() => {
       asked.current = null;
-    }, [shown, collection]);
+    }, [loaded, collection]);
     const choose = (next) => {
-      if (!next || next === shown || next === asked.current) return;
+      if (!next || next === loaded || next === asked.current) return;
       asked.current = next;
       onChange == null ? void 0 : onChange(next);
       void clover.goToManifest(next).finally(() => {
@@ -80,7 +82,7 @@ const CollectionSelect = forwardRef(
               value: pending ?? shown,
               onKeyDown: (event) => {
                 const { key } = event;
-                if (key === "Enter") choose(pending);
+                if (key === "Enter") choose(pending ?? shown);
                 else if (key === "Escape") {
                   if (stepBack()) event.preventDefault();
                 } else if (STEPS.has(key) || key.length === 1 && !event.ctrlKey && !event.metaKey) {

package/dist/components/Items/Items.mjs

@@ -6,7 +6,7 @@ import { ItemFigure } from "./Item.mjs";
 import { Tip } from "../../ui/Tip.mjs";
 import { itemsOfCollection, itemsOfManifest } from "../../core/items.mjs";
 import { selectAnnotationCollection } from "../../core/annotation-sets.mjs";
-import { selectPosition, selectSequence } from "../../core/selectors.mjs";
+import { selectShownId, selectPosition, selectSequence } from "../../core/selectors.mjs";
 import { resolveDirection } from "../../core/sequence.mjs";
 import { localize } from "../../core/value.mjs";
 import { useCloverTranslation } from "../../i18n/useCloverTranslation.mjs";
@@ -56,10 +56,7 @@ function MemberItems({
 }) {
   const { clover, language } = useOptionalClover();
   const collection = useCloverSelector((state) => state.collection);
-  const manifestId = useCloverSelector((state) => {
-    var _a;
-    return ((_a = state.manifest) == null ? void 0 : _a.id) ?? null;
-  });
+  const manifestId = useCloverSelector(selectShownId);
   const items = itemsOfCollection(collection);
   const direction = resolveDirection(
     collection == null ? void 0 : collection.viewingDirection

package/dist/components/Items/Position.mjs

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { forwardRef } from "react";
 import { itemsOfCollection } from "../../core/items.mjs";
-import { selectTargetIndex } from "../../core/selectors.mjs";
+import { selectShownId, selectTargetIndex } from "../../core/selectors.mjs";
 import { useCloverTranslation } from "../../i18n/useCloverTranslation.mjs";
 import { join } from "../../lib/classnames.mjs";
 import { useClover, useCloverSelector } from "../../react/context.mjs";
@@ -14,10 +14,7 @@ function useRootSteps(of, part) {
   const navigation = useNavigation();
   const { direction } = useSequence();
   const collection = useCloverSelector((state) => state.collection);
-  const shown = useCloverSelector((state) => {
-    var _a;
-    return ((_a = state.manifest) == null ? void 0 : _a.id) ?? null;
-  });
+  const shown = useCloverSelector(selectShownId);
   const targets = useCloverSelector(
     (state) => {
       var _a;

package/dist/components/Items/StandaloneItems.mjs

@@ -22,6 +22,12 @@ function StandaloneItems({
   const key = typeof iiifContent === "string" ? iiifContent : iiifContent == null ? void 0 : iiifContent.id;
   const latest = useRef({ iiifContent, request });
   latest.current = { iiifContent, request };
+  const [loadingFor, setLoadingFor] = useState(key);
+  if (loadingFor !== key) {
+    setLoadingFor(key);
+    setResource(null);
+    setSelected(0);
+  }
   useEffect(() => {
     if (provided || latest.current.iiifContent === void 0) return;
     const controller = new AbortController();

package/dist/components/Map/MapView.mjs

@@ -7,7 +7,7 @@ import { useHighContrast, highContrastProps } from "../../hooks/useHighContrast.
 import { DEFAULT_STYLE_URL, applyDefaultBasemap } from "./basemap.mjs";
 import { navPlaceOf, georeferencesOf, cornersOf, boundsOf, readGeoreference } from "../../core/geo.mjs";
 import { sendsCredentials } from "../../core/request.mjs";
-import { selectVisibleCanvases } from "../../core/selectors.mjs";
+import { selectVisibleCanvases, selectShownId } from "../../core/selectors.mjs";
 import { localize } from "../../core/value.mjs";
 import { useCloverTranslation } from "../../i18n/useCloverTranslation.mjs";
 import { join } from "../../lib/classnames.mjs";
@@ -65,13 +65,7 @@ function ConnectedMap({
     ),
     [picked, highlighted]
   );
-  const manifestId = useOptionalCloverSelector(
-    (state) => {
-      var _a;
-      return ((_a = state.manifest) == null ? void 0 : _a.id) ?? null;
-    },
-    null
-  );
+  const manifestId = useOptionalCloverSelector(selectShownId, null);
   const current = useMemo(
     () => scope === "view" ? [
       ...shown.map((canvas) => canvas.id),

package/dist/components/Root/useRootState.mjs

@@ -1,10 +1,11 @@
 "use client";
-import { useRef, useState, useEffect, useSyncExternalStore, useCallback, useMemo } from "react";
+import { useRef, useState, useLayoutEffect, useEffect, useSyncExternalStore, useCallback, useMemo } from "react";
 import { createClover } from "../../core/clover.mjs";
 import { requestKey } from "../../core/request.mjs";
 import { cloverI18n } from "../../i18n/config.mjs";
 import { useRootContentState } from "../../react/useContentStateOutput.mjs";
 import { sameRenderers } from "../Body/renderers.mjs";
+const useIsomorphicLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
 function useRootState({
   iiifContent,
   canvasId,
@@ -55,6 +56,18 @@ function useRootState({
     })
   );
   clover.setRequest(request);
+  const [status, setStatus] = useState(clover.store.get().status);
+  useIsomorphicLayoutEffect(() => {
+    let last = clover.store.get().status;
+    return clover.store.subscribe(() => {
+      var _a, _b;
+      const { status: next, error } = clover.store.get();
+      if (next === last) return;
+      last = next;
+      setStatus(next);
+      (_b = (_a = latest.current).onStatusChange) == null ? void 0 : _b.call(_a, next, error);
+    });
+  }, [clover]);
   const initial = useRef({});
   initial.current = {
     canvasId,
@@ -65,25 +78,13 @@ function useRootState({
   const content = useRef(iiifContent);
   content.current = iiifContent;
   const key = contentKey(iiifContent);
-  useEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     void clover.load(content.current, initial.current);
     return () => clover.dispose();
   }, [clover, key, requestSettings]);
   useEffect(() => {
     if (controlled) clover.syncCanvas(canvasId ?? null);
   }, [clover, controlled, canvasId]);
-  const [status, setStatus] = useState(clover.store.get().status);
-  useEffect(() => {
-    let last = clover.store.get().status;
-    return clover.store.subscribe(() => {
-      var _a, _b;
-      const { status: next, error } = clover.store.get();
-      if (next === last) return;
-      last = next;
-      setStatus(next);
-      (_b = (_a = latest.current).onStatusChange) == null ? void 0 : _b.call(_a, next, error);
-    });
-  }, [clover]);
   const annotationsRef = useRef(annotations);
   annotationsRef.current = annotations;
   const annotationsKey = annotationsInputKey(annotations);

package/dist/components/Scene/Loaded.mjs

@@ -10,9 +10,13 @@ function LoadedScene({ iiifContent, ...props }) {
   const [view, setView] = useState({ state: "loading" });
   const request = (_a = props.options) == null ? void 0 : _a.request;
   const key = typeof iiifContent === "string" ? iiifContent : String((iiifContent == null ? void 0 : iiifContent.id) ?? "");
+  const [loadingFor, setLoadingFor] = useState(key);
+  if (loadingFor !== key) {
+    setLoadingFor(key);
+    setView({ state: "loading" });
+  }
   useEffect(() => {
     let live = true;
-    setView({ state: "loading" });
     (async () => {
       var _a2;
       const content = await loadContent(iiifContent, { request });

package/dist/core/clover.mjs

@@ -30,6 +30,7 @@ const INITIAL = {
   status: "idle",
   error: null,
   manifest: null,
+  opening: null,
   collection: null,
   throughCollection: false,
   canvasId: null,
@@ -107,7 +108,6 @@ function createClover(options = {}) {
     const start = selectStart(manifest);
     const target = has(deepLink == null ? void 0 : deepLink.canvasId) ? deepLink : has(start == null ? void 0 : start.canvasId) ? start : null;
     const canvasId = has(initial.canvasId) ? initial.canvasId : (target == null ? void 0 : target.canvasId) ?? (has(initial.defaultCanvasId) ? initial.defaultCanvasId : null) ?? ((_a = canvases[0]) == null ? void 0 : _a.id) ?? null;
-    searching == null ? void 0 : searching.abort();
     const picked = pick && ((_b = findEntry(stateSets, pick)) == null ? void 0 : _b.canvasId) === canvasId ? pick : null;
     const arrival = target && picked ? { ...target, region: void 0 } : target;
     const at = ++arrivals;
@@ -117,6 +117,7 @@ function createClover(options = {}) {
       search: NO_SEARCH,
       regions: null,
       manifest,
+      opening: null,
       collection,
       canvasId,
       target: arrival && arrival.canvasId === canvasId ? arrival : null,
@@ -168,21 +169,48 @@ function createClover(options = {}) {
       total: selectSequence(manifest).views.length
     };
   };
-  const begin = () => {
+  const begin = (opening, within) => {
     loading == null ? void 0 : loading.abort();
+    searching == null ? void 0 : searching.abort();
     const controller = new AbortController();
     loading = controller;
     requested.clear();
-    store.set({ status: "loading", error: null, annotationId: null });
+    arrivals++;
+    layerSets = [];
+    if (!within) {
+      stateSets = [];
+      contentTargets = null;
+    }
+    store.set({
+      status: "loading",
+      error: null,
+      manifest: null,
+      opening,
+      canvasId: null,
+      target: null,
+      annotationId: null,
+      search: NO_SEARCH,
+      regions: null,
+      addedSets: added(),
+      ...!within && {
+        collection: null,
+        throughCollection: false,
+        targets: null,
+        targetIndex: null
+      }
+    });
     return controller.signal;
   };
   const fail = (error) => store.set({
     status: "error",
     error: error instanceof Error ? error : new Error(String(error))
   });
-  async function load(content, initial = {}) {
+  async function open(content, initial = {}, within = false) {
     var _a;
-    const signal = begin();
+    const signal = begin(
+      within && typeof content === "string" ? content : null,
+      within
+    );
     try {
       const loaded = await loadContent(content, {
         request,
@@ -212,8 +240,8 @@ function createClover(options = {}) {
     }
   }
   const isShown = (id) => {
-    const { manifest, collection } = store.get();
-    return (manifest == null ? void 0 : manifest.id) === id || (collection == null ? void 0 : collection.id) === id;
+    const { manifest, collection, opening, status } = store.get();
+    return (manifest == null ? void 0 : manifest.id) === id || (collection == null ? void 0 : collection.id) === id || opening === id && status === "loading";
   };
   const memberOf = (id) => {
     var _a;
@@ -237,11 +265,11 @@ function createClover(options = {}) {
   };
   const show = async (member, place) => {
     if (member.type === "Collection") {
-      await load(member.id);
+      await open(member.id, {}, true);
       return store.get().status === "ready";
     }
     const { collection } = store.get();
-    const signal = begin();
+    const signal = begin(member.id, true);
     const pick = pending;
     pending = null;
     const waiting = pick ? findEntry(stateSets, pick) : null;
@@ -278,7 +306,7 @@ function createClover(options = {}) {
     setRequest(next) {
       request = next;
     },
-    load,
+    load: open,
     async openCollection(id) {
       var _a;
       const shown = store.get().manifest;

package/dist/core/geo.mjs

@@ -85,17 +85,18 @@ function annotationsOf(canvas) {
 }
 const navPlaces = /* @__PURE__ */ new WeakMap();
 function navPlaceOf(manifest, collection = null, language) {
-  if (!manifest) return NO_FEATURES;
+  const held = manifest ?? collection;
+  if (!held) return NO_FEATURES;
   const key = `${language ?? ""}|${(collection == null ? void 0 : collection.id) ?? ""}`;
-  let byKey = navPlaces.get(manifest);
-  if (!byKey) navPlaces.set(manifest, byKey = /* @__PURE__ */ new Map());
+  let byKey = navPlaces.get(held);
+  if (!byKey) navPlaces.set(held, byKey = /* @__PURE__ */ new Map());
   const cached = byKey.get(key);
   if (cached) return cached;
   const features = [];
   const add = (geo, owner) => features.push(...featuresOf(geo).map((f) => flatten(f, owner, language)));
   const c = collection;
   if (c == null ? void 0 : c.navPlace) add(c.navPlace, { label: c.label, navDate: c.navDate });
-  const m = manifest;
+  const m = manifest ?? {};
   let own = false;
   for (const member of asArray(c == null ? void 0 : c.items)) {
     if (typeof (member == null ? void 0 : member.id) !== "string") continue;

package/dist/core/selectors.mjs

@@ -89,9 +89,14 @@ const hasBehavior = (resource, value) => {
   return Array.isArray(behavior) ? behavior.includes(value) : behavior === value;
 };
 const partOfCollection = (manifest) => [(manifest == null ? void 0 : manifest.partOf) ?? []].flat().find((part) => (part == null ? void 0 : part.id) && part.type === "Collection");
+function selectShownId(state) {
+  var _a;
+  return ((_a = state.manifest) == null ? void 0 : _a.id) ?? state.opening;
+}
 function selectTargetIndex(targets, targetIndex, manifest, canvasId) {
   const items = targets == null ? void 0 : targets.items;
-  if (!(items == null ? void 0 : items.length) || !manifest) return -1;
+  if (!(items == null ? void 0 : items.length)) return -1;
+  if (!manifest) return targetIndex ?? -1;
   const visible2 = selectVisibleCanvases(manifest, canvasId);
   const here = (index) => {
     const target = items[index];
@@ -108,6 +113,7 @@ export {
   selectNextCanvases,
   selectPosition,
   selectSequence,
+  selectShownId,
   selectStart,
   selectTargetIndex,
   selectVisibleCanvases

package/dist/index.d.mts

@@ -391,8 +391,19 @@ export type CloverStatus = "idle" | "loading" | "ready" | "error";
 export interface CloverState {
 	status: CloverStatus;
 	error: Error | null;
-	/** The Manifest shown, in Presentation 4. */
+	/**
+	 * The Manifest shown, in Presentation 4. Null from the moment another is asked for
+	 * (`load`, a Collection's member, a content state's target) until it arrives: nothing
+	 * of the last one shows while the next loads (Mat, 2026-11-06).
+	 */
 	manifest: Manifest | null;
+	/**
+	 * What was asked for while it loads, by the id it was asked by: a Collection's member,
+	 * a target's Manifest. What marks the current member (`selectShownId`) reads it until
+	 * the Manifest arrives, so the choice holds, and a step from it steps from there; and
+	 * after it fails, so the member the error is for is the one to try again.
+	 */
+	opening: string | null;
 	/** The Collection it was reached through, if any. */
 	collection: Presentation4Collection | null;
 	/**
@@ -2144,7 +2155,8 @@ export interface Georeference {
  * 0139 has). A feature from a member names that member, the open one's place its own
  * Manifest's where it gives one, in the member's place in the Collection's order; one
  * from a Canvas or annotation names that Canvas. Memoized on the Manifest (and the
- * Collection), so the same collection comes back while nothing changes.
+ * Collection), so the same collection comes back while nothing changes. While a member
+ * loads, its Manifest put away, the Collection's places stay, each its member's own.
  */
 export declare function navPlaceOf(manifest: Manifest | null, collection?: Presentation4Collection | null, language?: string): MapFeatureCollection;
 /**

package/dist/lib/renderer/CanvasRenderer.mjs

@@ -406,9 +406,10 @@ class CanvasRenderer {
   }
   /**
    * Put the scene away at once: from the next frame nothing of it is drawn, and a swap
-   * still preparing is dropped. For moving to a different resource, whose pictures should
-   * never show beside the last one's while they load; `setImages` then draws the new
-   * scene, framed afresh. A swap within one resource keeps the old scene up instead.
+   * still preparing is dropped. For moving to another Canvas or another resource, whose
+   * pictures should never show the last one's while they load (Mat, 2026-11-06);
+   * `setImages` then draws the new scene, framed afresh, each image as it can be drawn.
+   * A swap within one Canvas (a Choice picked) keeps the old scene up instead.
    */
   clear() {
     this.setUnloadable(false);

package/dist/map/index.d.mts

@@ -102,7 +102,8 @@ export interface Georeference {
  * 0139 has). A feature from a member names that member, the open one's place its own
  * Manifest's where it gives one, in the member's place in the Collection's order; one
  * from a Canvas or annotation names that Canvas. Memoized on the Manifest (and the
- * Collection), so the same collection comes back while nothing changes.
+ * Collection), so the same collection comes back while nothing changes. While a member
+ * loads, its Manifest put away, the Collection's places stay, each its member's own.
  */
 export declare function navPlaceOf(manifest: Manifest | null, collection?: Presentation4Collection | null, language?: string): MapFeatureCollection;
 /**

package/dist/ui/EntryThumbnail.mjs

@@ -1,16 +1,19 @@
 "use client";
 import { jsx } from "react/jsx-runtime";
-import { useState, useEffect } from "react";
+import { useState, useRef, useEffect } from "react";
 import { resolveThumbnail } from "../core/thumbnail.mjs";
 import { join } from "../lib/classnames.mjs";
 const ENTRY_THUMBNAIL_SIZE = 52;
 const PICTURE_SIZE = 336;
-function useThumbnail(source, size, request, hold = false) {
+function useThumbnail(source, size, request, hold) {
   const [src, setSrc] = useState(source == null ? void 0 : source.src);
   const key = source ? JSON.stringify(source) : "";
+  const heldFor = useRef(hold);
   useEffect(() => {
+    const held = hold !== void 0 && heldFor.current === hold;
+    heldFor.current = hold;
     if (!source || source.src) return setSrc(source == null ? void 0 : source.src);
-    if (!hold) setSrc(void 0);
+    if (!held) setSrc(void 0);
     let live = true;
     void resolveThumbnail(source, size, request).then(
       (url) => live && setSrc(url)

package/dist/web-components/About-I4h1cfup.mjs

@@ -0,0 +1 @@
+import{e as M,y as j,u as t,z as C,P as N,Z as w,a as x,Q as $,x as H,c as _,A as G,b as V,a0 as T,W,l as k}from"./shared-ByrLMUQa.mjs";import{j as B}from"./classnames-DukgfdpI.mjs";import{u as Q}from"./readingLanguages-B20n_dkw.mjs";import{Thumbnail as U,Summary as R,Metadata as Z,RequiredStatement as E,Rights as J,Homepage as X,SeeAlso as Y,Id as K}from"./Primitives-BdXIEpYW.mjs";import{u as ee}from"./downloads-DwzBIS-9.mjs";import{P as te}from"./Provider-DWIlPOzR.mjs";import{a as oe,t as ae}from"./heading-Cjt0f-Eu.mjs";import{L as ne}from"./Label-DElSTYS5.mjs";import{r as re}from"./dates-DR3gfcON.mjs";import"./styles-BOXm_R8o.mjs";const se=C(()=>import("./LanguageChoice-t55qbd8x.mjs").then(e=>e.b).then(e=>({default:e.LanguageChoice}))),le=e=>{var r;const s=e.closest(".clover-sections-actions"),a=(r=s==null?void 0:s.closest(".clover-sections-item"))==null?void 0:r.querySelector(".clover-sections-heading .clover-sections-label");return s&&a?{box:s,label:a}:null},ce=e=>void w.chooseInterfaceLanguage(e);function ue(){x();const{languages:e,chosen:s}=w.interfaceLanguages();return e.length>1?{languages:e,chosen:s}:null}function ie({values:e=true,interfaceLanguages:s=true}={}){const a=Q(),r=ue(),l=e?(a==null?void 0:a.languages)??[]:[],c=o=>l.some(b=>b===o||w.stringsFor(b)===o),g=[...l,...(s?(r==null?void 0:r.languages)??[]:[]).filter(o=>!c(o))];if(g.length<2)return null;const P=w.chosenLanguage,h=P&&w.stringsFor(P),L=h&&g.includes(h)&&!c(h)?h:e&&a?a.chosen:(r==null?void 0:r.chosen)??g[0];return{languages:g,chosen:L,onChange:o=>l.includes(o)&&a?a.onChange(o):ce(o)}}function me({values:e,interfaceLanguages:s}){const a=ie({values:e,interfaceLanguages:s}),{drawsToggle:r}=M("About"),l=!!a;return j(()=>l?r==null?void 0:r():void 0,[l,r]),a?t(N,{fallback:null,children:t(se,{...a,nameKey:"readingLanguage",part:"clover-about",fit:le})}):null}const de=$(false),ge=C(()=>import("./Download-BfZJVu-O.mjs").then(({DownloadGroups:e})=>({default:e}))),he=C(()=>import("./NavDate-CD3sFxZJ.mjs").then(e=>e.a).then(({NavDate:e})=>({default:e}))),be=C(()=>import("./PartOfManifest-Dgw1shMM.mjs"));function fe({languages:e=true,interfaceLanguages:s=true,...a}){const r=H(de);return t(ve,{...a,download:!r&&a.download!==false,choice:r?null:t(me,{values:e,interfaceLanguages:s})})}function ve({choice:e,canvasSummary:s=false,headingLevel:a=3,download:r=true,thumbnail:l=true,label:c=true,className:g,...P}){const{t:h,langOf:L}=x(),v=ee(),o=_(n=>n.manifest,Object.is,"About"),b=G(null);j(()=>{const n=b.current,i=n==null?void 0:n.querySelector(".clover-about-head");if(!n||!i||typeof ResizeObserver>"u")return;const m=new Set,d=()=>{const D=i.querySelector(".clover-about-thumbnail"),A=i.querySelector(".clover-about-label");for(const S of[D,A])S&&!m.has(S)&&(m.add(S),y.observe(S));const f=n.style;if(!D){f.removeProperty("--clover-about-label-height"),f.removeProperty("--clover-about-thumbnail-width");return}const O=`${(A==null?void 0:A.offsetHeight)??0}px`,q=`${D.offsetWidth}px`;f.getPropertyValue("--clover-about-label-height")!==O&&f.setProperty("--clover-about-label-height",O),f.getPropertyValue("--clover-about-thumbnail-width")!==q&&f.setProperty("--clover-about-thumbnail-width",q)};let p=0;const y=new ResizeObserver(()=>{cancelAnimationFrame(p),p=requestAnimationFrame(d)});return y.observe(i),d(),()=>{cancelAnimationFrame(p),y.disconnect(),n.style.removeProperty("--clover-about-label-height"),n.style.removeProperty("--clover-about-thumbnail-width")}},[c,l,o]);const z=V(),F=()=>{var m,d;const n=b.current;(d=((m=n==null?void 0:n.closest(".clover-sections-item"))==null?void 0:m.querySelector(".clover-sections-button"))??n)==null||d.focus({preventScroll:true})};if(!o)return null;const u=(n,i,m)=>{if(!i)return null;const{as:d,title:p,group:y}=ae(a,`${z}-${n}`);return t("section",{className:"clover-about-section",...y,children:[t(d,{className:"clover-about-heading",...k(L(n)),...p,children:h(n)}),m]})},I=n=>Array.isArray(o[n])?o[n].length>0:!!o[n];return t("div",{ref:b,className:B("clover-about",g),tabIndex:-1,...P,children:[e,(l||c)&&t("div",{className:"clover-about-head",children:[l&&t(U,{className:"clover-about-thumbnail",size:256,alt:c?"":void 0}),c&&t(ne,{as:oe(a),className:"clover-about-label clover-title"})]}),s&&t(R,{of:"canvas",className:"clover-about-summary"}),T(o)&&o.partOf&&t(N,{fallback:null,children:t(be,{manifest:o,headingLevel:a,onOpened:F})}),t(R,{className:"clover-about-summary"}),t(Z,{className:"clover-about-metadata"}),t(E,{className:"clover-about-metadata"}),u("aboutDate",re(o.navDate),t(N,{fallback:null,children:t(he,{value:o.navDate,className:"clover-about-date"})})),u("aboutProvider",I("provider"),t(te,{})),u("aboutRights",o.rights,t(J,{})),u("aboutHomepage",I("homepage"),t(X,{})),u("aboutSeeAlso",I("seeAlso"),t(Y,{})),u("download",r&&v.page.length+v.all.length>0,t(N,{fallback:null,children:t(ge,{page:v.page,all:v.all,headingLevel:a+1})})),u(T(o)?"aboutCanvas":"aboutManifest",!W(o)&&o.id,t(K,{}))]})}const De=Object.freeze(Object.defineProperty({__proto__:null,About:fe},Symbol.toStringTag,{value:"Module"}));export{fe as A,de as I,me as L,De as a,ie as u};

package/dist/web-components/AnnotationItems-BfQm1YRD.mjs

@@ -0,0 +1 @@
+import{e as P,c as v,am as _,T as E,H as O,A as R,y as T,u as f,k,d as q,a3 as F}from"./shared-ByrLMUQa.mjs";import{P as L,a as y}from"./Items-BsKByN_b.mjs";import{C as B}from"./CountMenu-CQ7ThPWJ.mjs";import{a as D}from"./annotation-name-DhMF4ZHj.mjs";import{f as G,r as H}from"./fetchManifest-Cp7c8vs5.mjs";import{u as K,L as V}from"./ListEnd-KSoUQrsM.mjs";function j({onSelect:o,forwardedRef:r,...c}){const{clover:l,language:e}=P("Items"),n=v(t=>t.manifest),s=v(t=>_(t.manifest,t.addedSets)),u=v(t=>t.annotationId),d=(s==null?void 0:s.pages)??z,g=(s==null?void 0:s.entries)??J,{loaded:A,more:N,reachNext:S}=K(d),x=E(()=>[...new Set(g.map(t=>O(t.annotation)).filter(t=>!!t&&t!==(n==null?void 0:n.id)))],[g,n==null?void 0:n.id]),C=U(c.layout==="pager"?Q:x),M=x.length>0,i=E(()=>{const t=d.length?new Set(d.slice(0,A).map(a=>a.id)):null;return g.filter(a=>!t||t.has(a.setId)).map(a=>{const m=O(a.annotation),p=m&&m!==(n==null?void 0:n.id)?C.get(m)??null:n;return X(a,p,e,M)})},[d,A,g,n,C,M,e]),b=Math.max((s==null?void 0:s.total)??0,i.length),I=R(null);if(T(()=>{const t=I.current;t===null||!i[t]||(I.current=null,l.selectAnnotation(i[t].id))},[l,i]),!i.length)return null;const h=i.findIndex(t=>t.id===u),w=(t,a)=>{o==null||o(t,a),l.selectAnnotation(t.id)};return c.layout==="pager"?f(L,{...c,forwardedRef:r,steps:{position:h,total:b,direction:"left-to-right",step:(a,m)=>{const p=h+a;if(!(p<0)){if(i[p])return w(i[p],m);N&&(I.current=p,S())}}},nameKey:"informationPanelTabsAnnotations",position:f(B,{position:h,total:b,list:a=>f(j,{layout:"list",forwardedRef:null,onSelect:a})})}):f(k,{children:[f(y,{...c,forwardedRef:r,items:i,selected:h,navigation:"id",language:e,request:l.request,showSummary:true,onActivate:w}),N&&f(V,{onReached:S})]})}const z=[],J=[],Q=[];function U(o){const{clover:r}=P("Items"),[c,l]=q(W);return T(()=>{if(!o.length)return;let e=true;for(const n of o)G(r,n).then(s=>{e&&s&&l(u=>u.has(n)?u:new Map(u).set(n,s))});return()=>{e=false}},[r,o]),c}const W=new Map;function X(o,r,c,l){const e=F(r,o.canvasId),n=D(o.bodies,c),s=n.text?{[n.lang??"none"]:[n.text]}:e==null?void 0:e.label,u=l?r==null?void 0:r.label:e==null?void 0:e.label,d=e&&o.target.rect?H(e,o.target.rect):void 0;return{id:o.id,label:s,summary:n.text?u:void 0,parts:[{id:o.id,type:"Canvas",label:s,resource:e??{id:o.canvasId},...d?{source:d}:{}}]}}export{j as default};

package/dist/web-components/{AnnotationMenu-4PN2LNP-.mjs → AnnotationMenu-guk9SbaL.mjs}

@@ -1 +1 @@
-import{A as I,u as a,l as y}from"./shared-D2pvbPvF.mjs";import{s as H}from"./Annotations-CPUvoKJe.mjs";import T from"./ControlMenu-ej-Kpb31.mjs";import{C as $}from"./Cue-BhXRUDe9.mjs";import{H as z}from"./HideToggle-CmwFnHcZ.mjs";import{u as B}from"./useContainerName-BfU0IozO.mjs";import"./styles-Bf3qmdsh.mjs";const G=({id:d,triggerId:C,label:M,labelLang:k,annotations:p,hiddenPages:x=[],onPageVisibilityChange:v,selected:w,onSelect:u,onActivate:i,onClose:D})=>{const h=B(M,k),m=I(false),r=[];p.forEach((n,c)=>{var s,l;const o=r[r.length-1];o&&((s=o.page)==null?void 0:s.text)===((l=n.page)==null?void 0:l.text)?o.items.push(c):r.push({page:n.page,items:[c]})});const E=r.some(n=>!n.page);return a(T,{className:"clover-canvas-annotation-menu","data-testid":"clover-canvas-annotation-menu",id:d,onClose:D,triggerId:C,children:[E&&h.node,r.map((n,c)=>{const o=[...new Set(n.items.flatMap(t=>p[t].pageId??[]))],s=`${d}-page-${c}`,l=v&&o.length>0&&a(z,{hidden:o.every(t=>x.includes(t)),onChange:t=>v(o,!t),of:n.page?s:void 0});return a("fieldset",{...n.page?{"aria-labelledby":s}:h.props,className:"clover-canvas-menu-group clover-annotations-set",children:[n.page?a("legend",{className:"clover-canvas-menu-legend clover-annotations-set-header",children:[a("span",{className:"clover-annotations-title",id:s,...y(n.page.lang),children:n.page.text}),l]}):l&&a("div",{className:"clover-annotations-set-header",children:l}),a("div",{className:"clover-annotations-list",children:n.items.map(t=>{const e=p[t],f=H(e),g=w===e.id,N="image"in e?e.image:void 0;return a("label",{className:"clover-canvas-menu-item clover-annotations-entry","data-selected":g,onMouseEnter:()=>i(e.id),onMouseLeave:()=>i(null),onPointerDown:()=>{m.current=true},children:[a("input",{type:"radio",name:d,checked:g,onChange:()=>u(e,m.current),onClick:()=>{(g||!m.current)&&u(e)},onKeyDown:b=>{m.current=false,b.key==="Enter"&&(b.preventDefault(),u(e))},onFocus:()=>i(e.id),onBlur:()=>i(null)}),f!==void 0&&a($,{start:f,className:"clover-annotations-time"}),a("span",{className:"clover-annotations-body clover-cue-text",children:[N&&a("img",{className:"clover-annotations-image",src:N,alt:"",loading:"lazy"}),a("span",{className:"clover-annotations-text",...y(e.label?e.lang:void 0),children:e.label??String(t+1)})]})]},e.id)})})]},c)})]})};export{G as default};
+import{A as I,u as a,l as y}from"./shared-ByrLMUQa.mjs";import{s as H}from"./Annotations-DBxLDLDf.mjs";import T from"./ControlMenu-BW39OjKC.mjs";import{C as $}from"./Cue-B1IlY4Ae.mjs";import{H as z}from"./HideToggle-nvJtMFOZ.mjs";import{u as B}from"./useContainerName-DR_6TyDU.mjs";import"./styles-BOXm_R8o.mjs";const G=({id:d,triggerId:C,label:M,labelLang:k,annotations:p,hiddenPages:x=[],onPageVisibilityChange:v,selected:w,onSelect:u,onActivate:i,onClose:D})=>{const h=B(M,k),m=I(false),r=[];p.forEach((n,c)=>{var s,l;const o=r[r.length-1];o&&((s=o.page)==null?void 0:s.text)===((l=n.page)==null?void 0:l.text)?o.items.push(c):r.push({page:n.page,items:[c]})});const E=r.some(n=>!n.page);return a(T,{className:"clover-canvas-annotation-menu","data-testid":"clover-canvas-annotation-menu",id:d,onClose:D,triggerId:C,children:[E&&h.node,r.map((n,c)=>{const o=[...new Set(n.items.flatMap(t=>p[t].pageId??[]))],s=`${d}-page-${c}`,l=v&&o.length>0&&a(z,{hidden:o.every(t=>x.includes(t)),onChange:t=>v(o,!t),of:n.page?s:void 0});return a("fieldset",{...n.page?{"aria-labelledby":s}:h.props,className:"clover-canvas-menu-group clover-annotations-set",children:[n.page?a("legend",{className:"clover-canvas-menu-legend clover-annotations-set-header",children:[a("span",{className:"clover-annotations-title",id:s,...y(n.page.lang),children:n.page.text}),l]}):l&&a("div",{className:"clover-annotations-set-header",children:l}),a("div",{className:"clover-annotations-list",children:n.items.map(t=>{const e=p[t],f=H(e),g=w===e.id,N="image"in e?e.image:void 0;return a("label",{className:"clover-canvas-menu-item clover-annotations-entry","data-selected":g,onMouseEnter:()=>i(e.id),onMouseLeave:()=>i(null),onPointerDown:()=>{m.current=true},children:[a("input",{type:"radio",name:d,checked:g,onChange:()=>u(e,m.current),onClick:()=>{(g||!m.current)&&u(e)},onKeyDown:b=>{m.current=false,b.key==="Enter"&&(b.preventDefault(),u(e))},onFocus:()=>i(e.id),onBlur:()=>i(null)}),f!==void 0&&a($,{start:f,className:"clover-annotations-time"}),a("span",{className:"clover-annotations-body clover-cue-text",children:[N&&a("img",{className:"clover-annotations-image",src:N,alt:"",loading:"lazy"}),a("span",{className:"clover-annotations-text",...y(e.label?e.lang:void 0),children:e.label??String(t+1)})]})]},e.id)})})]},c)})]})};export{G as default};