LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-25 05:41:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into fallback-image

Browse source
This commit is contained in:
Dessalines 2024-04-22 11:52:18 -04:00 committed by GitHub
commit 5ea42422a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/server/utils/create-ssr-html.tsx
View file

@ -105,6 +105,7 @@ export async function createSsrHtml(
-moz-filter: blur(10px);
-o-filter: blur(10px);
-ms-filter: blur(10px);
pointer-events: none;
}
</style>

9
src/shared/components/app/app.tsx
View file

@ -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;

1
src/shared/components/common/adult-consent-modal.tsx
View file

@ -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,

7
src/shared/components/post/post-listing.tsx
View file

@ -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({