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

Media Viewer: Fix muting hidden slides (#1690)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-02-02 22:49:25 +01:00
parent 33c6fe5df5
commit fa755aad9c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/mediaViewer/MediaViewerContent.tsx
View File

@ -6,7 +6,7 @@ import {
} from '../../api/types'; } from '../../api/types';
import { MediaViewerOrigin } from '../../types'; import { MediaViewerOrigin } from '../../types';
import { IS_SINGLE_COLUMN_LAYOUT } from '../../util/environment'; import { IS_SINGLE_COLUMN_LAYOUT, IS_TOUCH_ENV } from '../../util/environment';
import useBlurSync from '../../hooks/useBlurSync'; import useBlurSync from '../../hooks/useBlurSync';
import useMedia from '../../hooks/useMedia'; import useMedia from '../../hooks/useMedia';
import useMediaWithLoadProgress from '../../hooks/useMediaWithLoadProgress'; import useMediaWithLoadProgress from '../../hooks/useMediaWithLoadProgress';
@ -187,7 +187,11 @@ const MediaViewerContent: FC<OwnProps & StateProps> = (props) => {
message && calculateMediaViewerDimensions(dimensions!, hasFooter), message && calculateMediaViewerDimensions(dimensions!, hasFooter),
!IS_SINGLE_COLUMN_LAYOUT && !isProtected, !IS_SINGLE_COLUMN_LAYOUT && !isProtected,
)} )}
{isVideo && (isActive ? ( {isVideo && ((!isActive && IS_TOUCH_ENV) ? renderVideoPreview(
bestImageData,
message && calculateMediaViewerDimensions(dimensions!, hasFooter, false),
!IS_SINGLE_COLUMN_LAYOUT && !isProtected,
) : (
<VideoPlayer <VideoPlayer
key={messageId} key={messageId}
url={localBlobUrl || fullMediaBlobUrl} url={localBlobUrl || fullMediaBlobUrl}
@ -200,10 +204,6 @@ const MediaViewerContent: FC<OwnProps & StateProps> = (props) => {
noPlay={!isActive} noPlay={!isActive}
onClose={onClose} onClose={onClose}
/> />
) : renderVideoPreview(
bestImageData,
message && calculateMediaViewerDimensions(dimensions!, hasFooter, false),
!IS_SINGLE_COLUMN_LAYOUT && !isProtected,
))} ))}
{textParts && ( {textParts && (
<MediaViewerFooter <MediaViewerFooter

2
src/components/mediaViewer/MediaViewerSlides.tsx
View File

@ -524,7 +524,7 @@ const MediaViewerSlides: FC<OwnProps> = ({
/* eslint-disable-next-line react/jsx-props-no-spreading */ /* eslint-disable-next-line react/jsx-props-no-spreading */
{...rest} {...rest}
messageId={activeMessageId} messageId={activeMessageId}
isActive={isActiveRef.current} isActive={isActive && isActiveRef.current}
isFooterHidden={isFooterHidden || isZoomed || scale !== 1} isFooterHidden={isFooterHidden || isZoomed || scale !== 1}
/> />
</div> </div>