mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

stories: muted by default, muted on app blur

Browse source
This commit is contained in:
Jamie Kyle 2022-11-09 20:24:42 -08:00 • committed by GitHub
parent cd1a1a00a2
commit 9f85db3fd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 88 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

38
ts/components/StoryViewer.tsx
View file

@ -66,7 +66,7 @@ export type PropsType = {
| 'left'
>;
hasActiveCall?: boolean;
hasAllStoriesMuted: boolean;
hasAllStoriesUnmuted: boolean;
hasViewReceiptSetting: boolean;
i18n: LocalizerType;
isSignalConversation?: boolean;
@ -95,8 +95,9 @@ export type PropsType = {
skinTone?: number;
story: StoryViewType;
storyViewMode: StoryViewModeType;
toggleHasAllStoriesMuted: () => unknown;
setHasAllStoriesUnmuted: (isUnmuted: boolean) => unknown;
viewStory: ViewStoryActionCreatorType;
isWindowActive: boolean;
deleteGroupStoryReply: (id: string) => void;
deleteGroupStoryReplyForEveryone: (id: string) => void;
};
@ -119,7 +120,7 @@ export const StoryViewer = ({
getPreferredBadge,
group,
hasActiveCall,
hasAllStoriesMuted,
hasAllStoriesUnmuted,
hasViewReceiptSetting,
i18n,
isSignalConversation,
@ -143,8 +144,9 @@ export const StoryViewer = ({
skinTone,
story,
storyViewMode,
toggleHasAllStoriesMuted,
setHasAllStoriesUnmuted,
viewStory,
isWindowActive,
deleteGroupStoryReply,
deleteGroupStoryReplyForEveryone,
}: PropsType): JSX.Element => {
@ -305,6 +307,12 @@ export const StoryViewer = ({
const [pauseStory, setPauseStory] = useState(false);
useEffect(() => {
if (!isWindowActive) {
setPauseStory(true);
}
}, [isWindowActive]);
const shouldPauseViewing =
Boolean(confirmDeleteStory) ||
currentViewTarget != null ||
@ -436,19 +444,19 @@ export const StoryViewer = ({
const replyCount = replies.length;
const viewCount = views.length;
const canMuteStory = isVideoAttachment(attachment);
const isStoryMuted = hasAllStoriesMuted || !canMuteStory;
const hasAudio = isVideoAttachment(attachment);
const isStoryMuted = !hasAllStoriesUnmuted || !hasAudio;
let muteClassName: string;
let muteAriaLabel: string;
if (canMuteStory) {
muteAriaLabel = hasAllStoriesMuted
? i18n('StoryViewer__unmute')
: i18n('StoryViewer__mute');
if (hasAudio) {
muteAriaLabel = hasAllStoriesUnmuted
? i18n('StoryViewer__mute')
: i18n('StoryViewer__unmute');
muteClassName = hasAllStoriesMuted
? 'StoryViewer__unmute'
: 'StoryViewer__mute';
muteClassName = hasAllStoriesUnmuted
? 'StoryViewer__mute'
: 'StoryViewer__unmute';
} else {
muteAriaLabel = i18n('Stories__toast--hasNoSound');
muteClassName = 'StoryViewer__soundless';
@ -686,8 +694,8 @@ export const StoryViewer = ({
aria-label={muteAriaLabel}
className={muteClassName}
onClick={
canMuteStory
? toggleHasAllStoriesMuted
hasAudio
? () => setHasAllStoriesUnmuted(!hasAllStoriesUnmuted)
: () => showToast(ToastType.StoryMuted)
}
type="button"