Restore TW menu on Obsidian 1.8

Author: pjeby

manifest.json

@@ -3,7 +3,7 @@
   "name": "Tag Wrangler",
   "author": "PJ Eby",
   "authorUrl": "https://github.com/pjeby",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "minAppVersion": "1.5.8",
   "description": "Rename, merge, toggle, and search tags from the tags view",
   "fundingUrl": "https://dirtsimple.org/tips/tag-wrangler",

src/plugin.js

@@ -221,12 +221,7 @@ export default class TagWrangler extends Plugin {
     }
 
     onMenu(e, tagEl) {
-        let menu = e.obsidian_contextmenu;
-        if (!menu) {
-            menu = e.obsidian_contextmenu = new Menu();
-            setTimeout(() => menu.showAtPosition({x: e.pageX, y: e.pageY}), 0);
-        }
-
+        let menu = menuForEvent(e);
         const
             tagName = tagEl.find(".tag-pane-tag-text, .tag-pane-tag .tree-item-inner-text").textContent,
             isHierarchy = tagEl.parentElement.parentElement.find(".collapse-icon")
@@ -351,15 +346,22 @@ class TagPageUIHandler extends Component {
                                 }
                             }
                         });
+                        if (Menu.forEvent) {
+                            const remove2 = around(Menu, {forEvent(old) { return function (ev) {
+                                const m = old.call(this, e);
+                                if (ev === e) {
+                                    self.plugin.setupMenu(m, toTag(targetEl));
+                                    remove();
+                                }
+                                remove2()
+                                return m;
+                            }}})
+                            setTimeout(remove2, 0);
+                        }
                         setTimeout(remove, 0);
                         return
                     }
-                    let menu = e.obsidian_contextmenu;
-                    if (!menu) {
-                        menu = e.obsidian_contextmenu = new Menu();
-                        setTimeout(() => menu.showAtPosition({x: e.pageX, y: e.pageY}), 0);
-                    }
-                    this.plugin.setupMenu(menu, toTag(targetEl));
+                    this.plugin.setupMenu(menuForEvent(e), toTag(targetEl));
                 }, {capture: !!mergeMenu})
             );
             this.register(
@@ -404,3 +406,15 @@ class TagPageUIHandler extends Component {
         );
     }
 }
+
+function menuForEvent(e) {
+    if (Menu.forEvent) {
+        return e.obsidian_contextmenu ||= Menu.forEvent(e)
+    }
+    let menu = e.obsidian_contextmenu;
+    if (!menu) {
+        menu = e.obsidian_contextmenu = new Menu();
+        setTimeout(() => menu.showAtPosition({x: e.pageX, y: e.pageY}), 0);
+    }
+    return menu
+}

versions.json

@@ -1,5 +1,5 @@
 {
-    "0.6.2": "1.5.8",
+    "0.6.3": "1.5.8",
     "0.6.1": "1.2.8",
     "0.6.0": "1.2.8",
     "0.5.13": "1.2.8",