LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-12-23 11:21:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix modal bug

Browse source
This commit is contained in:
SleeplessOne1917 2024-04-13 20:18:20 -04:00
parent fea5ff1297
commit fb38fafd16
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,10 @@ function handleAdultConsent(i: App) {
i.setState({ showAdultConsentModal: false }); i.setState({ showAdultConsentModal: false });
} }
function handleAdultConsentGoBack(i: App) {
i.context.router.history.back();
}
export class App extends Component<any, AppState> { export class App extends Component<any, AppState> {
private isoData: IsoDataOptionalSite = setIsoData(this.context); private isoData: IsoDataOptionalSite = setIsoData(this.context);
private readonly mainContentRef: RefObject<HTMLElement>; private readonly mainContentRef: RefObject<HTMLElement>;
@ -81,6 +85,14 @@ export class App extends Component<any, AppState> {
<Theme defaultTheme={siteView.local_site.default_theme} /> <Theme defaultTheme={siteView.local_site.default_theme} />
)} )}
<Navbar siteRes={siteRes} /> <Navbar siteRes={siteRes} />
{siteRes?.site_view.site.content_warning && (
<AdultConsentModal
contentWarning={siteRes.site_view.site.content_warning}
show={this.state.showAdultConsentModal}
onBack={linkEvent(this, handleAdultConsentGoBack)}
onContinue={linkEvent(this, handleAdultConsent)}
/>
)}
<div className="mt-4 p-0 fl-1"> <div className="mt-4 p-0 fl-1">
<Switch> <Switch>
{routes.map( {routes.map(
@ -140,14 +152,6 @@ export class App extends Component<any, AppState> {
</div> </div>
<Footer site={siteRes} /> <Footer site={siteRes} />
</div> </div>
{siteRes?.site_view.site.content_warning && (
<AdultConsentModal
contentWarning={siteRes.site_view.site.content_warning}
show={this.state.showAdultConsentModal}
onBack={history.back}
onContinue={linkEvent(this, handleAdultConsent)}
/>
)}
</Provider> </Provider>
</> </>
); );

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

@ -5,7 +5,7 @@ interface AdultConsentModalProps {
contentWarning: string; contentWarning: string;
show: boolean; show: boolean;
onContinue: LinkedEvent<any, Event> | null; onContinue: LinkedEvent<any, Event> | null;
onBack: () => void; onBack: LinkedEvent<any, Event> | null;
} }
@modalMixin @modalMixin

2
src/shared/components/home/site-form.tsx
View file

@ -276,7 +276,7 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
<div className="alert small alert-info" role="alert"> <div className="alert small alert-info" role="alert">
<Icon icon="info" classes="icon-inline me-2" /> <Icon icon="info" classes="icon-inline me-2" />
Setting a content warning will display a prompt with the content Setting a content warning will display a prompt with the content
warning asking for their consent to continue. warning asking the user for their consent to continue.
</div> </div>
<label className="col-12 col-form-label">Content Warning</label> <label className="col-12 col-form-label">Content Warning</label>
<div className="col-12"> <div className="col-12">