Dont render detailsmodal until clicked. Fixes #261 (#263)

* Dont render detailsmodal until clicked. Fixes #261

* Make true.
This commit is contained in:
Dessalines 2023-11-01 22:32:49 -04:00 committed by GitHub
parent bd97a9337f
commit e5c3f406ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -93,78 +93,101 @@ const InstanceCardGrid = ({ instances }: InstanceCardGridProps) => (
</div> </div>
); );
interface InstanceCardProps {
instance: any;
}
function buildUrl(domain: string): string { function buildUrl(domain: string): string {
return `https://${domain}`; return `https://${domain}`;
} }
const InstanceCard = ({ instance }: InstanceCardProps) => { interface InstanceCardProps {
const domain = instance.domain; instance: any;
const description = instance.site_info.site_view.site.description; }
const sidebar = instance.site_info.site_view.site.sidebar || description;
const icon =
instance.site_info.site_view.site.icon || "/static/assets/images/lemmy.svg";
const banner = instance.site_info.site_view.site.banner;
const users = instance.site_info.site_view.counts.users;
const comments = instance.site_info.site_view.counts.comments;
const monthlyUsers = instance.site_info.site_view.counts.users_active_month;
const registrationMode =
instance.site_info.site_view.local_site.registration_mode;
const modalId = `modal_${domain}`; interface InstanceCardState {
showModal: boolean;
}
return ( class InstanceCard extends Component<InstanceCardProps, InstanceCardState> {
<div className="card card-bordered bg-neutral-900 shadow-xl"> state: InstanceCardState = {
<div className="card-body p-4"> showModal: false,
<div className="flex flex-row flex-wrap gap-4"> };
<DetailsModal
id={modalId} constructor(props: any, context: any) {
domain={domain} super(props, context);
banner={banner} }
users={users}
comments={comments} render() {
monthlyUsers={monthlyUsers} const instance = this.props.instance;
icon={icon}
sidebar={sidebar} const domain = instance.domain;
registrationMode={registrationMode} const description = instance.site_info.site_view.site.description;
/> const sidebar = instance.site_info.site_view.site.sidebar || description;
<InstanceIcon domain={domain} icon={icon} /> const icon =
<InstanceStats instance.site_info.site_view.site.icon ||
users={users} "/static/assets/images/lemmy.svg";
comments={comments} const banner = instance.site_info.site_view.site.banner;
monthlyUsers={monthlyUsers} const users = instance.site_info.site_view.counts.users;
/> const comments = instance.site_info.site_view.counts.comments;
</div> const monthlyUsers = instance.site_info.site_view.counts.users_active_month;
<a const registrationMode =
href={buildUrl(domain)} instance.site_info.site_view.local_site.registration_mode;
className={`text-2xl font-bold ${TEXT_GRADIENT}`}
> const modalId = `modal_${domain}`;
{domain}
</a> return (
<p className="text-sm text-gray-300 mb-2">{description}</p> <div className="card card-bordered bg-neutral-900 shadow-xl">
<div className="flex flex-row flex-wrap justify-between gap-2"> <div className="card-body p-4">
<div className="flex flex-row flex-wrap gap-4">
{this.state.showModal && (
<DetailsModal
id={modalId}
domain={domain}
banner={banner}
users={users}
comments={comments}
monthlyUsers={monthlyUsers}
icon={icon}
sidebar={sidebar}
registrationMode={registrationMode}
/>
)}
<InstanceIcon domain={domain} icon={icon} />
<InstanceStats
users={users}
comments={comments}
monthlyUsers={monthlyUsers}
/>
</div>
<a <a
className="btn btn-primary text-white max-md:btn-block bg-gradient-to-r from-[#69D066] to-[#03A80E] normal-case" href={buildUrl(domain)}
href={`${buildUrl(domain)}/signup`} className={`text-2xl font-bold ${TEXT_GRADIENT}`}
> >
{i18n.t("sign_up")} {domain}
</a> </a>
<button <p className="text-sm text-gray-300 mb-2">{description}</p>
className="btn btn-secondary btn-outline text-white max-md:btn-block normal-case" <div className="flex flex-row flex-wrap justify-between gap-2">
onClick={() => <a
(document.getElementById(modalId) as any).showModal() className="btn btn-primary text-white max-md:btn-block bg-gradient-to-r from-[#69D066] to-[#03A80E] normal-case"
} href={`${buildUrl(domain)}/signup`}
> >
{i18n.t("more_information")} {i18n.t("sign_up")}
</button> </a>
<button
className="btn btn-secondary btn-outline text-white max-md:btn-block normal-case"
onClick={linkEvent(this, handleModalClick)}
>
{i18n.t("more_information")}
</button>
</div>
</div> </div>
</div> </div>
</div> );
); }
}; }
function handleModalClick(i: InstanceCard) {
const modalId = `modal_${i.props.instance.domain}`;
i.setState({ showModal: true });
(document.getElementById(modalId) as any).showModal();
}
const imgError = const imgError =
"this.onError=null;this.src='/static/assets/images/lemmy.svg';" as unknown as InfernoEventHandler<HTMLImageElement>; "this.onError=null;this.src='/static/assets/images/lemmy.svg';" as unknown as InfernoEventHandler<HTMLImageElement>;