Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 35 additions & 9 deletions src/modules/Channel/context/hooks/useScrollToMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,25 @@ interface StaticParams {
logger: Logger;
}

// To prevent multiple clicks on the message in the channel while scrolling
function deactivateClick(scrollRef: React.RefObject<HTMLDivElement>) {
const element = scrollRef.current;
const parentNode = element?.parentNode as HTMLDivElement;
if (element && parentNode) {
element.style.pointerEvents = 'none';
parentNode.style.cursor = 'wait';
}
}

function activateClick(scrollRef: React.RefObject<HTMLDivElement>) {
const element = scrollRef.current;
const parentNode = element?.parentNode as HTMLDivElement;
if (element && parentNode) {
element.style.pointerEvents = 'auto';
parentNode.style.cursor = 'auto';
}
}

function useScrollToMessage({
setInitialTimeStamp,
setAnimatedMessageId,
Expand All @@ -30,15 +49,22 @@ function useScrollToMessage({
));
setAnimatedMessageId(null);
setTimeout(() => {
if (isPresent) {
logger.info('Channel: scroll to message - message is present');
setAnimatedMessageId(messageId);
scrollToRenderedMessage(scrollRef, createdAt);
} else {
logger.info('Channel: scroll to message - fetching older messages');
setInitialTimeStamp(null);
setInitialTimeStamp(createdAt);
setAnimatedMessageId(messageId);
try {
logger.info('Channel: scroll to message - disabling mouse events');
deactivateClick(scrollRef);
if (isPresent) {
logger.info('Channel: scroll to message - message is present');
setAnimatedMessageId(messageId);
scrollToRenderedMessage(scrollRef, createdAt);
} else {
logger.info('Channel: scroll to message - fetching older messages');
setInitialTimeStamp(null);
setInitialTimeStamp(createdAt);
setAnimatedMessageId(messageId);
}
} finally {
logger.info('Channel: scroll to message - enabled mouse events');
activateClick(scrollRef);
}
});
}, [
Expand Down
2 changes: 1 addition & 1 deletion src/ui/QuoteMessage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function QuoteMessage({
message,
userId = '',
isByMe = false,
className,
className = '',
isUnavailable = false,
onClick,
}: Props): ReactElement {
Expand Down