Skip to content

Commit c1c7fe4

Browse files
committed
Merge branch '263-vocabs-without-apache' into dev
2 parents fbe716a + e4ab042 commit c1c7fe4

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

src/components/Concept.jsx

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ const Concept = ({
2323
updateState({
2424
...data,
2525
currentScheme: concept.inScheme[0],
26+
indexPage: false,
27+
})
28+
}
29+
if (data.indexPage) {
30+
updateState({
31+
...data,
32+
indexPage: false,
2633
})
2734
}
2835
}, [])

src/components/ConceptScheme.jsx

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ const ConceptScheme = ({
2121
updateState({
2222
...data,
2323
currentScheme: conceptScheme,
24+
indexPage: false,
25+
})
26+
}
27+
if (data.indexPage) {
28+
updateState({
29+
...data,
30+
indexPage: false,
2431
})
2532
}
2633
}, [])

src/components/header.jsx

+3-9
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,10 @@ const Header = ({ siteTitle }) => {
128128
// we check if we are on the root i.e. index page.
129129
// if so we set the concept scheme to an empty object
130130
useEffect(() => {
131-
const handleNavigation = () => {
132-
if (window.location.pathname === "/") {
133-
updateState({ ...data, currentScheme: {} })
134-
}
135-
}
136-
window.addEventListener("popstate", handleNavigation)
137-
return () => {
138-
window.removeEventListener("popstate", handleNavigation)
131+
if (data.indexPage === true) {
132+
updateState({ ...data, currentScheme: {} })
139133
}
140-
}, [])
134+
}, [data?.indexPage])
141135

142136
return (
143137
<header css={style}>

src/context/Context.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const defaultState = {
44
currentScheme: {},
55
selectedLanguage: "",
66
conceptSchemeLanguages: [],
7+
indexPage: false,
78
}
89
const Context = createContext(defaultState)
910

src/pages/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const IndexPage = () => {
2323
const languages = Array.from(
2424
new Set([...csData.flatMap((cs) => cs.languages)])
2525
)
26-
updateState({ ...data, languages: languages })
26+
updateState({ ...data, languages: languages, indexPage: true })
2727
}
2828
fetchConceptData()
2929
}, [])

0 commit comments

Comments
 (0)