From 44060a239e7eed8362e97933badc9d44ec4f6929 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 5 Jul 2023 13:14:10 +0200 Subject: [PATCH] [Refactoring] Remove unused parameters (#3396) --- .eslintrc | 3 ++- src/components/common/ProfileInfo.tsx | 2 +- src/components/common/hooks/usePhotosPreload.ts | 3 +-- src/components/mediaViewer/MediaViewerSlides.tsx | 2 -- src/components/middle/ActionMessage.tsx | 2 +- src/components/middle/message/Invoice.tsx | 2 +- src/components/middle/message/Message.tsx | 4 +--- src/components/middle/message/Photo.tsx | 2 +- src/components/middle/message/helpers/getCustomAppendixBg.ts | 2 +- src/components/middle/message/hooks/useFocusMessage.ts | 1 - src/components/middle/message/hooks/useOuterHandlers.ts | 2 -- src/global/reducers/messages.ts | 2 +- 12 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.eslintrc b/.eslintrc index ec5785e67..dde2eaf5e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -50,7 +50,8 @@ "getActions": true, "useFlag": [false, true, true], "useForceUpdate": true, - "useReducer": [false, true] + "useReducer": [false, true], + "useLastCallback": true } } ], diff --git a/src/components/common/ProfileInfo.tsx b/src/components/common/ProfileInfo.tsx index 85c684fac..e8d121477 100644 --- a/src/components/common/ProfileInfo.tsx +++ b/src/components/common/ProfileInfo.tsx @@ -128,7 +128,7 @@ const ProfileInfo: FC = ({ } }, [userId, loadFullUser, connectionState, forceShowSelf]); - usePhotosPreload(user || chat, photos, currentPhotoIndex); + usePhotosPreload(photos, currentPhotoIndex); const handleProfilePhotoClick = useLastCallback(() => { openMediaViewer({ diff --git a/src/components/common/hooks/usePhotosPreload.ts b/src/components/common/hooks/usePhotosPreload.ts index f4d3a94fe..fc04fc34e 100644 --- a/src/components/common/hooks/usePhotosPreload.ts +++ b/src/components/common/hooks/usePhotosPreload.ts @@ -1,4 +1,4 @@ -import type { ApiChat, ApiPhoto, ApiUser } from '../../../api/types'; +import type { ApiPhoto } from '../../../api/types'; import { ApiMediaFormat } from '../../../api/types'; import { useEffect } from '../../../lib/teact/teact'; import * as mediaLoader from '../../../util/mediaLoader'; @@ -6,7 +6,6 @@ import * as mediaLoader from '../../../util/mediaLoader'; const PHOTOS_TO_PRELOAD = 4; export default function usePhotosPreload( - profile: ApiUser | ApiChat | undefined, photos: ApiPhoto[], currentIndex: number, ) { diff --git a/src/components/mediaViewer/MediaViewerSlides.tsx b/src/components/mediaViewer/MediaViewerSlides.tsx index e5e9f9583..a31a83579 100644 --- a/src/components/mediaViewer/MediaViewerSlides.tsx +++ b/src/components/mediaViewer/MediaViewerSlides.tsx @@ -83,9 +83,7 @@ const MediaViewerSlides: FC = ({ selectMedia, isVideo, isGif, - isPhoto, isOpen, - hasFooter, withAnimation, isHidden, ...rest diff --git a/src/components/middle/ActionMessage.tsx b/src/components/middle/ActionMessage.tsx index 9361c929d..900c3c2c6 100644 --- a/src/components/middle/ActionMessage.tsx +++ b/src/components/middle/ActionMessage.tsx @@ -104,7 +104,7 @@ const ActionMessage: FC = ({ useOnIntersect(ref, observeIntersectionForReading); useEnsureMessage(message.chatId, message.replyToMessageId, targetMessage); - useFocusMessage(ref, message.id, message.chatId, isFocused, focusDirection, noFocusHighlight, isJustAdded); + useFocusMessage(ref, message.chatId, isFocused, focusDirection, noFocusHighlight, isJustAdded); useEffect(() => { if (!message.isPinned) return undefined; diff --git a/src/components/middle/message/Invoice.tsx b/src/components/middle/message/Invoice.tsx index bf58db010..19a741091 100644 --- a/src/components/middle/message/Invoice.tsx +++ b/src/components/middle/message/Invoice.tsx @@ -65,7 +65,7 @@ const Invoice: FC = ({ if (photoUrl) { const contentEl = ref.current!.closest(MESSAGE_CONTENT_SELECTOR)!; - getCustomAppendixBg(photoUrl, false, isInSelectMode, isSelected, theme).then((appendixBg) => { + getCustomAppendixBg(photoUrl, false, isSelected, theme).then((appendixBg) => { contentEl.style.setProperty('--appendix-bg', appendixBg); contentEl.setAttribute(CUSTOM_APPENDIX_ATTRIBUTE, ''); }); diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx index 88c8831aa..e0b28f5d9 100644 --- a/src/components/middle/message/Message.tsx +++ b/src/components/middle/message/Message.tsx @@ -502,7 +502,6 @@ const Message: FC = ({ selectMessage, ref, messageId, - isAlbum, Boolean(isInSelectMode), Boolean(canReply), Boolean(isProtected), @@ -511,7 +510,6 @@ const Message: FC = ({ chatId, isContextMenuShown, quickReactionRef, - isOwn, isInDocumentGroupNotLast, ); @@ -670,7 +668,7 @@ const Message: FC = ({ ); useFocusMessage( - ref, messageId, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer, isJustAdded, + ref, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer, isJustAdded, ); const signature = (isChannel && message.postAuthorTitle) diff --git a/src/components/middle/message/Photo.tsx b/src/components/middle/message/Photo.tsx index 2569ad1dd..19877c3a6 100644 --- a/src/components/middle/message/Photo.tsx +++ b/src/components/middle/message/Photo.tsx @@ -158,7 +158,7 @@ const Photo: FC = ({ const contentEl = ref.current!.closest(MESSAGE_CONTENT_SELECTOR)!; if (fullMediaData) { - getCustomAppendixBg(fullMediaData, isOwn, isInSelectMode, isSelected, theme).then((appendixBg) => { + getCustomAppendixBg(fullMediaData, isOwn, isSelected, theme).then((appendixBg) => { requestMutation(() => { contentEl.style.setProperty('--appendix-bg', appendixBg); contentEl.setAttribute(CUSTOM_APPENDIX_ATTRIBUTE, ''); diff --git a/src/components/middle/message/helpers/getCustomAppendixBg.ts b/src/components/middle/message/helpers/getCustomAppendixBg.ts index 8e7a05c6b..d2ec35596 100644 --- a/src/components/middle/message/helpers/getCustomAppendixBg.ts +++ b/src/components/middle/message/helpers/getCustomAppendixBg.ts @@ -12,7 +12,7 @@ const SELECTED_APPENDIX_COLORS = { }; export default function getCustomAppendixBg( - src: string, isOwn: boolean, inSelectMode?: boolean, isSelected?: boolean, theme?: ISettings['theme'], + src: string, isOwn: boolean, isSelected?: boolean, theme?: ISettings['theme'], ) { if (isSelected) { return Promise.resolve(SELECTED_APPENDIX_COLORS[theme || 'light'][isOwn ? 'outgoing' : 'incoming']); diff --git a/src/components/middle/message/hooks/useFocusMessage.ts b/src/components/middle/message/hooks/useFocusMessage.ts index e5cfea66b..8ad11cc31 100644 --- a/src/components/middle/message/hooks/useFocusMessage.ts +++ b/src/components/middle/message/hooks/useFocusMessage.ts @@ -12,7 +12,6 @@ const FOCUS_MARGIN = 20; export default function useFocusMessage( elementRef: { current: HTMLDivElement | null }, - messageId: number, chatId: string, isFocused?: boolean, focusDirection?: FocusDirection, diff --git a/src/components/middle/message/hooks/useOuterHandlers.ts b/src/components/middle/message/hooks/useOuterHandlers.ts index 94410c4f3..d5e206537 100644 --- a/src/components/middle/message/hooks/useOuterHandlers.ts +++ b/src/components/middle/message/hooks/useOuterHandlers.ts @@ -24,7 +24,6 @@ export default function useOuterHandlers( selectMessage: (e?: React.MouseEvent, groupedId?: string) => void, containerRef: RefObject, messageId: number, - isAlbum: boolean, isInSelectMode: boolean, canReply: boolean, isProtected: boolean, @@ -33,7 +32,6 @@ export default function useOuterHandlers( chatId: string, isContextMenuShown: boolean, quickReactionRef: RefObject, - isOwn: boolean, shouldHandleMouseLeave: boolean, ) { const { setReplyingToId, sendDefaultReaction } = getActions(); diff --git a/src/global/reducers/messages.ts b/src/global/reducers/messages.ts index 4a4f3769e..d823fc2c8 100644 --- a/src/global/reducers/messages.ts +++ b/src/global/reducers/messages.ts @@ -493,7 +493,7 @@ export function updateThreadInfos( global: T, chatId: string, updates: Partial[], ): T { updates.forEach((update) => { - global = updateThreadInfo(global, update.chatId!, update.threadId!, update); + global = updateThreadInfo(global, chatId, update.threadId!, update); }); return global;