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

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

@@ -214,7 +214,7 @@ export default function TransformControl() {
                 <TransformControls
                     ref={ref}
                     showX={transformMode === "translate"}
-                    showY={transformMode === "rotate"}
+                    showY={transformMode === "rotate" || transformMode === "translate"}
                     showZ={transformMode === "translate"}
                     object={selectedFloorItem}
                     mode={transformMode}

app/src/modules/scene/helpers/StatsHelper.tsx

@@ -0,0 +1,22 @@
+import { useEffect, useState } from "react";
+import { Stats } from "@react-three/drei";
+import { detectModifierKeys } from "../../../utils/shortcutkeys/detectModifierKeys";
+
+export default function StatsHelper() {
+    const [visible, setVisible] = useState(false);
+
+    useEffect(() => {
+        const handleKeyDown = (event: KeyboardEvent) => {
+            const keyCombination = detectModifierKeys(event);
+            if (keyCombination === "F1") {
+                event.preventDefault();
+                setVisible(prev => !prev);
+            }
+        };
+
+        window.addEventListener("keydown", handleKeyDown);
+        return () => window.removeEventListener("keydown", handleKeyDown);
+    }, []);
+
+    return visible ? <Stats className="stats" /> : null;
+}

app/src/modules/scene/scene.tsx

@@ -14,8 +14,9 @@ import { getAllProjects } from "../../services/dashboard/getAllProjects";
 import { getUserData } from "../../functions/getUserData";
 import { useLoadingProgress, useSocketStore } from "../../store/builder/store";
 import { Color, SRGBColorSpace } from "three";
+import StatsHelper from "./helpers/StatsHelper";
 
-export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Comparison Layout' }) {
+export default function Scene({ layout }: { readonly layout: "Main Layout" | "Comparison Layout"; }) {
     const map = useMemo(() => [
         { name: "forward", keys: ["ArrowUp", "w", "W"] },
         { name: "backward", keys: ["ArrowDown", "s", "S"] },
@@ -35,12 +36,18 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
         getAllProjects(userId, organization)
             .then((projects) => {
                 if (!projects || !projects.Projects) return;
-                let project = projects.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId);
-                const canvas = document.getElementById("sceneCanvas")?.getElementsByTagName('canvas')[0];
+                let project = projects.Projects.find(
+                    (val: any) => val.projectUuid === projectId || val._id === projectId
+                );
+                const canvas = document
+                    .getElementById("sceneCanvas")
+                    ?.getElementsByTagName("canvas")[0];
                 if (!canvas) return;
-                const screenshotDataUrl = (canvas as HTMLCanvasElement)?.toDataURL("image/png");
+                const screenshotDataUrl = (canvas as HTMLCanvasElement)?.toDataURL(
+                    "image/png"
+                );
                 const updateProjects = {
-                    projectId: project?.projectUuid,
+                    projectId: project?._id,
                     organization,
                     userId,
                     projectName: project?.projectName,
@@ -49,11 +56,12 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                 if (projectSocket) {
                     projectSocket.emit("v1:project:update", updateProjects);
                 }
-            }).catch((err) => {
+            })
+            .catch((err) => {
                 console.error(err);
             });
         // eslint-disable-next-line
-    }, [activeModule, assets, loadingProgress])
+    }, [activeModule, assets, loadingProgress]);
 
     return (
         <KeyboardControls map={map}>
@@ -62,13 +70,9 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                 shadows
                 color="#aaaa"
                 eventPrefix="client"
-                onContextMenu={(e) => {
-                    e.preventDefault();
-                }}
+                onContextMenu={(e) => { e.preventDefault(); }}
                 performance={{ min: 0.9, max: 1.0 }}
-                onCreated={(e) => {
-                    e.scene.background = layout === 'Main Layout' ? null : new Color(0x19191d);
-                }}
+                onCreated={(e) => { e.scene.background = layout === "Main Layout" ? null : new Color(0x19191d); }}
                 gl={{ outputColorSpace: SRGBColorSpace, powerPreference: "high-performance", antialias: true }}
             >
                 <Setup />
@@ -76,6 +80,7 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co
                 <Builder />
                 <Simulation />
                 <Visualization />
+                <StatsHelper />
             </Canvas>
         </KeyboardControls>
     );