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

app/src/modules/builder/builder.tsx

@@ -57,6 +57,7 @@ export default function Builder() {
     const { setHoveredPoint, setHoveredLine } = useBuilderStore();
     const { userId, organization } = getUserData();
 
+
     useEffect(() => {
         if (!toggleView) {
             setHoveredLine(null);

app/src/modules/scene/controls/controls.tsx

@@ -18,6 +18,7 @@ import ContextControls from "./contextControls/contextControls";
 import SelectionControls2D from "./selectionControls/selection2D/selectionControls2D";
 import UndoRedo2DControls from "./undoRedoControls/undoRedo2D/undoRedo2DControls";
 import UndoRedo3DControls from "./undoRedoControls/undoRedo3D/undoRedo3DControls";
+import { useCameraShortcuts } from "../../../hooks/useCameraShortcuts";
 
 export default function Controls() {
     const controlsRef = useRef<CameraControls>(null);
@@ -116,6 +117,7 @@ export default function Controls() {
             stopInterval();
         };
     }, [toggleView, state, socket]);
+    useCameraShortcuts(controlsRef);
 
     return (
         <>

app/src/modules/visualization/zone/DisplayZone.tsx

@@ -241,21 +241,18 @@ const DisplayZone: React.FC<DisplayZoneProps> = ({
         {Object.keys(zonesData).length !== 0 ? (
           <>
             {Object.values(zonesData).map((zone, index) => (
-              <>
-                { }
-                <div
-                  key={index}
-                  className={`zone ${selectedZone.zoneUuid === zone.zoneUuid ? "active" : ""
-                    }`}
-                  onClick={() => {
+              <div
+                key={`${index}_${zone.zoneName}`}
+                className={`zone ${selectedZone.zoneUuid === zone.zoneUuid ? "active" : ""
+                  }`}
+                onClick={() => {
 
-                    handleSelect2dZoneData(zonesData[zone.zoneUuid]?.zoneUuid, zone.zoneName)
-                  }
-                  }
-                >
-                  {zone.zoneName}
-                </div>
-              </>
+                  handleSelect2dZoneData(zonesData[zone.zoneUuid]?.zoneUuid, zone.zoneName)
+                }
+                }
+              >
+                {zone.zoneName}
+              </div>
             ))}
           </>
         ) : (