feat: remember document sidebar tabs and add red highlight

Author: reycn

electron/recents.mjs

@@ -14,12 +14,13 @@ function storedThumbnail(thumbnail){try{return validateThumbnail(thumbnail);}cat
 export function validateReadingView(view){
  if(!view||typeof view!=='object'||Array.isArray(view))throw Error('Invalid recent document view.');
  const keys=Reflect.ownKeys(view);
- if(keys.length!==readingViewFields.length||readingViewFields.some(key=>!Object.hasOwn(view,key)))throw Error('Invalid recent document view.');
+ if(keys.length!==readingViewFields.length+(Object.hasOwn(view,'sidebarMode')?1:0)||readingViewFields.some(key=>!Object.hasOwn(view,key)))throw Error('Invalid recent document view.');
  if(!Number.isInteger(view.page)||view.page<1||view.page>1000000)throw Error('Invalid recent document view.');
  if(!Number.isFinite(view.offsetX)||view.offsetX<-16||view.offsetX>16||!Number.isFinite(view.offsetY)||view.offsetY<-16||view.offsetY>16)throw Error('Invalid recent document view.');
  if(!Number.isFinite(view.zoom)||view.zoom<.1||view.zoom>4)throw Error('Invalid recent document view.');
  if(!['width','height','manual'].includes(view.fit)||!['vertical','horizontal'].includes(view.direction)||![1,2,4].includes(view.columns)||typeof view.sidebar!=='boolean'||typeof view.showTranslations!=='boolean')throw Error('Invalid recent document view.');
- return {page:view.page,offsetX:view.offsetX,offsetY:view.offsetY,zoom:view.zoom,fit:view.fit,direction:view.direction,columns:view.columns,sidebar:view.sidebar,showTranslations:view.showTranslations};
+ if(Object.hasOwn(view,'sidebarMode')&&!['thumbnails','outline','annotations'].includes(view.sidebarMode))throw Error('Invalid recent document sidebar mode.');
+ return {...(Object.hasOwn(view,'sidebarMode')?{sidebarMode:view.sidebarMode}:{}),page:view.page,offsetX:view.offsetX,offsetY:view.offsetY,zoom:view.zoom,fit:view.fit,direction:view.direction,columns:view.columns,sidebar:view.sidebar,showTranslations:view.showTranslations};
 }
 function storedReadingView(view){try{return validateReadingView(view);}catch{return undefined;}}
 function cloneReadingView(view){return view===undefined?undefined:{...view};}

server/document-session.test.mjs

@@ -16,3 +16,19 @@ test('session persists multiple documents and positions; closing all restores on
  assert.equal(JSON.parse(await readFile(path)).documents.length,0);
  }finally{await rm(dir,{recursive:true,force:true});}
 });
+
+test('sidebar tabs persist separately for each document and reject unknown modes',async()=>{
+ const {createRecents}=await import('../electron/recents.mjs');
+ const dir=await mkdtemp(join(tmpdir(),'reader-sidebar-'));
+ try{
+  const path=join(dir,'recents.json'),recents=await createRecents(path);
+  const [a]=await recents.remember('/tmp/a.pdf');
+  const [b]=await recents.remember('/tmp/b.pdf');
+  await recents.setView(a.id,{...view,sidebarMode:'annotations'});
+  await recents.setView(b.id,{...view,sidebarMode:'outline'});
+  const restored=(await createRecents(path)).list();
+  assert.equal(restored.find(item=>item.id===a.id).view.sidebarMode,'annotations');
+  assert.equal(restored.find(item=>item.id===b.id).view.sidebarMode,'outline');
+  await assert.rejects(recents.setView(a.id,{...view,sidebarMode:'invalid'}));
+ }finally{await rm(dir,{recursive:true,force:true});}
+});

src/App.vue

@@ -250,12 +250,13 @@ const restoringView=ref(false);let currentRecentId=null,readingSaveTimer;
 function readingView(){
  const el=reader.value,p=pages.value[active.value-1],host=p&&pageEls.get(p.number);if(!el||!host)return null;
  const bounds=el.getBoundingClientRect(),box=host.getBoundingClientRect(),style=getComputedStyle(el);
- return {page:p.number,offsetX:Math.max(-16,Math.min(16,(bounds.left+parseFloat(style.paddingLeft)-box.left)/box.width)),offsetY:Math.max(-16,Math.min(16,(bounds.top+parseFloat(style.paddingTop)-box.top)/box.height)),zoom:zoom.value,fit:fitMode.value,direction:direction.value,columns:columns.value,sidebar:sidebar.value,showTranslations:showTranslations.value};
+ return {page:p.number,offsetX:Math.max(-16,Math.min(16,(bounds.left+parseFloat(style.paddingLeft)-box.left)/box.width)),offsetY:Math.max(-16,Math.min(16,(bounds.top+parseFloat(style.paddingTop)-box.top)/box.height)),zoom:zoom.value,fit:fitMode.value,direction:direction.value,columns:columns.value,sidebar:sidebar.value,sidebarMode:sidebarMode.value,showTranslations:showTranslations.value};
 }
 async function saveReadingView(){clearTimeout(readingSaveTimer);if(restoringView.value||loading.value)return;const view=readingView();if(view)try{if(currentRecentId){const id=currentRecentId,status=translationSnapshot();await window.previewRecents?.setView(id,view);await window.previewRecents?.setTranslationStatus?.(id,status);}await window.previewDocuments?.saveView(view);}catch{error.value=t('error.saveReadingPosition');}}
 function scheduleReadingSave(){if(restoringView.value||loading.value||!currentRecentId)return;clearTimeout(readingSaveTimer);readingSaveTimer=setTimeout(saveReadingView,180);}
 window.previewSaveReadingView=async()=>{await annotationWrites;await performanceRecorder.finish();await saveReadingView();};
 async function restoreReadingView(view){
+ sidebarMode.value=view?.sidebarMode==='outline'&&documentOutline.value.length?'outline':view?.sidebarMode==='annotations'&&annotations.value.length?'annotations':'thumbnails';
  if(view){direction.value=view.direction;columns.value=view.columns;sidebar.value=view.sidebar;showTranslations.value=view.showTranslations;fitMode.value=view.fit;zoom.value=view.zoom;active.value=Math.min(pages.value.length,Math.max(1,view.page));pageEntry.value=active.value;}
  mountAroundPage(active.value);await nextTick();
  if(documentOpening.value)await new Promise(resolve=>requestAnimationFrame(resolve));
@@ -557,7 +558,7 @@ async function closeDocument(closeStartPage=false){
  }finally{await sidebarMotion;capture?.element.remove();if(documentMotionController===controller)documentMotionController=null;documentClosing.value=false;closingDocument=false;}
 }
 async function closeDocumentNow(){
- referenceReturn.value=null;referenceNavigation++;const documentToken=epoch;await annotationWrites;annotations.value=[];showAnnotations.value=true;annotationKey.value='';sidebarMode.value='thumbnails';documentOutline.value=[];selectedAnnotation.value=null;await performanceRecorder.finish();await saveReadingView();await window.previewDocuments?.closed();if(documentToken!==epoch)return;currentRecentId=null;
+ referenceReturn.value=null;referenceNavigation++;const documentToken=epoch;await annotationWrites;await saveReadingView();annotations.value=[];showAnnotations.value=true;annotationKey.value='';sidebarMode.value='thumbnails';documentOutline.value=[];selectedAnnotation.value=null;await performanceRecorder.finish();await window.previewDocuments?.closed();if(documentToken!==epoch)return;currentRecentId=null;
  cancel();const closingToken=epoch;closeSearch();await releaseDocument();if(closingToken!==epoch)return;clearTimeout(timer);clearTimeout(navigatorTimer);cancelAnimationFrame(fitFrame);fitFrame=0;clearTimeout(fitResizeTimer);fitResizing=false;
  dismissPopovers();resetBitmaps();
  const tasks=new Set([pendingPDFTask,pdf?.loadingTask,...pages.value.map(page=>page.mathDocument?.loadingTask)].filter(Boolean));
@@ -579,16 +580,16 @@ async function importFile(file,ticket,origin){
  if(file&&!ticket&&(pages.value.length||loading.value)&&window.previewDocuments?.open){try{await window.previewDocuments.open(file);}catch(e){error.value=e.message;}return;}
  if(!file)return;closeSearch();if(testMode&&!['A quieter way to read.pdf','Portrait and landscape.pdf'].includes(file.name)){error.value=t('error.testDocumentsDisabled');return;}if(file.size>50*1024*1024){error.value=t('error.PDFTooLarge');return;}
  documentMotionController?.abort();documentOpening.value=!!origin&&!documentMotionReduced();
- referenceReturn.value=null;referenceNavigation++;await annotationWrites;annotations.value=[];showAnnotations.value=true;annotationKey.value='';sidebarMode.value='thumbnails';documentOutline.value=[];selectedAnnotation.value=null;await performanceRecorder.start(file.size);const runtimeReady=ensurePDF();await saveReadingView();currentRecentId=null;restoringView.value=true;selectedParagraph.value=null;cancel();const token=epoch;await releaseDocument();if(token!==epoch)return;resetBitmaps();renderMetrics.openedAt=performance.now();renderMetrics.firstPageMs=null;loading.value=true;error.value='';for(const p of pages.value)p.mathDocument?.loadingTask.destroy();pages.value=[];pageEls.clear();canvasEls.clear();thumbEls.clear();
+ referenceReturn.value=null;referenceNavigation++;await annotationWrites;await saveReadingView();annotations.value=[];showAnnotations.value=true;annotationKey.value='';sidebarMode.value='thumbnails';documentOutline.value=[];selectedAnnotation.value=null;await performanceRecorder.start(file.size);const runtimeReady=ensurePDF();currentRecentId=null;restoringView.value=true;selectedParagraph.value=null;cancel();const token=epoch;await releaseDocument();if(token!==epoch)return;resetBitmaps();renderMetrics.openedAt=performance.now();renderMetrics.firstPageMs=null;loading.value=true;error.value='';for(const p of pages.value)p.mathDocument?.loadingTask.destroy();pages.value=[];pageEls.clear();canvasEls.clear();thumbEls.clear();
  try{
   bytes=new Uint8Array(await file.arrayBuffer());let imported={annotations:[],nativeRefs:[]};if(window.previewAnnotations?.prepare){imported=await window.previewAnnotations.prepare(bytes);bytes=imported.bytes;}else if(window.previewAnnotations?.clean)bytes=await window.previewAnnotations.clean(bytes);performanceRecorder.mark('fileRead');if(token!==epoch)return;await pdf?.loadingTask.destroy();if(token!==epoch)return;
   const registered=await api('/api/documents',{method:'POST',headers:{'Content-Type':'application/pdf'},body:bytes});if(token!==epoch){await api('/api/documents/'+registered.id,{method:'DELETE'});return;}documentId=registered.id;performanceRecorder.mark('upload');
-  await runtimeReady;const task=getDocument({data:bytes});pendingPDFTask=task;const loaded=await task.promise;if(token!==epoch){void task.destroy();return;}pdf=markRaw(loaded);void loadOutline(pdf,token);performanceRecorder.mark('pdfReady');performanceRecorder.pages(pdf.numPages);bytes=undefined;if(pendingPDFTask===task)pendingPDFTask=undefined;
+  await runtimeReady;const task=getDocument({data:bytes});pendingPDFTask=task;const loaded=await task.promise;if(token!==epoch){void task.destroy();return;}pdf=markRaw(loaded);const outlineReady=loadOutline(pdf,token);performanceRecorder.mark('pdfReady');performanceRecorder.pages(pdf.numPages);bytes=undefined;if(pendingPDFTask===task)pendingPDFTask=undefined;
   showTranslations.value=documentOpenMode.value==='translation';translationDeferred.value=documentOpenMode.value==='manual';title.value=(testMode?'TEST — ':'')+file.name;active.value=1;const list=[];
   for(let first=1;first<=pdf.numPages;first+=16){const numbers=Array.from({length:Math.min(16,pdf.numPages-first+1)},(_,i)=>first+i),batch=await Promise.all(numbers.map(n=>pdf.getPage(n)));if(token!==epoch)return;for(let i=0;i<batch.length;i++){const v=batch[i].getViewport({scale:1});list.push(reactive({number:numbers[i],width:v.width,height:v.height,status:'idle',blocks:[],cached:false,translationModel:'',dwell:0}));}}
   performanceRecorder.mark('pageGeometry');let saved;
   if(window.previewRecents)try{const result=await window.previewRecents.remember(file,ticket);if(token!==epoch)return;recentDocuments.value=result.entries;currentRecentId=result.recentId;saved=result.view;}catch{if(token===epoch)error.value=t('error.saveRecentHistory');}
-  annotationKey.value=currentRecentId||pdf.fingerprints[0];try{const stored=window.previewAnnotations?.loadState?await window.previewAnnotations.loadState(annotationKey.value):{annotations:window.previewAnnotations?await window.previewAnnotations.load(annotationKey.value):JSON.parse(localStorage.getItem('annotations:'+annotationKey.value)||'[]'),nativeRefs:[]};annotationNativeRefs.value=[...new Set([...stored.nativeRefs,...imported.nativeRefs])];annotations.value=[...stored.annotations,...imported.annotations.filter(a=>!stored.annotations.some(b=>b.id===a.id)&&(!a.nativeRef||!stored.nativeRefs.includes(a.nativeRef)))];}catch(e){error.value='无法读取批注：'+e.message;}if(token!==epoch)return;await recoverHighlightedText(pdf,annotations.value);if(token!==epoch)return;performanceRecorder.mark('recentHistory');pages.value=list;await restoreReadingView(saved&&documentOpenMode.value==='manual'?{...saved,showTranslations:false}:saved);if(showTranslations.value)translationDeferred.value=false;performanceRecorder.mark('restoreView');if(token!==epoch)return;observe();observeThumbnails();await renderPages();if(token!==epoch)return;restoringView.value=false;loading.value=false;saveView();await nextTick();
+  annotationKey.value=currentRecentId||pdf.fingerprints[0];try{const stored=window.previewAnnotations?.loadState?await window.previewAnnotations.loadState(annotationKey.value):{annotations:window.previewAnnotations?await window.previewAnnotations.load(annotationKey.value):JSON.parse(localStorage.getItem('annotations:'+annotationKey.value)||'[]'),nativeRefs:[]};annotationNativeRefs.value=[...new Set([...stored.nativeRefs,...imported.nativeRefs])];annotations.value=[...stored.annotations,...imported.annotations.filter(a=>!stored.annotations.some(b=>b.id===a.id)&&(!a.nativeRef||!stored.nativeRefs.includes(a.nativeRef)))];}catch(e){error.value='无法读取批注：'+e.message;}if(token!==epoch)return;await recoverHighlightedText(pdf,annotations.value);if(token!==epoch)return;performanceRecorder.mark('recentHistory');await outlineReady;if(token!==epoch)return;pages.value=list;await restoreReadingView(saved&&documentOpenMode.value==='manual'?{...saved,showTranslations:false}:saved);if(showTranslations.value)translationDeferred.value=false;performanceRecorder.mark('restoreView');if(token!==epoch)return;observe();observeThumbnails();await renderPages();if(token!==epoch)return;restoringView.value=false;loading.value=false;saveView();await nextTick();
   if(origin&&!documentMotionReduced()){
    const host=pageEls.get(active.value),capture=captureDocumentPage(host);
    if(capture){const controller=new AbortController();documentMotionController=controller;const visibility=host.style.visibility;host.style.visibility='hidden';
@@ -778,7 +779,7 @@ watch(sidebar,()=>{if(!restoringView.value)nextTick(()=>{observeThumbnails();res
 watch(title,value=>{document.title=value;});
 watch(zoom,async()=>{if(restoringView.value)return;revealControllers.forEach(c=>c.abort());revealControllers.clear();localStorage.setItem('readerZoom',String(zoom.value));if(document.activeElement!==zoomInput.value)zoomEntry.value=formatPercentValue(zoom.value);const request=zoomRequest;zoomRequest=null;if(request&&!pinching.value&&!fitResizing){await applyRequestedZoom({...request,to:zoom.value});}else if(!pinching.value&&!fitResizing){await nextTick();await renderPages();}});watch(concurrency,pump);watch(automatic,()=>{if(automatic.value)settle();});watch(showTranslations,v=>{if(restoringView.value)return;if(v&&translationDeferred.value){translationDeferred.value=false;settle();}for(const p of pages.value)for(const b of p.blocks)b.translated=v;if(engine.value!=='pdf_inspector'){revealControllers.forEach(c=>c.abort());revealControllers.clear();renderPages(true);}});
 function visibility(){updateForeground();if(foreground.value){settle();pumpPages();pump();}}
-watch([active,zoom,direction,columns,fitMode,sidebar,showTranslations],scheduleReadingSave);
+watch([active,zoom,direction,columns,fitMode,sidebar,sidebarMode,showTranslations],scheduleReadingSave);
 onMounted(async()=>{if(window.previewActivity){stopActivity=window.previewActivity.onChange(value=>{activityActive.value=value;visibility();});activityActive.value=await window.previewActivity.current();foreground.value=activityActive.value&&!pageHidden();window.previewActivityActive=foreground.value;}if(window.previewRecents){recentDocuments.value=await window.previewRecents.list();scheduleRecentPreviews();}if(window.previewWindow){stopFullscreen=window.previewWindow.onFullscreen(value=>fullscreen.value=value);if(['win32','linux'].includes(platform)){stopMaximized=window.previewWindow.onMaximized(value=>maximized.value=value);maximized.value=await window.previewWindow.maximized();}fullscreen.value=await window.previewWindow.fullscreen();}reader.value?.addEventListener('wheel',pinchWheel,{passive:false});document.addEventListener('keydown',keyboard);document.addEventListener('pointerdown',outsidePopover);document.addEventListener('focusin',outsidePopover);window.addEventListener('blur',dismissPopovers);stopActions=window.previewActions?.onAction(readerAction);if(window.previewPreferences){const saved=await window.previewPreferences.load();applySavedSettings(saved);stopPreferences=window.previewPreferences.onChange?.(applySavedSettings);applyAppearance(saved);engine.value=saved.engine||'pdf_inspector';direction.value=saved.direction||'vertical';columns.value=saved.columns||1;fitMode.value=saved.fit;translationMode.value=saved.translationMode||'reading';if(saved.fit==='manual'){zoom.value=saved.zoom;zoomEntry.value=formatPercentValue(zoom.value);}}await nextTick();syncScrubInputs();loadingPreferences=false;window.addEventListener('resize',resizeFit);resizeObserver=new ResizeObserver(resizeFit);if(reader.value)resizeObserver.observe(reader.value,{box:'content-box'});if(window.previewAppearance){applyAppearance(await window.previewAppearance.current());stopAppearance=window.previewAppearance.onChange(applyAppearance);}const engineReady=checkEngine().then(()=>settle());const c=await api('/api/config');applyConfig(c);model.value=c.model;if(window.previewDocuments){stopDocuments=window.previewDocuments.onAvailable(receiveDocuments);await receiveDocuments();}document.addEventListener('visibilitychange',visibility);settle();scheduleRecentPreviews();if(testMode){await engineReady;window.previewReady=true;}});
 onBeforeUnmount(()=>{clearTimeout(recentPreviewTimer);clearInterval(sessionTimer);documentMotionController?.abort();clearTimeout(immersiveLightsTimer);clearTimeout(copyToastTimer);clearTimeout(annotationToastTimer);closeSearch();cancelResize();performanceRecorder.destroy();stopActivity?.();void releaseDocument();void saveReadingView();clearTimeout(readingSaveTimer);delete window.previewSaveReadingView;++recentPreviewGeneration;stopFullscreen?.();stopMaximized?.();reader.value?.removeEventListener('wheel',pinchWheel);cancelAnimationFrame(pinchFrame);clearTimeout(pinchTimer);document.removeEventListener('keydown',keyboard);document.removeEventListener('pointerdown',outsidePopover);document.removeEventListener('focusin',outsidePopover);window.removeEventListener('blur',dismissPopovers);stopActions?.();resizeObserver?.disconnect();window.removeEventListener('resize',resizeFit);cancelAnimationFrame(fitFrame);clearTimeout(fitResizeTimer);clearTimeout(navigatorTimer);scrollbarTimers.forEach(clearTimeout);scrollbarTimers.clear();clearTimeout(previewTimer);clearTimeout(zoomRenderTimer);scrubbers.forEach(entry=>entry.controller.destroy());scrubbers.clear();finishZoomAnimation();cancelAnimationFrame(viewportFrame);resetBitmaps();stopAppearance?.();stopPreferences?.();stopDocuments?.();cancel();clearTimeout(timer);void Promise.allSettled([pdf?.loadingTask,pendingPDFTask,...pages.value.map(p=>p.mathDocument?.loadingTask)].filter(Boolean).map(task=>task.destroy())).then(()=>pdfWorker?.destroy());document.removeEventListener('visibilitychange',visibility);});
 </script>