Skip to content
Open
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
28 changes: 25 additions & 3 deletions components/search/CustomSearchBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface SearchBoxProps {

function SearchBox({ refine }: SearchBoxProps) {
const [searchBarState, setSearchBarState] = useState("");
const router = useRouter();
useHotkeys("ctrl+k", () => {
if (document != null) {
const searchBar = document.querySelector(
Expand All @@ -21,8 +22,21 @@ function SearchBox({ refine }: SearchBoxProps) {
}
});

const dynamicRoute = useRouter().asPath;
// Populate search from ?query= URL parameter on initial load
const [initialQueryApplied, setInitialQueryApplied] = useState(false);
useEffect(() => {
if (initialQueryApplied || !router.isReady) return;
const urlQuery = router.query.query;
if (typeof urlQuery === "string" && urlQuery.length > 0) {
setSearchBarState(urlQuery);
refine(urlQuery);
}
setInitialQueryApplied(true);
}, [router.isReady, router.query.query, initialQueryApplied, refine]);

const dynamicRoute = router.asPath;
useEffect(() => {
if (!initialQueryApplied) return;
refine(""); // When the route changes - reset the search state
setSearchBarState("");
}, [dynamicRoute, refine]);
Expand All @@ -39,8 +53,16 @@ function SearchBox({ refine }: SearchBoxProps) {
value={searchBarState}
placeholder={"Ctrl + K"}
onChange={(e) => {
refine(e.currentTarget.value);
setSearchBarState(e.currentTarget.value);
const value = e.currentTarget.value;
refine(value);
setSearchBarState(value);
const url = new URL(window.location.href);
if (value) {
url.searchParams.set("query", value);
} else {
url.searchParams.delete("query");
}
window.history.replaceState({}, "", url.toString());
}}
className="grow h-9 cursor-pointer rounded-sm text-sm focus:outline-none dark:bg-card-dark bg-search-bar-light placeholder:opacity-50 dark:text-white px-2"
/>
Expand Down
28 changes: 25 additions & 3 deletions components/search/MobileSearchBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function SearchBox({
onCloseCallback,
}: MobileSearchBoxProps) {
const [searchBarState, setSearchBarState] = useState("");
const router = useRouter();
useEffect(() => {
const searchBar = document.querySelector(
"#algolia_search"
Expand All @@ -22,8 +23,21 @@ function SearchBox({
}
}, []);

const dynamicRoute = useRouter().asPath;
// Populate search from ?query= URL parameter on initial load
const [initialQueryApplied, setInitialQueryApplied] = useState(false);
useEffect(() => {
if (initialQueryApplied || !router.isReady) return;
const urlQuery = router.query.query;
if (typeof urlQuery === "string" && urlQuery.length > 0) {
setSearchBarState(urlQuery);
refine(urlQuery);
}
setInitialQueryApplied(true);
}, [router.isReady, router.query.query, initialQueryApplied, refine]);

const dynamicRoute = router.asPath;
useEffect(() => {
if (!initialQueryApplied) return;
refine(""); // When the route changes - reset the search state
setSearchBarState("");
}, [dynamicRoute, refine]);
Expand All @@ -37,8 +51,16 @@ function SearchBox({
placeholder={"Search commands"}
value={searchBarState}
onChange={(e) => {
refine(e.currentTarget.value);
setSearchBarState(e.currentTarget.value);
const value = e.currentTarget.value;
refine(value);
setSearchBarState(value);
const url = new URL(window.location.href);
if (value) {
url.searchParams.set("query", value);
} else {
url.searchParams.delete("query");
}
window.history.replaceState({}, "", url.toString());
}}
className="grow h-9 cursor-pointer text-sm focus:outline-none bg-inherit placeholder:opacity-50 text-black dark:text-white px-2"
/>
Expand Down