fix: restore object highlight under pointer and prevent right click when no object under pointer

julien-moreau · julien-moreau · commit 5b2ec997cb61 · 2025-10-27T18:55:29.000+01:00
#693
diff --git a/editor/src/editor/layout/preview.tsx b/editor/src/editor/layout/preview.tsx
@@ -625,8 +625,9 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 		const pickedObject = pickingInfo.pickedSprite ?? pickingInfo.pickedMesh?._masterMesh ?? pickingInfo.pickedMesh;
 
 		if (!pickedObject || (isNode(pickedObject) && isNodeLocked(pickedObject))) {
+			this._restoreCurrentMeshUnderPointer();
 			this._objectUnderPointer = null;
-			return this._restoreCurrentMeshUnderPointer();
+			return;
 		}
 
 		if (this._objectUnderPointer !== pickedObject) {
@@ -659,12 +660,13 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 		}
 
 		this._restoreCurrentMeshUnderPointer();
-		this._objectUnderPointer = null;
 
-		if (event.button === 2) {
+		if (event.button === 2 && this._objectUnderPointer) {
 			this.scene.activeCamera?.inputs.detachElement();
 			this._handleMouseUp(event);
 		}
+
+		this._objectUnderPointer = null;
 	}
 
 	private _handleDoubleClick(_event: MouseEvent<HTMLCanvasElement, globalThis.MouseEvent>): void {

Original file line number	Diff line number	Diff line change
`@@ -625,8 +625,9 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview`
`625`	`625`	`const pickedObject = pickingInfo.pickedSprite ?? pickingInfo.pickedMesh?._masterMesh ?? pickingInfo.pickedMesh;`
`626`	`626`
`627`	`627`	`if (!pickedObject \|\| (isNode(pickedObject) && isNodeLocked(pickedObject))) {`
	`628`	`+ this._restoreCurrentMeshUnderPointer();`
`628`	`629`	`this._objectUnderPointer = null;`
`629`		`- return this._restoreCurrentMeshUnderPointer();`
	`630`	`+ return;`
`630`	`631`	`}`
`631`	`632`
`632`	`633`	`if (this._objectUnderPointer !== pickedObject) {`
`@@ -659,12 +660,13 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview`
`659`	`660`	`}`
`660`	`661`
`661`	`662`	`this._restoreCurrentMeshUnderPointer();`
`662`		`- this._objectUnderPointer = null;`
`663`	`663`
`664`		`- if (event.button === 2) {`
	`664`	`+ if (event.button === 2 && this._objectUnderPointer) {`
`665`	`665`	`this.scene.activeCamera?.inputs.detachElement();`
`666`	`666`	`this._handleMouseUp(event);`
`667`	`667`	`}`
	`668`	`+`
	`669`	`+ this._objectUnderPointer = null;`
`668`	`670`	`}`
`669`	`671`
`670`	`672`	`private _handleDoubleClick(_event: MouseEvent<HTMLCanvasElement, globalThis.MouseEvent>): void {`