mirror of
https://github.com/bitsocialnet/5chan.git
synced 2026-08-03 07:41:04 +02:00
fix(directory-modal): move to global layout and close on navigation
This commit is contained in:
@@ -4,6 +4,7 @@ import { useAccountComment } from '@plebbit/plebbit-react-hooks';
|
|||||||
import { initSnow, removeSnow } from './lib/snow';
|
import { initSnow, removeSnow } from './lib/snow';
|
||||||
import { isAllView, isModView, isSubscriptionsView } from './lib/utils/view-utils';
|
import { isAllView, isModView, isSubscriptionsView } from './lib/utils/view-utils';
|
||||||
import useReplyModalStore from './stores/use-reply-modal-store';
|
import useReplyModalStore from './stores/use-reply-modal-store';
|
||||||
|
import useDirectoryModalStore from './stores/use-directory-modal-store';
|
||||||
import useSpecialThemeStore from './stores/use-special-theme-store';
|
import useSpecialThemeStore from './stores/use-special-theme-store';
|
||||||
import useIsMobile from './hooks/use-is-mobile';
|
import useIsMobile from './hooks/use-is-mobile';
|
||||||
import useTheme from './hooks/use-theme';
|
import useTheme from './hooks/use-theme';
|
||||||
@@ -18,6 +19,7 @@ import Post from './views/post';
|
|||||||
import { DesktopBoardButtons, MobileBoardButtons } from './components/board-buttons';
|
import { DesktopBoardButtons, MobileBoardButtons } from './components/board-buttons';
|
||||||
import BoardHeader from './components/board-header';
|
import BoardHeader from './components/board-header';
|
||||||
import ChallengeModal from './components/challenge-modal';
|
import ChallengeModal from './components/challenge-modal';
|
||||||
|
import DirectoryModal from './components/directory-modal';
|
||||||
import ReplyModal from './components/reply-modal';
|
import ReplyModal from './components/reply-modal';
|
||||||
import PostForm from './components/post-form';
|
import PostForm from './components/post-form';
|
||||||
import SubplebbitStats from './components/subplebbit-stats';
|
import SubplebbitStats from './components/subplebbit-stats';
|
||||||
@@ -93,13 +95,20 @@ const GlobalLayout = () => {
|
|||||||
}, [theme]);
|
}, [theme]);
|
||||||
|
|
||||||
const { activeCid, threadCid, subplebbitAddress, closeModal, showReplyModal, scrollY } = useReplyModalStore();
|
const { activeCid, threadCid, subplebbitAddress, closeModal, showReplyModal, scrollY } = useReplyModalStore();
|
||||||
|
const { closeDirectoryModal } = useDirectoryModalStore();
|
||||||
|
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const isInSettingsView = location.pathname.endsWith('/settings');
|
const isInSettingsView = location.pathname.endsWith('/settings');
|
||||||
|
|
||||||
|
// Close directory modal when navigating to a different page
|
||||||
|
useEffect(() => {
|
||||||
|
closeDirectoryModal();
|
||||||
|
}, [location.pathname, closeDirectoryModal]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ChallengeModal />
|
<ChallengeModal />
|
||||||
|
<DirectoryModal />
|
||||||
{activeCid && threadCid && subplebbitAddress && (
|
{activeCid && threadCid && subplebbitAddress && (
|
||||||
<ReplyModal
|
<ReplyModal
|
||||||
closeModal={closeModal}
|
closeModal={closeModal}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import BoardsList from './boards-list';
|
|||||||
import Version from '../../components/version';
|
import Version from '../../components/version';
|
||||||
import useDisclaimerModalStore from '../../stores/use-disclaimer-modal-store';
|
import useDisclaimerModalStore from '../../stores/use-disclaimer-modal-store';
|
||||||
import DisclaimerModal from '../../components/disclaimer-modal';
|
import DisclaimerModal from '../../components/disclaimer-modal';
|
||||||
import DirectoryModal from '../../components/directory-modal';
|
|
||||||
import _ from 'lodash';
|
import _ from 'lodash';
|
||||||
|
|
||||||
// https://github.com/plebbit/lists/blob/master/5chan-multisub.json
|
// https://github.com/plebbit/lists/blob/master/5chan-multisub.json
|
||||||
@@ -187,7 +186,6 @@ const Home = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<DisclaimerModal />
|
<DisclaimerModal />
|
||||||
<DirectoryModal />
|
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
<HomeLogo />
|
<HomeLogo />
|
||||||
<SearchBar />
|
<SearchBar />
|
||||||
|
|||||||
Reference in New Issue
Block a user