Skip to content

fix dot not being clickable #353

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

Open
seliayeu wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix dot not being clickable #353

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
30 changes: 15 additions & 15 deletions dashboard/src/components/DashboardLayout/NotificationPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ import { forwardRef, useContext, useEffect, useState } from 'react';
import clsx from 'clsx';

const IconWithBadge = forwardRef((
{
icon,
{
icon,
onClick,
className,
} : {
}: {
icon: IconDefinition,
onClick: () => void,
className: string,
},
},
ref: React.Ref<HTMLDivElement>) => {

return (
<div ref={ref}>
<FontAwesomeIcon icon={icon} className={className} onClick={onClick} />
<div className="absolute top-[3px] right-[0px] h-2 w-2 rounded-full bg-red" />
<div ref={ref} onClick={onClick} className={className}>
<FontAwesomeIcon icon={icon} />
<div className="bg-red absolute right-[0px] top-[3px] h-2 w-2 cursor-pointer rounded-full" />
</div>
)
});
Expand All @@ -34,33 +34,33 @@ IconWithBadge.displayName = 'IconWithBadge';

export const NotificationPopover = () => {
const { notifications, ongoingNotifications } = useContext(NotificationContext);
const [ newNotifications, setNewNotifications ] = useState<boolean>(false);
const [ previousNotifications, setPreviousNotifications ] = useState<NotificationItem[]>([]);
const [newNotifications, setNewNotifications] = useState<boolean>(false);
const [previousNotifications, setPreviousNotifications] = useState<NotificationItem[]>([]);

const shouldShowPopup = () => {
return newNotifications ||
ongoingNotifications.length > 0 ||
return newNotifications ||
ongoingNotifications.length > 0 ||
previousNotifications.map(n => n.fresh && !(notifications.includes(n))).length > 0;
};

useEffect(() => {
setPreviousNotifications(notifications);
setNewNotifications(shouldShowPopup());
}, [notifications, ongoingNotifications]);


return (
<Popover className="relative">
<Popover.Button
as={newNotifications ? IconWithBadge : FontAwesomeIcon}
icon={faBell}
className={clsx(
"w-4 select-none hover:cursor-pointer ui-open:text-gray-300",
"ui-open:text-gray-300 w-4 select-none hover:cursor-pointer",
newNotifications ? "ui-not-open:text-white/75 ui-not-open:hover:text-white/90" :
"ui-not-open:text-white/50 ui-not-open:hover:text-white/75")}
"ui-not-open:text-white/50 ui-not-open:hover:text-white/75")}
onClick={() => newNotifications && setNewNotifications(false)}
/>
<Popover.Panel className="absolute right-0 z-40 mt-1 h-[80vh] w-[480px] rounded-lg drop-shadow-lg child:h-full">
<Popover.Panel className="child:h-full absolute right-0 z-40 mt-1 h-[80vh] w-[480px] rounded-lg drop-shadow-lg">
<NotificationPanel className="rounded-lg border" />
</Popover.Panel>
</Popover>
Expand Down