techhub/mastodon
2
0
Fork 0
Code Activity

Fix dropdown menus not working on mobile (#34428)

Browse Source
This commit is contained in:
Claire
2025-04-11 11:28:25 +02:00
committed by GitHub
parent 7d50942b36
commit 23edac59ec
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,6 +354,28 @@ export const Dropdown = <Item = MenuItem,>({
dispatch(closeDropdownMenu({ id: currentId }));
}, [dispatch, currentId]);
const handleItemClick = useCallback(
(e: React.MouseEvent | React.KeyboardEvent) => {
const i = Number(e.currentTarget.getAttribute('data-index'));
const item = items?.[i];
handleClose();
if (!item) {
return;
}
if (typeof onItemClick === 'function') {
e.preventDefault();
onItemClick(item, i);
} else if (isActionItem(item)) {
e.preventDefault();
item.action();
}
},
[handleClose, onItemClick, items],
);
const handleClick = useCallback(
(e: React.MouseEvent | React.KeyboardEvent) => {
const { type } = e;
@@ -374,7 +396,7 @@ export const Dropdown = <Item = MenuItem,>({
modalProps: {
status,
actions: items,
onClick: onItemClick,
onClick: handleItemClick,
},
}),
);
@@ -394,7 +416,7 @@ export const Dropdown = <Item = MenuItem,>({
currentId,
scrollKey,
onOpen,
onItemClick,
handleItemClick,
open,
status,
items,
@@ -434,28 +456,6 @@ export const Dropdown = <Item = MenuItem,>({
[handleClick],
);
const handleItemClick = useCallback(
(e: React.MouseEvent | React.KeyboardEvent) => {
const i = Number(e.currentTarget.getAttribute('data-index'));
const item = items?.[i];
handleClose();
if (!item) {
return;
}
if (typeof onItemClick === 'function') {
e.preventDefault();
onItemClick(item, i);
} else if (isActionItem(item)) {
e.preventDefault();
item.action();
}
},
[handleClose, onItemClick, items],
);
useEffect(() => {
return () => {
if (currentId === openDropdownId) {