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

Jump to bottom

refactor(client): readMessage events #28709

Merged
merged 1 commit into from
Mar 30, 2023
Merged

refactor(client): readMessage events #28709

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion apps/meteor/client/startup/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import './messageTypes';
import './notifications';
import './oauth';
import './otr';
import './readMessage';
import './reloadRoomAfterLogin';
import './renderMessage';
import './renderNotification';
Expand Down
32 changes: 0 additions & 32 deletions apps/meteor/client/startup/readMessage.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/components/BlazeTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { memo, useLayoutEffect, useRef } from 'react';

import { useBlazePortals } from '../../../lib/portals/blazePortals';
import { useRoom } from '../contexts/RoomContext';
import { useRoomMessageContext } from './body/useRoomMessageContext';
import { useRoomMessageContext } from './body/hooks/useRoomMessageContext';

type PropsFromBox = 'className' | 'display' | 'flexGrow' | 'flexShrink' | 'flexDirection' | 'overflow' | 'w' | 'onClick' | 'onMouseEnter';

Expand Down
9 changes: 6 additions & 3 deletions apps/meteor/client/views/room/components/body/RoomBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ import RoomForeword from './RoomForeword';
import UnreadMessagesIndicator from './UnreadMessagesIndicator';
import UploadProgressIndicator from './UploadProgressIndicator';
import ComposerContainer from './composer/ComposerContainer';
import { useFileUploadDropTarget } from './useFileUploadDropTarget';
import { useRetentionPolicy } from './useRetentionPolicy';
import { useUnreadMessages } from './useUnreadMessages';
import { useFileUploadDropTarget } from './hooks/useFileUploadDropTarget';
import { useReadMessageWindowEvents } from './hooks/useReadMessageWindowEvents';
import { useRetentionPolicy } from './hooks/useRetentionPolicy';
import { useUnreadMessages } from './hooks/useUnreadMessages';

const RoomBody = (): ReactElement => {
const t = useTranslation();
Expand Down Expand Up @@ -538,6 +539,8 @@ const RoomBody = (): ReactElement => {
[toolbox],
);

useReadMessageWindowEvents();

return (
<>
{!isLayoutEmbedded && room.announcement && <Announcement announcement={room.announcement} announcementDetails={undefined} />}
Expand Down
0 ...ews/room/components/body/useDropTarget.ts → ...om/components/body/hooks/useDropTarget.ts
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...omponents/body/useFileUploadDropTarget.ts → ...nts/body/hooks/useFileUploadDropTarget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import type { ReactNode } from 'react';
import type React from 'react';
import { useCallback, useMemo } from 'react';

import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
import { useChat } from '../../contexts/ChatContext';
import { useRoom } from '../../contexts/RoomContext';
import { useReactiveValue } from '../../../../../hooks/useReactiveValue';
import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
import { useChat } from '../../../contexts/ChatContext';
import { useRoom } from '../../../contexts/RoomContext';
import { useDropTarget } from './useDropTarget';

export const useFileUploadDropTarget = (): readonly [
Expand Down Expand Up @@ -35,7 +35,7 @@ export const useFileUploadDropTarget = (): readonly [
const chat = useChat();

const onFileDrop = useMutableCallback(async (files: File[]) => {
const { mime } = await import('../../../../../app/utils/lib/mimeTypes');
const { mime } = await import('../../../../../../app/utils/lib/mimeTypes');

const uploads = Array.from(files).map((file) => {
Object.defineProperty(file, 'type', { value: mime.lookup(file.name) });
Expand Down
42 changes: 42 additions & 0 deletions apps/meteor/client/views/room/components/body/hooks/useReadMessageWindowEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { useEffect } from 'react';

import { readMessage } from '../../../../../../app/ui-utils/client';
import { useRoom } from '../../../contexts/RoomContext';

export function useReadMessageWindowEvents() {
const { _id: rid } = useRoom();

useEffect(() => {
const handleWindowBlur = () => {
readMessage.disable();
};

const handleWindowFocus = () => {
readMessage.enable();
readMessage.read();
};

const handleWindowTouchEnd = () => {
readMessage.enable();
};

const handleWindowKeyUp = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
readMessage.readNow(rid);
readMessage.refreshUnreadMark(rid);
}
};

window.addEventListener('blur', handleWindowBlur);
window.addEventListener('focus', handleWindowFocus);
window.addEventListener('touchend', handleWindowTouchEnd);
window.addEventListener('keyup', handleWindowKeyUp);

return () => {
window.removeEventListener('blur', handleWindowBlur);
window.removeEventListener('focus', handleWindowFocus);
window.removeEventListener('touchend', handleWindowTouchEnd);
window.removeEventListener('keyup', handleWindowKeyUp);
};
}, [rid]);
}
0 ...oom/components/body/useRetentionPolicy.ts → ...mponents/body/hooks/useRetentionPolicy.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../components/body/useRoomMessageContext.ts → ...nents/body/hooks/useRoomMessageContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import type { IRoom } from '@rocket.chat/core-typings';
import { useLayout, usePermission, useSetting, useUser, useUserId, useUserPreference } from '@rocket.chat/ui-contexts';
import { useCallback, useMemo } from 'react';

import { AutoTranslate } from '../../../../../app/autotranslate/client';
import { createMessageContext } from '../../../../../app/ui-utils/client/lib/messageContext';
import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { useRoomSubscription } from '../../contexts/RoomContext';
import { AutoTranslate } from '../../../../../../app/autotranslate/client';
import { createMessageContext } from '../../../../../../app/ui-utils/client/lib/messageContext';
import { useReactiveValue } from '../../../../../hooks/useReactiveValue';
import { useRoomSubscription } from '../../../contexts/RoomContext';

// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
export const useRoomMessageContext = (room: IRoom) => {
Expand Down
2 changes: 1 addition & 1 deletion ...components/body/useRoomRolesManagement.ts → ...ents/body/hooks/useRoomRolesManagement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
import { useMethod, useStream } from '@rocket.chat/ui-contexts';
import { useEffect } from 'react';

import { RoomRoles, ChatMessage } from '../../../../../app/models/client';
import { RoomRoles, ChatMessage } from '../../../../../../app/models/client';

// const roomRoles = RoomRoles as Mongo.Collection<Pick<ISubscription, 'rid' | 'u' | 'roles'>>;

Expand Down
4 changes: 2 additions & 2 deletions ...room/components/body/useUnreadMessages.ts → ...omponents/body/hooks/useUnreadMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
import type { Dispatch, SetStateAction } from 'react';
import { useCallback, useMemo, useState } from 'react';

import { LegacyRoomManager, RoomHistoryManager } from '../../../../../app/ui-utils/client';
import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { LegacyRoomManager, RoomHistoryManager } from '../../../../../../app/ui-utils/client';
import { useReactiveValue } from '../../../../../hooks/useReactiveValue';

interface IUnreadMessages {
count: number;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import VerticalBar from '../../../../../components/VerticalBar';
import RoomAvatar from '../../../../../components/avatar/RoomAvatar';
import type { Action } from '../../../../hooks/useActionSpread';
import { useActionSpread } from '../../../../hooks/useActionSpread';
import { useRetentionPolicy } from '../../../components/body/useRetentionPolicy';
import { useRetentionPolicy } from '../../../components/body/hooks/useRetentionPolicy';
import { useRoomActions } from '../hooks/useRoomActions';

type RoomInfoProps = {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import VerticalBarContent from '../../../../../components/VerticalBar/VerticalBa
import MessageListErrorBoundary from '../../../MessageList/MessageListErrorBoundary';
import DropTargetOverlay from '../../../components/body/DropTargetOverlay';
import ComposerContainer from '../../../components/body/composer/ComposerContainer';
import { useFileUploadDropTarget } from '../../../components/body/useFileUploadDropTarget';
import { useFileUploadDropTarget } from '../../../components/body/hooks/useFileUploadDropTarget';
import { useChat } from '../../../contexts/ChatContext';
import { useRoom, useRoomSubscription } from '../../../contexts/RoomContext';
import { useTabBarClose } from '../../../contexts/ToolboxContext';
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/providers/RoomProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RoomManager } from '../../../lib/RoomManager';
import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
import RoomNotFound from '../RoomNotFound';
import RoomSkeleton from '../RoomSkeleton';
import { useRoomRolesManagement } from '../components/body/useRoomRolesManagement';
import { useRoomRolesManagement } from '../components/body/hooks/useRoomRolesManagement';
import { RoomAPIContext } from '../contexts/RoomAPIContext';
import { RoomContext } from '../contexts/RoomContext';
import ComposerPopupProvider from './ComposerPopupProvider';
Expand Down