From 95d3a92e4ca38898feb7a3386c9c4d8d7448f632 Mon Sep 17 00:00:00 2001
From: TerraMaster85 <tm85@e3t.cc>
Date: Mon, 8 Apr 2024 01:02:29 -0400
Subject: [PATCH] 99% solve focus issue

---
 starkingdoms-client/src/components/ui/Popup.svelte | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/starkingdoms-client/src/components/ui/Popup.svelte b/starkingdoms-client/src/components/ui/Popup.svelte
index 57eef36c6f7bad902cf63c51be679fcca43f4138..5fa73861d54a317bbb0debf76b05877e734b854e 100644
--- a/starkingdoms-client/src/components/ui/Popup.svelte
+++ b/starkingdoms-client/src/components/ui/Popup.svelte
@@ -55,8 +55,10 @@
 
     pos3 = e.clientX - popup_dimensions.left;
     pos4 = e.clientY - popup_dimensions.top;
-    document.onmouseup = closeDragElement;
-    document.onmousemove = elementDrag;
+    e.target.onmouseup = function() {
+      closeDragElement(e.target);
+    }
+    e.target.onmousemove = elementDrag;
   }
 
   function elementDrag(e) {
@@ -113,9 +115,9 @@
     return [left, top, bounds_violated];
   }
 
-  function closeDragElement() {
-    document.onmouseup = null;
-    document.onmousemove = null;
+  function closeDragElement(el) {
+    el.onmouseup = null;
+    el.onmousemove = null;
 
     window.localStorage.setItem(`pop-${id}top`, popup.style.top);
     window.localStorage.setItem(`pop-${id}left`, popup.style.left);
@@ -131,7 +133,7 @@
 
 <div bind:this={popup} class="popup {clazz}" class:centered {style} {id}>
   {#if !notitle}
-    <div bind:this={header} on:mousedown={dragMouseDown}>
+    <div bind:this={header} on:mousedown|preventDefault={dragMouseDown}>
       <h1>
         {#if draggable}
           <MovableIcon class="hdr-icon" />