Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@solid-primitives/event-listener": "^2.3.3",
"@solid-primitives/marker": "^0.1.0",
"@solid-primitives/media": "^2.2.9",
"@solid-primitives/platform": "^0.2.0",
"@solidjs/meta": "^0.29.4",
"@solidjs/router": "^0.15.3",
"@solidjs/start": "^1.1.1",
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 14 additions & 16 deletions src/ui/search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import {
For,
Suspense,
startTransition,
onCleanup,
createMemo,
} from "solid-js";
import { Dialog } from "@kobalte/core/dialog";
import { A, createAsync, useNavigate, usePreloadRoute } from "@solidjs/router";
import { createList } from "solid-list";
import { createMarker, makeSearchRegex } from "@solid-primitives/marker";
import { createEventListener } from "@solid-primitives/event-listener";
import { isAppleDevice } from "@solid-primitives/platform";

function getOramaClient({
endpoint,
Expand Down Expand Up @@ -104,18 +105,11 @@ export function Search() {
preload(new URL(path, "https://docs.solidjs.com"), { preloadData: true });
});

createEffect(() => {
const handleKeyDown = (e: KeyboardEvent) => {
if (e.metaKey && e.key === "k") {
e.preventDefault();
setOpen((open) => !open);
}
};

window.addEventListener("keydown", handleKeyDown);
onCleanup(() => {
window.removeEventListener("keydown", handleKeyDown);
});
createEventListener(window, "keydown", (e: KeyboardEvent) => {
if ((e.ctrlKey || e.metaKey) && e.key === "k") {
e.preventDefault();
setOpen((open) => !open);
}
});

const regex = createMemo(() => makeSearchRegex(searchTerm()));
Expand All @@ -139,19 +133,23 @@ export function Search() {
setOpen(open);
}}
>
<Dialog.Trigger class="items-center rounded-lg md:border border-black/10 dark:border-white/60 dark:bg-slate-800 md:px-2 md:py-1.5 flex">
<Dialog.Trigger
aria-keyshortcuts={isAppleDevice ? "Meta+K" : "Control+K"}
class="items-center rounded-lg md:border border-black/10 dark:border-white/60 dark:bg-slate-800 md:px-2 md:py-1.5 flex"
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 256 256"
aria-hidden="true"
class="size-6 md:size-4"
>
<path d="M229.66,218.34l-50.07-50.06a88.11,88.11,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.32ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z" />
</svg>
<span class="hidden md:block ml-1 text-sm">Search</span>
<kbd class="hidden md:block ml-2 min-w-6 rounded border border-black/5 px-1 pb-px pt-1 text-center font-mono text-xs dark:bg-slate-700">
<span>⌘</span>
<span class="ml-0.5">K</span>
<kbd>{isAppleDevice ? "⌘" : "Ctrl"}</kbd>
<kbd class="ml-0.5">K</kbd>
</kbd>
</Dialog.Trigger>
<Dialog.Portal>
Expand Down