Skip to content

Исправил баг со стрелкой в меню #315

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
merged 1 commit into from
Jan 28, 2023
Merged

Исправил баг со стрелкой в меню #315

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
29 changes: 10 additions & 19 deletions src/components/layout/header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Link } from 'react-router-dom';
import { useEffect, useState, useRef } from 'react';
import { useEffect, useState } from 'react';
import styled from 'styled-components';
import { useSelector } from 'react-redux';
import { Button, Popover } from 'antd';
Expand Down Expand Up @@ -68,8 +68,6 @@ export const Header = () => {

const [openMenuProfile, setOpenMenuProfile] = useState(false);

const ref = useRef();

// todo: зачем это нужно?
const [windowWidth, setWindowWidth] = useState(window.innerWidth);

Expand All @@ -96,22 +94,10 @@ export const Header = () => {
document.body.style.overflowY = 'visible';
}
};
const handleOpenMenuProfile = () => {
setOpenMenuProfile(!openMenuProfile);
const handleOpenMenuProfile = (isOpen) => {
setOpenMenuProfile(isOpen);
};

useEffect(() => {
const handleClickOutside = (event) => {
if (openMenuProfile && !event.path.includes(ref.current)) {
setOpenMenuProfile(!openMenuProfile);
}
};
document.body.addEventListener('click', handleClickOutside);
return () => {
document.body.removeEventListener('click', handleClickOutside);
};
}, [setOpenMenuProfile, openMenuProfile]);

// todo: рефакторить
const iconMenuAndClose = !mobileMenu ? <MenuIcon /> : <CloseMenuIcon />;

Expand Down Expand Up @@ -153,8 +139,13 @@ export const Header = () => {
</div>
{token ? (
<div>
<Popover placement="bottomRight" trigger="click" content={PopoverContent}>
<StyledAvatar onClick={handleOpenMenuProfile} ref={ref} className="d-md-flex">
<Popover
onOpenChange={handleOpenMenuProfile}
placement="bottomRight"
trigger="click"
content={PopoverContent}
>
<StyledAvatar className="d-md-flex">
<img className="m-auto" src={profile.avatar?.thumbnail} alt="" />
<div className={openMenuProfile ? 'downArrow' : 'upArrow'}>
<ArrowAvatar />
Expand Down