oreolek/phanpy
1
0
Fork 0
Code Activity

Slight rewrite, possibly breaking

Browse source
This commit is contained in:
Lim Chee Aun 2023-10-23 16:23:33 +08:00
parent f2c2983663
commit 8bf3f31056
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/app.jsx
View file

@ -267,11 +267,14 @@ function PrimaryRoutes({ isLoggedIn, loading }) {
);
}
function getPrevLocation() {
return states.prevLocation || null;
}
function SecondaryRoutes({ isLoggedIn }) {
const snapStates = useSnapshot(states);
// const snapStates = useSnapshot(states);
const location = useLocation();
const prevLocation = snapStates.prevLocation;
const backgroundLocation = useRef(prevLocation || null);
// const prevLocation = snapStates.prevLocation;
const backgroundLocation = useRef(getPrevLocation());
const isModalPage = useMemo(() => {
return (
@ -280,7 +283,8 @@ function SecondaryRoutes({ isLoggedIn }) {
);
}, [location.pathname, matchPath]);
if (isModalPage) {
if (!backgroundLocation.current) backgroundLocation.current = prevLocation;
if (!backgroundLocation.current)
backgroundLocation.current = getPrevLocation();
} else {
backgroundLocation.current = null;
}