Refactor SelectionControls component for improved readability and maintainability; consolidate event handlers and state management, and enhance selection logic.

This commit is contained in:
2025-04-14 18:31:39 +05:30
parent 5219d545b8
commit d60d9812e4

View File

@@ -3,13 +3,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox"; import { SelectionBox } from "three/examples/jsm/interactive/SelectionBox";
import { SelectionHelper } from "./selectionHelper"; import { SelectionHelper } from "./selectionHelper";
import { useFrame, useThree } from "@react-three/fiber"; import { useFrame, useThree } from "@react-three/fiber";
import { import { useFloorItems, useSelectedAssets, useSimulationStates, useSocketStore, useToggleView, } from "../../../../store/store";
useFloorItems,
useSelectedAssets,
useSimulationStates,
useSocketStore,
useToggleView,
} from "../../../../store/store";
import BoundingBox from "./boundingBoxHelper"; import BoundingBox from "./boundingBoxHelper";
import { toast } from "react-toastify"; import { toast } from "react-toastify";
// import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi'; // import { deleteFloorItem } from '../../../../services/factoryBuilder/assest/floorAsset/deleteFloorItemApi';
@@ -33,17 +27,12 @@ const SelectionControls: React.FC = () => {
const [rotatedObjects, setRotatedObjects] = useState<THREE.Object3D[]>([]); const [rotatedObjects, setRotatedObjects] = useState<THREE.Object3D[]>([]);
const [copiedObjects, setCopiedObjects] = useState<THREE.Object3D[]>([]); const [copiedObjects, setCopiedObjects] = useState<THREE.Object3D[]>([]);
const [pastedObjects, setpastedObjects] = useState<THREE.Object3D[]>([]); const [pastedObjects, setpastedObjects] = useState<THREE.Object3D[]>([]);
const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>( const [duplicatedObjects, setDuplicatedObjects] = useState<THREE.Object3D[]>([]);
[]
);
const boundingBoxRef = useRef<THREE.Mesh>(); const boundingBoxRef = useRef<THREE.Mesh>();
const { floorItems, setFloorItems } = useFloorItems(); const { floorItems, setFloorItems } = useFloorItems();
const { activeModule } = useModuleStore(); const { activeModule } = useModuleStore();
const { socket } = useSocketStore(); const { socket } = useSocketStore();
const selectionBox = useMemo( const selectionBox = useMemo(() => new SelectionBox(camera, scene), [camera, scene]);
() => new SelectionBox(camera, scene),
[camera, scene]
);
useEffect(() => { useEffect(() => {
if (!camera || !scene || toggleView) return; if (!camera || !scene || toggleView) return;
@@ -85,12 +74,7 @@ const SelectionControls: React.FC = () => {
rightClickMoved = true; rightClickMoved = true;
} }
isSelecting = true; isSelecting = true;
if ( if (helper.isDown && event.ctrlKey && duplicatedObjects.length === 0 && isCtrlSelecting) {
helper.isDown &&
event.ctrlKey &&
duplicatedObjects.length === 0 &&
isCtrlSelecting
) {
selectionBox.endPoint.set(pointer.x, pointer.y, 0); selectionBox.endPoint.set(pointer.x, pointer.y, 0);
} }
}; };
@@ -110,15 +94,7 @@ const SelectionControls: React.FC = () => {
if (event.ctrlKey && duplicatedObjects.length === 0) { if (event.ctrlKey && duplicatedObjects.length === 0) {
selectAssets(); selectAssets();
} }
} else if ( } else if (!isSelecting && selectedAssets.length > 0 && ((pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) || event.button !== 0)) {
!isSelecting &&
selectedAssets.length > 0 &&
((pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0) ||
event.button !== 0)
) {
clearSelection(); clearSelection();
helper.enabled = true; helper.enabled = true;
isCtrlSelecting = false; isCtrlSelecting = false;
@@ -170,21 +146,7 @@ const SelectionControls: React.FC = () => {
helper.enabled = false; helper.enabled = false;
helper.dispose(); helper.dispose();
}; };
}, [ }, [camera, controls, scene, toggleView, selectedAssets, copiedObjects, pastedObjects, duplicatedObjects, movedObjects, socket, floorItems, rotatedObjects, activeModule,]);
camera,
controls,
scene,
toggleView,
selectedAssets,
copiedObjects,
pastedObjects,
duplicatedObjects,
movedObjects,
socket,
floorItems,
rotatedObjects,
activeModule,
]);
useEffect(() => { useEffect(() => {
if (activeModule !== "builder") { if (activeModule !== "builder") {
@@ -193,12 +155,7 @@ const SelectionControls: React.FC = () => {
}, [activeModule]); }, [activeModule]);
useFrame(() => { useFrame(() => {
if ( if (pastedObjects.length === 0 && duplicatedObjects.length === 0 && movedObjects.length === 0 && rotatedObjects.length === 0) {
pastedObjects.length === 0 &&
duplicatedObjects.length === 0 &&
movedObjects.length === 0 &&
rotatedObjects.length === 0
) {
selectionGroup.current.position.set(0, 0, 0); selectionGroup.current.position.set(0, 0, 0);
} }
}); });
@@ -227,11 +184,7 @@ const SelectionControls: React.FC = () => {
} }
const updatedSelections = new Set(selectedAssets); const updatedSelections = new Set(selectedAssets);
Objects.forEach((obj) => { Objects.forEach((obj) => { updatedSelections.has(obj) ? updatedSelections.delete(obj) : updatedSelections.add(obj); });
updatedSelections.has(obj)
? updatedSelections.delete(obj)
: updatedSelections.add(obj);
});
const selected = Array.from(updatedSelections); const selected = Array.from(updatedSelections);
@@ -246,19 +199,13 @@ const SelectionControls: React.FC = () => {
setDuplicatedObjects([]); setDuplicatedObjects([]);
setSelectedAssets([]); setSelectedAssets([]);
}; };
const updateBackend = async ( const updateBackend = async (updatedPaths: (SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
updatedPaths: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
if (updatedPaths.length === 0) return; if (updatedPaths.length === 0) return;
const email = localStorage.getItem("email"); const email = localStorage.getItem("email");
const organization = email ? email.split("@")[1].split(".")[0] : ""; const organization = email ? email.split("@")[1].split(".")[0] : "";
updatedPaths.forEach(async (updatedPath) => { updatedPaths.forEach(async (updatedPath) => {
if (updatedPath.type === "Conveyor") { if (updatedPath.type === "Conveyor") {
// await setEventApi( // await setEventApi(
// organization, // organization,
@@ -277,7 +224,9 @@ const SelectionControls: React.FC = () => {
}; };
socket.emit("v2:model-asset:updateEventData", data); socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "Vehicle") { } else if (updatedPath.type === "Vehicle") {
// await setEventApi( // await setEventApi(
// organization, // organization,
// updatedPath.modeluuid, // updatedPath.modeluuid,
@@ -291,7 +240,9 @@ const SelectionControls: React.FC = () => {
}; };
socket.emit("v2:model-asset:updateEventData", data); socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "StaticMachine") { } else if (updatedPath.type === "StaticMachine") {
// await setEventApi( // await setEventApi(
// organization, // organization,
// updatedPath.modeluuid, // updatedPath.modeluuid,
@@ -305,7 +256,9 @@ const SelectionControls: React.FC = () => {
}; };
socket.emit("v2:model-asset:updateEventData", data); socket.emit("v2:model-asset:updateEventData", data);
} else if (updatedPath.type === "ArmBot") { } else if (updatedPath.type === "ArmBot") {
// await setEventApi( // await setEventApi(
// organization, // organization,
// updatedPath.modeluuid, // updatedPath.modeluuid,
@@ -320,8 +273,10 @@ const SelectionControls: React.FC = () => {
socket.emit("v2:model-asset:updateEventData", data); socket.emit("v2:model-asset:updateEventData", data);
} }
}); });
}; };
// const removeConnection = (modelUUID: any) => { // const removeConnection = (modelUUID: any) => {
// //
// const removedPath = simulationStates?.flatMap((state) => { // const removedPath = simulationStates?.flatMap((state) => {
@@ -438,6 +393,7 @@ const SelectionControls: React.FC = () => {
// //
// return removedPath; // return removedPath;
// }; // };
const removeConnection = (modelUUIDs: any[]) => { const removeConnection = (modelUUIDs: any[]) => {
const removedPath = simulationStates?.flatMap((state: any) => { const removedPath = simulationStates?.flatMap((state: any) => {
let shouldInclude = false; let shouldInclude = false;
@@ -445,12 +401,8 @@ const SelectionControls: React.FC = () => {
// Conveyor type // Conveyor type
if (state.type === "Conveyor") { if (state.type === "Conveyor") {
state.points.forEach((point: any) => { state.points.forEach((point: any) => {
const sourceMatch = modelUUIDs.includes( const sourceMatch = modelUUIDs.includes(point.connections?.source?.modelUUID);
point.connections?.source?.modelUUID const targetMatch = point.connections?.targets?.some((target: any) => modelUUIDs.includes(target.modelUUID));
);
const targetMatch = point.connections?.targets?.some((target: any) =>
modelUUIDs.includes(target.modelUUID)
);
if (sourceMatch) { if (sourceMatch) {
point.connections.source = {}; point.connections.source = {};
@@ -467,9 +419,7 @@ const SelectionControls: React.FC = () => {
// Vehicle & StaticMachine types // Vehicle & StaticMachine types
if (state.type === "Vehicle") { if (state.type === "Vehicle") {
const targets = state.points?.connections?.targets || []; const targets = state.points?.connections?.targets || [];
const targetMatch = targets.some((target: any) => const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
modelUUIDs.includes(target.modelUUID)
);
if (targetMatch) { if (targetMatch) {
state.points.connections.targets = []; state.points.connections.targets = [];
@@ -478,9 +428,7 @@ const SelectionControls: React.FC = () => {
} }
if (state.type === "StaticMachine") { if (state.type === "StaticMachine") {
const targets = state.points?.connections?.targets || []; const targets = state.points?.connections?.targets || [];
const targetMatch = targets.some((target: any) => const targetMatch = targets.some((target: any) => modelUUIDs.includes(target.modelUUID));
modelUUIDs.includes(target.modelUUID)
);
if (targetMatch) { if (targetMatch) {
state.points.connections.targets = []; state.points.connections.targets = [];
@@ -490,9 +438,7 @@ const SelectionControls: React.FC = () => {
// ArmBot type // ArmBot type
if (state.type === "ArmBot") { if (state.type === "ArmBot") {
const sourceMatch = modelUUIDs.includes( const sourceMatch = modelUUIDs.includes(state.points.connections?.source?.modelUUID);
state.points.connections?.source?.modelUUID
);
const targetMatch = state.points.connections?.targets?.some( const targetMatch = state.points.connections?.targets?.some(
(target: any) => modelUUIDs.includes(target.modelUUID) (target: any) => modelUUIDs.includes(target.modelUUID)
@@ -536,9 +482,7 @@ const SelectionControls: React.FC = () => {
if (targetMatch) { if (targetMatch) {
state.points.connections.targets = state.points.connections.targets =
state.points.connections.targets.filter( state.points.connections.targets.filter((target: any) => !modelUUIDs.includes(target.modelUUID));
(target: any) => !modelUUIDs.includes(target.modelUUID)
);
shouldInclude = true; shouldInclude = true;
} }
@@ -569,16 +513,10 @@ const SelectionControls: React.FC = () => {
const email = localStorage.getItem("email"); const email = localStorage.getItem("email");
const organization = email!.split("@")[1].split(".")[0]; const organization = email!.split("@")[1].split(".")[0];
const storedItems = JSON.parse( const storedItems = JSON.parse(localStorage.getItem("FloorItems") || "[]");
localStorage.getItem("FloorItems") || "[]" const selectedUUIDs = selectedAssets.map((mesh: THREE.Object3D) => mesh.uuid);
);
const selectedUUIDs = selectedAssets.map(
(mesh: THREE.Object3D) => mesh.uuid
);
const updatedStoredItems = storedItems.filter( const updatedStoredItems = storedItems.filter((item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid));
(item: { modeluuid: string }) => !selectedUUIDs.includes(item.modeluuid)
);
localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems)); localStorage.setItem("FloorItems", JSON.stringify(updatedStoredItems));
selectedAssets.forEach((selectedMesh: THREE.Object3D) => { selectedAssets.forEach((selectedMesh: THREE.Object3D) => {
@@ -612,15 +550,7 @@ const SelectionControls: React.FC = () => {
} }
}); });
setSimulationStates( setSimulationStates((prevEvents: (| SimulationTypes.ConveyorEventsSchema | SimulationTypes.VehicleEventsSchema | SimulationTypes.StaticMachineEventsSchema | SimulationTypes.ArmBotEventsSchema)[]) => {
(
prevEvents: (
| SimulationTypes.ConveyorEventsSchema
| SimulationTypes.VehicleEventsSchema
| SimulationTypes.StaticMachineEventsSchema
| SimulationTypes.ArmBotEventsSchema
)[]
) => {
const updatedEvents = (prevEvents || []).filter( const updatedEvents = (prevEvents || []).filter(
(event) => event.modeluuid !== selectedMesh.uuid (event) => event.modeluuid !== selectedMesh.uuid
); );
@@ -633,6 +563,7 @@ const SelectionControls: React.FC = () => {
const allUUIDs = selectedAssets.map((val: any) => val.uuid); const allUUIDs = selectedAssets.map((val: any) => val.uuid);
removeConnection(allUUIDs); removeConnection(allUUIDs);
// const removedPath = simulationStates?.flatMap((path: any) => { // const removedPath = simulationStates?.flatMap((path: any) => {
// let shouldInclude = false; // let shouldInclude = false;
@@ -692,62 +623,14 @@ const SelectionControls: React.FC = () => {
<BoundingBox boundingBoxRef={boundingBoxRef} /> <BoundingBox boundingBoxRef={boundingBoxRef} />
</group> </group>
</group> </group>
<MoveControls
movedObjects={movedObjects} <MoveControls movedObjects={movedObjects} setMovedObjects={setMovedObjects} itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
setMovedObjects={setMovedObjects}
itemsGroupRef={itemsGroupRef} <RotateControls rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} selectionGroup={selectionGroup} boundingBoxRef={boundingBoxRef} />
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects} <DuplicationControls itemsGroupRef={itemsGroupRef} duplicatedObjects={duplicatedObjects} setDuplicatedObjects={setDuplicatedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects} <CopyPasteControls itemsGroupRef={itemsGroupRef} copiedObjects={copiedObjects} setCopiedObjects={setCopiedObjects} pastedObjects={pastedObjects} setpastedObjects={setpastedObjects} selectionGroup={selectionGroup} setDuplicatedObjects={setDuplicatedObjects} movedObjects={movedObjects} setMovedObjects={setMovedObjects} rotatedObjects={rotatedObjects} setRotatedObjects={setRotatedObjects} boundingBoxRef={boundingBoxRef} />
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
selectionGroup={selectionGroup}
boundingBoxRef={boundingBoxRef}
/>
<RotateControls
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
itemsGroupRef={itemsGroupRef}
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects}
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
selectionGroup={selectionGroup}
boundingBoxRef={boundingBoxRef}
/>
<DuplicationControls
itemsGroupRef={itemsGroupRef}
duplicatedObjects={duplicatedObjects}
setDuplicatedObjects={setDuplicatedObjects}
setpastedObjects={setpastedObjects}
selectionGroup={selectionGroup}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
boundingBoxRef={boundingBoxRef}
/>
<CopyPasteControls
itemsGroupRef={itemsGroupRef}
copiedObjects={copiedObjects}
setCopiedObjects={setCopiedObjects}
pastedObjects={pastedObjects}
setpastedObjects={setpastedObjects}
selectionGroup={selectionGroup}
setDuplicatedObjects={setDuplicatedObjects}
movedObjects={movedObjects}
setMovedObjects={setMovedObjects}
rotatedObjects={rotatedObjects}
setRotatedObjects={setRotatedObjects}
boundingBoxRef={boundingBoxRef}
/>
</> </>
); );
}; };