Merge remote-tracking branch 'origin/main-dev' into main-demo

app/src/modules/builder/line/line.tsx

@@ -10,6 +10,7 @@ import { useVersionContext } from '../version/versionContext';
 import { useParams } from 'react-router-dom';
 import { getUserData } from '../../../functions/getUserData';
 import { handleCanvasCursors } from '../../../utils/mouseUtils/handleCanvasCursors';
+import { useSelectedPoints } from '../../../store/simulation/useSimulationStore';
 
 // import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
 // import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
@@ -39,6 +40,7 @@ function Line({ points }: Readonly<LineProps>) {
     const { projectId } = useParams();
     const [dragOffset, setDragOffset] = useState<THREE.Vector3 | null>(null);
     const { hoveredLine, setHoveredLine, hoveredPoint } = useBuilderStore();
+    const { selectedPoints } = useSelectedPoints();
 
     const path = useMemo(() => {
         const [start, end] = points.map(p => new THREE.Vector3(...p.position));
@@ -373,8 +375,8 @@ function Line({ points }: Readonly<LineProps>) {
                 onClick={() => {
                     handlePointClick(points);
                 }}
-                onPointerOver={() => {
-                    if (!hoveredLine) {
+                onPointerOver={(e) => {
+                    if (!hoveredLine && selectedPoints.length === 0 && e.buttons === 0 && !e.ctrlKey) {
                         setHoveredLine(points);
                         setIsHovered(true)
                         if (toolMode === 'move' && !hoveredPoint) {
@@ -385,7 +387,9 @@ function Line({ points }: Readonly<LineProps>) {
                 onPointerOut={() => {
                     if (hoveredLine) {
                         setHoveredLine(null);
-                        handleCanvasCursors('default');
+                        if(!hoveredPoint){
+                            handleCanvasCursors('default');
+                        }
                     }
                     setIsHovered(false)
                 }}