@onerjs/gui 8.50.5 → 8.50.7

package/2D/controls/control.d.ts

@@ -131,6 +131,8 @@ export declare class Control implements IAnimatable, IFocusableControl {
     isRoot: boolean;
     private _fixed;
     private _fixedWorldPoint;
+    private _isPointerMoved1;
+    private _isPointerDown1;
     /** @internal */
     protected _urlRewriter?: (url: string) => string;
     /**

package/2D/controls/control.js

@@ -1070,6 +1070,8 @@ export class Control {
         this.isRoot = false;
         this._fixed = false;
         this._fixedWorldPoint = Vector2.Zero();
+        this._isPointerMoved1 = false;
+        this._isPointerDown1 = false;
         /**
          * Observable that fires when the control's enabled state changes
          */
@@ -1955,6 +1957,7 @@ export class Control {
      * @internal
      */
     _onPointerMove(target, coordinates, pointerId, pi) {
+        this._isPointerMoved1 = true;
         const canNotify = this.onPointerMoveObservable.notifyObservers(coordinates, -1, target, this, pi);
         if (canNotify && this.parent != null && !this.isPointerBlocker) {
             this.parent._onPointerMove(target, coordinates, pointerId, pi);
@@ -2003,6 +2006,8 @@ export class Control {
     _onPointerDown(target, coordinates, pointerId, buttonIndex, pi) {
         // Prevent pointerout to lose control context.
         // Event redundancy is checked inside the function.
+        this._isPointerDown1 = true;
+        this._isPointerMoved1 = false;
         this._onPointerEnter(this, pi);
         if (this.tabIndex !== -1) {
             this.host.focusedControl = this;
@@ -2025,6 +2030,10 @@ export class Control {
      * @internal
      */
     _onPointerUp(target, coordinates, pointerId, buttonIndex, notifyClick, pi) {
+        const isDown = this._isPointerDown1;
+        const isMoved = this._isPointerMoved1;
+        this._isPointerDown1 = false;
+        this._isPointerMoved1 = false;
         if (!this._isEnabled) {
             return;
         }
@@ -2033,7 +2042,9 @@ export class Control {
         let canNotifyClick = notifyClick;
         if (notifyClick && (this._enterCount > 0 || this._enterCount === -1)) {
             if (!this._host.usePointerTapForClickEvent) {
-                canNotifyClick = this.onPointerClickObservable.notifyObservers(new Vector2WithInfo(coordinates, buttonIndex), -1, target, this, pi);
+                if (isDown && !isMoved) {
+                    canNotifyClick = this.onPointerClickObservable.notifyObservers(new Vector2WithInfo(coordinates, buttonIndex), -1, target, this, pi);
+                }
             }
         }
         const canNotify = this.onPointerUpObservable.notifyObservers(new Vector2WithInfo(coordinates, buttonIndex), -1, target, this, pi);