fix #22

nkappler · Aug 19, 2021 · e74354a · e74354a
1 parent 9c81ead
commit e74354a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/docs/ctxmenu.js b/docs/ctxmenu.js
@@ -109,11 +109,13 @@
         this.hdir = "r";
         this.vdir = "d";
         window.addEventListener("click", function (ev) {
-          var item = ev.target && ev.target.parentElement;
+          var item = ev.target instanceof Element && ev.target.parentElement;
 
-          if (item && item.className !== "interactive") {
-            _this.closeMenu();
+          if (item && item.className === "interactive") {
+            return;
           }
+
+          _this.closeMenu();
         });
         window.addEventListener("resize", function () {
           return _this.closeMenu();

diff --git a/docs/ctxmenu.min.js b/docs/ctxmenu.min.js
diff --git a/index.js b/index.js
@@ -34,11 +34,13 @@ var ContextMenu = /*#__PURE__*/function () {
     this.hdir = "r";
     this.vdir = "d";
     window.addEventListener("click", function (ev) {
-      var item = ev.target && ev.target.parentElement;
+      var item = ev.target instanceof Element && ev.target.parentElement;
 
-      if (item && item.className !== "interactive") {
-        _this.closeMenu();
+      if (item && item.className === "interactive") {
+        return;
       }
+
+      _this.closeMenu();
     });
     window.addEventListener("resize", function () {
       return _this.closeMenu();

diff --git a/src/ctxmenu.ts b/src/ctxmenu.ts
@@ -124,10 +124,11 @@ class ContextMenu implements CTXMenuSingleton {
     private vdir: "u" | "d" = "d";
     private constructor() {
         window.addEventListener("click", ev => {
-            const item = ev.target && (ev.target as Element).parentElement;
-            if (item && item.className !== "interactive") {
-                this.closeMenu();
+            const item = ev.target instanceof Element && ev.target.parentElement;
+            if (item && item.className === "interactive") {
+                return;
             }
+            this.closeMenu();
         });
         window.addEventListener("resize", () => this.closeMenu());
         window.addEventListener("scroll", () => this.closeMenu());
@@ -340,7 +341,7 @@ class ContextMenu implements CTXMenuSingleton {
             ev.preventDefault();
         });
         container.addEventListener("click", ev => {
-            const item = ev.target && (ev.target as Element).parentElement;
+            const item = ev.target instanceof Element && ev.target.parentElement;
             if (item && item.className !== "interactive") {
                 ev.stopPropagation();
             }