Fix onboarding start / end sequence (#1848)

This commit is contained in:
lucas lelievre authored and GitHub committed 2026-05-18 22:12:23 +02:00
1 parent 695d7b7bf8
commit bf2203ff2c
4 files changed
+30 -19

No files matched your search

+9 -2
View File
@@ -4,13 +4,20 @@ import { Button } from '@/components/commons/Button';
import { SlimeVRIcon } from '@/components/commons/icon/SimevrIcon';
import { LangSelector } from '@/components/commons/LangSelector';
import { Typography } from '@/components/commons/Typography';
import { useNavigate } from 'react-router-dom';
export function HomePage() {
const nav = useNavigate();
const { l10n } = useLocalization();
const { applyProgress } = useOnboarding();
const { applyProgress, onboardingStarted } = useOnboarding();
applyProgress(0.1);
const start = () => {
onboardingStarted();
nav('/onboarding/quiz/slime-set');
};
return (
<>
<div className="flex relative flex-col gap-5 h-full items-center w-full justify-center px-4 overflow-clip">
@@ -19,7 +26,7 @@ export function HomePage() {
<Typography variant="mobile-title">
{l10n.getString('onboarding-home')}
</Typography>
<Button variant="primary" to="/onboarding/quiz/slime-set">
<Button variant="primary" onClick={start}>
{l10n.getString('onboarding-home-start')}
</Button>
</div>
@@ -7,10 +7,18 @@ import { useState } from 'react';
import { SittingIcon } from '@/components/commons/icon/SittingIcon';
import { VMCFileUpload } from '@/components/settings/pages/VMCSettings';
import { QuizButton } from './SlimeSetQuestion';
import { useNavigate } from 'react-router-dom';
export function QuizMocapPosQuestion() {
const { applyProgress, setMocapPos, mocapPos, playspace, setPlayspace } =
useOnboarding();
const nav = useNavigate();
const {
applyProgress,
setMocapPos,
mocapPos,
playspace,
setPlayspace,
onboardingEnded,
} = useOnboarding();
const [headTracker, setHeadTracker] = useState(true);
@@ -18,6 +26,11 @@ export function QuizMocapPosQuestion() {
const canContinue = (!headTracker || mocapPos) && playspace;
const end = () => {
onboardingEnded();
nav('/');
};
return (
<div className="grid w-full h-full justify-center items-center">
<div className="flex flex-col gap-8 max-w-xl p-2">
@@ -146,7 +159,7 @@ export function QuizMocapPosQuestion() {
variant="primary"
id="onboarding-quiz_continue"
disabled={!canContinue}
to="/"
onClick={end}
/>
</div>
</div>
@@ -7,13 +7,14 @@ import { useNavigate } from 'react-router-dom';
import { Button } from '@/components/commons/Button';
export function QuizRuntimeQuestion() {
const { applyProgress, setVrcOSC, vrcOsc } = useOnboarding();
const { applyProgress, setVrcOSC, vrcOsc, onboardingEnded } = useOnboarding();
const nav = useNavigate();
applyProgress(0.9);
const next = (type: typeof vrcOsc) => {
setVrcOSC(type);
onboardingEnded();
nav('/');
};
+3 -13
View File
@@ -78,8 +78,7 @@ export function useProvideOnboarding() {
const { sendRPCPacket, useRPCPacket } = useWebsocketAPI();
const { state: locatioState, pathname } = useLocation();
const [previousPath, setPreviousPath] = useState(pathname);
const { state: locatioState } = useLocation();
const [settings, setSettings] = useState<SettingsResponseT>();
useLayoutEffect(() => {
@@ -139,17 +138,6 @@ export function useProvideOnboarding() {
setPlayspace(undefined);
};
useEffect(() => {
setPreviousPath(pathname);
if (!pathname.startsWith('/onboarding') && previousPath.startsWith('/onboarding')) {
onboardingEnded();
}
if (pathname.startsWith('/onboarding') && !previousPath.startsWith('/onboarding')) {
onboardingStarted();
}
}, [pathname]);
return {
state,
slimeSet,
@@ -173,6 +161,8 @@ export function useProvideOnboarding() {
setUsage,
setVrcOSC,
setMocapPos,
onboardingEnded,
onboardingStarted,
};
}