three-gamepad-controls 0.25.3 → 0.25.5

package/dist/core.d.ts

@@ -1,4 +1,3 @@
-//#region src/core.d.ts
 /**
  * Smallest valid browser-assigned gamepad index.
  *
@@ -60,5 +59,4 @@ export type GamepadAxisKey = keyof typeof GAMEPAD_AXIS;
 /**
  * Union type of all valid {@link GAMEPAD_AXIS} values.
  */
-export type GamepadAxisValue = (typeof GAMEPAD_AXIS)[keyof typeof GAMEPAD_AXIS];
-//#endregion
+export type GamepadAxisValue = (typeof GAMEPAD_AXIS)[keyof typeof GAMEPAD_AXIS];

package/dist/core.js

@@ -1,4 +1,4 @@
-//#region src/core.ts
+// src/core.ts
 /**
 * Smallest valid browser-assigned gamepad index.
 *
@@ -45,5 +45,4 @@ const GAMEPAD_AXIS = {
 	RightX: 2,
 	RightY: 3
 };
-//#endregion
 export { GAMEPAD_AXIS, GAMEPAD_BUTTON, MAX_GAMEPAD_INDEX, MIN_GAMEPAD_INDEX };

package/dist/gamepad-arcball-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { ArcballControls } from "three/addons/controls/ArcballControls.js";
-//#region src/gamepad-arcball-controls.d.ts
 /**
  * Configuration for {@link GamepadArcballControls}.
  *
@@ -113,5 +112,4 @@ export declare class GamepadArcballControls extends GamepadControls {
    * @param gamepad - The gamepad that just disconnected.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-arcball-controls.js

@@ -2,7 +2,7 @@ import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
 import { Vector2, Vector3 } from "three";
-//#region src/gamepad-arcball-controls.ts
+// src/gamepad-arcball-controls.ts
 const DEFAULT_ARCBALL_OPTIONS = {
 	rotateSpeed: 1,
 	panSpeed: 1,
@@ -342,5 +342,4 @@ var GamepadArcballControls = class extends GamepadControls {
 		}
 	}
 };
-//#endregion
 export { GamepadArcballControls };

package/dist/gamepad-controls.d.ts

@@ -1,6 +1,5 @@
 import { GamepadInput, GamepadInputOptions } from "./gamepad-input.js";
 import { EventDispatcher } from "three";
-//#region src/gamepad-controls.d.ts
 /**
  * Event map for {@link GamepadControls}.
  *
@@ -132,5 +131,4 @@ export declare abstract class GamepadControls extends EventDispatcher<GamepadCon
    * @param gamepad - The gamepad that was active before disconnection.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-controls.js

@@ -1,6 +1,6 @@
 import { GamepadInput } from "./gamepad-input.js";
 import { EventDispatcher } from "three";
-//#region src/gamepad-controls.ts
+// src/gamepad-controls.ts
 /**
 * Abstract base class for Three.js gamepad controls.
 *
@@ -153,5 +153,4 @@ var GamepadControls = class extends EventDispatcher {
 		});
 	}
 };
-//#endregion
 export { GamepadControls };

package/dist/gamepad-drag-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { DragControls } from "three/addons/controls/DragControls.js";
-//#region src/gamepad-drag-controls.d.ts
 /**
  * Configuration for {@link GamepadDragControls}.
  *
@@ -66,5 +65,4 @@ export declare class GamepadDragControls extends GamepadControls {
    * @param gamepad - The gamepad that just disconnected.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-drag-controls.js

@@ -3,7 +3,7 @@ import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./ga
 import { GamepadControls } from "./gamepad-controls.js";
 import { getCameraViewSize } from "./three-utils.js";
 import { Matrix4, Vector2, Vector3 } from "three";
-//#region src/gamepad-drag-controls.ts
+// src/gamepad-drag-controls.ts
 const DEFAULT_DRAG_OPTIONS = {
 	dragSpeed: 1,
 	rotateSpeed: 1,
@@ -286,5 +286,4 @@ var GamepadDragControls = class extends GamepadControls {
 		getCameraViewSize(camera, this.#selectedWorldPosition, this.#viewSize, this.#cameraToSelected);
 	}
 };
-//#endregion
 export { GamepadDragControls };

package/dist/gamepad-first-person-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { FirstPersonControls } from "three/addons/controls/FirstPersonControls.js";
-//#region src/gamepad-first-person-controls.d.ts
 /**
  * Configuration for {@link GamepadFirstPersonControls}.
  *
@@ -68,5 +67,4 @@ export declare class GamepadFirstPersonControls extends GamepadControls {
    * @param deltaTime - Seconds since the last frame.
    */
   protected onUpdate(deltaTime: number): void;
-}
-//#endregion
+}

package/dist/gamepad-first-person-controls.js

@@ -2,7 +2,7 @@ import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
 import { MathUtils, Spherical, Vector3 } from "three";
-//#region src/gamepad-first-person-controls.ts
+// src/gamepad-first-person-controls.ts
 const DEFAULT_FIRST_PERSON_OPTIONS = {
 	moveSpeed: 1,
 	lookSpeed: 1,
@@ -157,5 +157,4 @@ var GamepadFirstPersonControls = class extends GamepadControls {
 		};
 	}
 };
-//#endregion
 export { GamepadFirstPersonControls };

package/dist/gamepad-fly-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { FlyControls } from "three/addons/controls/FlyControls.js";
-//#region src/gamepad-fly-controls.d.ts
 /**
  * Configuration for {@link GamepadFlyControls}.
  *
@@ -56,7 +55,9 @@ export type GamepadFlyControlsOptions = GamepadControlsOptions & {
  * Adds full 6DOF gamepad support to Three.js `FlyControls`.
  *
  * Gamepad input is additive with keyboard/mouse input — call both
- * `gamepadControls.update(delta)` and `controls.update(delta)` each frame.
+ * `gamepadControls.update(delta)` before `controls.update(delta)` each frame.
+ * Applied backward translation suppresses only auto-forward for the next native
+ * update. Neutral or blocked input leaves native automation and manual input intact.
  * Bindings and speeds are configurable via {@link GamepadFlyControlsOptions}.
  */
 export declare class GamepadFlyControls extends GamepadControls {
@@ -67,11 +68,24 @@ export declare class GamepadFlyControls extends GamepadControls {
    *                  Any property not provided falls back to its default value.
    */
   constructor(controls: FlyControls, options?: Partial<GamepadFlyControlsOptions>);
+  /**
+   * Starts a fresh input frame, dropping any unconsumed auto-forward suppression.
+   * Recursive updates from pipelines or native change listeners are ignored.
+   *
+   * @param deltaTime - Seconds since the last frame.
+   */
+  update(deltaTime: number): void;
+  /**
+   * Disables input and releases this instance's update adapter. Later application
+   * replacements are preserved; the native control remains owned by the caller.
+   */
+  dispose(): void;
+  /** Releases pending suppression before notifying disconnection listeners. */
+  protected onGamepadDisconnected(gamepad: Gamepad): void;
   /**
    * Maps the current gamepad state to `FlyControls` translation and rotation.
    *
    * @param deltaTime - Seconds since the last frame.
    */
   protected onUpdate(deltaTime: number): void;
-}
-//#endregion
+}

package/dist/gamepad-fly-controls.js

@@ -2,7 +2,7 @@ import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
 import { Quaternion } from "three";
-//#region src/gamepad-fly-controls.ts
+// src/gamepad-fly-controls.ts
 const DEFAULT_FLY_OPTIONS = {
 	moveSpeed: 1,
 	rotateSpeed: 1,
@@ -26,12 +26,22 @@ const DEFAULT_FLY_OPTIONS = {
 * Adds full 6DOF gamepad support to Three.js `FlyControls`.
 *
 * Gamepad input is additive with keyboard/mouse input — call both
-* `gamepadControls.update(delta)` and `controls.update(delta)` each frame.
+* `gamepadControls.update(delta)` before `controls.update(delta)` each frame.
+* Applied backward translation suppresses only auto-forward for the next native
+* update. Neutral or blocked input leaves native automation and manual input intact.
 * Bindings and speeds are configurable via {@link GamepadFlyControlsOptions}.
 */
 var GamepadFlyControls = class extends GamepadControls {
 	#controls;
 	#options;
+	#originalUpdate;
+	#originalUpdateDescriptor;
+	#nativeUpdate;
+	#backwardObject = null;
+	#backwardGamepad = null;
+	#updating = false;
+	#nativeUpdating = false;
+	#disposed = false;
 	#tmpQuaternion;
 	/**
 	* @param controls - A Three.js `FlyControls` instance.
@@ -48,6 +58,87 @@ var GamepadFlyControls = class extends GamepadControls {
 			lookStick: resolveGamepadStickBinding(DEFAULT_FLY_OPTIONS.lookStick, options?.lookStick)
 		};
 		this.#tmpQuaternion = new Quaternion();
+		this.#originalUpdate = controls.update;
+		this.#originalUpdateDescriptor = Object.getOwnPropertyDescriptor(controls, "update");
+		this.#nativeUpdate = (deltaTime) => this.#updateNative(deltaTime);
+		controls.update = this.#nativeUpdate;
+	}
+	/**
+	* Starts a fresh input frame, dropping any unconsumed auto-forward suppression.
+	* Recursive updates from pipelines or native change listeners are ignored.
+	*
+	* @param deltaTime - Seconds since the last frame.
+	*/
+	update(deltaTime) {
+		if (this.#updating || this.#nativeUpdating || this.#disposed) return;
+		this.#clearBackwardInput();
+		this.#updating = true;
+		try {
+			super.update(deltaTime);
+		} finally {
+			this.#updating = false;
+		}
+	}
+	/**
+	* Disables input and releases this instance's update adapter. Later application
+	* replacements are preserved; the native control remains owned by the caller.
+	*/
+	dispose() {
+		if (this.#disposed) return;
+		this.#disposed = true;
+		this.#clearBackwardInput();
+		super.dispose();
+		if (this.#controls.update === this.#nativeUpdate) {
+			if (this.#originalUpdateDescriptor === void 0) Reflect.deleteProperty(this.#controls, "update");
+			else Object.defineProperty(this.#controls, "update", this.#originalUpdateDescriptor);
+		}
+	}
+	/** Releases pending suppression before notifying disconnection listeners. */
+	onGamepadDisconnected(gamepad) {
+		this.#clearBackwardInput();
+		super.onGamepadDisconnected(gamepad);
+	}
+	/** Clears the destination and snapshot that received backward translation. */
+	#clearBackwardInput() {
+		this.#backwardObject = null;
+		this.#backwardGamepad = null;
+	}
+	/** Revalidates the frame after a user-supplied stick pipeline returns. */
+	#canApplyInput(gamepad, object) {
+		return !this.#disposed && this.enabled && this.#controls.enabled && this.gamepadInput.gamepad === gamepad && this.#controls.object === object;
+	}
+	/**
+	* Consumes one applied backward frame before the original native update.
+	* Only longitudinal automation is omitted; native movement, rotation, and
+	* change publication remain in the original method. Conditional cleanup uses
+	* current configuration and manual state, including changes made by listeners.
+	*/
+	#updateNative(deltaTime) {
+		if (this.#nativeUpdating) return;
+		const controls = this.#controls;
+		const gamepad = this.#backwardGamepad;
+		const object = this.#backwardObject;
+		this.#clearBackwardInput();
+		this.#nativeUpdating = true;
+		try {
+			if (gamepad === null || deltaTime === 0 || !this.#canApplyInput(gamepad, object)) {
+				this.#originalUpdate.call(controls, deltaTime);
+				return;
+			}
+			const vector = controls._moveVector;
+			const manualZ = controls._moveState.back - (controls._moveState.forward ? 1 : 0);
+			vector.z = manualZ;
+			try {
+				this.#originalUpdate.call(controls, deltaTime);
+			} finally {
+				if (controls._moveVector === vector && vector.z === manualZ) {
+					const { forward, back } = controls._moveState;
+					vector.z = back - (forward || controls.autoForward && !back ? 1 : 0);
+				}
+			}
+		} finally {
+			this.#nativeUpdating = false;
+		}
 	}
 	/**
 	* Maps the current gamepad state to `FlyControls` translation and rotation.
@@ -58,11 +149,22 @@ var GamepadFlyControls = class extends GamepadControls {
 		if (!this.#controls.enabled) return;
 		const { moveSpeed, rotateSpeed, buttonDeadzone, moveStick, lookStick, buttonRollLeft, buttonRollRight, buttonMoveUp, buttonMoveDown } = this.#options;
 		const input = this.gamepadInput;
+		const gamepad = input.gamepad;
+		const object = this.#controls.object;
 		const move = input.stick(moveStick.xAxis, moveStick.yAxis, moveStick.pipeline);
+		if (!this.#canApplyInput(gamepad, object)) return;
 		const look = input.stick(lookStick.xAxis, lookStick.yAxis, lookStick.pipeline);
+		if (!this.#canApplyInput(gamepad, object)) return;
 		const moveMult = deltaTime * this.#controls.movementSpeed * moveSpeed;
 		const fwd = move.y;
-		if (fwd !== 0) this.#controls.object.translateZ(fwd * moveMult);
+		if (fwd !== 0) {
+			const displacement = fwd * moveMult;
+			object.translateZ(displacement);
+			if (displacement > 0) {
+				this.#backwardObject = object;
+				this.#backwardGamepad = gamepad;
+			}
+		}
 		const strafe = move.x;
 		if (strafe !== 0) this.#controls.object.translateX(strafe * moveMult);
 		const up = input.buttonValue(buttonMoveUp);
@@ -79,5 +181,4 @@ var GamepadFlyControls = class extends GamepadControls {
 		}
 	}
 };
-//#endregion
 export { GamepadFlyControls };

package/dist/gamepad-haptics.js

@@ -1,4 +1,4 @@
-//#region src/gamepad-haptics.ts
+// src/gamepad-haptics.ts
 /**
 * Returns the primary vibration actuator exposed by a gamepad at runtime.
 *
@@ -84,5 +84,4 @@ const resetGamepadVibration = async (gamepad) => {
 		throw error;
 	}
 };
-//#endregion
 export { isGamepadVibrationSupported, playGamepadVibrationEffect, resetGamepadVibration };

package/dist/gamepad-input.d.ts

@@ -1,5 +1,4 @@
 import { GamepadStick, GamepadStickPipeline } from "./gamepad-stick-processing.js";
-//#region src/gamepad-input.d.ts
 /**
  * Native custom event map for {@link GamepadInput}.
  * Gamepad snapshots are available through `event.detail.gamepad`.
@@ -267,4 +266,4 @@ export declare class GamepadInput extends EventTarget {
    */
   resetVibration(): Promise<GamepadHapticsResult | null>;
 }
-//#endregion
+export {};

package/dist/gamepad-input.js

@@ -1,7 +1,7 @@
 import { isGamepadVibrationSupported, playGamepadVibrationEffect, resetGamepadVibration } from "./gamepad-haptics.js";
 import { GamepadManager } from "./gamepad-manager.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE } from "./gamepad-stick-processing.js";
-//#region src/gamepad-input.ts
+// src/gamepad-input.ts
 const DEFAULT_GAMEPAD_INPUT_OPTIONS = {
 	axisDeadzone: .1,
 	stickPipeline: DEFAULT_GAMEPAD_STICK_PIPELINE
@@ -347,5 +347,4 @@ var GamepadInput = class extends EventTarget {
 		return options?.deadzone ?? this.#options.axisDeadzone;
 	}
 };
-//#endregion
 export { GamepadInput };

package/dist/gamepad-manager.js

@@ -1,5 +1,5 @@
 import { MAX_GAMEPAD_INDEX } from "./core.js";
-//#region src/gamepad-manager.ts
+// src/gamepad-manager.ts
 const EMPTY_UPDATE_RESULT = {
 	gamepad: null,
 	connected: null,
@@ -164,5 +164,4 @@ var GamepadManager = class {
 		};
 	}
 };
-//#endregion
 export { GamepadManager };

package/dist/gamepad-map-controls.d.ts

@@ -1,6 +1,5 @@
 import { GamepadOrbitControls, GamepadOrbitControlsOptions } from "./gamepad-orbit-controls.js";
 import { MapControls } from "three/addons/controls/MapControls.js";
-//#region src/gamepad-map-controls.d.ts
 /**
  * Adds gamepad support to Three.js `MapControls`.
  *
@@ -18,5 +17,4 @@ export declare class GamepadMapControls extends GamepadOrbitControls {
    *                  Any property not provided falls back to its default value.
    */
   constructor(controls: MapControls, options?: Partial<GamepadOrbitControlsOptions>);
-}
-//#endregion
+}

package/dist/gamepad-map-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS } from "./core.js";
 import { GamepadOrbitControls } from "./gamepad-orbit-controls.js";
-//#region src/gamepad-map-controls.ts
+// src/gamepad-map-controls.ts
 const DEFAULT_MAP_OPTIONS = {
 	panStick: {
 		xAxis: GAMEPAD_AXIS.LeftX,
@@ -42,5 +42,4 @@ var GamepadMapControls = class extends GamepadOrbitControls {
 		});
 	}
 };
-//#endregion
 export { GamepadMapControls };

package/dist/gamepad-orbit-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { OrbitControls } from "three/addons/controls/OrbitControls.js";
-//#region src/gamepad-orbit-controls.d.ts
 /**
  * Configuration for {@link GamepadOrbitControls}.
  *
@@ -91,5 +90,4 @@ export declare class GamepadOrbitControls extends GamepadControls {
    * @param gamepad - The gamepad that just disconnected.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-orbit-controls.js

@@ -1,7 +1,7 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
-//#region src/gamepad-orbit-controls.ts
+// src/gamepad-orbit-controls.ts
 const DEFAULT_ORBIT_OPTIONS = {
 	rotateSpeed: 1,
 	panSpeed: 1,
@@ -192,5 +192,4 @@ var GamepadOrbitControls = class extends GamepadControls {
 		}
 	}
 };
-//#endregion
 export { GamepadOrbitControls };

package/dist/gamepad-pointer-lock-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { PointerLockControls } from "three/addons/controls/PointerLockControls.js";
-//#region src/gamepad-pointer-lock-controls.d.ts
 /**
  * Configuration for {@link GamepadPointerLockControls}.
  *
@@ -63,5 +62,4 @@ export declare class GamepadPointerLockControls extends GamepadControls {
    * @param deltaTime - Seconds since the last frame.
    */
   protected onUpdate(deltaTime: number): void;
-}
-//#endregion
+}

package/dist/gamepad-pointer-lock-controls.js

@@ -2,7 +2,7 @@ import { GAMEPAD_AXIS } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
 import { Euler, Quaternion } from "three";
-//#region src/gamepad-pointer-lock-controls.ts
+// src/gamepad-pointer-lock-controls.ts
 const DEFAULT_POINTER_LOCK_OPTIONS = {
 	moveSpeed: 5,
 	lookSpeed: 1,
@@ -95,5 +95,4 @@ var GamepadPointerLockControls = class extends GamepadControls {
 		}
 	}
 };
-//#endregion
 export { GamepadPointerLockControls };

package/dist/gamepad-stick-processing.d.ts

@@ -1,4 +1,3 @@
-//#region src/gamepad-stick-processing.d.ts
 /**
  * Geometry used when processing two-dimensional stick values.
  *
@@ -169,5 +168,4 @@ export declare const DEFAULT_GAMEPAD_STICK_PIPELINE: GamepadStickPipeline;
  * @param options - Optional binding overrides.
  * @returns Complete resolved binding.
  */
-export declare const resolveGamepadStickBinding: (defaults: GamepadStickBinding, options?: GamepadStickBindingOptions) => GamepadStickBinding;
-//#endregion
+export declare const resolveGamepadStickBinding: (defaults: GamepadStickBinding, options?: GamepadStickBindingOptions) => GamepadStickBinding;

package/dist/gamepad-stick-processing.js

@@ -1,4 +1,4 @@
-//#region src/gamepad-stick-processing.ts
+// src/gamepad-stick-processing.ts
 const DEFAULT_GAMEPAD_STICK_PROCESSING_MODE = "axial";
 const DEFAULT_GAMEPAD_DEADZONE_THRESHOLD = .1;
 /**
@@ -195,5 +195,4 @@ const resolveGamepadStickBinding = (defaults, options) => {
 		pipeline: options?.pipeline ?? defaults.pipeline
 	};
 };
-//#endregion
 export { DEFAULT_GAMEPAD_STICK_PIPELINE, gamepadStickPipeline, resolveGamepadStickBinding };

package/dist/gamepad-trackball-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { TrackballControls } from "three/addons/controls/TrackballControls.js";
-//#region src/gamepad-trackball-controls.d.ts
 /**
  * Configuration for {@link GamepadTrackballControls}.
  *
@@ -91,5 +90,4 @@ export declare class GamepadTrackballControls extends GamepadControls {
    * @param gamepad - The gamepad that just disconnected.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-trackball-controls.js

@@ -1,7 +1,7 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
-//#region src/gamepad-trackball-controls.ts
+// src/gamepad-trackball-controls.ts
 const DEFAULT_TRACKBALL_OPTIONS = {
 	rotateSpeed: 1,
 	panSpeed: 1,
@@ -174,5 +174,4 @@ var GamepadTrackballControls = class extends GamepadControls {
 		}
 	}
 };
-//#endregion
 export { GamepadTrackballControls };

package/dist/gamepad-transform-controls.d.ts

@@ -1,7 +1,6 @@
 import { GamepadStickBindingOptions } from "./gamepad-stick-processing.js";
 import { GamepadControls, GamepadControlsOptions } from "./gamepad-controls.js";
 import { TransformControls } from "three/addons/controls/TransformControls.js";
-//#region src/gamepad-transform-controls.d.ts
 /**
  * Configuration for {@link GamepadTransformControls}.
  *
@@ -92,6 +91,8 @@ export type GamepadTransformControlsOptions = GamepadControlsOptions & {
  * Modes and axes are selected explicitly with buttons. Moving the transform
  * stick starts a native-style transform interaction, and releasing it ends
  * the interaction while keeping the active axis highlighted.
+ * Selection follows the native helper's explicit visibility flags, including
+ * combined axes and planes, independently of camera-alignment hiding.
  */
 export declare class GamepadTransformControls extends GamepadControls {
   #private;
@@ -118,5 +119,4 @@ export declare class GamepadTransformControls extends GamepadControls {
    * @param gamepad - The gamepad that just disconnected.
    */
   protected onGamepadDisconnected(gamepad: Gamepad): void;
-}
-//#endregion
+}

package/dist/gamepad-transform-controls.js

@@ -3,7 +3,7 @@ import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./ga
 import { GamepadControls } from "./gamepad-controls.js";
 import { getCameraViewSize } from "./three-utils.js";
 import { Matrix4, Quaternion, Vector2, Vector3 } from "three";
-//#region src/gamepad-transform-controls.ts
+// src/gamepad-transform-controls.ts
 const DEFAULT_TRANSFORM_OPTIONS = {
 	translateSpeed: 1,
 	rotateSpeed: 1,
@@ -66,6 +66,8 @@ const PROJECTED_AXIS_EPSILON = .001;
 * Modes and axes are selected explicitly with buttons. Moving the transform
 * stick starts a native-style transform interaction, and releasing it ends
 * the interaction while keeping the active axis highlighted.
+* Selection follows the native helper's explicit visibility flags, including
+* combined axes and planes, independently of camera-alignment hiding.
 */
 var GamepadTransformControls = class extends GamepadControls {
 	#controls;
@@ -321,9 +323,10 @@ var GamepadTransformControls = class extends GamepadControls {
 	* callbacks, interrupting this update if its context or segment was invalidated.
 	*
 	* @param context - Context expected after the operation that invoked callbacks.
+	* @param validateAxis - Also validate a newly selected axis before acquisition.
 	* @returns `true` when this update may continue applying gamepad input.
 	*/
-	#afterCallback(context) {
+	#afterCallback(context, validateAxis = false) {
 		const segment = this.#segment;
 		if (!this.#matchesContext(context)) {
 			this.#interrupted = true;
@@ -331,6 +334,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		}
 		this.#reconcileSegment();
 		if (segment !== null && this.#segment !== segment) this.#interrupted = true;
+		if (validateAxis && context.axis !== null && !this.#isAxisAllowed(context.mode, context.axis)) this.#interrupted = true;
 		return this.#canApplyInput();
 	}
 	/**
@@ -347,7 +351,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		};
 		const controls = this.#controls;
 		controls[key] = value;
-		this.#afterCallback(context);
+		this.#afterCallback(context, key === "axis");
 	}
 	/**
 	* Applies mode, space, and axis button transitions from the current frame.
@@ -404,7 +408,10 @@ var GamepadTransformControls = class extends GamepadControls {
 	* @param axis - Axis requested by the gamepad button mapping.
 	*/
 	#selectAxis(axis) {
-		if (!this.#isAxisAllowed(this.#controls.mode, axis)) return;
+		if (!this.#isAxisAllowed(this.#controls.mode, axis)) {
+			if (this.#resolveAxis() === null) this.#setActiveAxis(null);
+			return;
+		}
 		this.#endTransform(false);
 		if (!this.#canApplyInput()) return;
 		this.#setActiveAxis(axis);
@@ -413,8 +420,7 @@ var GamepadTransformControls = class extends GamepadControls {
 	* Selects the next visible composite axis available in the current mode.
 	*/
 	#cycleCompositeAxis() {
-		const validAxes = this.#getVisibleAxes(COMPOSITE_AXES[this.#controls.mode]);
-		this.#cycleThroughAxes(validAxes, 1);
+		this.#cycleThroughAxes(COMPOSITE_AXES[this.#controls.mode], 1);
 	}
 	/**
 	* Cycles through all valid axes for the current mode.
@@ -422,17 +428,18 @@ var GamepadTransformControls = class extends GamepadControls {
 	* @param direction - `1` for next axis, `-1` for previous axis.
 	*/
 	#cycleAxis(direction) {
-		this.#cycleThroughAxes(this.#getValidAxes(this.#controls.mode), direction);
+		this.#cycleThroughAxes(MODE_AXES[this.#controls.mode], direction);
 	}
 	/**
-	* Moves the active axis through a candidate axis list.
+	* Moves the active axis through candidates permitted after end callbacks.
 	*
-	* @param axes - Candidate axes to cycle through.
+	* @param candidates - Unfiltered candidate axes to cycle through.
 	* @param direction - `1` for next axis, `-1` for previous axis.
 	*/
-	#cycleThroughAxes(axes, direction) {
+	#cycleThroughAxes(candidates, direction) {
 		this.#endTransform(false);
 		if (!this.#canApplyInput()) return;
+		const axes = this.#getVisibleAxes(candidates);
 		if (axes.length === 0) {
 			this.#setActiveAxis(null);
 			return;
@@ -457,11 +464,16 @@ var GamepadTransformControls = class extends GamepadControls {
 		return current !== null && validAxes.includes(current) ? current : validAxes[0] ?? null;
 	}
 	/**
-	* Updates both the remembered axis for the current mode and the control axis.
+	* Revalidates a candidate after end callbacks before updating axis memory
+	* and the control. An invalidated candidate interrupts this update.
 	*
 	* @param axis - Axis to activate, or `null` to clear selection.
 	*/
 	#setActiveAxis(axis) {
+		if (axis !== null && !this.#isAxisAllowed(this.#controls.mode, axis)) {
+			this.#interrupted = true;
+			return;
+		}
 		this.#activeAxisByMode[this.#controls.mode] = axis;
 		if (this.#controls.axis !== axis) this.#writeProperty("axis", axis);
 	}
@@ -496,7 +508,8 @@ var GamepadTransformControls = class extends GamepadControls {
 		return MODE_AXES[mode].includes(axis) && this.#isAxisVisible(axis);
 	}
 	/**
-	* Reads TransformControls visibility flags for an axis or plane.
+	* Reads the native helper's explicit axis and plane visibility flags.
+	* Camera-alignment hiding does not prohibit gamepad selection.
 	*
 	* @param axis - Axis whose visibility should be checked.
 	* @returns `true` when all components required by the axis are visible.
@@ -510,9 +523,9 @@ var GamepadTransformControls = class extends GamepadControls {
 			case "XY": return controls.showX && controls.showY && controls.showXY;
 			case "YZ": return controls.showY && controls.showZ && controls.showYZ;
 			case "XZ": return controls.showX && controls.showZ && controls.showXZ;
-			case "XYZ":
-			case "XYZE": return controls.showX && controls.showY && controls.showZ;
-			case "E": return true;
+			case "XYZ": return controls.showX && controls.showY && controls.showZ && controls.showXY && controls.showYZ;
+			case "XYZE": return controls.showX && controls.showY && controls.showZ && controls.showXY && controls.showYZ && controls.showXYZE;
+			case "E": return controls.showX && controls.showY && controls.showZ && controls.showE;
 		}
 	}
 	/**
@@ -1064,5 +1077,4 @@ var GamepadTransformControls = class extends GamepadControls {
 		return startedButtons;
 	}
 };
-//#endregion
 export { GamepadTransformControls };

package/dist/three-utils.js

@@ -1,4 +1,4 @@
-//#region src/three-utils.ts
+// src/three-utils.ts
 /**
 * Reads the effective viewport dimensions at a world-space point.
 *
@@ -23,5 +23,4 @@ const getCameraViewSize = (camera, worldPosition, target, cameraPosition) => {
 	}
 	return target.set(1, 1);
 };
-//#endregion
 export { getCameraViewSize };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "three-gamepad-controls",
   "description": "Gamepad support for Three.js controls.",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "license": "MIT",
   "homepage": "https://github.com/luckasnix/three-gamepad-controls#readme",
   "author": {
@@ -46,20 +46,20 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "2.5.14",
-    "@commitlint/cli": "21.2.3",
-    "@commitlint/config-conventional": "21.2.3",
+    "@biomejs/biome": "2.6.3",
+    "@commitlint/cli": "21.2.4",
+    "@commitlint/config-conventional": "21.2.4",
     "@commitlint/types": "21.2.3",
-    "@types/node": "24.13.3",
+    "@types/node": "24.19.2",
     "@types/three": "0.186.0",
-    "@vitest/browser-playwright": "5.0.2",
-    "@vitest/coverage-v8": "5.0.2",
+    "@vitest/browser-playwright": "5.0.5",
+    "@vitest/coverage-v8": "5.0.5",
     "husky": "9.1.7",
-    "playwright": "1.63.0",
+    "playwright": "1.64.1",
     "three": "0.186.0",
-    "tsdown": "0.23.0",
+    "tsdown": "0.23.3",
     "typescript": "7.0.2",
-    "vitest": "5.0.2"
+    "vitest": "5.0.5"
   },
   "peerDependencies": {
     "@types/three": "~0.186.0",