matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge expandSpoilers and displayMedia into a single option

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-04-21 22:06:53 +02:00
parent a5ab595446
commit 9a5f2bbc77
9 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/statuses/sensitive-content-overlay.tsx
View File

@ -29,16 +29,15 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
const dispatch = useAppDispatch();
const intl = useIntl();
const { displayMedia, expandSpoilers } = useSettings();
const { displayMedia } = useSettings();
let visible = false;
let visible = !status.sensitive;
if (status.hidden !== null) {
visible = status.hidden;
} else {
if (expandSpoilers) visible = true;
if ((displayMedia === 'default' && status.sensitive) || displayMedia === 'hide_all') visible = false;
}
if (status.hidden !== null) visible = status.hidden;
else if (displayMedia === 'show_all') visible = true;
else if (displayMedia === 'hide_all' && status.media_attachments.size) visible = false;
const showHideButton = status.sensitive || (status.media_attachments.size && displayMedia === 'hide_all');
const toggleVisibility = (event: React.MouseEvent<HTMLButtonElement>) => {
event.stopPropagation();
@ -46,6 +45,8 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
dispatch(toggleStatusHidden(status));
};
if (visible && !showHideButton) return null;
return (
<div
className={clsx('absolute z-40', {