From fdc8255c19e03182a4fddea68295e16536adef88 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Tue, 10 Jun 2025 11:34:03 +0530 Subject: [PATCH] refactor: streamline right-click selection handling and event listener management in SelectionControls --- .../selectionControls/selectionControls.tsx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx index 955eecf..2a9b5c8 100644 --- a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx @@ -84,7 +84,6 @@ const SelectionControls: React.FC = () => { const onPointerUp = (event: PointerEvent) => { if (event.button === 2 && !event.ctrlKey && !event.shiftKey) { isRightClick.current = false; - rightClickMoved.current = false; if (!rightClickMoved.current) { clearSelection(); } @@ -171,18 +170,14 @@ const SelectionControls: React.FC = () => { if (!rightClickMoved.current) { clearSelection(); } + rightClickMoved.current = false; }; if (!toggleView && activeModule === "builder") { helper.enabled = true; - if (duplicatedObjects.length === 0 && pastedObjects.length === 0) { - canvasElement.addEventListener("pointerdown", onPointerDown); - canvasElement.addEventListener("pointermove", onPointerMove); - canvasElement.addEventListener("pointerup", onPointerUp); - } else { - helper.enabled = false; - helper.dispose(); - } + canvasElement.addEventListener("pointermove", onPointerMove); + canvasElement.addEventListener("pointerup", onPointerUp); + canvasElement.addEventListener("pointerdown", onPointerDown); canvasElement.addEventListener("contextmenu", onContextMenu); canvasElement.addEventListener("keydown", onKeyDown); } else { @@ -208,7 +203,6 @@ const SelectionControls: React.FC = () => { }, [activeModule]); useFrame(() => { - console.log(rightClickMoved.current); if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) { selectionGroup.current.position.set(0, 0, 0); }