Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

save search query, and restore on cmd-K #897

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

save search query, and restore on cmd-K #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b0179e
rebased
Fil Sep 1, 2024
5c509f5
Merge branch 'main' into fil/save-search-query
Fil Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/client/search-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ const input = container.querySelector<HTMLInputElement>("input")!;
const load = () => import("observablehq:search");
input.addEventListener("focus", load, {once: true});
input.addEventListener("keydown", load, {once: true});
input.addEventListener("focus", () => {
if (input.value) return; // only restore the query if empty
input.value = sessionStorage.getItem("search-query") ?? "";
input.select();
Fil marked this conversation as resolved.
Show resolved Hide resolved
});

// Focus on meta-K and /
const toggle = document.querySelector<HTMLInputElement>("#observablehq-sidebar-toggle")!;
Expand All @@ -22,6 +27,7 @@ addEventListener("keydown", (event) => {
// open until the user blurs the input.
if (toggle.checked) input.focus();
else toggle.click(), input.focus(), toggle.click();
input.value = sessionStorage.getItem("search-query") ?? "";
input.select();
event.preventDefault();
}
Expand Down
39 changes: 29 additions & 10 deletions src/client/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const index = await fetch(import.meta.resolve("observablehq:minisearch.json"))
input.addEventListener("input", () => {
if (currentValue === input.value) return;
currentValue = input.value;
sessionStorage.setItem("search-query", currentValue);
if (!currentValue.length) {
container.setAttribute("data-shortcut", shortcut);
sidebar.classList.remove("observablehq-search-results");
Expand All @@ -43,22 +44,40 @@ input.addEventListener("input", () => {
resultsContainer.innerHTML =
results.length === 0
? "<div>no results</div>"
: `<div>${results.length.toLocaleString("en-US")} result${results.length === 1 ? "" : "s"}</div><ol>${results
.map(renderResult)
.join("")}</ol>`;
: `<div>${results.length.toLocaleString("en-US")} result${
results.length === 1 ? "" : "s"
}</div><ol>${renderResults(results)}</ol>`;
resultsContainer.querySelector(`.${activeClass}`)?.scrollIntoView({block: "nearest"});
});

function renderResults(results) {
const me = document.location.href.replace(/[?#].*/, "");
let found;
results = results.map(({id, score, title}) => {
const external = /^\w+:/.test(id);
const href = external ? id : import.meta.resolve(`..${id}`);
return {
title: String(title ?? "—"),
href,
external,
score: Math.min(5, Math.round(0.6 * score)),
active: me === href && (found = true)
};
});
if (!found) results[0].active = true;
return results.map(renderResult).join("");
}

function isExternal(id) {
return /^\w+:/.test(id);
}

function renderResult({id, score, title}, i) {
const external = /^\w+:/.test(id);
return `<li data-score="${Math.min(5, Math.round(0.6 * score))}" class="observablehq-link${
i === 0 ? ` ${activeClass}` : ""
}"><a href="${escapeDoubleQuote(external ? id : import.meta.resolve(`..${id}`))}"${
external ? ' target="_blank"' : ""
}><span>${escapeText(String(title ?? "—"))}</span></a></li>`;
function renderResult({href, score, external, title, active}) {
return `<li data-score="${score}" class="observablehq-link${
active ? ` ${activeClass}` : ""
}"><a href="${escapeDoubleQuote(href)}"${external ? ' target="_blank"' : ""}><span>${escapeText(
title
)}</span></a></li>`;
}

function escapeDoubleQuote(text) {
Expand Down