gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 12:16:14 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Fix edit dropdown crashing the web interface on mobile (#34564)

Browse Source
This commit is contained in:
Claire 2025-04-29 11:48:54 +02:00 committed by GitHub
parent ce13fca0c5
commit b81c28e7dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/components/dropdown_menu.tsx
View File

@ -297,6 +297,7 @@ interface DropdownProps<Item = MenuItem> {
scrollable?: boolean; scrollable?: boolean;
scrollKey?: string; scrollKey?: string;
status?: ImmutableMap<string, unknown>; status?: ImmutableMap<string, unknown>;
forceDropdown?: boolean;
renderItem?: RenderItemFn<Item>; renderItem?: RenderItemFn<Item>;
renderHeader?: RenderHeaderFn<Item>; renderHeader?: RenderHeaderFn<Item>;
onOpen?: () => void; onOpen?: () => void;
@ -316,6 +317,7 @@ export const Dropdown = <Item = MenuItem,>({
disabled, disabled,
scrollable, scrollable,
status, status,
forceDropdown = false,
renderItem, renderItem,
renderHeader, renderHeader,
onOpen, onOpen,
@ -386,7 +388,7 @@ export const Dropdown = <Item = MenuItem,>({
dispatch(fetchRelationships([prefetchAccountId])); dispatch(fetchRelationships([prefetchAccountId]));
} }
if (isUserTouching()) { if (isUserTouching() && !forceDropdown) {
dispatch( dispatch(
openModal({ openModal({
modalType: 'ACTIONS', modalType: 'ACTIONS',
@ -416,6 +418,7 @@ export const Dropdown = <Item = MenuItem,>({
handleItemClick, handleItemClick,
open, open,
items, items,
forceDropdown,
handleClose, handleClose,
], ],
); );

1
app/javascript/mastodon/components/edited_timestamp/index.tsx
View File

@ -116,6 +116,7 @@ export const EditedTimestamp: React.FC<{
renderHeader={renderHeader} renderHeader={renderHeader}
onOpen={handleOpen} onOpen={handleOpen}
onItemClick={handleItemClick} onItemClick={handleItemClick}
forceDropdown
> >
<button className='dropdown-menu__text-button'> <button className='dropdown-menu__text-button'>
<FormattedMessage <FormattedMessage