@caperjs/core 0.2.3 → 0.2.4

package/lib/ui/Button.d.ts

@@ -104,6 +104,7 @@ export declare class Button extends _Button implements IButton {
     private _isDownListenerAdded;
     private _pointerId?;
     private _textLabel?;
+    private _lastClickEvent?;
     /**
      * The text label of the button.
      * @returns {Text | HTMLText | BitmapText | undefined} The text label instance.
@@ -120,6 +121,12 @@ export declare class Button extends _Button implements IButton {
      * @param {boolean} enabled - Whether the button is enabled.
      */
     set enabled(enabled: boolean);
+    /**
+     * Clears any in-progress press: removes the window-level release listener and
+     * resets press tracking. Called when the button is disabled, removed, or
+     * destroyed mid-press so a stale pointerId can't block future presses.
+     */
+    private _resetPressState;
     addLabel<T extends Text | HTMLText | BitmapText>(config: (Partial<TextProps | HTMLTextProps> & {
         type?: 'text' | 'html' | 'bitmap';
     }) | T): T;
@@ -149,7 +156,7 @@ export declare class Button extends _Button implements IButton {
      * Removes the keyup event listener and emits the onPress and onUp events.
      */
     protected handlePointerUp(e: FederatedEvent): void;
-    protected handleClick(): void;
+    protected handleClick(e?: FederatedEvent): void;
     /**
      *  Handles the pointer up event.
      */

package/lib/ui/Button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../../src/ui/Button.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../../src/ui/Button.ts"],"names":[],"mappings":"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"}

package/lib/ui/Button.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Button.test.d.ts.map

package/lib/ui/Button.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Button.test.d.ts","sourceRoot":"","sources":["../../src/ui/Button.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caperjs/core",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "title": "Caper",
   "description": "An opinionated HTML game framework built on PixiJS v8",
   "bin": {

package/src/ui/Button.test.ts

@@ -0,0 +1,236 @@
+import { describe, expect, it, vi } from 'vitest';
+
+// Button transitively imports Application → Pixi display graph. Stub it — these
+// tests drive the press-state machine directly and never touch the app singleton.
+vi.mock('../core/Application', () => ({
+  Application: { getInstance: () => ({}) },
+}));
+
+import { Button } from './Button';
+import { Signal } from '../signals';
+
+/**
+ * Builds a Button instance without running the real constructor (which drags in
+ * Factory/Interactive/Focusable mixin construction and a real Pixi Sprite). Only
+ * the fields the handlers under test actually touch are hand-initialized.
+ */
+function makeButton() {
+  const button = Object.create(Button.prototype) as Button;
+
+  // Pixi's Container (via eventemitter3) normally initializes these in its own
+  // constructor, which this hand-rolled instance never runs; `on`/`off` throw
+  // without them.
+  (button as any)._events = Object.create(null);
+  (button as any)._eventsCount = 0;
+
+  (button as any).config = {
+    id: 'button',
+    textures: { default: '' },
+    sheet: undefined,
+    enabled: true,
+    cursor: 'default',
+    disabledCursor: 'not-allowed',
+  };
+
+  (button as any)._enabled = true;
+  button.isDown = false;
+  button.isOver = false;
+  (button as any)._pointerId = undefined;
+  (button as any).isKeyDown = false;
+  (button as any).cursor = 'default';
+  (button as any).focusEnabled = true;
+
+  (button as any).view = { texture: undefined };
+  (button as any).make = { texture: vi.fn(() => 'texture') };
+  (button as any)._isDownCallbacks = new Map();
+  (button as any)._isDownListenerAdded = false;
+
+  button.onDown = new Signal();
+  button.onUp = new Signal();
+  button.onUpOutside = new Signal();
+  button.onOut = new Signal();
+  button.onOver = new Signal();
+  button.onClick = new Signal();
+  button.onEnabled = new Signal();
+  button.onDisabled = new Signal();
+  button.onKeyboardEvent = new Signal();
+  button.onDestroy = new Signal();
+
+  return button;
+}
+
+describe('Button press-state machine', () => {
+  it('recovers from a press that is disabled mid-press', () => {
+    const button = makeButton();
+    const onDown = vi.fn();
+    button.onDown.connect(onDown);
+
+    (button as any).handlePointerDown({ pointerId: 1 });
+    expect(button.isDown).toBe(true);
+
+    button.enabled = false;
+    expect(button.isDown).toBe(false);
+    expect((button as any)._pointerId).toBeUndefined();
+
+    button.enabled = true;
+    (button as any).handlePointerDown({ pointerId: 2 });
+
+    expect(onDown).toHaveBeenCalledTimes(2);
+    expect(button.isDown).toBe(true);
+  });
+
+  it('clears press state on pointerupoutside while disabled and does not emit onUpOutside', () => {
+    const button = makeButton();
+    const onUpOutside = vi.fn();
+    button.onUpOutside.connect(onUpOutside);
+
+    // Arm a stale press, then disable without going through the enabled setter,
+    // to exercise the handler's own cleanup path directly.
+    button.isDown = true;
+    (button as any)._pointerId = 1;
+    (button as any)._enabled = false;
+
+    (button as any).handlePointerUpOutside({ pointerId: 1 });
+
+    expect(button.isDown).toBe(false);
+    expect((button as any)._pointerId).toBeUndefined();
+    expect(onUpOutside).not.toHaveBeenCalled();
+  });
+
+  it('removes the window pointerup listener on destroy', () => {
+    const button = makeButton();
+    (button as any).handlePointerDown({ pointerId: 1 });
+
+    // Stub out the real mixin chain's destroy() (Focusable → Interactive →
+    // WithSignals → Factory → real Pixi Container.destroy) so this test isolates
+    // Button.destroy()'s own added cleanup without needing a fully-constructed
+    // Container underneath.
+    const superDestroy = vi
+      .spyOn(Object.getPrototypeOf(Button.prototype), 'destroy')
+      .mockImplementation(() => {});
+    const removeSpy = vi.spyOn(window, 'removeEventListener');
+
+    button.destroy();
+
+    expect(removeSpy).toHaveBeenCalledWith('pointerup', (button as any).handlePointerUpOutside);
+    expect(superDestroy).toHaveBeenCalled();
+    expect(button.isDown).toBe(false);
+    expect((button as any)._pointerId).toBeUndefined();
+
+    removeSpy.mockRestore();
+    superDestroy.mockRestore();
+  });
+
+  it('does not click after a cancelled press (disabled then re-enabled)', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    (button as any).handlePointerDown({ pointerId: 1 });
+    button.enabled = false;
+    button.enabled = true;
+
+    // A real pointer-driven click event carries the same pointerId as the press.
+    (button as any).handleClick({ pointerId: 1 });
+
+    expect(onClick).not.toHaveBeenCalled();
+  });
+
+  it('clicks normally after a press', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    (button as any).handlePointerDown({ pointerId: 1 });
+    (button as any).handleClick({ pointerId: 1 });
+
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('still clicks for a synthetic keyboard activation (no pointerId)', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    // Mimics FocusManagerPlugin's synthetic pointerdown on Enter/Space keydown.
+    (button as any).handlePointerDown({ type: 'pointerdown' });
+    (button as any).handleClick();
+
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('fires onClick exactly once for a single accessibility activation delivered as click+tap', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    // AccessibilitySystem dispatches ONE shared FederatedEvent instance as both
+    // 'click' and 'tap' — Button connects both to handleClick.
+    const a11yEvent = { type: 'click' };
+    (button as any).handleClick(a11yEvent);
+    (button as any).handleClick(a11yEvent);
+
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('suppresses a cancelled pointer-driven click even without a prior press in this test', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    // isDown is false (no press) — a click event carrying a pointerId must be treated
+    // as a cancelled press and suppressed.
+    (button as any).handleClick({ pointerId: 5 });
+
+    expect(onClick).not.toHaveBeenCalled();
+  });
+
+  it('fires onClick for each of two distinct accessibility activations', () => {
+    const button = makeButton();
+    const onClick = vi.fn();
+    button.onClick.connect(onClick);
+
+    (button as any).handleClick({ type: 'click' });
+    (button as any).handleClick({ type: 'click' });
+
+    expect(onClick).toHaveBeenCalledTimes(2);
+  });
+
+  it('toggles the ticker listener on for the first isDown callback and off when the last is removed', () => {
+    const button = makeButton();
+    const add = vi.fn();
+    const remove = vi.fn();
+    Object.defineProperty(button, 'app', { value: { ticker: { add, remove } }, configurable: true });
+
+    button.addIsDownCallback('a', () => {});
+    button.addIsDownCallback('b', () => {});
+
+    expect(add).toHaveBeenCalledTimes(1);
+    expect(remove).not.toHaveBeenCalled();
+
+    button.removeIsDownCallback('a');
+    expect(remove).not.toHaveBeenCalled();
+
+    button.removeIsDownCallback('b');
+    expect(remove).toHaveBeenCalledTimes(1);
+  });
+
+  it('removes the ticker listener on destroy when one is active', () => {
+    const button = makeButton();
+    const add = vi.fn();
+    const remove = vi.fn();
+    Object.defineProperty(button, 'app', { value: { ticker: { add, remove } }, configurable: true });
+
+    button.addIsDownCallback('a', () => {});
+
+    const superDestroy = vi
+      .spyOn(Object.getPrototypeOf(Button.prototype), 'destroy')
+      .mockImplementation(() => {});
+
+    button.destroy();
+
+    expect(remove).toHaveBeenCalledTimes(1);
+
+    superDestroy.mockRestore();
+  });
+});

package/src/ui/Button.ts

@@ -121,6 +121,7 @@ export class Button extends _Button implements IButton {
   private _isDownListenerAdded: boolean = false;
   private _pointerId?: number;
   private _textLabel?: Text | HTMLText | BitmapText;
+  private _lastClickEvent?: FederatedEvent;
 
   /**
    * The text label of the button.
@@ -190,6 +191,8 @@ export class Button extends _Button implements IButton {
       this.onInteraction('tap').connect(this.handleClick, -1),
       this.onInteraction('pointerdown').connect(this.handlePointerDown, -1),
     );
+
+    this.on('removed', this._resetPressState);
   }
 
   // enabled state
@@ -213,6 +216,7 @@ export class Button extends _Button implements IButton {
       });
       this.onEnabled.emit();
     } else {
+      this._resetPressState();
       this.view.texture = this.make.texture({
         asset: this.config.textures.disabled || this.config.textures.default,
         sheet: this.config.sheet ?? undefined,
@@ -221,6 +225,18 @@ export class Button extends _Button implements IButton {
     }
   }
 
+  /**
+   * Clears any in-progress press: removes the window-level release listener and
+   * resets press tracking. Called when the button is disabled, removed, or
+   * destroyed mid-press so a stale pointerId can't block future presses.
+   */
+  private _resetPressState() {
+    window.removeEventListener('pointerup', this.handlePointerUpOutside);
+    this.off('pointerupoutside', this.handlePointerUpOutside);
+    this.isDown = false;
+    this._pointerId = undefined;
+  }
+
   public addLabel<T extends Text | HTMLText | BitmapText>(
     config: (Partial<TextProps | HTMLTextProps> & { type?: 'text' | 'html' | 'bitmap' }) | T,
   ): T {
@@ -264,6 +280,11 @@ export class Button extends _Button implements IButton {
 
   destroy(options?: DestroyOptions) {
     this.onDestroy.emit();
+    this._resetPressState();
+    if (this._isDownListenerAdded) {
+      this.app.ticker.remove(this._handleIsDownCallbacks);
+      this._isDownListenerAdded = false;
+    }
     super.destroy(options);
   }
 
@@ -290,6 +311,7 @@ export class Button extends _Button implements IButton {
 
   removeIsDownCallback(callbackId: string) {
     this._isDownCallbacks.delete(callbackId);
+    this._checkIsDownCallbacks();
   }
 
   setTexture(textureId: ButtonTextureId, texture: TextureAsset) {
@@ -395,10 +417,20 @@ export class Button extends _Button implements IButton {
     this._pointerId = undefined;
   }
 
-  protected handleClick() {
+  protected handleClick(e?: FederatedEvent) {
     if (!this._enabled) {
       return;
     }
+    const pointerId = (e as FederatedPointerEvent | undefined)?.pointerId;
+    if (pointerId !== undefined && !this.isDown) {
+      // a pointer press that was cancelled (e.g. disabled mid-press) must not click
+      return;
+    }
+    if (e !== undefined && e === this._lastClickEvent) {
+      // accessibility dispatches one event instance as both 'click' and 'tap'
+      return;
+    }
+    this._lastClickEvent = e;
     this.isDown = false;
     this.onClick.emit();
     if (this.config.sounds?.click) {
@@ -413,17 +445,16 @@ export class Button extends _Button implements IButton {
    *  Handles the pointer up event.
    */
   protected handlePointerUpOutside(e: PointerEvent | FederatedPointerEvent) {
-    if (!this._enabled || e.pointerId !== this._pointerId) {
+    if (e.pointerId !== this._pointerId) {
       return;
     }
-    window.removeEventListener('pointerup', this.handlePointerUpOutside);
-    this.off('pointerupoutside', this.handlePointerUpOutside);
-    this.view.texture = this.make.texture({ asset: this.config.textures.default, sheet: this.config.sheet });
-    this.isDown = false;
+    const wasEnabled = this._enabled;
+    this._resetPressState();
     this.isOver = false;
-    this.onUpOutside.emit();
-
-    this._pointerId = undefined;
+    if (wasEnabled) {
+      this.view.texture = this.make.texture({ asset: this.config.textures.default, sheet: this.config.sheet });
+      this.onUpOutside.emit();
+    }
   }
 
   private _doAction(action: ButtonActionOrCallback) {
@@ -442,7 +473,7 @@ export class Button extends _Button implements IButton {
     if (!this._isDownListenerAdded && this._isDownCallbacks.size > 0) {
       this._isDownListenerAdded = true;
       this.app.ticker.add(this._handleIsDownCallbacks);
-    } else {
+    } else if (this._isDownListenerAdded && this._isDownCallbacks.size === 0) {
       this.app.ticker.remove(this._handleIsDownCallbacks);
       this._isDownListenerAdded = false;
     }

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is auto-generated during the build process.
-export const version: string = '0.2.3';
+export const version: string = '0.2.4';
 export const pixiVersion: string = '8.19.0';