@vpmedia/phaser 1.115.0 → 1.117.0

package/src/phaser/core/input_mouse.ts

@@ -61,7 +61,7 @@ export class Mouse {
   /**
    * TBD.
    */
-  public start() {
+  public start(): void {
     if (this.game.device.android && !this.game.device.chrome) {
       //  Android stock browser fires mouse events even if you preventDefault on the touchStart, so ...
       return;
@@ -71,28 +71,28 @@ export class Mouse {
       return;
     }
     const scope = this;
-    this._onMouseDown = (event) => {
+    this._onMouseDown = (event): void => {
       scope.onMouseDown(event);
     };
-    this._onMouseMove = (event) => {
+    this._onMouseMove = (event): void => {
       scope.onMouseMove(event);
     };
-    this._onMouseUp = (event) => {
+    this._onMouseUp = (event): void => {
       scope.onMouseUp(event);
     };
-    this._onMouseUpGlobal = (event) => {
+    this._onMouseUpGlobal = (event): void => {
       scope.onMouseUpGlobal(event);
     };
-    this._onMouseOutGlobal = (event) => {
+    this._onMouseOutGlobal = (event): void => {
       scope.onMouseOutGlobal(event);
     };
-    this._onMouseOut = (event) => {
+    this._onMouseOut = (event): void => {
       scope.onMouseOut(event);
     };
-    this._onMouseOver = (event) => {
+    this._onMouseOver = (event): void => {
       scope.onMouseOver(event);
     };
-    this._onMouseWheel = (event) => {
+    this._onMouseWheel = (event): void => {
       scope.onMouseWheel(event);
     };
     const { canvas } = this.game;
@@ -112,7 +112,7 @@ export class Mouse {
   /**
    * TBD.
    */
-  public stop() {
+  public stop(): void {
     const { canvas } = this.game;
     if (this._onMouseDown) {
       canvas.removeEventListener('mousedown', this._onMouseDown, true);
@@ -147,7 +147,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseDown(event: InputEvent) {
+  public onMouseDown(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.mouseDownCallback) {
@@ -164,7 +164,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseMove(event: InputEvent) {
+  public onMouseMove(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.mouseMoveCallback) {
@@ -181,7 +181,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseUp(event: InputEvent) {
+  public onMouseUp(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.mouseUpCallback) {
@@ -198,7 +198,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseUpGlobal(event: InputEvent) {
+  public onMouseUpGlobal(event: InputEvent): void {
     if (!this.input.mousePointer.withinGame) {
       if (this.mouseUpCallback) {
         this.mouseUpCallback.call(this.callbackContext, event);
@@ -212,7 +212,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseOutGlobal(event: InputEvent) {
+  public onMouseOutGlobal(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     this.input.mousePointer.withinGame = false;
@@ -231,7 +231,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseOut(event: InputEvent) {
+  public onMouseOut(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     this.input.mousePointer.withinGame = false;
@@ -251,7 +251,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public onMouseOver(event: InputEvent) {
+  public onMouseOver(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     this.input.mousePointer.withinGame = true;
@@ -264,7 +264,7 @@ export class Mouse {
    * TBD.
    * @param {WheelEvent} event - TBD.
    */
-  public onMouseWheel(event: InputEvent) {
+  public onMouseWheel(event: InputEvent): void {
     if (this._wheelEvent) {
       event = this._wheelEvent.bindEvent(event);
     }
@@ -281,7 +281,7 @@ export class Mouse {
    * TBD.
    * @param {MouseEvent} event - TBD.
    */
-  public eventPreventDefault(event: Event) {
+  public eventPreventDefault(event: Event): void {
     if (this.capture) {
       if (typeof event.cancelable !== 'boolean' || event.cancelable) {
         event.preventDefault();

package/src/phaser/core/input_mspointer.ts

@@ -43,27 +43,27 @@ export class MSPointer {
   /**
    * TBD.
    */
-  public start() {
+  public start(): void {
     if (!this.game.device.mspointer || this._onMSPointerDown !== null) {
       return;
     }
     const scope = this;
-    this._onMSPointerDown = (event) => {
+    this._onMSPointerDown = (event): void => {
       scope.onPointerDown(event);
     };
-    this._onMSPointerMove = (event) => {
+    this._onMSPointerMove = (event): void => {
       scope.onPointerMove(event);
     };
-    this._onMSPointerUp = (event) => {
+    this._onMSPointerUp = (event): void => {
       scope.onPointerUp(event);
     };
-    this._onMSPointerUpGlobal = (event) => {
+    this._onMSPointerUpGlobal = (event): void => {
       scope.onPointerUpGlobal(event);
     };
-    this._onMSPointerOut = (event) => {
+    this._onMSPointerOut = (event): void => {
       scope.onPointerOut(event);
     };
-    this._onMSPointerOver = (event) => {
+    this._onMSPointerOver = (event): void => {
       scope.onPointerOver(event);
     };
     const { canvas } = this.game;
@@ -88,7 +88,7 @@ export class MSPointer {
   /**
    * TBD.
    */
-  public stop() {
+  public stop(): void {
     if (!this.game.device.mspointer) {
       return;
     }
@@ -141,7 +141,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerDown(event: InputEvent) {
+  public onPointerDown(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.pointerDownCallback) {
@@ -162,7 +162,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerMove(event: InputEvent) {
+  public onPointerMove(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.pointerMoveCallback) {
@@ -183,7 +183,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerUp(event: InputEvent) {
+  public onPointerUp(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (this.pointerUpCallback) {
@@ -204,7 +204,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerUpGlobal(event: InputEvent) {
+  public onPointerUpGlobal(event: InputEvent): void {
     if ((event.pointerType === 'mouse' || event.pointerType === 0x00000004) && !this.input.mousePointer.withinGame) {
       this.onPointerUp(event);
     } else {
@@ -219,7 +219,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerOut(event: InputEvent) {
+  public onPointerOut(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     let pointer;
@@ -251,7 +251,7 @@ export class MSPointer {
    * TBD.
    * @param {PointerEvent} event - TBD.
    */
-  public onPointerOver(event: InputEvent) {
+  public onPointerOver(event: InputEvent): void {
     this.event = event;
     this.eventPreventDefault(event);
     if (event.pointerType === 'mouse' || event.pointerType === 0x00000004) {
@@ -271,7 +271,7 @@ export class MSPointer {
    * TBD.
    * @param {Event} event - TBD.
    */
-  public eventPreventDefault(event: Event) {
+  public eventPreventDefault(event: Event): void {
     if (this.capture) {
       if (typeof event.cancelable !== 'boolean' || event.cancelable) {
         event.preventDefault();

package/src/phaser/core/input_pointer.ts

@@ -12,18 +12,27 @@ import {
   TOUCH_OVERRIDES_MOUSE,
 } from './const.js';
 
+/** A callback deferred until the click that triggered it has finished dispatching. */
+export type ClickTrampoline = {
+  name: string;
+  targetObject: InputHandler | null;
+  callback: Function;
+  callbackContext: unknown;
+  callbackArgs: unknown[];
+};
+
 export class Pointer {
   public game!: Game;
   public id!: number;
   public type!: number;
   public exists!: boolean;
   public identifier!: number | null;
-  public pointerId!: any;
+  public pointerId!: number | null;
   public pointerMode!: number;
   public target!: EventTarget | null;
-  public button!: any;
+  public button!: number | null;
   public _holdSent!: boolean;
-  public _history!: any;
+  public _history!: { x: number; y: number }[];
   public _nextDrop!: number;
   public _stateReset!: boolean;
   public withinGame!: boolean;
@@ -47,16 +56,16 @@ export class Pointer {
   public previousTapTime!: number;
   public totalTouches!: number;
   public msSinceLastClick!: number;
-  public targetObject!: any;
-  public interactiveCandidates!: any;
+  public targetObject!: InputHandler | null;
+  public interactiveCandidates!: InputHandler[];
   public active!: boolean;
   public dirty!: boolean;
   public position!: Point;
   public positionDown!: Point;
   public positionUp!: Point;
   public circle!: Circle;
-  public _clickTrampolines!: any;
-  public _trampolineTargetObject!: any;
+  public _clickTrampolines!: ClickTrampoline[] | null;
+  public _trampolineTargetObject!: InputHandler | null;
   /**
    * TBD.
    * @param {Game} game - TBD.
@@ -113,7 +122,7 @@ export class Pointer {
   /**
    * TBD.
    */
-  public resetButtons() {
+  public resetButtons(): void {
     this.isDown = false;
     this.isUp = true;
   }
@@ -122,7 +131,7 @@ export class Pointer {
    * TBD.
    * @param {MouseEvent|PointerEvent} event - TBD.
    */
-  public updateButtons(event: InputEvent) {
+  public updateButtons(event: InputEvent): void {
     if (event.type.toLowerCase().endsWith('down')) {
       this.isUp = false;
       this.isDown = true;
@@ -137,7 +146,7 @@ export class Pointer {
    * @param {PointerEvent} event - TBD.
    * @returns {Pointer} TBD.
    */
-  public start(event: InputEvent) {
+  public start(event: InputEvent): this {
     const { input } = this.game;
     if (event.pointerId) {
       this.pointerId = event.pointerId;
@@ -186,7 +195,7 @@ export class Pointer {
   /**
    * TBD.
    */
-  public update() {
+  public update(): void {
     const { input } = this.game;
     if (this.active) {
       // Force a check?
@@ -226,7 +235,7 @@ export class Pointer {
    * @param {boolean} fromClick - TBD.
    * @returns {Pointer} TBD.
    */
-  public move(event: InputEvent, fromClick = false) {
+  public move(event: InputEvent, fromClick = false): this | null {
     const { input } = this.game;
     if (input.pollLocked) {
       return null;
@@ -275,8 +284,8 @@ export class Pointer {
       moveCallback.callback.call(moveCallback.context, this, this.x, this.y, fromClick);
     }
     //  Easy out if we're dragging something and it still exists
-    if (this.targetObject !== null && this.targetObject.isDragged === true) {
-      if (this.targetObject.update(this) === false) {
+    if (this.targetObject !== null && this.targetObject.isDragged) {
+      if (!this.targetObject.update(this)) {
         this.targetObject = null;
       }
     } else if (input.interactiveItems.total > 0) {
@@ -290,7 +299,7 @@ export class Pointer {
    * @param {boolean} fromClick - TBD.
    * @returns {boolean} TBD.
    */
-  public processInteractiveObjects(fromClick = false) {
+  public processInteractiveObjects(fromClick = false): boolean {
     // Work out which object is on the top
     let highestRenderOrderID = 0;
     let highestInputPriorityID = -1;
@@ -352,7 +361,7 @@ export class Pointer {
    * @param {InputHandler} newTarget - TBD.
    * @param {boolean} silent - TBD.
    */
-  public swapTarget(newTarget: InputHandler, silent = false) {
+  public swapTarget(newTarget: InputHandler, silent = false): void {
     //  Now we know the top-most item (if any) we can process it
     if (newTarget === null) {
       //  The pointer isn't currently over anything, check if we've got a lingering previous target
@@ -383,7 +392,7 @@ export class Pointer {
    * TBD.
    * @param {MouseEvent|PointerEvent} event - TBD.
    */
-  public leave(event: InputEvent) {
+  public leave(event: InputEvent): void {
     this.withinGame = false;
     this.move(event, false);
   }
@@ -393,7 +402,7 @@ export class Pointer {
    * @param {MouseEvent|PointerEvent} event - TBD.
    * @returns {Pointer} TBD.
    */
-  public stop(event: InputEvent) {
+  public stop(event: InputEvent): this | null {
     const { input } = this.game;
     if (this._stateReset && this.withinGame) {
       event.preventDefault();
@@ -446,7 +455,7 @@ export class Pointer {
    * @param {number} duration - TBD.
    * @returns {boolean} TBD.
    */
-  public justPressed(duration: number) {
+  public justPressed(duration: number): boolean {
     duration = duration || this.game.input.justPressedRate;
     return this.isDown && this.timeDown + duration > this.game.time.time;
   }
@@ -456,7 +465,7 @@ export class Pointer {
    * @param {number} duration - TBD.
    * @returns {boolean} TBD.
    */
-  public justReleased(duration: number) {
+  public justReleased(duration: number): boolean {
     duration = duration || this.game.input.justReleasedRate;
     return this.isUp && this.timeUp + duration > this.game.time.time;
   }
@@ -468,14 +477,14 @@ export class Pointer {
    * @param {object} callbackContext - TBD.
    * @param {...any} callbackArgs - TBD.
    */
-  public addClickTrampoline(name: string, callback: Function, callbackContext: unknown, callbackArgs: any) {
+  public addClickTrampoline(name: string, callback: Function, callbackContext: unknown, callbackArgs: unknown[]): void {
     if (!this.isDown) {
       return;
     }
     this._clickTrampolines = this._clickTrampolines ?? [];
     const trampolines = this._clickTrampolines;
     for (let i = 0; i < trampolines.length; i += 1) {
-      if (trampolines[i].name === name) {
+      if (trampolines[i]!.name === name) {
         trampolines.splice(i, 1);
         break;
       }
@@ -492,7 +501,7 @@ export class Pointer {
   /**
    * TBD.
    */
-  public processClickTrampolines() {
+  public processClickTrampolines(): void {
     const trampolines = this._clickTrampolines;
     if (!trampolines) {
       return;
@@ -509,7 +518,7 @@ export class Pointer {
   /**
    * TBD.
    */
-  public reset() {
+  public reset(): void {
     if (!this.isMouse) {
       this.active = false;
     }
@@ -530,7 +539,7 @@ export class Pointer {
   /**
    * TBD.
    */
-  public resetMovement() {
+  public resetMovement(): void {
     this.movementX = 0;
     this.movementY = 0;
   }
@@ -539,7 +548,7 @@ export class Pointer {
    * TBD.
    * @returns {number} TBD.
    */
-  public get duration() {
+  public get duration(): number {
     if (this.isUp) {
       return -1;
     }
@@ -550,7 +559,7 @@ export class Pointer {
    * TBD.
    * @returns {number} TBD.
    */
-  public get worldX() {
+  public get worldX(): number {
     return this.x;
   }
 
@@ -558,7 +567,7 @@ export class Pointer {
    * TBD.
    * @returns {number} TBD.
    */
-  public get worldY() {
+  public get worldY(): number {
     return this.y;
   }
 }

package/src/phaser/core/input_touch.ts

@@ -47,27 +47,27 @@ export class Touch {
   /**
    * TBD.
    */
-  public start() {
+  public start(): void {
     if (!this.game.device.touch || this._onTouchStart !== null) {
       return;
     }
     const scope = this;
-    this._onTouchStart = (event) => {
+    this._onTouchStart = (event): void => {
       scope.onTouchStart(event);
     };
-    this._onTouchMove = (event) => {
+    this._onTouchMove = (event): void => {
       scope.onTouchMove(event);
     };
-    this._onTouchEnd = (event) => {
+    this._onTouchEnd = (event): void => {
       scope.onTouchEnd(event);
     };
-    this._onTouchEnter = (event) => {
+    this._onTouchEnter = (event): void => {
       scope.onTouchEnter(event);
     };
-    this._onTouchLeave = (event) => {
+    this._onTouchLeave = (event): void => {
       scope.onTouchLeave(event);
     };
-    this._onTouchCancel = (event) => {
+    this._onTouchCancel = (event): void => {
       scope.onTouchCancel(event);
     };
     this.game.canvas.addEventListener('touchstart', this._onTouchStart, false);
@@ -81,7 +81,7 @@ export class Touch {
   /**
    * TBD.
    */
-  public stop() {
+  public stop(): void {
     if (!this.game.device.touch) {
       return;
     }
@@ -108,8 +108,8 @@ export class Touch {
   /**
    * TBD.
    */
-  public consumeDocumentTouches() {
-    this._documentTouchMove = (event) => {
+  public consumeDocumentTouches(): void {
+    this._documentTouchMove = (event): void => {
       event.preventDefault();
     };
     document.addEventListener('touchmove', this._documentTouchMove, false);
@@ -119,7 +119,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchStart(event: InputEvent) {
+  public onTouchStart(event: InputEvent): void {
     this.event = event;
     if (!this.game.input.enabled || !this.enabled) {
       return;
@@ -141,7 +141,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchCancel(event: InputEvent) {
+  public onTouchCancel(event: InputEvent): void {
     this.event = event;
     if (this.touchCancelCallback) {
       this.touchCancelCallback.call(this.callbackContext, event);
@@ -162,7 +162,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchEnter(event: InputEvent) {
+  public onTouchEnter(event: InputEvent): void {
     this.event = event;
     if (this.touchEnterCallback) {
       this.touchEnterCallback.call(this.callbackContext, event);
@@ -177,7 +177,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchLeave(event: InputEvent) {
+  public onTouchLeave(event: InputEvent): void {
     this.event = event;
     if (this.touchLeaveCallback) {
       this.touchLeaveCallback.call(this.callbackContext, event);
@@ -189,7 +189,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchMove(event: InputEvent) {
+  public onTouchMove(event: InputEvent): void {
     this.event = event;
     if (this.touchMoveCallback) {
       this.touchMoveCallback.call(this.callbackContext, event);
@@ -205,7 +205,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public onTouchEnd(event: InputEvent) {
+  public onTouchEnd(event: InputEvent): void {
     this.event = event;
     if (this.touchEndCallback) {
       this.touchEndCallback.call(this.callbackContext, event);
@@ -224,7 +224,7 @@ export class Touch {
    * TBD.
    * @param {TouchEvent} event - TBD.
    */
-  public eventPreventDefault(event: InputEvent) {
+  public eventPreventDefault(event: InputEvent): void {
     if (this.preventDefault) {
       if (typeof event.cancelable !== 'boolean' || event.cancelable) {
         event.preventDefault();