mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-22 06:36:17 +00:00
Content warning fixups (#2432)
* Content warning fixups - Require consent of logged in existing users. - Prevent link clicks in blurred areas. - Enable tippy again. - Prevent stacking of countdowns for Back button. - Fix auto expand blocking for images. * Hide content warning for logged in users
This commit is contained in:
parent
b608e8e525
commit
f01701f5ec
|
@ -105,6 +105,7 @@ export async function createSsrHtml(
|
|||
-moz-filter: blur(10px);
|
||||
-o-filter: blur(10px);
|
||||
-ms-filter: blur(10px);
|
||||
pointer-events: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ import "./styles.scss";
|
|||
import { Theme } from "./theme";
|
||||
import AnonymousGuard from "../common/anonymous-guard";
|
||||
import AdultConsentModal from "../common/adult-consent-modal";
|
||||
import { destroyTippy, setupTippy } from "../../tippy";
|
||||
|
||||
function handleJumpToContent(event) {
|
||||
event.preventDefault();
|
||||
|
@ -23,6 +24,14 @@ export default class App extends Component<any, any> {
|
|||
private isoData: IsoDataOptionalSite = setIsoData(this.context);
|
||||
private readonly rootRef = createRef<HTMLDivElement>();
|
||||
|
||||
componentDidMount() {
|
||||
setupTippy(this.rootRef);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
destroyTippy();
|
||||
}
|
||||
|
||||
render() {
|
||||
const siteRes = this.isoData.site_res;
|
||||
const siteView = siteRes?.site_view;
|
||||
|
|
|
@ -96,6 +96,7 @@ function handleAdultConsent(i: AdultConsentModal) {
|
|||
function handleAdultConsentGoBack(i: AdultConsentModal) {
|
||||
i.setState({ redirectCountdown: 5 });
|
||||
|
||||
clearInterval(i.redirectTimeout);
|
||||
i.redirectTimeout = setInterval(() => {
|
||||
i.setState(prev => ({
|
||||
...prev,
|
||||
|
|
|
@ -103,7 +103,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
private readonly isoData: IsoDataOptionalSite = setIsoData(this.context);
|
||||
state: PostListingState = {
|
||||
showEdit: false,
|
||||
imageExpanded: !!this.isoData.site_res?.site_view.site.content_warning,
|
||||
imageExpanded: false,
|
||||
viewSource: false,
|
||||
showAdvanced: false,
|
||||
showBody: false,
|
||||
|
@ -135,7 +135,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
}
|
||||
|
||||
componentDidMount(): void {
|
||||
if (UserService.Instance.myUserInfo) {
|
||||
if (
|
||||
UserService.Instance.myUserInfo &&
|
||||
!this.isoData.showAdultConsentModal
|
||||
) {
|
||||
const { auto_expand, blur_nsfw } =
|
||||
UserService.Instance.myUserInfo.local_user_view.local_user;
|
||||
this.setState({
|
||||
|
|
Loading…
Reference in a new issue