diff --git a/.changeset/adopt-getMouseEventCords.md b/.changeset/adopt-getMouseEventCords.md new file mode 100644 index 000000000..c1a4bcbc3 --- /dev/null +++ b/.changeset/adopt-getMouseEventCords.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Adopt the existing getMouseEventCords helper at the two remaining hand-rolled coordinate literals. diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx index 5488bff92..90ee8040e 100644 --- a/src/app/features/room-nav/RoomNavItem.tsx +++ b/src/app/features/room-nav/RoomNavItem.tsx @@ -31,7 +31,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient'; import { useRoomUnread } from '$state/hooks/unread'; import { roomToUnreadAtom } from '$state/room/roomToUnread'; import { usePowerLevels } from '$hooks/usePowerLevels'; -import { copyToClipboard } from '$utils/dom'; +import { copyToClipboard, getMouseEventCords } from '$utils/dom'; import { markAsRead } from '$utils/notifications'; import { confirm } from '$components/confirm/confirm'; import { showToast } from '$state/toast'; @@ -406,12 +406,7 @@ export function RoomNavItem({ } evt.preventDefault(); - setMenuAnchor({ - x: evt.clientX, - y: evt.clientY, - width: 0, - height: 0, - }); + setMenuAnchor(getMouseEventCords(evt.nativeEvent)); }; const handleOpenMenu: MouseEventHandler = (evt) => { diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 764b116a7..87abe5912 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -41,6 +41,7 @@ import { } from '$components/message'; import { canEditEvent, getEditedEvent, getMemberAvatarMxc } from '$utils/room'; import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix'; +import { getMouseEventCords } from '$utils/dom'; import type { MessageSpacing } from '$state/settings'; import { getSettings, MessageLayout, settingsAtom } from '$state/settings'; import { useMatrixClient } from '$hooks/useMatrixClient'; @@ -912,12 +913,7 @@ function MessageInternal( } evt.preventDefault(); - setMenuAnchor({ - x: evt.clientX, - y: evt.clientY, - width: 0, - height: 0, - }); + setMenuAnchor(getMouseEventCords(evt.nativeEvent)); }; const handleOpenMenu: MouseEventHandler = (evt) => {