ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reactions: Fix effect duration (#2405)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-01-28 02:16:47 +01:00
parent f8afe1c544
commit 6b5b9d7a2f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/middle/message/Message.tsx
View File

@ -96,11 +96,11 @@ import { getMinMediaWidth, calculateMediaDimensions } from './helpers/mediaDimen
import { calculateAlbumLayout } from './helpers/calculateAlbumLayout'; import { calculateAlbumLayout } from './helpers/calculateAlbumLayout';
import renderText from '../../common/helpers/renderText'; import renderText from '../../common/helpers/renderText';
import calculateAuthorWidth from './helpers/calculateAuthorWidth'; import calculateAuthorWidth from './helpers/calculateAuthorWidth';
import { isAnimatingScroll } from '../../../util/fastSmoothScroll';
import { getServerTime } from '../../../util/serverTime'; import { getServerTime } from '../../../util/serverTime';
import { isElementInViewport } from '../../../util/isElementInViewport'; import { isElementInViewport } from '../../../util/isElementInViewport';
import { getCustomEmojiSize } from '../composer/helpers/customEmoji'; import { getCustomEmojiSize } from '../composer/helpers/customEmoji';
import { isAnimatingScroll } from '../../../util/fastSmoothScroll';
import useEnsureMessage from '../../../hooks/useEnsureMessage'; import useEnsureMessage from '../../../hooks/useEnsureMessage';
import useContextMenuHandlers from '../../../hooks/useContextMenuHandlers'; import useContextMenuHandlers from '../../../hooks/useContextMenuHandlers';
import { useOnIntersect } from '../../../hooks/useIntersectionObserver'; import { useOnIntersect } from '../../../hooks/useIntersectionObserver';
@ -110,8 +110,8 @@ import useFlag from '../../../hooks/useFlag';
import useFocusMessage from './hooks/useFocusMessage'; import useFocusMessage from './hooks/useFocusMessage';
import useOuterHandlers from './hooks/useOuterHandlers'; import useOuterHandlers from './hooks/useOuterHandlers';
import useInnerHandlers from './hooks/useInnerHandlers'; import useInnerHandlers from './hooks/useInnerHandlers';
import useResizeObserver from '../../../hooks/useResizeObserver';
import useAppLayout from '../../../hooks/useAppLayout'; import useAppLayout from '../../../hooks/useAppLayout';
import useResizeObserver from '../../../hooks/useResizeObserver';
import Button from '../../ui/Button'; import Button from '../../ui/Button';
import Avatar from '../../common/Avatar'; import Avatar from '../../common/Avatar';

6
src/global/actions/api/reactions.ts
View File

@ -9,6 +9,7 @@ import {
selectLocalAnimatedEmojiEffectByName, selectLocalAnimatedEmojiEffectByName,
selectMaxUserReactions, selectMaxUserReactions,
selectMessageIdsByGroupId, selectMessageIdsByGroupId,
selectCurrentMessageList,
} from '../../selectors'; } from '../../selectors';
import { addMessageReaction, subtractXForEmojiInteraction, updateUnreadReactions } from '../../reducers/reactions'; import { addMessageReaction, subtractXForEmojiInteraction, updateUnreadReactions } from '../../reducers/reactions';
import { import {
@ -160,7 +161,10 @@ addActionHandler('toggleReaction', (global, actions, payload): ActionReturnType
}); });
addActionHandler('openChat', (global, actions, payload): ActionReturnType => { addActionHandler('openChat', (global, actions, payload): ActionReturnType => {
const { tabId = getCurrentTabId() } = payload; const { id, tabId = getCurrentTabId() } = payload;
const currentChatId = selectCurrentMessageList(global, tabId)?.chatId;
if (currentChatId === id) return global;
return updateTabState(global, { return updateTabState(global, {
activeReactions: {}, activeReactions: {},