fix: async bug

windingwind · Nov 29, 2023 · ae99f96 · ae99f96
1 parent 3b11a12
commit ae99f96
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/src/modules/menu.ts b/src/modules/menu.ts
@@ -56,7 +56,7 @@ function initItemMenu(win: Window) {
         },
       ],
     },
-    win.document.querySelector("popupset")!
+    win.document.querySelector("popupset")!,
   );
 }
 
@@ -124,15 +124,15 @@ function initReaderMenu() {
             classList: ["dropmarker"],
           },
         ],
-      })
+      }),
     );
     append(
       ztoolkit.UI.createElement(doc, "style", {
         id: `${config.addonRef}-reader-button`,
         properties: {
           textContent: readerButtonCSS,
         },
-      })
+      }),
     );
   });
 }
@@ -148,19 +148,19 @@ function initReaderAnnotationMenu() {
           label: action.menu!,
           onCommand: () => {
             triggerMenuCommand(action.key, () =>
-              getItemsByKey(reader._item.libraryID, ...params.ids)
+              getItemsByKey(reader._item.libraryID, ...params.ids),
             );
           },
         });
       }
-    }
+    },
   );
 }
 
 function buildItemMenu(win: Window, target: "item" | "collection" | "reader") {
   const doc = win.document;
   const popup = doc.querySelector(
-    `#${config.addonRef}-${target}-popup`
+    `#${config.addonRef}-${target}-popup`,
   ) as XUL.MenuPopup;
   // Remove all children in popup
   while (popup?.firstChild) {
@@ -196,7 +196,7 @@ function buildItemMenu(win: Window, target: "item" | "collection" | "reader") {
                 triggerMenuCommand(
                   action.key,
                   () => getCurrentItems(target),
-                  target === "collection"
+                  target === "collection",
                 );
               },
             },
@@ -217,7 +217,7 @@ function getActionsByMenu(target: ActionShowInMenu) {
         action &&
         action.menu &&
         action.enabled &&
-        (!action.showInMenu || action.showInMenu[target] !== false)
+        (!action.showInMenu || action.showInMenu[target] !== false),
     )
     .sort((x, y) => {
       if (!x && !y) {
@@ -231,7 +231,7 @@ function getActionsByMenu(target: ActionShowInMenu) {
       }
       return ((x[sortBy] as string) || "").localeCompare(
         (y[sortBy] || "") as string,
-        Zotero.locale
+        Zotero.locale,
       );
     });
 }
@@ -241,7 +241,7 @@ async function triggerMenuCommand(
   getItems: () =>
     | Zotero.DataObject[]
     | Promise<Zotero.DataObject[]> = getCurrentItems,
-  withCollection: boolean = false
+  withCollection: boolean = false,
 ) {
   const items = await getItems();
   let collection: Zotero.Collection | undefined = undefined;

diff --git a/src/modules/shortcuts.ts b/src/modules/shortcuts.ts
@@ -63,7 +63,7 @@ async function triggerShortcut(e: KeyboardEvent) {
   const shortcut = new KeyModifier(addon.data.shortcut.getRaw());
   addon.data.shortcut = undefined;
 
-  const items = getCurrentItems();
+  const items = await getCurrentItems();
   // Trigger action for multiple items
   await addon.api.actionManager.dispatchActionByShortcut(shortcut, {
     itemIDs: items.map((item) => item?.id),

diff --git a/src/utils/actions.ts b/src/utils/actions.ts
@@ -113,7 +113,7 @@ function initActions() {
   addon.data.actions.map = new ztoolkit.LargePref(
     `${config.prefsPrefix}.rules`,
     `${config.prefsPrefix}.rules.`,
-    "parser"
+    "parser",
   ).asMapLike() as ActionMap;
   if (!getPref("rulesInit")) {
     for (const key of defaultActions.keys()) {
@@ -161,7 +161,7 @@ function initActions() {
 
 function updateCachedActionKeys() {
   addon.data.actions.cachedKeys = Array.from(
-    addon.data.actions.map.keys()
+    addon.data.actions.map.keys(),
   ).sort((a, b) => {
     const actionA = addon.data.actions.map.get(a);
     const actionB = addon.data.actions.map.get(b);
@@ -172,13 +172,13 @@ function updateCachedActionKeys() {
       actionA[
         addon.data.prefs.columns[addon.data.prefs.columnIndex]
           .dataKey as keyof ActionData
-      ] || ""
+      ] || "",
     );
     const valueB = String(
       actionB[
         addon.data.prefs.columns[addon.data.prefs.columnIndex]
           .dataKey as keyof ActionData
-      ] || ""
+      ] || "",
     );
 
     return addon.data.prefs.columnAscending
@@ -234,7 +234,7 @@ async function applyAction(action: ActionData, args: ActionArgs) {
         }
       }
       message = `Toggle tag ${tags.join(",")} to item ${item?.getField(
-        "title"
+        "title",
       )}`;
       break;
     }
@@ -245,7 +245,9 @@ async function applyAction(action: ActionData, args: ActionArgs) {
 
       let collection: Zotero.Collection | false = false;
       if (args.collectionID) {
-        collection = Zotero.Collections.get(args.collectionID) as Zotero.Collection | false;
+        collection = Zotero.Collections.get(args.collectionID) as
+          | Zotero.Collection
+          | false;
       }
 
       let paramList: any[] = [item, items, collection, _require];
@@ -286,7 +288,7 @@ async function applyAction(action: ActionData, args: ActionArgs) {
       const actions = getActions();
       // Find the action by name
       const nextAction = Object.values(actions).find(
-        (_action) => _action.name === action.data
+        (_action) => _action.name === action.data,
       );
       if (nextAction) {
         await applyAction(nextAction, args);
@@ -307,7 +309,7 @@ async function applyAction(action: ActionData, args: ActionArgs) {
 function getActions(): Record<string, ActionData>;
 function getActions(key: string): ActionData | undefined;
 function getActions(
-  key?: string
+  key?: string,
 ): Record<string, ActionData> | ActionData | undefined {
   if (!key) {
     const map = addon.data.actions.map;

diff --git a/src/utils/items.ts b/src/utils/items.ts
@@ -3,7 +3,7 @@ import { ActionShowInMenu } from "./actions";
 export { getCurrentItems, getItemsByKey };
 
 async function getCurrentItems(type?: ActionShowInMenu) {
-  let items = [] as Zotero.DataObject[];
+  let items = [] as Zotero.Item[];
   if (!type) {
     type = getCurrentTargetType();
   }