Skip to content

fix: Prevent React hydration error #418 on game setup page #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
braedonsaunders merged 1 commit into from
Jan 30, 2026
Merged

fix: Prevent React hydration error #418 on game setup page #1126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/app/game/setup/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,24 @@ function SettingSelect<T extends string>({

export default function GameSetupPage() {
const router = useRouter();
const musicEnabled = useUIStore((state) => state.musicEnabled);
const [hasMounted, setHasMounted] = useState(false);

const musicEnabledStore = useUIStore((state) => state.musicEnabled);
const musicVolume = useUIStore((state) => state.musicVolume);
const toggleMusic = useUIStore((state) => state.toggleMusic);
const isFullscreen = useUIStore((state) => state.isFullscreen);
const isFullscreenStore = useUIStore((state) => state.isFullscreen);
const toggleFullscreen = useUIStore((state) => state.toggleFullscreen);
const setFullscreen = useUIStore((state) => state.setFullscreen);

// Use default values during SSR/hydration to avoid mismatch, then sync after mount
const musicEnabled = hasMounted ? musicEnabledStore : true;
const isFullscreen = hasMounted ? isFullscreenStore : false;

// Mark as mounted after hydration
useEffect(() => {
setHasMounted(true);
}, []);

// Join lobby modal state
const [showJoinModal, setShowJoinModal] = useState(false);
const [showLobbyBrowser, setShowLobbyBrowser] = useState(false);
Expand All @@ -310,14 +321,14 @@ export default function GameSetupPage() {

const handleMusicToggle = useCallback(() => {
toggleMusic();
const newEnabled = !musicEnabled;
const newEnabled = !musicEnabledStore;
MusicPlayer.setMuted(!newEnabled);
if (!newEnabled) {
MusicPlayer.pause();
} else {
MusicPlayer.resume();
}
}, [toggleMusic, musicEnabled]);
}, [toggleMusic, musicEnabledStore]);

// Continue menu music (or start if navigated directly here)
// Also start preloading 3D assets in background while player is in lobby
Expand All @@ -343,11 +354,11 @@ export default function GameSetupPage() {
// Don't stop on unmount - music stops when game starts
}, []);

// Sync volume changes
// Sync volume changes - use store value directly since MusicPlayer only runs client-side
useEffect(() => {
MusicPlayer.setVolume(musicVolume);
MusicPlayer.setMuted(!musicEnabled);
}, [musicVolume, musicEnabled]);
MusicPlayer.setMuted(!musicEnabledStore);
}, [musicVolume, musicEnabledStore]);

// Sync fullscreen state with browser
useEffect(() => {
Expand Down