Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: context menu for new macs #1099

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: context menu for new macs #1099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions src/components/message.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export const Message = ({
});

const checkClickPosition = (
e: React.MouseEvent | TouchEvent | MouseEvent,
e: React.MouseEvent | React.TouchEvent | TouchEvent | MouseEvent,
) => {
const clickPosition =
"touches" in e && e.touches[0]
Expand Down Expand Up @@ -301,6 +301,19 @@ export const Message = ({
};
const longPressEvent = useLongPress(onLongPress, defaultOptions);

const selectMessage = (
e: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>,
) => {
e.preventDefault();
if (
(message.type === "message" && message.deleted) ||
message.type !== "message"
)
return;
checkClickPosition(e);
setSelectedMessageId(message._id);
};

return (
<div className="flex" ref={ref}>
{chatContainerElement &&
Expand Down Expand Up @@ -477,20 +490,17 @@ export const Message = ({
<EditedLabel message={message} />
<ReplyToMessage message={message} scrollToMessage={scrollToMessage} />
<div
{...longPressEvent}
{...(isMobile ? longPressEvent : {})}
ref={(ref) => {
refsContextModal.setReference(ref);
refsEmojiPickerQuickReaction.setReference(ref);
}}
onContextMenu={(e) => {
e.preventDefault();
if (
(message.type === "message" && message.deleted) ||
message.type !== "message"
)
return;
checkClickPosition(e);
setSelectedMessageId(message._id);
onContextMenu={selectMessage}
onClick={(e) => {
// We need this for users with new macs
if (e.ctrlKey) {
selectMessage(e);
}
}}
id={`message-${message._id}`}
className={cn(
Expand Down Expand Up @@ -652,20 +662,17 @@ export const Message = ({
<EditedLabel message={message} />
<ReplyToMessage message={message} scrollToMessage={scrollToMessage} />
<div
{...longPressEvent}
{...(isMobile ? longPressEvent : {})}
ref={(ref) => {
refsContextModal.setReference(ref);
refsEmojiPickerQuickReaction.setReference(ref);
}}
onContextMenu={(e) => {
e.preventDefault();
if (
(message.type === "message" && message.deleted) ||
message.type !== "message"
)
return;
checkClickPosition(e);
setSelectedMessageId(message._id);
onContextMenu={selectMessage}
onClick={(e) => {
// We need this for users with new macs
if (e.ctrlKey) {
selectMessage(e);
}
}}
id={`message-${message._id}`}
className={cn(
Expand Down