Skip to content

fix(ssr): prevent hydration mismatches from client-only storage reads #392

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

Closed
Valyrian-Code wants to merge 1 commit into from
Closed

fix(ssr): prevent hydration mismatches from client-only storage reads #392

Show file tree
Hide file tree
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
9 changes: 5 additions & 4 deletions src/components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import { getFossologyVersion } from "@/services/info";
import { getSessionStorage, setSessionStorage } from "@/shared/storageHelper";

const Footer = () => {
const [version, setVersion] = useState(
getSessionStorage("fossologyVersion") || null
);
const [version, setVersion] = useState(null);

const fetchVersion = () => {
return getFossologyVersion()
Expand All @@ -36,7 +34,10 @@ const Footer = () => {
};

useEffect(() => {
if (!version) {
const cached = getSessionStorage("fossologyVersion");
if (cached) {
setVersion(cached);
} else {
fetchVersion();
}
}, []);
Expand Down
10 changes: 7 additions & 3 deletions src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import { getLocalStorage, setLocalStorage } from "@/shared/storageHelper";

export default function Header() {
const [currentGroup, setCurrentGroup] = useState(null);
const [authenticated, setAuthenticated] = useState(false);
const [groups, setGroups] = useState(null);
const pathname = usePathname();
const router = useRouter();

Expand Down Expand Up @@ -78,6 +80,8 @@ export default function Header() {
getLocalStorage("currentGroup") ||
getLocalStorage("user")?.default_group;
setCurrentGroup(defaultGroup);
setAuthenticated(isAuth());
setGroups(getAllGroups());
}, []);

const handleGroupChange = (groupName) => {
Expand All @@ -94,7 +98,7 @@ export default function Header() {
{/* Navigation Menu */}
<nav className="hidden md:flex">
<Link href={routes.home} className={clsx("flex items-center h-13 p-4 justify-between", !isHomeActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Home</Link>
{isAuth() && (
{authenticated && (
<>
<Link href={routes.search} className={clsx("flex items-center h-13 p-4 justify-between", !isSearchActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Search</Link>
<Link href={routes.browse} className={clsx("flex items-center h-13 p-4 justify-between", !isBrowseActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Browse</Link>
Expand Down Expand Up @@ -473,7 +477,7 @@ export default function Header() {
{/* Right Side Icons */}
<div className="flex items-center gap-6 text-sm text-gray-800">
{/* Group Dropdown */}
{getAllGroups() && (
{groups && (
<DropdownMenu open={isGroupOpen} onOpenChange={setIsGroupOpen}>
<DropdownMenuTrigger
onClick={(e) => {
Expand Down Expand Up @@ -537,7 +541,7 @@ export default function Header() {

{isGroupSelectOpen && (
<div className="mt-1 border rounded-[4px] border-[#CECECE] shadow bg-white overflow-hidden">
{getAllGroups().map((group) => (
{groups.map((group) => (
<div
key={group.id}
onClick={() => {
Expand Down
8 changes: 6 additions & 2 deletions src/shared/storageHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export const setLocalStorage = (key, value) => {
// Get from localstorage
export const getLocalStorage = (key) => {
if (typeof window !== "undefined") {
return JSON.parse(localStorage.getItem(key));
const item = localStorage.getItem(key);
if (item === null || item === "undefined") return null;
return JSON.parse(item);
}
return null;
};
Expand Down Expand Up @@ -98,7 +100,9 @@ export const defaultAgentsList = () => {
// Get from session storage
export const getSessionStorage = (key) => {
if (typeof window !== "undefined") {
return JSON.parse(sessionStorage.getItem(key));
const item = sessionStorage.getItem(key);
if (item === null || item === "undefined") return null;
return JSON.parse(item);
}
return null;
};
Expand Down