fix(macOS): use native annotation and translation status dialogs

Author: reycn

electron/main.mjs

@@ -233,6 +233,17 @@ else {
    try{const document=await readSystemPDF(path),source={path,reliable:true,preserveWithoutPath:false,bytes:Buffer.from(document.bytes)};state.unkeyedAnnotationSource=source;state.annotationSources.set(path,source);const ticket=randomBytes(16).toString('hex');state.tickets.set(ticket,path);return {...document,ticket};}catch{state.performance.hasDocument=false;return {error:'Could not open this PDF. Check file access and the 50 MB limit.'};}
   });
   ipcMain.handle('previewAnnotations:prepare',async(event,value)=>{const target=trustedWindow(event);if(!(value instanceof Uint8Array)||value.byteLength>50*1024*1024)throw Error('Invalid annotation PDF bytes.');const imported=await importPDFAnnotations(value);windows.get(target).unkeyedAnnotationSource={bytes:Buffer.from(value),reliable:false,preserveWithoutPath:true};return {...imported,bytes:new Uint8Array(await embedAnnotations(value,[],imported.nativeRefs))};});
+  ipcMain.handle('previewAnnotations:confirmDelete',async(event,kind)=>{
+    const target=trustedWindow(event);
+    if(!['highlight','comment'].includes(kind))throw Error('Invalid annotation kind.');
+    const {response}=await dialog.showMessageBox(target,{type:'warning',message:`删除这条${kind==='highlight'?'高亮':'批注'}？`,buttons:['取消','删除'],defaultId:0,cancelId:0,noLink:true});
+    return response===1;
+  });
+  ipcMain.handle('recents:statusDialog',async(event,value)=>{
+    const target=trustedWindow(event);
+    if(!value||typeof value.title!=='string'||value.title.length>200||typeof value.detail!=='string'||value.detail.length>12000||typeof value.close!=='string'||value.close.length>100)throw Error('Invalid status dialog.');
+    await dialog.showMessageBox(target,{type:'info',message:value.title,detail:value.detail,buttons:[value.close],defaultId:0,cancelId:0,noLink:true});
+  });
   ipcMain.handle('previewAnnotations:palette',async event=>{trustedWindow(event);return annotations.palette();});
   ipcMain.handle('previewAnnotations:contextMenu',(event,kind)=>{
    const target=trustedWindow(event);

electron/preload.cjs

@@ -25,6 +25,7 @@ contextBridge.exposeInMainWorld('previewTestMode',process.argv.includes('--previ
 
 contextBridge.exposeInMainWorld('previewAnnotations',Object.freeze({
  contextMenu:kind=>ipcRenderer.invoke('previewAnnotations:contextMenu',kind),
+ confirmDelete:kind=>ipcRenderer.invoke('previewAnnotations:confirmDelete',kind),
  palette:()=>ipcRenderer.invoke('previewAnnotations:palette'),
  markDeleteHint:()=>ipcRenderer.invoke('previewAnnotations:markDeleteHint'),
  prepare:bytes=>ipcRenderer.invoke('previewAnnotations:prepare',bytes),
@@ -55,7 +56,7 @@ contextBridge.exposeInMainWorld('previewWindow',Object.freeze({
  onFullscreen:callback=>{const listener=(_event,value)=>callback(value);ipcRenderer.on('window:fullscreen',listener);return ()=>ipcRenderer.removeListener('window:fullscreen',listener);}
 }));
 
-contextBridge.exposeInMainWorld('previewRecents',Object.freeze({list:()=>ipcRenderer.invoke('recents:list'),clear:()=>ipcRenderer.invoke('recents:clear'),open:id=>ipcRenderer.invoke('recents:open',id),openWindow:id=>ipcRenderer.invoke('recents:openWindow',id),preview:id=>ipcRenderer.invoke('recents:preview',id),contextMenu:id=>ipcRenderer.invoke('recents:contextMenu',id),setThumbnail:(id,thumbnail)=>ipcRenderer.invoke('recents:setThumbnail',{id,thumbnail}),setView:(id,view)=>ipcRenderer.invoke('recents:setView',{id,view}),setTranslationStatus:(id,status)=>ipcRenderer.invoke('recents:setTranslationStatus',{id,status}),remember:(file,ticket,thumbnail)=>ipcRenderer.invoke('recents:remember',ticket?{ticket,thumbnail}:{path:webUtils.getPathForFile(file),thumbnail})}));
+contextBridge.exposeInMainWorld('previewRecents',Object.freeze({statusDialog:value=>ipcRenderer.invoke('recents:statusDialog',value),list:()=>ipcRenderer.invoke('recents:list'),clear:()=>ipcRenderer.invoke('recents:clear'),open:id=>ipcRenderer.invoke('recents:open',id),openWindow:id=>ipcRenderer.invoke('recents:openWindow',id),preview:id=>ipcRenderer.invoke('recents:preview',id),contextMenu:id=>ipcRenderer.invoke('recents:contextMenu',id),setThumbnail:(id,thumbnail)=>ipcRenderer.invoke('recents:setThumbnail',{id,thumbnail}),setView:(id,view)=>ipcRenderer.invoke('recents:setView',{id,view}),setTranslationStatus:(id,status)=>ipcRenderer.invoke('recents:setTranslationStatus',{id,status}),remember:(file,ticket,thumbnail)=>ipcRenderer.invoke('recents:remember',ticket?{ticket,thumbnail}:{path:webUtils.getPathForFile(file),thumbnail})}));
 
 contextBridge.exposeInMainWorld('previewActivity',Object.freeze({current:()=>ipcRenderer.invoke('window:activity'),onChange:callback=>{const listener=(_event,value)=>callback(value);ipcRenderer.on('activity:changed',listener);return ()=>ipcRenderer.removeListener('activity:changed',listener);}}));
 

src/ReadingAnnotations.vue

@@ -136,7 +136,7 @@ async function openContextMenu(a,event){
  }
  menu.value={a,x:event.clientX,y:event.clientY};
 }
-async function action(name,a=menu.value?.a){menu.value=null;if(!a)return;try{if(name==='删除'){confirming.value=a;await nextTick();confirmPopup.value?.querySelector('button')?.focus();return;}if(name==='修改'){await comment(a);return;}const text=[a.text,a.comment].filter(Boolean).join('\n\n');if(name==='分享'&&window.previewAnnotations?.share&&await window.previewAnnotations.share(text))return;if(name==='分享'&&navigator.share){await navigator.share({text});return;}if(name==='Hand over to AI'){if(!window.previewAnnotations?.handover)throw Error('请在桌面客户端中交接到本机 ChatGPT 或 Claude。');const result=await window.previewAnnotations.handover(text);if(!result.cancelled)emit('notice',{text:`已打开 ${result.client}，内容已复制，请粘贴并发送`,...pointer.value});return;}if(name==='Paraphrase'){assistController?.abort();const controller=assistController=new AbortController();const result={title:'Paraphrase',text:'',busy:true,error:''};assistance.value=result;try{const response=await fetch('/api/reading-assist',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({action:'paraphrase',text:a.text,comment:a.comment}),signal:controller.signal});const data=await response.json();if(!response.ok)throw Error(data.error||'请求失败');result.text=data.text;}catch(e){if(e.name!=='AbortError')result.error=e.message;}finally{result.busy=false;if(!controller.signal.aborted)assistance.value={...result};}return;}await (window.previewClipboard?.writeText||navigator.clipboard.writeText.bind(navigator.clipboard))(text);emit('notice',{text:name==='分享'?'已复制分享内容':'已复制',...pointer.value});}catch(e){if(e.name!=='AbortError')emit('notice',{text:'无法完成操作：'+e.message,...pointer.value});}}
+async function action(name,a=menu.value?.a){menu.value=null;if(!a)return;try{if(name==='删除'){if(popupPlatform==='darwin'&&window.previewAnnotations?.confirmDelete){if(await window.previewAnnotations.confirmDelete(a.kind)){const current=props.annotations.find(item=>item.id===a.id);if(current)remove(current);}}else{confirming.value=a;await nextTick();confirmPopup.value?.querySelector('button')?.focus();}return;}if(name==='修改'){await comment(a);return;}const text=[a.text,a.comment].filter(Boolean).join('\n\n');if(name==='分享'&&window.previewAnnotations?.share&&await window.previewAnnotations.share(text))return;if(name==='分享'&&navigator.share){await navigator.share({text});return;}if(name==='Hand over to AI'){if(!window.previewAnnotations?.handover)throw Error('请在桌面客户端中交接到本机 ChatGPT 或 Claude。');const result=await window.previewAnnotations.handover(text);if(!result.cancelled)emit('notice',{text:`已打开 ${result.client}，内容已复制，请粘贴并发送`,...pointer.value});return;}if(name==='Paraphrase'){assistController?.abort();const controller=assistController=new AbortController();const result={title:'Paraphrase',text:'',busy:true,error:''};assistance.value=result;try{const response=await fetch('/api/reading-assist',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({action:'paraphrase',text:a.text,comment:a.comment}),signal:controller.signal});const data=await response.json();if(!response.ok)throw Error(data.error||'请求失败');result.text=data.text;}catch(e){if(e.name!=='AbortError')result.error=e.message;}finally{result.busy=false;if(!controller.signal.aborted)assistance.value={...result};}return;}await (window.previewClipboard?.writeText||navigator.clipboard.writeText.bind(navigator.clipboard))(text);emit('notice',{text:name==='分享'?'已复制分享内容':'已复制',...pointer.value});}catch(e){if(e.name!=='AbortError')emit('notice',{text:'无法完成操作：'+e.message,...pointer.value});}}
 onMounted(()=>{textObserver=new MutationObserver(records=>{if(records.some(r=>r.target.closest?.('.reading-text-layer,.reading-paragraphs')))updatePopupLayout();});if(props.host())textObserver.observe(props.host(),{subtree:true,childList:true,characterData:true,attributes:true,attributeFilter:['style','class']});popupObserver=new ResizeObserver(updatePopupLayout);window.addEventListener('resize',updatePopupLayout);window.addEventListener('scroll',updatePopupLayout,true);void window.previewAnnotations?.palette?.().then(value=>{favorite.value=value.favorite;if(value.deleteHintShown)localStorage.setItem('annotationDeleteHint','1');}).catch(()=>{});document.addEventListener('pointerup',capture);document.addEventListener('pointerdown',outside);document.addEventListener('keydown',key);document.addEventListener('pointermove',observePointer);});
 onBeforeUnmount(()=>{textObserver?.disconnect();popupObserver?.disconnect();cancelAnimationFrame(layoutFrame);window.removeEventListener('resize',updatePopupLayout);window.removeEventListener('scroll',updatePopupLayout,true);cancelAnimationFrame(motionFrame);eraseTimers.forEach(clearTimeout);eraseTimers.clear();assistController?.abort();clearTimeout(timer);document.removeEventListener('pointerup',capture);document.removeEventListener('pointerdown',outside);document.removeEventListener('keydown',key);document.removeEventListener('pointermove',observePointer);});
 watch([opened,editor,toolbar],async()=>{await nextTick();popupObserver?.disconnect();const popup=editor.value?editorPopup.value:opened.value?readerPopup.value:toolbar.value?toolbarPopup.value:null;if(popup)popupObserver?.observe(popup);updatePopupLayout();},{flush:'post'});

src/RecentTranslationStatus.vue

@@ -6,7 +6,22 @@ const emit=defineEmits(['close']);
 const dialog=ref(null);
 const platform=window.previewAppearance?.platform||'web';
 const languageKeys={'Simplified Chinese':'simplifiedChinese','Traditional Chinese':'traditionalChinese',English:'english',Japanese:'japanese',Korean:'korean',French:'french',German:'german',Spanish:'spanish'};
-onMounted(()=>dialog.value.showModal());
+onMounted(async()=>{
+ if(platform==='darwin'&&window.previewRecents?.statusDialog){
+  const status=props.document.translationStatus;
+  const rows=status?[
+   ['total',status.totalPages],['completed',status.completedPages],['partial',status.partialPages],
+   ['pending',status.totalPages-status.completedPages-status.partialPages-status.failedPages],['failed',status.failedPages],
+   ['engine',t({pdf_inspector:'engine.ultraFast',pdf_math_fast:'engine.fast',pdf_math_precise:'engine.precise'}[status.engine])],
+   ['language',languageKeys[status.language]?t('languages.'+languageKeys[status.language]):status.language],
+   ['updated',new Date(status.updatedAt).toLocaleString(uiLanguage.value)]
+  ].map(([key,value])=>`${t('recentStatus.'+key)}：${value}`).join('\n'):'';
+  try{
+   await window.previewRecents.statusDialog({title:t('recentStatus.title'),detail:[props.document.name,t(status?'recentStatus.snapshot':'recentStatus.unknown'),rows].filter(Boolean).join('\n\n'),close:t('recentStatus.close')});
+   emit('close');
+  }catch{dialog.value.showModal();}
+ }else dialog.value.showModal();
+});
 </script>
 <template>
  <dialog ref="dialog" class="recent-status-dialog" :data-platform="platform" aria-labelledby="recent-status-title" @close="emit('close')" @click="event=>{if(event.target===dialog)dialog.close();}">