From 7e910639cd2d1e5e0dcdcbac140e16c7a4b93927 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 29 Apr 2025 11:48:54 +0200 Subject: [PATCH] [Glitch] Fix edit dropdown crashing the web interface on mobile Port b81c28e7dcc6a306e412bbc5beac364ff74531e0 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/dropdown_menu.tsx | 5 ++++- .../flavours/glitch/components/edited_timestamp/index.tsx | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.tsx b/app/javascript/flavours/glitch/components/dropdown_menu.tsx index 961f6c8c58..cb03204a5f 100644 --- a/app/javascript/flavours/glitch/components/dropdown_menu.tsx +++ b/app/javascript/flavours/glitch/components/dropdown_menu.tsx @@ -297,6 +297,7 @@ interface DropdownProps { scrollable?: boolean; scrollKey?: string; status?: ImmutableMap; + forceDropdown?: boolean; renderItem?: RenderItemFn; renderHeader?: RenderHeaderFn; onOpen?: () => void; @@ -316,6 +317,7 @@ export const Dropdown = ({ disabled, scrollable, status, + forceDropdown = false, renderItem, renderHeader, onOpen, @@ -386,7 +388,7 @@ export const Dropdown = ({ dispatch(fetchRelationships([prefetchAccountId])); } - if (isUserTouching()) { + if (isUserTouching() && !forceDropdown) { dispatch( openModal({ modalType: 'ACTIONS', @@ -416,6 +418,7 @@ export const Dropdown = ({ handleItemClick, open, items, + forceDropdown, handleClose, ], ); diff --git a/app/javascript/flavours/glitch/components/edited_timestamp/index.tsx b/app/javascript/flavours/glitch/components/edited_timestamp/index.tsx index e094f93bac..2cc9219fb5 100644 --- a/app/javascript/flavours/glitch/components/edited_timestamp/index.tsx +++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.tsx @@ -116,6 +116,7 @@ export const EditedTimestamp: React.FC<{ renderHeader={renderHeader} onOpen={handleOpen} onItemClick={handleItemClick} + forceDropdown >