fix: index setup, styling fixes
This commit is contained in:
		@@ -128,6 +128,7 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  const data = await fetchData
 | 
					  const data = await fetchData
 | 
				
			||||||
  const container = document.getElementById("search-container")
 | 
					  const container = document.getElementById("search-container")
 | 
				
			||||||
 | 
					  const searchSpace = document.getElementById("search-space")
 | 
				
			||||||
  const sidebar = container?.closest(".sidebar") as HTMLElement
 | 
					  const sidebar = container?.closest(".sidebar") as HTMLElement
 | 
				
			||||||
  const searchIcon = document.getElementById("search-icon")
 | 
					  const searchIcon = document.getElementById("search-icon")
 | 
				
			||||||
  const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
 | 
					  const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
 | 
				
			||||||
@@ -170,7 +171,7 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
 | 
				
			|||||||
      removeAllChildren(preview)
 | 
					      removeAllChildren(preview)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (searchLayout) {
 | 
					    if (searchLayout) {
 | 
				
			||||||
      searchLayout.style.opacity = "0"
 | 
					      searchLayout.style.visibility = "hidden"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    searchType = "basic" // reset search type after closing
 | 
					    searchType = "basic" // reset search type after closing
 | 
				
			||||||
@@ -449,11 +450,11 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
 | 
				
			|||||||
    currentSearchTerm = (e.target as HTMLInputElement).value
 | 
					    currentSearchTerm = (e.target as HTMLInputElement).value
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (searchLayout) {
 | 
					    if (searchLayout) {
 | 
				
			||||||
      searchLayout.style.opacity = "1"
 | 
					      searchLayout.style.visibility = "visible"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (term === "" && searchLayout) {
 | 
					    if (term === "" && searchLayout) {
 | 
				
			||||||
      searchLayout.style.opacity = "0"
 | 
					      searchLayout.style.visibility = "hidden"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (term.toLowerCase().startsWith("#")) {
 | 
					    if (term.toLowerCase().startsWith("#")) {
 | 
				
			||||||
@@ -503,35 +504,8 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
 | 
				
			|||||||
  searchBar?.addEventListener("input", onType)
 | 
					  searchBar?.addEventListener("input", onType)
 | 
				
			||||||
  window.addCleanup(() => searchBar?.removeEventListener("input", onType))
 | 
					  window.addCleanup(() => searchBar?.removeEventListener("input", onType))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // setup index if it hasn't been already
 | 
					  index ??= await fillDocument(data)
 | 
				
			||||||
  if (!index) {
 | 
					  registerEscapeHandler(searchSpace, hideSearch)
 | 
				
			||||||
    index = new FlexSearch.Document({
 | 
					 | 
				
			||||||
      charset: "latin:extra",
 | 
					 | 
				
			||||||
      encode: encoder,
 | 
					 | 
				
			||||||
      document: {
 | 
					 | 
				
			||||||
        id: "id",
 | 
					 | 
				
			||||||
        index: [
 | 
					 | 
				
			||||||
          {
 | 
					 | 
				
			||||||
            field: "title",
 | 
					 | 
				
			||||||
            tokenize: "forward",
 | 
					 | 
				
			||||||
          },
 | 
					 | 
				
			||||||
          {
 | 
					 | 
				
			||||||
            field: "content",
 | 
					 | 
				
			||||||
            tokenize: "forward",
 | 
					 | 
				
			||||||
          },
 | 
					 | 
				
			||||||
          {
 | 
					 | 
				
			||||||
            field: "tags",
 | 
					 | 
				
			||||||
            tokenize: "forward",
 | 
					 | 
				
			||||||
          },
 | 
					 | 
				
			||||||
        ],
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
    })
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    fillDocument(index, data)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // register handlers
 | 
					 | 
				
			||||||
  registerEscapeHandler(container, hideSearch)
 | 
					 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -539,7 +513,28 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
 | 
				
			|||||||
 * @param index index to fill
 | 
					 * @param index index to fill
 | 
				
			||||||
 * @param data data to fill index with
 | 
					 * @param data data to fill index with
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
async function fillDocument(index: FlexSearch.Document<Item, false>, data: any) {
 | 
					async function fillDocument(data: { [key: FullSlug]: ContentDetails }) {
 | 
				
			||||||
 | 
					  const index = new FlexSearch.Document<Item>({
 | 
				
			||||||
 | 
					    charset: "latin:extra",
 | 
				
			||||||
 | 
					    encode: encoder,
 | 
				
			||||||
 | 
					    document: {
 | 
				
			||||||
 | 
					      id: "id",
 | 
				
			||||||
 | 
					      index: [
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					          field: "title",
 | 
				
			||||||
 | 
					          tokenize: "forward",
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					          field: "content",
 | 
				
			||||||
 | 
					          tokenize: "forward",
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					          field: "tags",
 | 
				
			||||||
 | 
					          tokenize: "forward",
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					      ],
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					  })
 | 
				
			||||||
  let id = 0
 | 
					  let id = 0
 | 
				
			||||||
  for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
 | 
					  for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
 | 
				
			||||||
    await index.addAsync(id++, {
 | 
					    await index.addAsync(id++, {
 | 
				
			||||||
@@ -550,4 +545,6 @@ async function fillDocument(index: FlexSearch.Document<Item, false>, data: any)
 | 
				
			|||||||
      tags: fileData.tags,
 | 
					      tags: fileData.tags,
 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  return index
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -85,7 +85,7 @@
 | 
				
			|||||||
      & > #search-layout {
 | 
					      & > #search-layout {
 | 
				
			||||||
        display: flex;
 | 
					        display: flex;
 | 
				
			||||||
        flex-direction: row;
 | 
					        flex-direction: row;
 | 
				
			||||||
        opacity: 0;
 | 
					        visibility: hidden;
 | 
				
			||||||
        border: 1px solid var(--lightgray);
 | 
					        border: 1px solid var(--lightgray);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        & > div {
 | 
					        & > div {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@ import { escapeHTML } from "../../util/escape"
 | 
				
			|||||||
import { FilePath, FullSlug, SimpleSlug, joinSegments, simplifySlug } from "../../util/path"
 | 
					import { FilePath, FullSlug, SimpleSlug, joinSegments, simplifySlug } from "../../util/path"
 | 
				
			||||||
import { QuartzEmitterPlugin } from "../types"
 | 
					import { QuartzEmitterPlugin } from "../types"
 | 
				
			||||||
import { toHtml } from "hast-util-to-html"
 | 
					import { toHtml } from "hast-util-to-html"
 | 
				
			||||||
import path from "path"
 | 
					 | 
				
			||||||
import { write } from "./helpers"
 | 
					import { write } from "./helpers"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export type ContentIndex = Map<FullSlug, ContentDetails>
 | 
					export type ContentIndex = Map<FullSlug, ContentDetails>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user