diff --git a/src/app/components/MobileSwipeDownModal.tsx b/src/app/components/MobileSwipeDownModal.tsx
index 71860a64c..04cb97769 100644
--- a/src/app/components/MobileSwipeDownModal.tsx
+++ b/src/app/components/MobileSwipeDownModal.tsx
@@ -1,4 +1,5 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
+import { createPortal } from 'react-dom';
import { Box } from 'folds';
import * as css from '$features/room/message/styles.css';
@@ -19,6 +20,11 @@ export function MobileSwipeDownModal({ children, requestClose }: MobileSwipeDown
const [touchYDiff, setTouchYDiff] = useState(0);
const date = new Date();
const startTime = useRef(0);
+ const [mounted, setMounted] = useState(false);
+
+ useEffect(() => {
+ setMounted(true);
+ }, []);
const handleTouchStart = (e: React.TouchEvent) => {
touchStartY.current = e.touches[0]?.clientY ?? null;
@@ -58,7 +64,9 @@ export function MobileSwipeDownModal({ children, requestClose }: MobileSwipeDown
);
- return (
+ if (!mounted) return null;
+
+ return createPortal(
{children(dragHandleJSX, dragHandlers)}
-
+ ,
+ document.body
);
}
diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index a520601e4..9b0c089ba 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -36,6 +36,7 @@ import { copyToClipboard } from '$utils/dom';
import { markAsRead } from '$utils/notifications';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveRoomPrompt } from '$components/leave-room-prompt';
+import { useMobileLongPress } from '$hooks/useMobileLongPress';
import { useRoomTypingMember } from '$hooks/useRoomTypingMembers';
import { TypingIndicator } from '$components/typing-indicator';
import { stopPropagation } from '$utils/keyboard';
@@ -350,18 +351,29 @@ export function RoomNavItem({
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
+ const { onTouchStart, onTouchEnd, onTouchMove, firedRef: longPressFiredRef } = useMobileLongPress(() => {
+ setIsMobileMenuOpen(true);
+ });
+
const handleContextMenu: MouseEventHandler = (evt) => {
- evt.preventDefault();
if (isMobile) {
+ if (longPressFiredRef.current) {
+ evt.preventDefault();
+ longPressFiredRef.current = false;
+ return;
+ }
+ evt.preventDefault();
setIsMobileMenuOpen(true);
- } else {
- setMenuAnchor({
- x: evt.clientX,
- y: evt.clientY,
- width: 0,
- height: 0,
- });
+ return;
}
+
+ evt.preventDefault();
+ setMenuAnchor({
+ x: evt.clientX,
+ y: evt.clientY,
+ width: 0,
+ height: 0,
+ });
};
const handleOpenMenu: MouseEventHandler = (evt) => {
@@ -437,6 +449,9 @@ export function RoomNavItem({
userSelect: 'none',
WebkitUserSelect: 'none',
}}
+ onTouchStart={onTouchStart}
+ onTouchEnd={onTouchEnd}
+ onTouchMove={onTouchMove}
>
void, delay = 500) {
- const timerRef = useRef | null>(null);
- const firedRef = useRef(false);
-
- const clear = useCallback(() => {
- if (timerRef.current !== null) {
- clearTimeout(timerRef.current);
- timerRef.current = null;
- }
- }, []);
-
- const onTouchStart = useCallback(() => {
- if (!mobileOrTablet()) return;
- firedRef.current = false;
- timerRef.current = setTimeout(() => {
- firedRef.current = true;
- callback();
- }, delay);
- }, [callback, delay]);
-
- const onTouchEnd = useCallback(() => {
- clear();
- }, [clear]);
-
- const onTouchMove = useCallback(() => {
- clear();
- }, [clear]);
-
- return { onTouchStart, onTouchEnd, onTouchMove, firedRef };
-}
+import { useMobileLongPress } from '$hooks/useMobileLongPress';
const clamp = (str: string, len: number) => (str.length > len ? `${str.slice(0, len)}...` : str);
diff --git a/src/app/hooks/useMobileLongPress.ts b/src/app/hooks/useMobileLongPress.ts
new file mode 100644
index 000000000..c1839154f
--- /dev/null
+++ b/src/app/hooks/useMobileLongPress.ts
@@ -0,0 +1,33 @@
+import { useRef, useCallback } from 'react';
+import { mobileOrTablet } from '$utils/user-agent';
+
+export function useMobileLongPress(callback: () => void, delay = 500) {
+ const timerRef = useRef | null>(null);
+ const firedRef = useRef(false);
+
+ const clear = useCallback(() => {
+ if (timerRef.current !== null) {
+ clearTimeout(timerRef.current);
+ timerRef.current = null;
+ }
+ }, []);
+
+ const onTouchStart = useCallback(() => {
+ if (!mobileOrTablet()) return;
+ firedRef.current = false;
+ timerRef.current = setTimeout(() => {
+ firedRef.current = true;
+ callback();
+ }, delay);
+ }, [callback, delay]);
+
+ const onTouchEnd = useCallback(() => {
+ clear();
+ }, [clear]);
+
+ const onTouchMove = useCallback(() => {
+ clear();
+ }, [clear]);
+
+ return { onTouchStart, onTouchEnd, onTouchMove, firedRef };
+}