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

Jump to bottom

fix(navbar): on Mobile Screen Navbar remains open even page is changed #1247

Merged
merged 6 commits into from
Feb 5, 2024
Merged

fix(navbar): on Mobile Screen Navbar remains open even page is changed #1247

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee4e353
fix((navbar)): fixed Navbar Collapse was not happening when clicking …
dhavalveera Jan 24, 2024
3abe191
fix(navbar): eslint issue fixed for Navbar.Link
dhavalveera Jan 24, 2024
37bcb68
fix: made changes based on Suggested Changes in PR # 1247
dhavalveera Jan 30, 2024
a733e74
fix: handling Users Custom onClick event as well
dhavalveera Jan 30, 2024
fd07e7f
fix: renamed the userOnClick to onClick
dhavalveera Jan 30, 2024
cb6cfc4
fix: made changes accordingly to latest review by Sutu
dhavalveera Feb 5, 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
11 changes: 9 additions & 2 deletions src/components/Navbar/NavbarLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import type { ComponentProps, ElementType, FC } from 'react';
import type { ComponentProps, ElementType, FC, MouseEvent } from 'react';
import { twMerge } from 'tailwind-merge';
import { mergeDeep } from '../../helpers/merge-deep';
import type { DeepPartial } from '../../types';
Expand Down Expand Up @@ -28,12 +28,18 @@ export const NavbarLink: FC<NavbarLinkProps> = ({
children,
className,
theme: customTheme = {},
onClick,
...props
}) => {
const { theme: rootTheme } = useNavbarContext();
const { theme: rootTheme, setIsOpen } = useNavbarContext();

const theme = mergeDeep(rootTheme.link, customTheme);

const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
setIsOpen(false);
onClick?.(event);
};

return (
<li>
<Component
Expand All @@ -44,6 +50,7 @@ export const NavbarLink: FC<NavbarLinkProps> = ({
theme.disabled[disabled ? 'on' : 'off'],
className,
)}
onClick={handleClick}
dhavalveera marked this conversation as resolved.
Show resolved Hide resolved
{...props}
>
{children}
Expand Down
Loading