From 92d801e01cfc628a2a131cfb47cc5bee6ad45378 Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Sat, 25 Jul 2026 20:13:15 +0200 Subject: [PATCH] feat: open home and direct tab menus with a long press on touch --- src/app/pages/client/sidebar/DirectTab.tsx | 31 +++++++++++++++++----- src/app/pages/client/sidebar/HomeTab.tsx | 31 +++++++++++++++++----- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx index 7732bf46f..0b9466539 100644 --- a/src/app/pages/client/sidebar/DirectTab.tsx +++ b/src/app/pages/client/sidebar/DirectTab.tsx @@ -1,5 +1,5 @@ -import type { MouseEventHandler } from 'react'; -import { forwardRef, useMemo, useState } from 'react'; +import type { MouseEventHandler, TouchEvent as ReactTouchEvent } from 'react'; +import { forwardRef, useMemo, useRef, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import type { RectCords } from 'folds'; import { Box, Menu, MenuItem, PopOut, Text, config, toRem } from 'folds'; @@ -28,6 +28,7 @@ import { settingsAtom } from '$state/settings'; import { useSetting } from '$state/hooks/settings'; import { useDirectRooms } from '$pages/client/direct/useDirectRooms'; import { useSidebarDirectRoomIds } from './useSidebarDirectRoomIds'; +import { useMobileLongPress } from '$hooks/useMobileLongPress'; type DirectMenuProps = { requestClose: () => void; @@ -96,13 +97,25 @@ export function DirectTab() { navigate(getDirectPath()); }; + const buttonRef = useRef(null); + + const openMenuAt = (element: HTMLElement) => { + const cords = element.getBoundingClientRect(); + setMenuAnchor((currentState) => (currentState ? undefined : cords)); + }; + const handleContextMenu: MouseEventHandler = (evt) => { evt.preventDefault(); - const cords = evt.currentTarget.getBoundingClientRect(); - setMenuAnchor((currentState) => { - if (currentState) return undefined; - return cords; - }); + openMenuAt(evt.currentTarget); + }; + + const longPress = useMobileLongPress(() => { + if (buttonRef.current) openMenuAt(buttonRef.current); + }); + + const handleTouchStart = (evt: ReactTouchEvent) => { + buttonRef.current = evt.currentTarget; + longPress.onTouchStart(evt); }; return ( @@ -114,6 +127,10 @@ export function DirectTab() { outlined onClick={handleDirectClick} onContextMenu={handleContextMenu} + onTouchStart={handleTouchStart} + onTouchEnd={longPress.onTouchEnd} + onTouchMove={longPress.onTouchMove} + onTouchCancel={longPress.onTouchCancel} > (null); + + const openMenuAt = (element: HTMLElement) => { + const cords = element.getBoundingClientRect(); + setMenuAnchor((currentState) => (currentState ? undefined : cords)); + }; + const handleContextMenu: MouseEventHandler = (evt) => { evt.preventDefault(); - const cords = evt.currentTarget.getBoundingClientRect(); - setMenuAnchor((currentState) => { - if (currentState) return undefined; - return cords; - }); + openMenuAt(evt.currentTarget); + }; + + const longPress = useMobileLongPress(() => { + if (buttonRef.current) openMenuAt(buttonRef.current); + }); + + const handleTouchStart = (evt: ReactTouchEvent) => { + buttonRef.current = evt.currentTarget; + longPress.onTouchStart(evt); }; return ( @@ -105,6 +118,10 @@ export function HomeTab() { outlined onClick={handleHomeClick} onContextMenu={handleContextMenu} + onTouchStart={handleTouchStart} + onTouchEnd={longPress.onTouchEnd} + onTouchMove={longPress.onTouchMove} + onTouchCancel={longPress.onTouchCancel} >