Skip to content

React hydration fix #11

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
WixBe merged 1 commit into from
Nov 2, 2025
Merged

React hydration fix #11

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
15 changes: 15 additions & 0 deletions frontend/components/layout/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import React from 'react';
import Link from 'next/link';
import { useEffect, useState } from 'react';
import { usePathname } from 'next/navigation';
import {
HomeIcon,
Expand Down Expand Up @@ -59,9 +60,23 @@ const navigation: NavSection[] = [
];

export const Sidebar: React.FC = () => {

// Add state to handle client-side rendering
const [isMounted, setIsMounted] = useState(false);

// Use useEffect to mark component as mounted
useEffect(() => {
setIsMounted(true);
}, []);

const pathname = usePathname();
const { collapsed, toggleSidebar } = useSidebar();

// Return null or loading state until mounted
if (!isMounted) {
return <aside className="fixed left-0 top-0 h-screen w-[280px] bg-white dark:bg-slate border-r border-gray-200 dark:border-slate-light" />;
}

return (
<aside
className={cn(
Expand Down
Loading