alrayyes/wiki
1
0
Fork 0
mirror of https://github.com/alrayyes/wiki.git synced 2024-11-22 19:46:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: jump to search for operand

Browse source
This commit is contained in:
Jacky Zhao 2022-11-21 23:36:27 -08:00
parent f08a76a738
commit e374e3abd4
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/js/full-text-search.js
View file

@ -56,6 +56,6 @@
} }
const allIds = new Set([...getByField("title"), ...getByField("content")]) const allIds = new Set([...getByField("title"), ...getByField("content")])
const finalResults = [...allIds].map(formatForDisplay) const finalResults = [...allIds].map(formatForDisplay)
displayResults(finalResults, true) displayResults(term, finalResults, true)
}) })
})() })()

4
assets/js/semantic-search.js
View file

@ -24,7 +24,7 @@ async function searchContents(query) {
}, },
body: JSON.stringify({ body: JSON.stringify({
query: query, query: query,
limit: 8, limit: 10,
}), }),
}) })
if (result.ok) { if (result.ok) {
@ -48,7 +48,7 @@ registerHandlers(
debounce((e) => { debounce((e) => {
let term = e.target.value let term = e.target.value
if (term !== "") { if (term !== "") {
searchContents(term).then((results) => displayResults(results)) searchContents(term).then((results) => displayResults(term, results))
} }
}), }),
) )

26
assets/js/util.js
View file

@ -115,9 +115,11 @@ const resultToHTML = ({ url, title, content }) => {
} }
const redir = (id, term) => { const redir = (id, term) => {
// SPA navigation const shouldTrim = PRODUCTION && SEARCH_ENABLED
const baseURLPrefix = shouldTrim ? "" : BASE_URL.replace(/\/$/g, "")
const urlString = `${baseURLPrefix}${id}#:~:text=${encodeURIComponent(term)}/`
window.Million.navigate( window.Million.navigate(
new URL(`${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`), new URL(urlString),
".singlePage", ".singlePage",
) )
closeSearch() closeSearch()
@ -179,7 +181,7 @@ const registerHandlers = (onInputFn) => {
}) })
} }
const displayResults = (finalResults, extractHighlight = false) => { const displayResults = (term, finalResults, extractHighlight = false) => {
const results = document.getElementById("results-container") const results = document.getElementById("results-container")
if (finalResults.length === 0) { if (finalResults.length === 0) {
results.innerHTML = `<button class="result-card"> results.innerHTML = `<button class="result-card">
@ -189,16 +191,16 @@ const displayResults = (finalResults, extractHighlight = false) => {
} else { } else {
results.innerHTML = finalResults results.innerHTML = finalResults
.map((result) => { .map((result) => {
if (extractHighlight) { if (extractHighlight) {
return resultToHTML({ return resultToHTML({
url: result.url, url: result.url,
title: highlight(result.title, term), title: highlight(result.title, term),
content: highlight(removeMarkdown(result.content), term) content: highlight(removeMarkdown(result.content), term)
}) })
} else { } else {
return resultToHTML(result) return resultToHTML(result)
}
} }
}
) )
.join("\n") .join("\n")
const anchors = [...document.getElementsByClassName("result-card")] const anchors = [...document.getElementsByClassName("result-card")]

2
layouts/partials/head.html
View file

@ -79,6 +79,8 @@
"indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify
}} }}
<script> <script>
const SEARCH_ENABLED = {{.Site.Data.config.search.enableSemanticSearch}}
const PRODUCTION = {{ hugo.IsProduction }}
const BASE_URL = {{.Site.BaseURL}} const BASE_URL = {{.Site.BaseURL}}
const fetchData = Promise.all([ const fetchData = Promise.all([
fetch("{{ $linkIndex.Permalink }}") fetch("{{ $linkIndex.Permalink }}")