moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fixes-1371' into 'develop' 

DropdownMenu: close only if open in Redux

Closes #1371

See merge request soapbox-pub/soapbox!2294
This commit is contained in:
Alex Gleason 2023-02-15 18:47:04 +00:00
parent dec2cc69e8 d92a4fd239
commit 919b545e82
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/components/dropdown-menu/dropdown-menu.tsx
View File

@ -9,7 +9,7 @@ import {
openDropdownMenu,
} from 'soapbox/actions/dropdown-menu';
import { closeModal, openModal } from 'soapbox/actions/modals';
import { useAppDispatch } from 'soapbox/hooks';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import { isUserTouching } from 'soapbox/is-mobile';
import { IconButton, Portal } from '../ui';
@ -53,6 +53,7 @@ const DropdownMenu = (props: IDropdownMenu) => {
const history = useHistory();
const [isOpen, setIsOpen] = useState<boolean>(false);
const isOpenRedux = useAppSelector(state => state.dropdown_menu.isOpen);
const arrowRef = useRef<HTMLDivElement>(null);
const activeElement = useRef<Element | null>(null);
@ -130,7 +131,7 @@ const DropdownMenu = (props: IDropdownMenu) => {
};
const closeDropdownMenu = () => {
if (isOpen) {
if (isOpenRedux) {
dispatch(closeDropdownMenuRedux());
}
};