triiiceratops 0.16.5 → 0.16.7

package/dist/components/OSDViewer.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
     import { onMount } from 'svelte';
     import { SvelteSet } from 'svelte/reactivity';
+    import { createRevealSession } from './osdReveal';
     import { parseAnnotations } from '../utils/annotationAdapter';
     import { manifestsState } from '../state/manifests.svelte';
     import type { ViewerState } from '../state/viewer.svelte';
@@ -393,15 +394,23 @@
     // Load tile source when it changes
     $effect(() => {
         if (!viewer) return;
+        let cleanupRevealSession: (() => void) | null = null;
+
+        const clearRevealSession = () => {
+            if (!cleanupRevealSession) return;
+            cleanupRevealSession();
+            cleanupRevealSession = null;
+        };
 
         // If sources are cleared/absent during a canvas/world switch, clear
         // stale tiles immediately and allow the same source to reopen later.
         if (!tileSources) {
+            clearRevealSession();
             setViewerImageVisible(false);
             viewer.close();
             viewerState.tileSourceError = null;
             lastTileSourceStr = '';
-            return;
+            return clearRevealSession;
         }
 
         const mode = viewerState.viewingMode;
@@ -431,11 +440,12 @@
               : [];
 
         if (sources.length === 0) {
+            clearRevealSession();
             setViewerImageVisible(false);
             viewer.close();
             viewerState.tileSourceError = null;
             lastTileSourceStr = '';
-            return;
+            return clearRevealSession;
         }
 
         // Capture stateKey for staleness guard
@@ -443,10 +453,13 @@
         const overrides = viewerState.config?.openSeadragonConfig ?? {};
 
         // Hide the previous image immediately; reveal once new tiles are drawn.
+        clearRevealSession();
         setViewerImageVisible(false);
-        viewer.addOnceHandler('tile-drawn', () => {
-            if (capturedKey !== lastTileSourceStr) return;
-            setViewerImageVisible(true);
+        cleanupRevealSession = createRevealSession({
+            viewer,
+            capturedKey,
+            getCurrentKey: () => lastTileSourceStr,
+            setViewerImageVisible,
         });
 
         if (mode === 'continuous') {
@@ -637,6 +650,8 @@
             // Clear any previous error
             viewerState.tileSourceError = null;
         });
+
+        return clearRevealSession;
     });
 
     // Handle navigation in continuous mode

package/dist/components/osdReveal.d.ts

@@ -0,0 +1,14 @@
+export declare const REVEAL_FALLBACK_MS = 1500;
+type OSDLikeViewer = {
+    addHandler: (eventName: string, handler: () => void) => void;
+    removeHandler: (eventName: string, handler: () => void) => void;
+};
+type RevealSessionParams = {
+    viewer: OSDLikeViewer;
+    capturedKey: string;
+    getCurrentKey: () => string;
+    setViewerImageVisible: (isVisible: boolean) => void;
+    timeoutMs?: number;
+};
+export declare function createRevealSession({ viewer, capturedKey, getCurrentKey, setViewerImageVisible, timeoutMs, }: RevealSessionParams): () => void;
+export {};

package/dist/components/osdReveal.js

@@ -0,0 +1,37 @@
+export const REVEAL_FALLBACK_MS = 1500;
+const REVEAL_EVENTS = ['open', 'tile-drawn', 'animation', 'update-viewport'];
+export function createRevealSession({ viewer, capturedKey, getCurrentKey, setViewerImageVisible, timeoutMs = REVEAL_FALLBACK_MS, }) {
+    let disposed = false;
+    let revealed = false;
+    const handlers = new Map();
+    let timeoutId = null;
+    const cleanup = () => {
+        if (disposed)
+            return;
+        disposed = true;
+        if (timeoutId !== null) {
+            clearTimeout(timeoutId);
+            timeoutId = null;
+        }
+        for (const [eventName, handler] of handlers.entries()) {
+            viewer.removeHandler(eventName, handler);
+        }
+        handlers.clear();
+    };
+    const revealIfCurrent = () => {
+        if (revealed || disposed)
+            return;
+        revealed = true;
+        cleanup();
+        if (capturedKey !== getCurrentKey())
+            return;
+        setViewerImageVisible(true);
+    };
+    for (const eventName of REVEAL_EVENTS) {
+        const handler = () => revealIfCurrent();
+        handlers.set(eventName, handler);
+        viewer.addHandler(eventName, handler);
+    }
+    timeoutId = setTimeout(revealIfCurrent, timeoutMs);
+    return cleanup;
+}

package/dist/components/osdReveal.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/osdReveal.test.js

@@ -0,0 +1,112 @@
+import { describe, expect, it, vi } from 'vitest';
+import { createRevealSession } from './osdReveal';
+class MockViewer {
+    handlers = new Map();
+    addHandler(eventName, handler) {
+        const set = this.handlers.get(eventName) ?? new Set();
+        set.add(handler);
+        this.handlers.set(eventName, set);
+    }
+    removeHandler(eventName, handler) {
+        const set = this.handlers.get(eventName);
+        if (!set)
+            return;
+        set.delete(handler);
+        if (set.size === 0)
+            this.handlers.delete(eventName);
+    }
+    emit(eventName) {
+        const set = this.handlers.get(eventName);
+        if (!set)
+            return;
+        for (const handler of [...set]) {
+            handler();
+        }
+    }
+    getHandlerCount(eventName) {
+        return this.handlers.get(eventName)?.size ?? 0;
+    }
+}
+describe('createRevealSession', () => {
+    it('reveals when open fires', () => {
+        const viewer = new MockViewer();
+        let currentKey = 'abc';
+        const setVisible = vi.fn();
+        createRevealSession({
+            viewer,
+            capturedKey: 'abc',
+            getCurrentKey: () => currentKey,
+            setViewerImageVisible: setVisible,
+        });
+        viewer.emit('open');
+        expect(setVisible).toHaveBeenCalledTimes(1);
+        expect(setVisible).toHaveBeenCalledWith(true);
+    });
+    it('reveals when tile-drawn fires', () => {
+        const viewer = new MockViewer();
+        const setVisible = vi.fn();
+        createRevealSession({
+            viewer,
+            capturedKey: 'abc',
+            getCurrentKey: () => 'abc',
+            setViewerImageVisible: setVisible,
+        });
+        viewer.emit('tile-drawn');
+        expect(setVisible).toHaveBeenCalledTimes(1);
+        expect(setVisible).toHaveBeenCalledWith(true);
+    });
+    it('reveals on timeout when no events fire', () => {
+        vi.useFakeTimers();
+        const viewer = new MockViewer();
+        const setVisible = vi.fn();
+        createRevealSession({
+            viewer,
+            capturedKey: 'abc',
+            getCurrentKey: () => 'abc',
+            setViewerImageVisible: setVisible,
+            timeoutMs: 25,
+        });
+        vi.advanceTimersByTime(25);
+        expect(setVisible).toHaveBeenCalledTimes(1);
+        expect(setVisible).toHaveBeenCalledWith(true);
+        vi.useRealTimers();
+    });
+    it('does not reveal when key is stale', () => {
+        const viewer = new MockViewer();
+        let currentKey = 'abc';
+        const setVisible = vi.fn();
+        createRevealSession({
+            viewer,
+            capturedKey: 'abc',
+            getCurrentKey: () => currentKey,
+            setViewerImageVisible: setVisible,
+        });
+        currentKey = 'new-key';
+        viewer.emit('open');
+        expect(setVisible).not.toHaveBeenCalled();
+    });
+    it('cleans up handlers and timer on cleanup', () => {
+        vi.useFakeTimers();
+        const viewer = new MockViewer();
+        const setVisible = vi.fn();
+        const cleanup = createRevealSession({
+            viewer,
+            capturedKey: 'abc',
+            getCurrentKey: () => 'abc',
+            setViewerImageVisible: setVisible,
+            timeoutMs: 25,
+        });
+        expect(viewer.getHandlerCount('open')).toBe(1);
+        expect(viewer.getHandlerCount('tile-drawn')).toBe(1);
+        expect(viewer.getHandlerCount('animation')).toBe(1);
+        expect(viewer.getHandlerCount('update-viewport')).toBe(1);
+        cleanup();
+        expect(viewer.getHandlerCount('open')).toBe(0);
+        expect(viewer.getHandlerCount('tile-drawn')).toBe(0);
+        expect(viewer.getHandlerCount('animation')).toBe(0);
+        expect(viewer.getHandlerCount('update-viewport')).toBe(0);
+        vi.advanceTimersByTime(30);
+        expect(setVisible).not.toHaveBeenCalled();
+        vi.useRealTimers();
+    });
+});

package/dist/state/viewer.search.test.js

@@ -77,8 +77,12 @@ describe('ViewerState - IIIF Search', () => {
      * Helper to setup a mock manifest with canvases
      */
     function setupMockManifest(manifestJson) {
-        const mockManifest = manifesto.parseManifest(manifestJson);
-        const mockCanvases = mockManifest.getSequences()[0].getCanvases();
+        const parsed = manifesto.parseManifest(manifestJson);
+        if (!parsed) {
+            throw new Error('Failed to parse mock manifest');
+        }
+        const mockManifest = parsed;
+        const mockCanvases = mockManifest.getSequences()[0]?.getCanvases() ?? [];
         vi.mocked(manifestsState.getManifest).mockReturnValue(mockManifest);
         vi.mocked(manifestsState.getCanvases).mockReturnValue(mockCanvases);
         return { mockManifest, mockCanvases };