@knaw-huc/osd-iiif-viewer 0.2.1 → 0.2.2

package/dist/index.js

@@ -1797,10 +1797,14 @@ const defaultState$1 = {
   setRotation: (rotation) => set({ rotation }),
   reset: () => set(defaultState)
 });
-function findCanvasIndex(vault, manifestUrl, canvasId) {
-  return vault.get({ id: manifestUrl, type: "Manifest" }).items.findIndex((item) => vault.get(item).id === canvasId);
+function findCanvasIndex(vault, manifestId, canvasId) {
+  return vault.get({ id: manifestId, type: "Manifest" }).items.findIndex((item) => vault.get(item).id === canvasId);
+}
+function orThrow(msg) {
+  throw new Error(msg);
 }
 const defaultManifest = {
+  id: null,
   url: null,
   isLoading: !1,
   isReady: !1,
@@ -1811,10 +1815,14 @@ const defaultManifest = {
   loadManifest: async (url, initialCanvasId) => {
     set({ url, isLoading: !0, error: null });
     try {
-      await vault.loadManifest(url);
-      const updates = { isLoading: !1, error: null };
+      const id = (await vault.loadManifest(url))?.id || orThrow("No manifest"), updates = {
+        id,
+        url,
+        isLoading: !1,
+        error: null
+      };
       if (initialCanvasId) {
-        const index = findCanvasIndex(vault, url, initialCanvasId);
+        const index = findCanvasIndex(vault, id, initialCanvasId);
         index !== -1 && (updates.currentIndex = index);
       }
       set(updates);
@@ -1829,17 +1837,17 @@ const defaultManifest = {
 }, createCanvasSlice = (set, get) => ({
   ...defaultCanvas,
   goToCanvas: (index) => {
-    const { vault, url } = get();
-    if (!url)
+    const { vault, id: manifestId } = get();
+    if (!manifestId)
       return;
-    const manifest = vault.get({ id: url, type: "Manifest" }), clamped = Math.max(0, Math.min(index, manifest.items.length - 1));
+    const manifest = vault.get({ id: manifestId, type: "Manifest" }), clamped = Math.max(0, Math.min(index, manifest.items.length - 1));
     set({ currentIndex: clamped });
   },
   goToCanvasById: (id) => {
-    const { vault, url, goToCanvas } = get();
-    if (!url)
+    const { vault, id: manifestId, goToCanvas } = get();
+    if (!manifestId)
       return;
-    const index = findCanvasIndex(vault, url, id);
+    const index = findCanvasIndex(vault, manifestId, id);
     if (index === -1) {
       console.warn(`Canvas not found: ${id}`);
       return;
@@ -1871,9 +1879,6 @@ const defaultManifest = {
     };
   });
 }, ViewerContext = createContext(null);
-function orThrow(msg) {
-  throw new Error(msg);
-}
 function useViewerStore() {
   return useContext(ViewerContext) ?? orThrow("viewer hook must be used within viewer provider");
 }
@@ -1968,12 +1973,12 @@ function useViewerStoreSelector(selector) {
   return useStore(store, selector);
 }
 function useCanvas() {
-  const vault = useViewerStoreSelector((s2) => s2.vault), url = useViewerStoreSelector((s2) => s2.url), isLoading = useViewerStoreSelector((s2) => s2.isLoading), currentIndex = useViewerStoreSelector((s2) => s2.currentIndex), goTo = useViewerStoreSelector((s2) => s2.goToCanvas), goToById = useViewerStoreSelector((s2) => s2.goToCanvasById), next = useViewerStoreSelector((s2) => s2.nextCanvas), prev = useViewerStoreSelector((s2) => s2.prevCanvas), { current, total } = useMemo(() => {
-    if (!url || isLoading)
+  const vault = useViewerStoreSelector((s2) => s2.vault), id = useViewerStoreSelector((s2) => s2.id), isLoading = useViewerStoreSelector((s2) => s2.isLoading), currentIndex = useViewerStoreSelector((s2) => s2.currentIndex), goTo = useViewerStoreSelector((s2) => s2.goToCanvas), goToById = useViewerStoreSelector((s2) => s2.goToCanvasById), next = useViewerStoreSelector((s2) => s2.nextCanvas), prev = useViewerStoreSelector((s2) => s2.prevCanvas), { current, total } = useMemo(() => {
+    if (!id || isLoading)
       return { current: null, total: 0 };
-    const manifest = vault.get({ id: url, type: "Manifest" }), canvasRef = manifest.items[currentIndex] ?? orThrow("No canvas ref for " + currentIndex), current2 = vault.get(canvasRef), total2 = manifest.items.length;
+    const manifest = vault.get({ id, type: "Manifest" }), canvasRef = manifest.items[currentIndex] ?? orThrow("No canvas ref for " + currentIndex), current2 = vault.get(canvasRef), total2 = manifest.items.length;
     return { current: current2, total: total2 };
-  }, [vault, url, isLoading, currentIndex]), currentCanvasId = current?.id ?? null;
+  }, [vault, id, isLoading, currentIndex]), currentCanvasId = current?.id ?? null;
   return {
     currentIndex,
     currentCanvasId,
@@ -1986,8 +1991,8 @@ function useCanvas() {
   };
 }
 function useManifest() {
-  const vault = useViewerStoreSelector((s2) => s2.vault), url = useViewerStoreSelector((s2) => s2.url), isLoading = useViewerStoreSelector((s2) => s2.isLoading), error = useViewerStoreSelector((s2) => s2.error), loadManifest = useViewerStoreSelector((s2) => s2.loadManifest);
-  return { vault, url, isLoading, error, isReady: !!url && !isLoading && !error, loadManifest };
+  const vault = useViewerStoreSelector((s2) => s2.vault), id = useViewerStoreSelector((s2) => s2.id), url = useViewerStoreSelector((s2) => s2.url), isLoading = useViewerStoreSelector((s2) => s2.isLoading), error = useViewerStoreSelector((s2) => s2.error), loadManifest = useViewerStoreSelector((s2) => s2.loadManifest);
+  return { vault, id, url, isLoading, error, isReady: !!url && !isLoading && !error, loadManifest };
 }
 function useLoadManifest() {
   return useViewerStoreSelector((s2) => s2.loadManifest);
@@ -2085,23 +2090,23 @@ function useImageInfo() {
   }, [viewer, ready]);
 }
 function Overlay({ location, children }) {
-  const viewer = useViewer(), [container] = useState(() => {
-    const el = document.createElement("div");
-    return el.style.position = "absolute", el.style.pointerEvents = "none", el;
+  const viewer = useViewer(), [overlay] = useState(() => {
+    const div = document.createElement("div");
+    return div.style.position = "absolute", div.style.pointerEvents = "none", div;
   });
   return useEffect(() => {
-    function stopPropagation(e2) {
-      e2.target !== container && e2.stopPropagation();
+    function stopPropagation(event) {
+      event.target !== overlay && event.stopPropagation();
     }
-    return container.addEventListener("pointerdown", stopPropagation), () => {
-      container.removeEventListener("pointerdown", stopPropagation);
+    return overlay.addEventListener("pointerdown", stopPropagation), () => {
+      overlay.removeEventListener("pointerdown", stopPropagation);
     };
-  }, [container]), useEffect(() => {
+  }, [overlay]), useEffect(() => {
     if (viewer)
-      return viewer.addOverlay({ element: container, location }), () => {
-        viewer.isOpen() && viewer.removeOverlay(container);
+      return viewer.addOverlay({ element: overlay, location }), () => {
+        viewer.isOpen() && viewer.removeOverlay(overlay);
       };
-  }, [viewer, location, container]), viewer ? createPortal(children, container) : null;
+  }, [viewer, location, overlay]), viewer ? createPortal(children, overlay) : null;
 }
 function ViewerProvider({ children }) {
   const [store] = useState(() => createViewerStore());

package/dist/manifest/ManifestSlice.d.ts

@@ -3,6 +3,7 @@ import { Vault } from '@iiif/helpers/vault';
 import { ViewerStore } from '../ViewerStore.ts';
 import { Resettable } from '../Resettable.ts';
 export type ManifestState = {
+    id: string | null;
     url: string | null;
     isLoading: boolean;
     error: string | null;

package/dist/manifest/findCanvasIndex.d.ts

@@ -1,2 +1,2 @@
 import { Vault } from '@iiif/helpers/vault';
-export declare function findCanvasIndex(vault: Vault, manifestUrl: string, canvasId: string): number;
+export declare function findCanvasIndex(vault: Vault, manifestId: string, canvasId: string): number;

package/dist/manifest/useManifest.d.ts

@@ -1,5 +1,6 @@
 export declare function useManifest(): {
     vault: import('@iiif/helpers/vault').Vault;
+    id: string | null;
     url: string | null;
     isLoading: boolean;
     error: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knaw-huc/osd-iiif-viewer",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/knaw-huc/osd-iiif-viewer.git"