three-gamepad-controls 0.25.3 → 0.25.4

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

@@ -92,6 +92,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;

package/dist/gamepad-transform-controls.js

@@ -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;
 		}
 	}
 	/**

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.4",
   "license": "MIT",
   "homepage": "https://github.com/luckasnix/three-gamepad-controls#readme",
   "author": {