From 8a7bd507e291b7bda320e402314ee8cb64487282 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Thu, 30 Jul 2026 16:46:41 -0500 Subject: [PATCH] attempt to fix ios long press detection --- src/app/features/room/message/Message.tsx | 3 ++- .../room/message/messageTouch.test.ts | 27 +++++++++++++++++++ src/app/features/room/message/messageTouch.ts | 6 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/app/features/room/message/messageTouch.test.ts create mode 100644 src/app/features/room/message/messageTouch.ts diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index b6959172b..6d00e02f5 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -131,6 +131,7 @@ export type MessageProps = { }; import { useMenuAnchor } from '$hooks/useMenuAnchor'; +import { shouldIgnoreMessageLongPress } from './messageTouch'; const clamp = (str: string, len: number) => (str.length > len ? `${str.slice(0, len)}...` : str); @@ -988,7 +989,7 @@ function MessageInternal( onContextMenu={contextMenuHandler} onTouchStart={(evt) => { const target = evt.target instanceof Element ? evt.target : undefined; - if (target?.closest('[data-gestures="ignore"]')) { + if (shouldIgnoreMessageLongPress(target)) { menu.triggerProps.onTouchCancel(); return; } diff --git a/src/app/features/room/message/messageTouch.test.ts b/src/app/features/room/message/messageTouch.test.ts new file mode 100644 index 000000000..a28431012 --- /dev/null +++ b/src/app/features/room/message/messageTouch.test.ts @@ -0,0 +1,27 @@ +import { describe, expect, it } from 'vitest'; +import { shouldIgnoreMessageLongPress } from './messageTouch'; + +describe('shouldIgnoreMessageLongPress', () => { + it('keeps the message swipe wrapper eligible for long press', () => { + const swipeWrapper = document.createElement('div'); + swipeWrapper.dataset.gestures = 'ignore'; + swipeWrapper.dataset.messageSwipe = ''; + const messageContent = document.createElement('span'); + swipeWrapper.append(messageContent); + + expect(shouldIgnoreMessageLongPress(messageContent)).toBe(false); + }); + + it('still ignores nested controls that own touch gestures', () => { + const swipeWrapper = document.createElement('div'); + swipeWrapper.dataset.gestures = 'ignore'; + swipeWrapper.dataset.messageSwipe = ''; + const media = document.createElement('div'); + media.dataset.gestures = 'ignore'; + const mediaContent = document.createElement('img'); + media.append(mediaContent); + swipeWrapper.append(media); + + expect(shouldIgnoreMessageLongPress(mediaContent)).toBe(true); + }); +}); diff --git a/src/app/features/room/message/messageTouch.ts b/src/app/features/room/message/messageTouch.ts new file mode 100644 index 000000000..42071a199 --- /dev/null +++ b/src/app/features/room/message/messageTouch.ts @@ -0,0 +1,6 @@ +const IGNORED_MESSAGE_GESTURE_SELECTOR = + '[data-gestures="ignore"]:not([data-message-swipe])'; + +export function shouldIgnoreMessageLongPress(target: Element | null | undefined): boolean { + return target?.closest(IGNORED_MESSAGE_GESTURE_SELECTOR) !== null; +}