Skip to content
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

Fixing/scroll bar restoration #1584

Closed
wants to merge 3 commits into from
Closed

Fixing/scroll bar restoration #1584

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1df12cc
fix: preserve scroll position on navbar back button
noobpiyush Nov 25, 2024
5bab8bd
removed unused imports
noobpiyush Nov 25, 2024
3d7a1d3
removed unused imports
noobpiyush Nov 25, 2024
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
41 changes: 35 additions & 6 deletions src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import { motion, AnimatePresence } from 'framer-motion';
import { useSession } from 'next-auth/react';
import { usePathname, useRouter } from 'next/navigation';
import React, { useState, useCallback, useMemo } from 'react';
import { usePathname } from 'next/navigation';
import React, { useState, useCallback, useMemo, useEffect } from 'react';
import Link from 'next/link';
import { ArrowLeft, Menu, Search, X } from 'lucide-react';
import { Button } from './ui/button';
Expand All @@ -12,9 +12,10 @@ import ThemeToggler from './ThemeToggler';
import ProfileDropdown from './profile-menu/ProfileDropdown';
import { SearchBar } from './search/SearchBar';

const scrollPositions = new Map<string, number>();

export const Navbar = () => {
const { data: session } = useSession();
const router = useRouter();
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [isSearchOpen, setIsSearchOpen] = useState(false);
const pathname = usePathname();
Expand All @@ -40,6 +41,34 @@ export const Navbar = () => {
[],
);

// Save scroll position when leaving a page

useEffect(() => {
const handleScroll = () => {
scrollPositions.set(pathname, window.scrollY);
};

window.addEventListener('scroll', handleScroll);

return () => window.removeEventListener('scroll', handleScroll);
}, [pathname]);

// Custom back navigation with scroll position restoration

const handleBack = useCallback(() => {
scrollPositions.set(pathname, window.scrollY);

// Use window.history to go back
window.history.back();

// Restore scroll position after a short delay to ensure the page has loaded
setTimeout(() => {
const previousPath = window.location.pathname;
const savedPosition = scrollPositions.get(previousPath) || 0;
window.scrollTo(0, savedPosition);
}, 100);
}, [pathname]);

return (
<>
<motion.nav
Expand All @@ -63,7 +92,7 @@ export const Navbar = () => {
>
{session?.user && pathname !== '/home' && (
<Button
onClick={() => router.back()}
onClick={handleBack}
variant={'ghost'}
size={'icon'}
className="flex items-center gap-2"
Expand Down Expand Up @@ -158,9 +187,9 @@ export const Navbar = () => {
exit={{ opacity: 0, y: -20 }}
>
<AppbarAuth />
<Button variant={'branding'} className="w-full">
<Button variant={'branding'} className="w-full">
<Link
href={'https://harkirat.classx.co.in/new-courses'}
href={'https://harkirat.classx.co.in/new-courses'}
target="_blank"
>
Join now
Expand Down
Loading