fix: reader menu in reader window

fix: #318
windingwind · Apr 27, 2024 · 8aeb168 · 8aeb168
1 parent 1a0db2b
commit 8aeb168
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 28 deletions.
diff --git a/src/hooks.ts b/src/hooks.ts
@@ -100,7 +100,7 @@ async function onPrefsEvent(type: string, data: { [key: string]: any }) {
 async function onMenuEvent(type: "showing", data: { [key: string]: any }) {
   switch (type) {
     case "showing":
-      buildItemMenu(data.window, data.target);
+      buildItemMenu(data.window, data.target, data.extraData);
       break;
     default:
       return;

diff --git a/src/modules/menu.ts b/src/modules/menu.ts
@@ -58,22 +58,6 @@ function initItemMenu(win: Window) {
       },
     ],
   });
-
-  ztoolkit.UI.appendElement(
-    {
-      tag: "menupopup",
-      id: `${config.addonRef}-reader-popup`,
-      listeners: [
-        {
-          type: "popupshowing",
-          listener: (ev) => {
-            addon.hooks.onMenuEvent("showing", { window, target: "reader" });
-          },
-        },
-      ],
-    },
-    win.document.querySelector("popupset")!,
-  );
 }
 
 async function initReaderMenu() {
@@ -89,6 +73,45 @@ async function initReaderMenu() {
   Zotero.Reader._readers.forEach(buildReaderMenuButton);
 }
 
+function getReaderMenuPopup(reader: _ZoteroTypes.ReaderInstance) {
+  const doc = reader._iframe?.ownerDocument;
+  if (!doc) {
+    return;
+  }
+  let popup = doc.querySelector(
+    `#${config.addonRef}-reader-popup`,
+  ) as XUL.MenuPopup;
+  if (!popup) {
+    popup = ztoolkit.UI.appendElement(
+      {
+        tag: "menupopup",
+        id: `${config.addonRef}-reader-popup`,
+        listeners: [
+          {
+            type: "popupshowing",
+            listener: (ev) => {
+              addon.hooks.onMenuEvent("showing", {
+                window: reader._window,
+                target: "reader",
+                extraData: {
+                  readerID:
+                    // Do not pass readerID if the reader is in main window
+                    reader._window?.location.href ===
+                    "chrome://zotero/content/zoteroPane.xhtml"
+                      ? undefined
+                      : reader._instanceID,
+                },
+              });
+            },
+          },
+        ],
+      },
+      doc.querySelector("popupset")!,
+    ) as XUL.MenuPopup;
+  }
+  return popup;
+}
+
 function initReaderAnnotationMenu() {
   Zotero.Reader.registerEventListener(
     "createAnnotationContextMenu",
@@ -139,7 +162,8 @@ async function buildReaderMenuButton(reader: _ZoteroTypes.ReaderInstance) {
 function readerToolbarCallback(
   event: Parameters<_ZoteroTypes.Reader.EventHandler<"renderToolbar">>[0],
 ) {
-  const { append, doc } = event;
+  const { append, doc, reader } = event;
+  getReaderMenuPopup(reader);
   const button = ztoolkit.UI.createElement(doc, "button", {
     namespace: "html",
     classList: [
@@ -155,13 +179,11 @@ function readerToolbarCallback(
       {
         type: "click",
         listener: (ev: Event) => {
-          document
-            .querySelector(`#${config.addonRef}-reader-popup`)
-            // @ts-ignore XUL.MenuPopup
-            ?.openPopup(
-              doc.querySelector(`.${config.addonRef}-reader-button`),
-              "after_start",
-            );
+          // @ts-ignore TODO: update types
+          getReaderMenuPopup(reader)?.openPopup(
+            doc.querySelector(`.${config.addonRef}-reader-button`),
+            "after_start",
+          );
         },
       },
     ],
@@ -179,6 +201,7 @@ function readerToolbarCallback(
 function buildItemMenu(
   win: Window,
   target: "item" | "collection" | "tools" | "reader",
+  extraData?: { readerID?: string },
 ) {
   const doc = win.document;
   const popup = doc.querySelector(
@@ -217,7 +240,7 @@ function buildItemMenu(
               listener: (event) => {
                 triggerMenuCommand(
                   action.key,
-                  () => getCurrentItems(target),
+                  () => getCurrentItems(target, extraData),
                   target === "collection",
                 );
               },

diff --git a/src/utils/items.ts b/src/utils/items.ts
@@ -2,7 +2,12 @@ import { ActionShowInMenu } from "./actions";
 
 export { getCurrentItems, getItemsByKey };
 
-async function getCurrentItems(type?: ActionShowInMenu) {
+async function getCurrentItems(
+  type?: ActionShowInMenu,
+  extraData?: {
+    readerID?: string;
+  },
+) {
   let items = [] as Zotero.Item[];
   if (!type || type === "tools") {
     type = getCurrentTargetType();
@@ -25,7 +30,20 @@ async function getCurrentItems(type?: ActionShowInMenu) {
       break;
     }
     case "reader": {
-      const reader = Zotero.Reader.getByTabID(Zotero_Tabs.selectedID);
+      let reader: _ZoteroTypes.ReaderInstance;
+      if (extraData?.readerID) {
+        const _reader = Zotero.Reader._readers.find(
+          (r) => r._instanceID === extraData.readerID,
+        );
+        if (!_reader) {
+          throw new Error(
+            `Reader ${extraData.readerID} not found in getCurrentItems()`,
+          );
+        }
+        reader = _reader;
+      } else {
+        reader = Zotero.Reader.getByTabID(Zotero_Tabs.selectedID);
+      }
       const annotationIDs =
         // @ts-ignore TODO: update types
         reader?._internalReader._lastView._selectedAnnotationIDs as string[];