From 91cb19b03ed63e52e2ca35e181a1240e6d260e24 Mon Sep 17 00:00:00 2001
From: QuazChick <quazchicken@outlook.com>
Date: Mon, 20 Jan 2025 17:42:13 +0000
Subject: [PATCH] Improved search experience

---
 docs/.vitepress/config.ts                     |   2 +-
 .../components/navigation/AlgoliaSearch.vue   | 136 +++++++++---------
 2 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 8d3f7c4c41e..77b98432e3b 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -43,7 +43,7 @@ export default defineConfigWithTheme<ThemeConfig>({
       appId: "N9ZHAYJQII",
       apiKey: "a664f5a5da631810a08e1a48554fe523",
       indexName: "wiki-bedrock",
-      placeholder: "Search Bedrock Wiki...",
+      placeholder: "Search Bedrock Wiki…",
     },
 
     navigation: [
diff --git a/docs/.vitepress/theme/components/navigation/AlgoliaSearch.vue b/docs/.vitepress/theme/components/navigation/AlgoliaSearch.vue
index c2295b25c6b..3e7e2e56eec 100644
--- a/docs/.vitepress/theme/components/navigation/AlgoliaSearch.vue
+++ b/docs/.vitepress/theme/components/navigation/AlgoliaSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="docsearch" class="algolia-search-box" />
+  <div id="docsearch" />
 </template>
 
 <script setup lang="ts">
@@ -20,7 +20,7 @@ const router = useRouter();
 watch(
   () => options,
   (value) => {
-    update(value);
+    initialize(value);
   }
 );
 
@@ -32,75 +32,68 @@ function isSpecialClick(event: MouseEvent) {
   return event.button === 1 || event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
 }
 
-function getRelativePath(absoluteUrl: string) {
-  const { pathname, hash } = new URL(absoluteUrl);
-
-  return pathname + hash;
-}
-
-function update(options: any) {
-  initialize(options);
-}
-
-function initialize(userOptions: any) {
-  docsearch(
-    Object.assign({}, userOptions, {
-      container: "#docsearch",
-
-      navigator: {
-        navigate: ({ itemUrl }: { itemUrl: string }) => {
-          const { pathname: hitPathname } = new URL(window.location.origin + itemUrl);
-          // Router doesn't handle same-page navigation so we use the native
-          // browser location API for anchor navigation
-          if (route.path === hitPathname) {
-            window.location.assign(window.location.origin + itemUrl);
-          } else {
-            router.go(itemUrl);
-          }
+const docsearchProps: Partial<Parameters<typeof docsearch>[0]> = {
+  container: "#docsearch",
+
+  navigator: {
+    navigate: ({ itemUrl }: { itemUrl: string }) => {
+      const url = new URL(window.location.origin + itemUrl);
+      // Router doesn't handle same-page navigation so we use the native
+      // browser location API for anchor navigation
+      if (route.path === url.pathname) {
+        window.location.assign(url);
+      } else {
+        router.go(itemUrl);
+      }
+    },
+  },
+  transformItems: (items) => {
+    const transformedItems: typeof items = [];
+
+    for (const item of items) {
+      const url = new URL(item.url);
+
+      if (url.pathname.endsWith(".html")) continue;
+      if (url.hash === "#app") url.hash = "";
+
+      const transformedItem = {
+        ...item,
+        url: url.pathname + url.hash,
+      };
+
+      transformedItems.push(transformedItem);
+    }
+
+    return transformedItems;
+  },
+  hitComponent: ({ hit, children }: { hit: any; children: any }) => {
+    return {
+      type: "a",
+      key: undefined,
+      constructor: undefined,
+      ref: undefined,
+      props: {
+        href: hit.url,
+        onClick: (event: MouseEvent) => {
+          // we rely on the native link scrolling when user is already on
+          // the right anchor because Router doesn't support duplicated
+          // history entries
+          if (isSpecialClick(event) || route.path === hit.url) return;
+
+          // if the hits goes to another page, we prevent the native link
+          // behavior to leverage the Router loading feature
+          event.preventDefault();
+          router.go(hit.url);
         },
+        children,
       },
-      transformItems: (items: any) => {
-        return items.map((item: any) => {
-          return Object.assign({}, item, {
-            url: getRelativePath(item.url),
-          });
-        });
-      },
-      hitComponent: ({ hit, children }: { hit: any; children: any }) => {
-        const relativeHit = hit.url.startsWith("http")
-          ? getRelativePath(hit.url as string)
-          : hit.url;
-        return {
-          type: "a",
-          ref: undefined,
-          constructor: undefined,
-          key: undefined,
-          props: {
-            href: hit.url,
-            onClick: (event: MouseEvent) => {
-              if (isSpecialClick(event)) {
-                return;
-              }
-              // we rely on the native link scrolling when user is already on
-              // the right anchor because Router doesn't support duplicated
-              // history entries
-              if (route.path === relativeHit) {
-                return;
-              }
-              // if the hits goes to another page, we prevent the native link
-              // behavior to leverage the Router loading feature
-              if (route.path !== relativeHit) {
-                event.preventDefault();
-              }
-              router.go(relativeHit);
-            },
-            children,
-          },
-          __v: null,
-        };
-      },
-    })
-  );
+      __v: null,
+    };
+  },
+};
+
+function initialize(userOptions: any) {
+  docsearch({ ...userOptions, ...docsearchProps });
 }
 </script>
 
@@ -166,11 +159,14 @@ function initialize(userOptions: any) {
 }
 .DocSearch-Button-Placeholder {
   &::after {
-    content: "...";
+    content: "…";
   }
 }
 .DocSearch-Button-Key {
   padding: 0;
   margin: 0;
 }
+.DocSearch-Logo svg * {
+  fill: var(--accent-color);
+}
 </style>