@needle-tools/engine 3.28.3-beta → 3.28.5-beta

package/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.28.5-beta] - 2023-12-22
+- Fix: WebXRController falsely triggering click in EventSystem
+
 ## [3.28.3-beta] - 2023-12-21
 - Fix: Issue in pointer events not triggering onPointerEnter and Exit in VR
 - Remove: warning log in USDZ export about double sided materials not being supported

package/dist/needle-engine.js

@@ -61912,18 +61912,15 @@ const vs = class extends NA {
       if (e.set(g, null), s)
         for (const C of this.pressedByID.keys()) {
           const a = this.pressedByID[C];
-          a.obj === s && a.handler && ((n = a.handler.onPointerUp) == null || n.call(a.handler, o), this.pressedByID.delete(C));
+          a && a.obj === s && a.handler && ((n = a.handler.onPointerUp) == null || n.call(a.handler, o), this.pressedByID.delete(C));
         }
     });
     const t = new Yo();
     this._selectUpdateFn ?? (this._selectUpdateFn = (g) => {
       var s;
       t.ray = g.getRay();
-      const I = this.performRaycast(t);
-      if (!I)
-        return;
-      const o = new ia(this.context.input);
-      o.inputSource = g, o.pointerId = ((s = g.input) == null ? void 0 : s.handedness) === "right" ? 0 : 1, o.isDown = g.selectionDown, o.isUp = g.selectionUp, o.isPressed = g.selectionPressed, o.isClicked = g.selectionClick, this.handleIntersections(I, o);
+      const I = this.performRaycast(t) ?? [], o = new ia(this.context.input);
+      o.inputSource = g, o.pointerId = ((s = g.input) == null ? void 0 : s.handedness) === "right" ? 0 : 1, o.isDown = g.selectionDown, o.isUp = g.selectionUp, o.isPressed = g.selectionPressed, o.isClicked = !1, this.handleIntersections(o.pointerId, I, o);
     }), ui.addEventListener(XC.SelectStart, this._selectStartFn), ui.addEventListener(XC.SelectEnd, this._selectEndFn), ui.addEventListener(XC.Update, this._selectUpdateFn), this._handleInputFn = this.onPointerEvent.bind(this), this.context.input.addEventListener(Ni.PointerDown, this._handleInputFn), this.context.input.addEventListener(Ni.PointerUp, this._handleInputFn), this.context.input.addEventListener(Ni.PointerMove, this._handleInputFn);
   }
   onDisable() {
@@ -61951,17 +61948,7 @@ const vs = class extends NA {
       args: g,
       hasActiveUI: this.currentActiveMeshUIComponents.length > 0
     };
-    if (this.dispatchEvent(new CustomEvent("BeforeHandleInput", { detail: s })), !this.handleIntersections(o, g)) {
-      const n = this.hoveredByID.get(t);
-      if (n && this.triggerOnExit(n.obj, n.data), this.hoveredByID.delete(t), g.isUp) {
-        const C = this.pressedByID.get(t);
-        C == null || C.handlers.forEach((a) => {
-          var B;
-          return (B = a.onPointerUp) == null ? void 0 : B.call(a, g);
-        }), this.pressedByID.delete(t);
-      }
-    }
-    this.dispatchEvent(new CustomEvent("AfterHandleInput", { detail: s }));
+    this.dispatchEvent(new CustomEvent("BeforeHandleInput", { detail: s })), this.handleIntersections(t, o, g), this.dispatchEvent(new CustomEvent("AfterHandleInput", { detail: s }));
   }
   /** the raycast filter is always overriden */
   performRaycast(e) {
@@ -61976,15 +61963,22 @@ const vs = class extends NA {
     }
     return this._sortedHits.sort((t, g) => t.distance - g.distance), this._sortedHits;
   }
-  // Handles first hit that has a handler, the rest is ignored
-  handleIntersections(e, t) {
-    if (!e || e.length <= 0)
-      return !1;
-    e = this.sortCandidates(e);
-    for (const g of e) {
-      const { object: I } = g;
-      if (t.point = g.point, t.normal = g.normal, t.face = g.face, t.distance = g.distance, t.instanceId = g.instanceId, this.handleEventOnObject(I, t))
-        return !0;
+  handleIntersections(e, t, g) {
+    if (t != null && t.length) {
+      t = this.sortCandidates(t);
+      for (const o of t) {
+        const { object: s } = o;
+        if (g.point = o.point, g.normal = o.normal, g.face = o.face, g.distance = o.distance, g.instanceId = o.instanceId, this.handleEventOnObject(s, g))
+          return !0;
+      }
+    }
+    const I = this.hoveredByID.get(e);
+    if (I && this.triggerOnExit(I.obj, I.data), this.hoveredByID.delete(e), g.isUp) {
+      const o = this.pressedByID.get(e);
+      o == null || o.handlers.forEach((s) => {
+        var n;
+        return (n = s.onPointerUp) == null ? void 0 : n.call(s, g);
+      }), this.pressedByID.delete(e);
     }
     return !1;
   }

package/dist/needle-engine.light.js

@@ -61912,18 +61912,15 @@ const Sa = class extends Ie {
       if (t.set(s, null), a)
         for (const l of this.pressedByID.keys()) {
           const u = this.pressedByID[l];
-          u.obj === a && u.handler && ((c = u.handler.onPointerUp) == null || c.call(u.handler, o), this.pressedByID.delete(l));
+          u && u.obj === a && u.handler && ((c = u.handler.onPointerUp) == null || c.call(u.handler, o), this.pressedByID.delete(l));
         }
     });
     const i = new Ro();
     this._selectUpdateFn ?? (this._selectUpdateFn = (s) => {
       var a;
       i.ray = s.getRay();
-      const r = this.performRaycast(i);
-      if (!r)
-        return;
-      const o = new Ul(this.context.input);
-      o.inputSource = s, o.pointerId = ((a = s.input) == null ? void 0 : a.handedness) === "right" ? 0 : 1, o.isDown = s.selectionDown, o.isUp = s.selectionUp, o.isPressed = s.selectionPressed, o.isClicked = s.selectionClick, this.handleIntersections(r, o);
+      const r = this.performRaycast(i) ?? [], o = new Ul(this.context.input);
+      o.inputSource = s, o.pointerId = ((a = s.input) == null ? void 0 : a.handedness) === "right" ? 0 : 1, o.isDown = s.selectionDown, o.isUp = s.selectionUp, o.isPressed = s.selectionPressed, o.isClicked = !1, this.handleIntersections(o.pointerId, r, o);
     }), un.addEventListener(Dl.SelectStart, this._selectStartFn), un.addEventListener(Dl.SelectEnd, this._selectEndFn), un.addEventListener(Dl.Update, this._selectUpdateFn), this._handleInputFn = this.onPointerEvent.bind(this), this.context.input.addEventListener(wn.PointerDown, this._handleInputFn), this.context.input.addEventListener(wn.PointerUp, this._handleInputFn), this.context.input.addEventListener(wn.PointerMove, this._handleInputFn);
   }
   onDisable() {
@@ -61951,17 +61948,7 @@ const Sa = class extends Ie {
       args: s,
       hasActiveUI: this.currentActiveMeshUIComponents.length > 0
     };
-    if (this.dispatchEvent(new CustomEvent("BeforeHandleInput", { detail: a })), !this.handleIntersections(o, s)) {
-      const c = this.hoveredByID.get(i);
-      if (c && this.triggerOnExit(c.obj, c.data), this.hoveredByID.delete(i), s.isUp) {
-        const l = this.pressedByID.get(i);
-        l == null || l.handlers.forEach((u) => {
-          var d;
-          return (d = u.onPointerUp) == null ? void 0 : d.call(u, s);
-        }), this.pressedByID.delete(i);
-      }
-    }
-    this.dispatchEvent(new CustomEvent("AfterHandleInput", { detail: a }));
+    this.dispatchEvent(new CustomEvent("BeforeHandleInput", { detail: a })), this.handleIntersections(i, o, s), this.dispatchEvent(new CustomEvent("AfterHandleInput", { detail: a }));
   }
   /** the raycast filter is always overriden */
   performRaycast(t) {
@@ -61976,15 +61963,22 @@ const Sa = class extends Ie {
     }
     return this._sortedHits.sort((i, s) => i.distance - s.distance), this._sortedHits;
   }
-  // Handles first hit that has a handler, the rest is ignored
-  handleIntersections(t, i) {
-    if (!t || t.length <= 0)
-      return !1;
-    t = this.sortCandidates(t);
-    for (const s of t) {
-      const { object: r } = s;
-      if (i.point = s.point, i.normal = s.normal, i.face = s.face, i.distance = s.distance, i.instanceId = s.instanceId, this.handleEventOnObject(r, i))
-        return !0;
+  handleIntersections(t, i, s) {
+    if (i != null && i.length) {
+      i = this.sortCandidates(i);
+      for (const o of i) {
+        const { object: a } = o;
+        if (s.point = o.point, s.normal = o.normal, s.face = o.face, s.distance = o.distance, s.instanceId = o.instanceId, this.handleEventOnObject(a, s))
+          return !0;
+      }
+    }
+    const r = this.hoveredByID.get(t);
+    if (r && this.triggerOnExit(r.obj, r.data), this.hoveredByID.delete(t), s.isUp) {
+      const o = this.pressedByID.get(t);
+      o == null || o.handlers.forEach((a) => {
+        var c;
+        return (c = a.onPointerUp) == null ? void 0 : c.call(a, s);
+      }), this.pressedByID.delete(t);
     }
     return !1;
   }