fix: Sidebar scrolling misclick issue on iOS (#32769)

RocketChat · Jul 29, 2024 · 5253bcb · 5253bcb
1 parent 2cc8644
commit 5253bcb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/.changeset/red-vans-shave.md b/.changeset/red-vans-shave.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue that caused unintentional clicks when scrolling the channels sidebar on safari/chrome in iOS
diff --git a/apps/meteor/client/polyfills/hoverTouchClick.ts b/apps/meteor/client/polyfills/hoverTouchClick.ts
diff --git a/apps/meteor/client/polyfills/index.ts b/apps/meteor/client/polyfills/index.ts
@@ -3,5 +3,4 @@ import 'url-polyfill';
 import './childNodeRemove';
 import './cssVars';
 import './customEventPolyfill';
-import './hoverTouchClick';
 import './promiseFinally';
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -8,6 +8,7 @@ import React, { memo, useMemo } from 'react';
 
 import { RoomIcon } from '../../components/RoomIcon';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+import { isIOsDevice } from '../../lib/utils/isIOsDevice';
 import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannelPriorities';
 import RoomMenu from '../RoomMenu';
 import { OmnichannelBadges } from '../badges/OmnichannelBadges';
@@ -195,6 +196,7 @@ function SideBarItemTemplateWithData({
 			avatar={AvatarTemplate && <AvatarTemplate {...room} />}
 			actions={actions}
 			menu={
+				!isIOsDevice &&
 				!isAnonymous &&
 				(!isQueued || (isQueued && isPriorityEnabled)) &&
 				((): ReactElement => (

diff --git a/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SideBarItemTemplateWithData.tsx
@@ -8,6 +8,7 @@ import React, { memo, useMemo } from 'react';
 
 import { RoomIcon } from '../../components/RoomIcon';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+import { isIOsDevice } from '../../lib/utils/isIOsDevice';
 import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannelPriorities';
 import RoomMenu from '../RoomMenu';
 import { OmnichannelBadges } from '../badges/OmnichannelBadges';
@@ -195,6 +196,7 @@ const SideBarItemTemplateWithData = ({
 			avatar={AvatarTemplate && <AvatarTemplate {...room} />}
 			actions={actions}
 			menu={
+				!isIOsDevice &&
 				!isAnonymous &&
 				(!isQueued || (isQueued && isPriorityEnabled)) &&
 				((): ReactElement => (