Possible fix for menus again

This commit is contained in:
Lim Chee Aun 2024-04-04 14:34:04 +08:00
parent 80196f83ca
commit 30382d088b

View file

@ -209,7 +209,7 @@ function NavMenu(props) {
</MenuLink> </MenuLink>
)} )}
{lists?.length > 0 ? ( {lists?.length > 0 ? (
<SubMenu <SubMenu2
menuClassName="nav-submenu" menuClassName="nav-submenu"
overflow="auto" overflow="auto"
gap={-8} gap={-8}
@ -234,7 +234,7 @@ function NavMenu(props) {
))} ))}
</> </>
)} )}
</SubMenu> </SubMenu2>
) : ( ) : (
<MenuLink to="/l"> <MenuLink to="/l">
<Icon icon="list" size="l" /> <Icon icon="list" size="l" />
@ -244,7 +244,7 @@ function NavMenu(props) {
<MenuLink to="/b"> <MenuLink to="/b">
<Icon icon="bookmark" size="l" /> <span>Bookmarks</span> <Icon icon="bookmark" size="l" /> <span>Bookmarks</span>
</MenuLink> </MenuLink>
<SubMenu <SubMenu2
menuClassName="nav-submenu" menuClassName="nav-submenu"
overflow="auto" overflow="auto"
gap={-8} gap={-8}
@ -293,7 +293,7 @@ function NavMenu(props) {
<Icon icon="block" size="l" /> <Icon icon="block" size="l" />
Blocked users&hellip; Blocked users&hellip;
</MenuItem>{' '} </MenuItem>{' '}
</SubMenu> </SubMenu2>
<MenuDivider /> <MenuDivider />
<MenuItem <MenuItem
onClick={() => { onClick={() => {
@ -371,4 +371,27 @@ function NavMenu(props) {
); );
} }
function SubMenu2(props) {
const menuRef = useRef();
return (
<SubMenu
{...props}
instanceRef={menuRef}
// Test fix for bug; submenus not opening on Android
itemProps={{
onPointerMove: (e) => {
if (e.pointerType === 'touch') {
menuRef.current?.openMenu?.();
}
},
onPointerLeave: (e) => {
if (e.pointerType === 'touch') {
menuRef.current?.openMenu?.();
}
},
}}
/>
);
}
export default memo(NavMenu); export default memo(NavMenu);