@babylonjs/gui 7.20.1 → 7.21.1

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

@@ -835,6 +835,7 @@ export declare class Control implements IAnimatable, IFocusableControl {
      * @internal
      */
     _onPointerUp(target: Control, coordinates: Vector2, pointerId: number, buttonIndex: number, notifyClick: boolean, pi?: Nullable<PointerInfoBase>): void;
+    _onPointerPick(target: Control, coordinates: Vector2, pointerId: number, buttonIndex: number, notifyClick: boolean, pi: Nullable<PointerInfoBase>): boolean;
     /**
      * @internal
      */

package/2D/controls/control.js

@@ -1908,7 +1908,9 @@ export class Control {
         delete this._downPointerIds[pointerId];
         let canNotifyClick = notifyClick;
         if (notifyClick && (this._enterCount > 0 || this._enterCount === -1)) {
-            canNotifyClick = this.onPointerClickObservable.notifyObservers(new Vector2WithInfo(coordinates, buttonIndex), -1, target, this, pi);
+            if (!this._host.usePointerTapForClickEvent) {
+                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);
         if (canNotify && this.parent != null && !this.isPointerBlocker) {
@@ -1918,6 +1920,20 @@ export class Control {
             this._host._capturedPointerIds.delete(pi.event.pointerId);
         }
     }
+    _onPointerPick(target, coordinates, pointerId, buttonIndex, notifyClick, pi) {
+        if (!this._host.usePointerTapForClickEvent) {
+            return false;
+        }
+        let canNotifyClick = notifyClick;
+        if (notifyClick && (this._enterCount > 0 || this._enterCount === -1)) {
+            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);
+        if (canNotify && this.parent != null && !this.isPointerBlocker) {
+            this.parent._onPointerPick(target, coordinates, pointerId, buttonIndex, canNotifyClick, pi);
+        }
+        return true;
+    }
     /**
      * @internal
      */
@@ -1965,25 +1981,34 @@ export class Control {
             this._host._lastControlOver[pointerId] = this;
             return true;
         }
-        if (type === PointerEventTypes.POINTERDOWN) {
+        else if (type === PointerEventTypes.POINTERDOWN) {
             this._onPointerDown(this, this._dummyVector2, pointerId, buttonIndex, pi);
             this._host._registerLastControlDown(this, pointerId);
             this._host._lastPickedControl = this;
             return true;
         }
-        if (type === PointerEventTypes.POINTERUP) {
+        else if (type === PointerEventTypes.POINTERUP) {
             if (this._host._lastControlDown[pointerId]) {
                 this._host._lastControlDown[pointerId]._onPointerUp(this, this._dummyVector2, pointerId, buttonIndex, true, pi);
             }
-            delete this._host._lastControlDown[pointerId];
+            if (!this._host.usePointerTapForClickEvent) {
+                delete this._host._lastControlDown[pointerId];
+            }
             return true;
         }
-        if (type === PointerEventTypes.POINTERWHEEL) {
+        else if (type === PointerEventTypes.POINTERWHEEL) {
             if (this._host._lastControlOver[pointerId]) {
                 this._host._lastControlOver[pointerId]._onWheelScroll(deltaX, deltaY);
                 return true;
             }
         }
+        else if (type === PointerEventTypes.POINTERTAP) {
+            if (this._host._lastControlDown[pointerId]) {
+                this._host._lastControlDown[pointerId]._onPointerPick(this, this._dummyVector2, pointerId, buttonIndex, true, pi);
+            }
+            delete this._host._lastControlDown[pointerId];
+            return true;
+        }
         return false;
     }
     _getStyleProperty(propName, defaultValue) {