Refactoring and fixes

js/input/mouse/MouseTracking.js

@@ -3,47 +3,67 @@ import Pointing from "./Pointing"
 
 export default class MouseTracking extends Pointing {
 
+    #mouseTracker = null
+    #mousemoveHandler
+    #trackingMouseStolenHandler
+    #trackingMouseGaveBackHandler
+
     constructor(target, blueprint, options = {}) {
         options.wantsFocusCallback = true
         super(target, blueprint, options)
 
-        this.trackingStolen = null
         let self = this
-        this.mousemoveHandler = e => {
+
+        /**
+         * 
+         * @param {MouseEvent} e 
+         */
+        this.#mousemoveHandler = e => {
             self.blueprint.entity.mousePosition = self.locationFromEvent(e)
-            return true
         }
-        this.trackingMouseStolenHandler = e => {
-            this.trackingStolen = e.target
-            self.unlistenMouseMove()
-            return true
-        }
-        this.trackingMouseGaveBackHandler = e => {
-            if (!this.trackingStolen == e.target) {
-                return false
+
+        /**
+         * 
+         * @param {CustomEvent} e 
+         */
+        this.#trackingMouseStolenHandler = e => {
+            if (!self.#mouseTracker) {
+                e.preventDefault()
+                this.#mouseTracker = e.detail.tracker
+                self.unlistenMouseMove()
+            }
+        }
+
+        /**
+         * 
+         * @param {CustomEvent} e 
+         */
+        this.#trackingMouseGaveBackHandler = e => {
+            if (self.#mouseTracker == e.detail.tracker) {
+                e.preventDefault()
+                self.#mouseTracker = null
+                self.listenMouseMove()
             }
-            self.listenMouseMove()
-            return true
         }
     }
 
     listenMouseMove() {
-        this.target.addEventListener("mousemove", this.mousemoveHandler)
+        this.target.addEventListener("mousemove", this.#mousemoveHandler)
     }
 
     unlistenMouseMove() {
-        this.target.removeEventListener("mousemove", this.mousemoveHandler)
+        this.target.removeEventListener("mousemove", this.#mousemoveHandler)
     }
 
     listenEvents() {
         this.listenMouseMove()
-        this.blueprint.addEventListener(Configuration.trackingMouseEventName.begin, this.trackingMouseStolenHandler)
-        this.blueprint.addEventListener(Configuration.trackingMouseEventName.end, this.trackingMouseGaveBackHandler)
+        this.blueprint.addEventListener(Configuration.trackingMouseEventName.begin, this.#trackingMouseStolenHandler)
+        this.blueprint.addEventListener(Configuration.trackingMouseEventName.end, this.#trackingMouseGaveBackHandler)
     }
 
     unlistenEvents() {
         this.unlistenMouseMove()
-        this.blueprint.removeEventListener(Configuration.trackingMouseEventName.begin, this.trackingMouseStolenHandler)
-        this.blueprint.removeEventListener(Configuration.trackingMouseEventName.end, this.trackingMouseGaveBackHandler)
+        this.blueprint.removeEventListener(Configuration.trackingMouseEventName.begin, this.#trackingMouseStolenHandler)
+        this.blueprint.removeEventListener(Configuration.trackingMouseEventName.end, this.#trackingMouseGaveBackHandler)
     }
 }