From 1ab318fd2c527cd7a4feba505bfcfa3dfacba49b Mon Sep 17 00:00:00 2001
From: subnub <kyle.hoell@gmail.com>
Date: Sat, 11 Jan 2025 02:56:34 -0500
Subject: [PATCH] cleanup and context menu fixes

---
 package.json                               |  2 +-
 src/components/ContextMenu/ContextMenu.tsx | 14 +++++++++++++-
 src/hooks/contextMenu.ts                   |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 22a16d3..daf384e 100755
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "regenerator-runtime": "^0.13.3",
     "sharp": "^0.33.4",
     "supertest-session": "^4.1.0",
-    "sweetalert2": "^11.6.13",
+    "sweetalert2": "^11.15.10",
     "temp": "^0.9.1",
     "typescript": "^5.4.5",
     "uuid": "^3.4.0",
diff --git a/src/components/ContextMenu/ContextMenu.tsx b/src/components/ContextMenu/ContextMenu.tsx
index 13f4a69..6b6e54a 100644
--- a/src/components/ContextMenu/ContextMenu.tsx
+++ b/src/components/ContextMenu/ContextMenu.tsx
@@ -287,8 +287,20 @@ const ContextMenu: React.FC<ContextMenuProps> = memo((props) => {
     }
   };
 
+  const outterWrapperClick = (e: React.MouseEvent<HTMLDivElement>) => {
+    e.stopPropagation();
+    if ((e.target as HTMLDivElement).id !== "context-wrapper") {
+      return;
+    }
+    closeContext();
+  };
+
   return (
-    <div className="w-screen dynamic-height absolute top-0 left-0 right-0 bottom-0 z-50 flex justify-center items-center flex-col">
+    <div
+      id="context-wrapper"
+      className="w-screen dynamic-height absolute top-0 left-0 right-0 bottom-0 z-50 flex justify-center items-center flex-col"
+      onClick={outterWrapperClick}
+    >
       <div
         onClick={stopPropagation}
         ref={wrapperRef}
diff --git a/src/hooks/contextMenu.ts b/src/hooks/contextMenu.ts
index 40c3c28..0290f57 100644
--- a/src/hooks/contextMenu.ts
+++ b/src/hooks/contextMenu.ts
@@ -38,6 +38,8 @@ export const useContextMenu = () => {
     let X = e.clientX || touches.clientX;
     let Y = e.clientY || touches.clientY;
 
+    if (contextData.selected) return;
+
     timeoutRef.current = setTimeout(() => {
       console.log("timeout");
       setContextData({