From 06e4d516bad04492421b9be039f651865104968a Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Tue, 22 Jul 2025 17:12:09 +0530 Subject: [PATCH] bug fix --- .../machine/instances/animator/machineAnimator.tsx | 1 - .../instances/machineInstance/machineInstance.tsx | 3 +++ app/src/pages/Project.tsx | 10 ---------- app/src/utils/shortcutkeys/handleShortcutKeys.ts | 7 ++++++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/src/modules/simulation/machine/instances/animator/machineAnimator.tsx b/app/src/modules/simulation/machine/instances/animator/machineAnimator.tsx index d510784..a04119d 100644 --- a/app/src/modules/simulation/machine/instances/animator/machineAnimator.tsx +++ b/app/src/modules/simulation/machine/instances/animator/machineAnimator.tsx @@ -84,7 +84,6 @@ const MachineAnimator = ({ currentPhase, handleCallBack, processingTime, machine animationFrameId.current = null; handleCallBack(); } - } } diff --git a/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx b/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx index 5715016..f45f909 100644 --- a/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx +++ b/app/src/modules/simulation/machine/instances/machineInstance/machineInstance.tsx @@ -23,6 +23,7 @@ function MachineInstance({ machineDetail }: { readonly machineDetail: MachineSta const { triggerPointActions } = useTriggerHandler(); const { speed } = useAnimationPlaySpeed(); const { isPaused } = usePauseButtonStore(); + useEffect(() => { isPausedRef.current = isPaused; }, [isPaused]); @@ -50,6 +51,7 @@ function MachineInstance({ machineDetail }: { readonly machineDetail: MachineSta function machineStatus(modelId: string, status: string) { // console.log(`${modelId} , ${status}`); } + function animate(currentTime: number) { if (previousTimeRef.current === null) { previousTimeRef.current = currentTime; @@ -130,6 +132,7 @@ function MachineInstance({ machineDetail }: { readonly machineDetail: MachineSta return ( <> + diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx index 1df03f7..96c529f 100644 --- a/app/src/pages/Project.tsx +++ b/app/src/pages/Project.tsx @@ -14,7 +14,6 @@ import FollowPerson from "../components/templates/FollowPerson"; import { useLogger } from "../components/ui/log/LoggerContext"; import RenderOverlay from "../components/templates/Overlay"; import LogList from "../components/ui/log/LogList"; -import { useToggleStore } from "../store/useUIToggleStore"; import { getAllProjects } from "../services/dashboard/getAllProjects"; import { viewProject } from "../services/dashboard/viewProject"; import ComparisonSceneProvider from "../components/layout/scenes/ComparisonSceneProvider"; @@ -30,11 +29,9 @@ import { handleCanvasCursors } from "../utils/mouseUtils/handleCanvasCursors"; const Project: React.FC = () => { let navigate = useNavigate(); const echo = useLogger(); - const { setToggleUI } = useToggleStore(); const { setActiveModule } = useModuleStore(); const { setUserName } = useUserName(); const { setOrganization } = useOrganization(); - const { isVersionSaved } = useSaveVersion(); const { projectId } = useParams(); const { setProjectName } = useProjectName(); const { userId, email, organization, userName } = getUserData(); @@ -98,13 +95,6 @@ const Project: React.FC = () => { // eslint-disable-next-line react-hooks/exhaustive-deps }, [projectId]); - useEffect(() => { - if (!isVersionSaved) { - setToggleUI(true, true); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [isVersionSaved]); - useEffect(() => { setActiveModule("builder"); if (email) { diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts index 9cc81e4..0764fd2 100644 --- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts +++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts @@ -95,10 +95,15 @@ const KeyPressListener: React.FC = () => { const toggleTo2D = toggleView; setToggleView(!toggleTo2D); setToggleThreeD(toggleTo2D); - setToggleUI(toggleTo2D, toggleTo2D); if (toggleTo2D) { setSelectedWallItem(null); setAddAction(null); + setToggleUI( + localStorage.getItem("navBarUiLeft") !== "false", + localStorage.getItem("navBarUiRight") !== "false" + ); + } else { + setToggleUI(false, false); } setActiveTool("cursor"); setActiveSubTool("cursor");