diff --git a/src/components/Collapsibles.tsx b/src/components/Collapsibles.tsx index a01fe91..15fcf78 100644 --- a/src/components/Collapsibles.tsx +++ b/src/components/Collapsibles.tsx @@ -1,4 +1,9 @@ import React, { useEffect, useRef, useState } from 'react'; +import { useLocation, useHistory } from 'react-router-dom'; + +const useQuery = () => { + return new URLSearchParams(useLocation().search); +}; export const Collapsibles = ({ children }) => { return ( @@ -13,19 +18,47 @@ interface CollapsibleProps { subtitle?: React.ReactNode; tags?: string[]; inner: React.ReactNode; + id: string; } -export const Collapsible: React.FC = ({ title, subtitle, inner, tags = [] }) => { - const [isInnerVisible, setIsInnerVisible] = useState(false); - const innerRef = useRef(null); +export const Collapsible: React.FC = ({ title, subtitle, inner, tags = [], id }) => { + const query = useQuery(); + const history = useHistory(); + + const initialExpandedState = query.get(id) === 'expanded'; + const [isInnerVisible, setIsInnerVisible] = useState(initialExpandedState); + const innerRef = useRef(null); const [innerHeight, setInnerHeight] = useState(0); useEffect(() => { + const updateHeight = () => { + if (innerRef.current) { + setInnerHeight(isInnerVisible ? innerRef.current.scrollHeight : 0); + } + }; + + updateHeight(); + + const observer = new MutationObserver(updateHeight); if (innerRef.current) { - setInnerHeight(isInnerVisible ? innerRef.current.scrollHeight : 0); + observer.observe(innerRef.current, { childList: true, subtree: true }); } + + return () => { + observer.disconnect(); + }; }, [isInnerVisible]); + useEffect(() => { + const params = new URLSearchParams(window.location.search); + if (isInnerVisible) { + params.set(id, 'expanded'); + } else { + params.delete(id); + } + history.replace({ search: params.toString() }); + }, [isInnerVisible, id, history]); + const toggleVisibility = () => { setIsInnerVisible(!isInnerVisible); }; @@ -34,8 +67,13 @@ export const Collapsible: React.FC = ({ title, subtitle, inner

- {title}{tags.map((tag) => ({tag}))} - {subtitle &&
{subtitle}
} + + {title} + {tags.map((tag, index) => ( + {tag} + ))} + + {subtitle &&
{subtitle}
}

diff --git a/src/pages/download/index.tsx b/src/pages/download/index.tsx index 60a20ba..379dcce 100644 --- a/src/pages/download/index.tsx +++ b/src/pages/download/index.tsx @@ -60,6 +60,7 @@ const DownloadPage: React.FC = () => ( A plugin to allow for Geyser players to connect to your server without needing to use a proxy.} + id='geyserconnect' inner={ ( An optional Bedrock resource pack to extend Geyser functionality.} + id='geyseroptionalpack' inner={ ( An extension that adds support for loading ears and other third party cosmetics on java players} + id='thirdpartycosmetics' inner={ ( A companion mod to Geyser which allows for Bedrock players to join modded Minecraft: Java Edition servers.} + id='hydraulic' tags={['Beta']} inner={