@papyrus-sdk/ui-react-native 0.2.35-beta.11 → 0.2.35-beta.11.epub.2

package/runtime/runtime.js

@@ -109,6 +109,67 @@
 /* @papyrus-comic-runtime:end */
 
 (function () {
+/* @papyrus-epub-reader:start */
+(function(root){
+  function mode(value){return value==='chapter-scroll'?'chapter-scroll':'paged';}
+  function validCfi(value){return typeof value==='string' && value.length<=4096 && /^epubcfi\([^\n<>]+\)$/.test(value);}
+  function options(value){return {manager:'default',flow:mode(value)==='paged'?'paginated':'scrolled-doc',spread:'none',width:'100%',height:'100%',allowScriptedContent:false};}
+  function gesture(start,end,state){
+    if(!start || !end || state.selected || state.interactive || state.multitouch)return null;
+    var dx=end.x-start.x,dy=end.y-start.y,elapsed=end.time-start.time;
+    if(state.mode==='paged' && Math.abs(dx)>=48 && Math.abs(dx)>Math.abs(dy)*1.5 && elapsed>=0 && elapsed<1500)return (dx<0)!==Boolean(state.rtl)?'next':'prev';
+    if(elapsed>=0 && elapsed<450 && Math.hypot(dx,dy)<=12)return 'tap';
+    return null;
+  }
+  function location(raw,count,readingMode,geometry){
+    var start=raw && raw.start;if(!start || !validCfi(start.cfi))return null;
+    var displayed=start.displayed||{},chapter=Math.max(1,(Number(start.index)||0)+1);
+    var visualPage=mode(readingMode)==='paged' && Number.isFinite(displayed.page)?displayed.page:null;
+    var total=mode(readingMode)==='paged' && Number.isFinite(displayed.total)?displayed.total:null;
+    var atStart=Boolean(raw.atStart),atEnd=Boolean(raw.atEnd);
+    // Chromium may round a column offset down by a fraction of a CSS pixel.
+    // Keep epub.js authoritative outside a 1px boundary, and for RTL layouts.
+    if(visualPage!==null && total>0 && geometry && geometry.direction==='ltr' && geometry.pageWidth>0 && Number.isFinite(geometry.offset)){
+      var boundary=Math.round(geometry.offset/geometry.pageWidth);
+      if(Math.abs(geometry.offset-boundary*geometry.pageWidth)<=1){
+        visualPage=Math.min(total,Math.max(1,boundary+1));
+        atStart=chapter===(geometry.firstIndex ?? 0)+1 && visualPage===1;
+        atEnd=chapter===(geometry.lastIndex ?? count-1)+1 && visualPage===total;
+      }
+    }
+    var fraction=total?Math.max(0,(visualPage-1)/total):0;
+    return {version:1,cfi:start.cfi,href:start.href||'',chapter:chapter,chapterCount:count,visualPage:visualPage,visualPageCount:total,progress:Math.min(1,Math.max(0,(chapter-1+fraction)/Math.max(1,count))),mode:mode(readingMode),atStart:atStart,atEnd:atEnd};
+  }
+  function installResizeAnchor(manager,readCfi){
+    var original=manager.resize,anchor=null;
+    function resize(width,height,target){
+      if(validCfi(target))anchor=target;
+      if(!anchor){var current=readCfi();if(validCfi(current))anchor=current;}
+      // epub.js accepts a logical target as its third argument. Keep it across
+      // keyboard/dialog reflows instead of adopting each new viewport start.
+      return original.call(this,width,height,anchor || target);
+    }
+    manager.resize=resize;
+    return {cfi:function(){return anchor;},invalidate:function(){anchor=null;},destroy:function(){if(manager.resize===resize)manager.resize=original;anchor=null;}};
+  }
+  function install(contents,config){
+    var doc=contents.document,win=contents.window,start=null,blocked=false;
+    function point(e){var t=e.changedTouches&&e.changedTouches[0]||e.touches&&e.touches[0];return t?{x:t.clientX,y:t.clientY,time:Date.now()}:null;}
+    function selected(){return Boolean(String(win.getSelection()||'').trim()) || config.blocked();}
+    function interactive(target){return Boolean(target && target.closest && target.closest('a,button,input,textarea,select,[contenteditable="true"],[data-papyrus-overlay]'));}
+    function begin(e){start=point(e);blocked=e.touches.length!==1 || selected() || interactive(e.target);}
+    function invalidateScroll(finish){if(config.current() && start && finish && config.mode()==='chapter-scroll' && !blocked && !selected() && Math.abs(finish.y-start.y)>12 && Math.abs(finish.y-start.y)>Math.abs(finish.x-start.x) && config.interact)config.interact();}
+    function move(e){if(e.touches.length!==1)blocked=true;invalidateScroll(point(e));}
+    function end(e){var finish=point(e);invalidateScroll(finish);var action=gesture(start,finish,{mode:config.mode(),rtl:config.rtl(),selected:selected(),interactive:blocked||interactive(e.target)||Boolean(config.annotationHit && config.annotationHit(point(e))),multitouch:blocked});start=null;if(!config.current())return;if(action==='tap')config.tap();else if(action)config.turn(action==='next'?1:-1);}
+    function cancel(){start=null;blocked=true;}
+    function link(e){if(config.current() && e.target?.closest?.('a') && config.interact)config.interact();}
+    doc.addEventListener('touchstart',begin,{passive:true});doc.addEventListener('touchmove',move,{passive:true});doc.addEventListener('touchend',end,{passive:true});doc.addEventListener('touchcancel',cancel,{passive:true});doc.addEventListener('click',link);
+    return function(){doc.removeEventListener('touchstart',begin);doc.removeEventListener('touchmove',move);doc.removeEventListener('touchend',end);doc.removeEventListener('touchcancel',cancel);doc.removeEventListener('click',link);};
+  }
+  root.PapyrusEpubReader={mode:mode,validCfi:validCfi,options:options,gesture:gesture,location:location,installResizeAnchor:installResizeAnchor,install:install};
+})(typeof window==='undefined'?globalThis:window);
+
+/* @papyrus-epub-reader:end */
 /* @papyrus-epub-annotations:start */
 (function (root, factory) {
   if (typeof module === 'object' && module.exports) module.exports = factory();
@@ -187,6 +248,7 @@
         var color = /^#[0-9a-f]{6}$/i.test(annotation.color) ? annotation.color : '#FFC928';
         var style = annotation.markupStyle || annotation.type;
         var opacity = Number.isFinite(annotation.opacity) ? Math.max(0,Math.min(1,annotation.opacity)) : 0.35;
+        if(style === 'highlight')opacity=Math.min(0.35,opacity);
         rects.forEach(function(rect) {
           var mark = doc.createElement('div');
           var bodyRect=doc.body.getBoundingClientRect();
@@ -199,8 +261,10 @@
         if (hasNote) {
           var last = rects[rects.length-1], button = doc.createElement('button');
           button.textContent = '●'; button.setAttribute('aria-label',options.labels().comment || '');
-          button.style.cssText = 'position:absolute;pointer-events:auto;border:0;background:transparent;color:'+color+';width:44px;height:44px;left:'+Math.max(0,Math.min(doc.documentElement.clientWidth-44,last.right-doc.body.getBoundingClientRect().left))+'px;top:'+(Math.floor(last.top/44)*44-doc.body.getBoundingClientRect().top)+'px';
-          var key = Math.floor(last.top/44);
+          var pageWidth=Math.max(44, options.pageWidth ? options.pageWidth() : win.innerWidth);
+          var bodyRect=doc.body.getBoundingClientRect(), column=Math.max(0,Math.floor((last.left-bodyRect.left)/pageWidth));
+          button.style.cssText = 'position:absolute;pointer-events:auto;border:0;background:transparent;color:'+color+';width:44px;height:44px;left:'+((column+1)*pageWidth-44)+'px;top:'+(Math.floor(last.top/44)*44-doc.body.getBoundingClientRect().top)+'px';
+          var key = column+":"+Math.floor(last.top/44);
           var neighbors=noteGroups.get(key);
           if(!neighbors){neighbors={button:button,ids:[]};noteGroups.set(key,neighbors);group.appendChild(button);}
           neighbors.ids.push(annotation.id);
@@ -221,10 +285,10 @@
     doc.addEventListener('click',tapMarkup);
     var observer = typeof win.ResizeObserver === 'function' ? new win.ResizeObserver(schedule) : null;
     if (observer) observer.observe(doc.body);
-    win.addEventListener('resize',schedule); doc.addEventListener('load',schedule,true);
+    win.addEventListener('resize',schedule);win.addEventListener('scroll',schedule); doc.addEventListener('load',schedule,true);
     if (doc.fonts && doc.fonts.ready) doc.fonts.ready.then(schedule);
     schedule();
-    return {schedule:schedule, range:function(anchor){return resolveRange(contents,anchor);}, destroy:function(){alive=false;if(frame)win.cancelAnimationFrame(frame);if(observer)observer.disconnect();win.removeEventListener('resize',schedule);doc.removeEventListener('load',schedule,true);doc.removeEventListener('click',tapMarkup);overlay.remove();doc.body.style.position=originalPosition;registry.clear();}};
+    return {schedule:schedule, hit:function(x,y){return hitRegions.some(function(item){return item.rects.some(function(r){return x>=r.left && x<=r.right && y>=r.top && y<=r.bottom;});});}, range:function(anchor){return resolveRange(contents,anchor);}, destroy:function(){alive=false;if(frame)win.cancelAnimationFrame(frame);if(observer)observer.disconnect();win.removeEventListener('resize',schedule);win.removeEventListener('scroll',schedule);doc.removeEventListener('load',schedule,true);doc.removeEventListener('click',tapMarkup);overlay.remove();doc.body.style.position=originalPosition;registry.clear();}};
   }
   return {validAnchor:validAnchor,recoverRange:recoverRange,resolveRange:resolveRange,selection:selection,install:install};
 });
@@ -237,6 +301,7 @@
   let currentType = null;
   let book = null;
   let rendition = null;
+  let epubResizeAnchor = null;
   let documentSessionId = null;
   let annotationDocumentId;
   let annotationLabels = {};
@@ -649,6 +714,7 @@
   };
 
   const clearViewer = () => {
+    if(epubResizeAnchor){epubResizeAnchor.destroy();epubResizeAnchor=null;}
     epubAnnotationRenderers.forEach(renderer => renderer.destroy());
     epubAnnotationRenderers.clear();
     if (epubInteractionCleanup) {
@@ -1305,26 +1371,57 @@
       pageCount,
     });
 
+    if (book.locations?.generate) {
+      const activeBook=book;
+      activeBook.locations.generate(150).then(() => {
+        if (isCurrentLoad() && activeBook===book && epubLocation) {
+          epubLocation.progress=activeBook.locations.percentageFromCfi(epubLocation.cfi);
+          sendEvent('EPUB_LOCATION',{documentSessionId,location:epubLocation});
+        }
+      }).catch(() => {});
+    }
+    return renderEpubRendition(loadId,generation,null);
+  };
+
+  const renderEpubRendition = async (loadId,generation,target) => {
+    const diagnosticPayload={loadId};
+    const isCurrentLoad=()=>generation===epubLoadGeneration;
+    if(epubInteractionCleanup)epubInteractionCleanup();
+    if(rendition)rendition.destroy();
     clearViewer();
-    rendition = book.renderTo(viewer, {
-      manager: 'continuous',
-      allowScriptedContent: false,
-      width: '100%',
-      height: '100%',
-      flow: 'scrolled-continuous',
-      spread: 'none',
-    });
+    rendition = book.renderTo(viewer, window.PapyrusEpubReader.options(epubViewMode === 'single' ? 'paged' : 'chapter-scroll'));
     sendEpubDiagnostic('epub.rendition.created', diagnosticPayload);
 
     if (rendition && rendition.hooks && rendition.hooks.content) {
       const session = documentSessionId;
       const activeRendition = rendition;
       rendition.hooks.content.register((contents) => {
+        const removeGestureListeners = window.PapyrusEpubReader.install(contents, {
+          mode: () => epubViewMode === 'single' ? 'paged' : 'chapter-scroll',
+          rtl: () => book.package?.metadata?.direction === 'rtl' || book.spine?.direction === 'rtl',
+          blocked: () => Boolean(nativeMenuSelection && String(nativeMenuSelection.contents?.window?.getSelection() || '').trim()),
+          annotationHit: point => epubAnnotationRenderers.get(contents)?.hit(point.x,point.y),
+          current: () => session === documentSessionId && activeRendition === rendition,
+          interact: () => epubResizeAnchor?.invalidate(),
+          tap: () => sendEvent('EPUB_CONTENT_TAP',{documentSessionId:session}),
+          turn: direction => {
+            epubNavigationQueue = epubNavigationQueue.catch(()=>{}).then(() => {
+              if(session !== documentSessionId || activeRendition !== rendition)return;
+              epubResizeAnchor?.invalidate();
+              return direction<0?activeRendition.prev():activeRendition.next();
+            });
+            epubNavigationQueue.catch(error => sendEvent('EPUB_NAVIGATION_ERROR',{message:String(error)}));
+          },
+        });
+        const gestureCleanup = () => {removeGestureListeners();epubSelectionCleanups.delete(gestureCleanup);};
+        epubSelectionCleanups.add(gestureCleanup);
+        contents.__papyrusGestureCleanup=gestureCleanup;
         const href = spineItems[contents.sectionIndex]?.href;
         if (href && window.PapyrusEpubAnnotations) {
           const renderer = window.PapyrusEpubAnnotations.install(contents, {
             href, get documentId() { return annotationDocumentId; },
             isCurrent: () => session === documentSessionId && activeRendition === rendition,
+            pageWidth: () => activeRendition.layout?.width || viewer.clientWidth,
             annotations: () => epubAnnotations, labels: () => annotationLabels,
             onTap: (id, ids) => sendEvent("EPUB_ANNOTATION_TAP", {documentSessionId: session, id, ids}),
           });
@@ -1343,8 +1440,7 @@
           typeof selectionWindow.getSelection === 'function'
         ) {
           let selectionTimer = null;
-          let lastSelectionKey = '';
-          let lastSelectionAt = 0;
+
           const reportSelection = () => {
             selectionTimer = null;
             if (session !== documentSessionId || activeRendition !== rendition) return;
@@ -1359,11 +1455,7 @@
             try { cfi = contents.cfiFromRange(range); } catch (_) { return; }
             const anchor = window.PapyrusEpubAnnotations?.selection(contents, cfi, href, annotationDocumentId);
             if (!anchor) return;
-            const key = anchor.cfiRange + ':' + anchor.quote;
-            const now = Date.now();
-            if (key === lastSelectionKey && now - lastSelectionAt < 750) return;
-            lastSelectionKey = key;
-            lastSelectionAt = now;
+            if (nativeMenuSelection?.payload?.anchor?.cfiRange === anchor.cfiRange && nativeMenuSelection?.payload?.anchor?.quote === anchor.quote) return;
             const payload = {documentSessionId: session, text: anchor.quote,
               pageIndex: contents.sectionIndex + 1, anchor};
             nativeMenuSelection = {contents, payload};
@@ -1378,6 +1470,7 @@
             // The content document still emits selectionchange, so resolve its
             // live Range to a CFI before the native menu action can fire.
             if (text) reportSelection();
+            else if (nativeMenuSelection?.contents === contents) nativeMenuSelection = null;
           };
           selectionDocument.addEventListener('selectionchange', handleSelectionChange);
           const selectionCleanup = () => {
@@ -1400,6 +1493,7 @@
       typeof rendition.hooks.unloaded.register === 'function'
     ) {
       rendition.hooks.unloaded.register((view) => {
+        view?.contents?.__papyrusGestureCleanup?.();
         const cleanup = view && view.contents && view.contents.__papyrusSelectionCleanup;
         if (typeof cleanup === 'function') cleanup();
         const renderer = epubAnnotationRenderers.get(view?.contents);
@@ -1415,13 +1509,13 @@
         if (selectionSession !== documentSessionId || selectionRendition !== rendition) return;
         const href = spineItems[contents.sectionIndex]?.href;
         const anchor = href && window.PapyrusEpubAnnotations?.selection(contents,cfiRange,href,annotationDocumentId);
-        if (!anchor) return;
+        if (!anchor || nativeMenuSelection?.payload?.anchor?.cfiRange === anchor.cfiRange && nativeMenuSelection?.payload?.anchor?.quote === anchor.quote) return;
         epubScrollDiagnostics && epubScrollDiagnostics.setSelectionActive(true);
         const payload = {documentSessionId: selectionSession, text: anchor.quote, pageIndex: contents.sectionIndex+1, anchor};
         nativeMenuSelection = {contents, payload};
         sendEvent('EPUB_TEXT_SELECTED', payload);
       });
-      ['rendered','resized','layout'].forEach(name => rendition.on(name, () => {
+      ['rendered','resized','layout','relocated'].forEach(name => rendition.on(name, () => {
         if (selectionSession === documentSessionId && selectionRendition === rendition) epubAnnotationRenderers.forEach(renderer => renderer.schedule());
       }));
       rendition.on('relocated', (location) => {
@@ -1431,6 +1525,21 @@
         if (index < 0 && start && start.href) index = getSpineIndexByHref(start.href);
         if (index < 0 || index >= spineItems.length) return;
         epubScrollDiagnostics && epubScrollDiagnostics.relocated(location);
+        let pageGeometry;
+        const manager=rendition.manager,layout=manager?.layout;
+        if(epubViewMode==='single' && layout?.divisor===1 && !manager?.settings?.fullsize && manager?.settings?.direction==='ltr'){
+          const visible=manager.visible?.();
+          const view=visible?.find(view=>view.index===index);
+          if(view && manager.container){
+            pageGeometry={direction:'ltr',firstIndex:book.spine.first()?.index,lastIndex:book.spine.last()?.index,pageWidth:layout.pageWidth,offset:manager.container.getBoundingClientRect().left-view.position().left};
+          }
+        }
+        epubLocation=window.PapyrusEpubReader.location(location,spineItems.length,epubViewMode==='single'?'paged':'chapter-scroll',pageGeometry);
+        if(epubLocation){
+          epubLocation.cfi=epubResizeAnchor?.cfi() || epubLocation.cfi;
+          if(book.locations?.length?.()>0)epubLocation.progress=book.locations.percentageFromCfi(epubLocation.cfi);
+          sendEvent('EPUB_LOCATION',{documentSessionId,location:epubLocation});
+        }
         const nextPage = index + 1;
         if (nextPage === currentPage) return;
         currentPage = nextPage;
@@ -1438,21 +1547,23 @@
       });
     }
 
+    applyEpubZoom();
     sendEpubDiagnostic('epub.display.start', diagnosticPayload);
     await withEpubStageTimeout(
-      displayEpubPage(0),
+      rendition.display(target || spineItems[0]?.href),
       'rendition.display',
       diagnosticPayload,
     );
     if (!isCurrentLoad()) throw new Error('EPUB load superseded by a newer load');
     sendEpubDiagnostic('epub.display.end', diagnosticPayload);
+    const resizeRendition=rendition;
+    epubResizeAnchor=window.PapyrusEpubReader.installResizeAnchor(resizeRendition.manager,()=>resizeRendition.location?.start?.cfi);
     if (
       rendition &&
       rendition.manager &&
       typeof rendition.manager.on === 'function' &&
       typeof rendition.on === 'function'
     ) {
-      let touchStart = null;
       let lastScrollOffset = -1;
       const manager = rendition.manager;
       epubScrollDiagnostics = createEpubScrollDiagnostics(manager);
@@ -1527,57 +1638,19 @@
           return result;
         };
       }
-      const getTouchPoint = (event) => {
-        const touch =
-          (event && event.changedTouches && event.changedTouches[0]) ||
-          (event && event.touches && event.touches[0]);
-        if (!touch) return null;
-        const x = Number(touch.screenX ?? touch.clientX);
-        const y = Number(touch.screenY ?? touch.clientY);
-        return Number.isFinite(x) && Number.isFinite(y) ? { x, y } : null;
-      };
-      const handleScroll = (event) => {
+      const handleScroll = event => {
         const offsetY = Math.max(0, Number(event && event.top) || 0);
         epubScrollDiagnostics && epubScrollDiagnostics.scroll(event);
-        if (Math.abs(offsetY - lastScrollOffset) < 1) return;
-        lastScrollOffset = offsetY;
-        sendEvent('VIEWER_SCROLL', { offsetY });
+        if (Math.abs(offsetY-lastScrollOffset)<1) return;
+        lastScrollOffset=offsetY;
+        sendEvent('VIEWER_SCROLL',{offsetY});
       };
-      const handleTouchStart = (event) => {
-        touchStart = event?.touches?.length > 1 ? null : getTouchPoint(event);
-        epubScrollDiagnostics && epubScrollDiagnostics.touchStart(event);
-      };
-      const handleTouchMove = (event) => {
-        if (event?.touches?.length > 1) touchStart = null;
-        epubScrollDiagnostics && epubScrollDiagnostics.touchMove(event);
-      };
-      const handleTouchEnd = (event) => {
-        const end = getTouchPoint(event);
-        const start = touchStart;
-        touchStart = null;
-        const selectedText = event?.target?.ownerDocument?.defaultView?.getSelection?.()?.toString().trim() || '';
-        if (!selectedText && start && end && epubViewMode === 'single' && Math.abs(end.x-start.x) >= 48 && Math.abs(end.x-start.x) > Math.abs(end.y-start.y)*1.5) {
-          const active = rendition;
-          const interactionSession = documentSessionId;
-          epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
-            if (active !== rendition || interactionSession !== documentSessionId) return;
-            return end.x < start.x ? active.next() : active.prev();
-          });
-          epubNavigationQueue.catch(error => sendEvent('EPUB_NAVIGATION_ERROR', {message:String(error)}));
-        } else if (!selectedText && start && end && Math.hypot(end.x - start.x, end.y - start.y) <= 12) {
-          sendEvent('VIEWER_TAP', {});
-        }
-        epubScrollDiagnostics && epubScrollDiagnostics.touchEnd(event);
-      };
-
       manager.on('scroll', handleScroll);
       const handleScrolled = (event) => {
         epubScrollDiagnostics && epubScrollDiagnostics.settled(event);
       };
       manager.on('scrolled', handleScrolled);
-      rendition.on('touchstart', handleTouchStart);
-      rendition.on('touchmove', handleTouchMove);
-      rendition.on('touchend', handleTouchEnd);
+
       epubInteractionCleanup = () => {
         epubSelectionCleanups.forEach((cleanup) => cleanup());
         epubSelectionCleanups.clear();
@@ -1586,16 +1659,9 @@
         if (originalEnqueue) queue.enqueue = originalEnqueue;
         if (typeof manager.off === 'function') manager.off('scroll', handleScroll);
         if (typeof manager.off === 'function') manager.off('scrolled', handleScrolled);
-        if (typeof rendition.off === 'function') {
-          rendition.off('touchstart', handleTouchStart);
-          rendition.off('touchmove', handleTouchMove);
-          rendition.off('touchend', handleTouchEnd);
-        }
         epubScrollDiagnostics = null;
       };
     }
-    applyEpubZoom();
-
     const outline = await withEpubStageTimeout(
       buildOutline(),
       'outline',
@@ -1625,6 +1691,7 @@
     const request = ++epubNavigationRequest;
     const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
       if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
+      epubResizeAnchor?.invalidate();
       await activeRendition.display(target);
       if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
       currentPage = pageIndex + 1;
@@ -1733,7 +1800,8 @@
   };
 
   let nativeMenuSelection = null;
-  let epubViewMode = "continuous";
+  let epubViewMode = "single";
+  let epubLocation = null;
 
   const handleCommand = async (message) => {
     const { id, kind, payload } = message;
@@ -1746,7 +1814,9 @@
         epubAnnotations = [];
         annotationDocumentId = undefined;
         zoom = 1.0;
-        epubViewMode = "continuous";
+        epubViewMode = payload.epubMode === "chapter-scroll" ? "continuous" : "single";
+        epubLocation = null;
+        nativeMenuSelection = null;
         epubNavigationRequest += 1;
         epubNavigationQueue = Promise.resolve();
 
@@ -1811,6 +1881,7 @@
           epubNavigationRequest += 1;
           const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
             if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
+            epubResizeAnchor?.invalidate();
             await activeRendition.display(annotation.anchor.href);
             if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
             const contents = activeRendition.getContents().find(c => spineItems[c.sectionIndex]?.href === annotation.anchor.href);
@@ -1852,6 +1923,7 @@
         const active = rendition;
         epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
           if (active !== rendition || payload.documentSessionId !== documentSessionId) return;
+          epubResizeAnchor?.invalidate();
           return payload.direction < 0 ? active.prev() : active.next();
         });
         await epubNavigationQueue;
@@ -1860,25 +1932,40 @@
 
       if (kind === 'set-epub-view-mode') {
         if (currentType !== 'epub' || payload.documentSessionId !== documentSessionId) throw new Error('Stale EPUB layout session');
-        epubViewMode = payload.viewMode === 'single' ? 'single' : 'continuous';
-        const active = rendition;
-        epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
-          if (active !== rendition || payload.documentSessionId !== documentSessionId) return;
-          const flow = epubViewMode === 'single' ? 'paginated' : 'scrolled-continuous';
-          if (active.settings.flow === flow) return;
-          active.flow(flow);
-          return active.q.enqueue(() => Promise.resolve());
-        });
-        await epubNavigationQueue;
-        sendResponse(id,true,null); return;
+        const next=payload.epubMode ? (payload.epubMode==='paged'?'single':'continuous') : (payload.viewMode==='single'?'single':'continuous');
+        {
+          epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(async()=>{
+            if(payload.documentSessionId!==documentSessionId || next===epubViewMode)return;
+            const target=epubResizeAnchor?.cfi() || epubLocation?.cfi;
+            epubViewMode=next;
+            await renderEpubRendition('layout',epubLoadGeneration,target);
+          });
+          await epubNavigationQueue;
+        }
+        sendResponse(id,true,null);return;
+      }
+      if(kind === 'epub-go-to-location'){
+        if(currentType!=='epub' || payload.documentSessionId!==documentSessionId || !window.PapyrusEpubReader.validCfi(payload.cfi))throw new Error('Invalid EPUB location');
+        epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(()=>{if(payload.documentSessionId!==documentSessionId)return;epubResizeAnchor?.invalidate();return rendition.display(payload.cfi);});
+        await epubNavigationQueue;sendResponse(id,true,null);return;
       }
 
       if (kind === 'set-zoom') {
-        zoom = Math.max(0.5, Math.min(4.0, payload.zoom || 1.0));
-        applyZoom();
-        sendState();
-        sendResponse(id, true, { zoom });
-        return;
+        const requestedZoom=Math.max(0.5,Math.min(4.0,payload.zoom || 1.0));
+        if(currentType === 'epub') {
+          const session=documentSessionId;
+          epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(async()=>{
+            if(session!==documentSessionId)return;
+            const active=rendition;
+            const cfi=epubResizeAnchor?.cfi() || epubLocation?.cfi;
+            zoom=requestedZoom;applyEpubZoom();
+            // Let the content CSS update before redisplaying the logical anchor.
+            await new Promise(resolve=>(window.requestAnimationFrame || (callback=>setTimeout(callback,0)))(resolve));
+            if(cfi && active===rendition && session===documentSessionId)await active.display(cfi);
+          });
+          await epubNavigationQueue;
+        } else {zoom=requestedZoom;applyZoom();}
+        sendState();sendResponse(id,true,{zoom});return;
       }
 
       if (kind === 'set-rotation') {

package/runtime/syncComicRuntime.mjs

@@ -24,11 +24,13 @@ const runtimeBodyStart = runtime.indexOf("\n(function () {", runtime.indexOf(com
 if (runtimeBodyStart < 0) {
   throw new Error("Main runtime body not found");
 }
-const runtimeBody = runtime.slice(runtimeBodyStart + 1).trim();
+const readerSource=await readFile(resolve(runtimeDirectory,"epubReader.js"),"utf8");
+const readerRuntime=replaceMarkedSource(runtime,"/* @papyrus-epub-reader:start */","/* @papyrus-epub-reader:end */",`\n${readerSource}\n`);
+const runtimeBody = readerRuntime.slice(readerRuntime.indexOf("\n(function () {",readerRuntime.indexOf(comicRuntimeEnd))+1).trim();
 await writeFile(
   runtimePath,
   replaceMarkedSource(
-    runtime,
+    readerRuntime,
     "/* @papyrus-comic-runtime:start */",
     "/* @papyrus-comic-runtime:end */",
     `\n${source.trim()}\n`
@@ -37,12 +39,13 @@ await writeFile(
 
 const htmlPath = resolve(runtimeDirectory, "index.html");
 const html = await readFile(htmlPath, "utf8");
-const htmlWithComicRuntime = replaceMarkedSource(
+let htmlWithComicRuntime = replaceMarkedSource(
   html,
   "<!-- @papyrus-comic-runtime:start -->",
   "<!-- @papyrus-comic-runtime:end -->",
   `\n    <script>\n${source}\n    </script>\n`
 );
+htmlWithComicRuntime=htmlWithComicRuntime.replace(/<!-- @papyrus-epub-reader:start -->[\s\S]*?<!-- @papyrus-epub-reader:end -->\n?/g,"");
 const htmlComicRuntimeEnd = "<!-- @papyrus-comic-runtime:end -->";
 const htmlBodyStart = htmlWithComicRuntime.indexOf(
   "<script>",