livemark 0.25.0 → 0.27.0

package/source/components/Layout.tsx

@@ -1,15 +1,3 @@
-import { config } from "livemark:virtual"
-import { Link, useLocation, useMatch } from "@tanstack/react-router"
-import { useHotkey } from "@tanstack/react-hotkeys"
-import {
-  currentSection,
-  sectionFirstArticle,
-  sectionFlatArticles,
-  sortedArticles,
-} from "../content/article.ts"
-import { DynamicIcon } from "../helpers/dynamic-icon.tsx"
-import { prefixUrl } from "../helpers/prefix-url.ts"
-import { activeSiteLink, customSectionActive } from "../helpers/section.ts"
 import {
   SidebarInset,
   SidebarProvider,
@@ -18,160 +6,25 @@ import {
 } from "../elements/sidebar.tsx"
 import { BackToTop } from "./BackToTop.tsx"
 import { Banner } from "./Banner.tsx"
+import { Header } from "./Header.tsx"
 import { Sidebar } from "./Sidebar.tsx"
-import { SiteLink } from "./SiteLink.tsx"
-import { SiteTitle } from "./SiteTitle.tsx"
-
-function splatFor(pathname: string) {
-  return { _splat: pathname.replace(/^\/|\/$/g, "") }
-}
 
+/** Site chrome around a page: banner, header, sidebar and back-to-top */
 export function Layout(props: { withSidebar?: boolean; children?: React.ReactNode }) {
-  const pathname = useLocation({ select: l => l.pathname })
-  const articleRoute = useMatch({ from: "/$", shouldThrow: false })
-  const activeSection = articleRoute
-    ? currentSection(`/${pathname.replace(/^\/|\/$/g, "")}/`)
-    : undefined
-  const siteLinkTarget = activeSiteLink(pathname, config.sections ?? [])
-
-  useHotkey("J", () =>
-    window.scrollBy({ top: window.innerHeight * 0.8, behavior: "smooth" }),
-  )
-  useHotkey("K", () =>
-    window.scrollBy({ top: -window.innerHeight * 0.8, behavior: "smooth" }),
-  )
-
-  const sections = config.sections
-
-  const header = (
-    <header className="sticky top-0 z-20 flex h-16 shrink-0 items-center border-b bg-background">
-      <div
-        className={`flex items-center self-stretch pl-4 ${props.withSidebar ? "pr-4" : "lg:pr-20"}`}
-      >
-        {props.withSidebar ? (
-          <>
-            <div className="hidden lg:flex">
-              <SidebarTrigger />
-            </div>
-            <SiteLink to={siteLinkTarget} className="lg:hidden flex items-center gap-2">
-              <SiteTitle />
-            </SiteLink>
-          </>
-        ) : (
-          <SiteLink to={siteLinkTarget} className="flex items-center gap-2">
-            <SiteTitle />
-          </SiteLink>
-        )}
-      </div>
-      <div className="hidden lg:flex flex-1 items-center gap-8 self-stretch px-6 text-sm">
-        {sections?.length ? (
-          sections
-            .filter(section => section.position === "header")
-            .map(section => {
-              const icon = section.icon
-              if (section.type === "custom") {
-                const isActive = customSectionActive(section.url, pathname)
-                return (
-                  <a
-                    key={section.url}
-                    href={prefixUrl(section.url, config.base)}
-                    className={`inline-flex items-center gap-1.5 text-foreground ${
-                      isActive
-                        ? "font-medium border-b-2 border-foreground pb-0.5 -mb-0.5"
-                        : "opacity-80 hover:opacity-100 transition-opacity"
-                    }`}
-                  >
-                    {icon && <DynamicIcon name={icon} className="size-3.5" />}
-                    <span>{section.title}</span>
-                  </a>
-                )
-              }
-              const isActive = activeSection?.prefix === section.prefix
-              const target =
-                section.type === "blog" || section.type === "changelog"
-                  ? section.prefix
-                  : sectionFirstArticle.get(section.prefix)
-              const latestVersion =
-                section.type === "changelog" && section.version
-                  ? sortedArticles.find(
-                      a => a.path === sectionFlatArticles.get(section.prefix)?.[0],
-                    )?.title
-                  : undefined
-              return (
-                <Link
-                  key={section.prefix}
-                  to={target === "/" ? "/" : "/$"}
-                  params={target && target !== "/" ? splatFor(target) : {}}
-                  className={`inline-flex items-center gap-1.5 text-foreground ${
-                    isActive
-                      ? "font-medium border-b-2 border-foreground pb-0.5 -mb-0.5"
-                      : "opacity-80 hover:opacity-100 transition-opacity"
-                  }`}
-                >
-                  {icon && <DynamicIcon name={icon} className="size-3.5" />}
-                  <span>
-                    {section.title}
-                    {latestVersion && (
-                      <span className="opacity-80"> ({latestVersion})</span>
-                    )}
-                  </span>
-                </Link>
-              )
-            })
-        ) : (
-          <Link
-            to="/"
-            className="text-foreground font-medium underline underline-offset-4"
-          >
-            Docs
-          </Link>
-        )}
-        {config.links
-          ?.filter(
-            link =>
-              link.position === "header" &&
-              (!link.prefix || link.prefix === activeSection?.prefix),
-          )
-          .map(link => (
-            <a
-              key={link.url}
-              href={prefixUrl(link.url, config.base)}
-              className="text-foreground opacity-80 hover:opacity-100 transition-opacity"
-            >
-              {link.icon && (
-                <DynamicIcon
-                  name={link.icon}
-                  className="inline size-3.5 align-[-0.125em]"
-                />
-              )}{" "}
-              {link.title}
-            </a>
-          ))}
-        <Banner />
-      </div>
-      <div className="lg:hidden ml-auto pr-2">
-        <SidebarTrigger />
-      </div>
-    </header>
-  )
-
   return (
-    <SidebarProvider
-      key={props.withSidebar ? "sidebar" : "mini"}
-      defaultOpen={!!props.withSidebar}
-    >
-      <SidebarShell withSidebar={props.withSidebar} header={header}>
-        {props.children}
-      </SidebarShell>
-    </SidebarProvider>
+    <>
+      <Banner />
+      <SidebarProvider
+        key={props.withSidebar ? "sidebar" : "mini"}
+        defaultOpen={!!props.withSidebar}
+      >
+        <SidebarShell withSidebar={props.withSidebar}>{props.children}</SidebarShell>
+      </SidebarProvider>
+    </>
   )
 }
 
-function SidebarShell(props: {
-  withSidebar?: boolean
-  header: React.ReactNode
-  children?: React.ReactNode
-}) {
+function SidebarShell(props: { withSidebar?: boolean; children?: React.ReactNode }) {
   const { isMobile, setOpenMobile } = useSidebar()
   const onClick = (event: React.MouseEvent<HTMLDivElement>) => {
     if (!isMobile) return
@@ -181,7 +34,10 @@ function SidebarShell(props: {
     <div style={{ display: "contents" }} onClick={onClick}>
       <Sidebar withSidebar={props.withSidebar} />
       <SidebarInset>
-        {props.header}
+        <Header
+          toggle={props.withSidebar && <SidebarTrigger />}
+          menu={<SidebarTrigger />}
+        />
         <main className="flex-1">{props.children}</main>
         <BackToTop />
       </SidebarInset>

package/source/components/LinkButton.tsx

@@ -5,7 +5,15 @@ import { cn } from "cn"
 export function LinkButton(props: {
   href: string
   label: string
-  variant?: "default" | "outline" | "secondary" | "ghost" | "destructive" | "link"
+  variant?:
+    | "default"
+    | "outline"
+    | "secondary"
+    | "ghost"
+    | "positive"
+    | "warning"
+    | "destructive"
+    | "link"
   size?: "default" | "sm" | "lg"
 }) {
   return (

package/source/components/MenuSheet.tsx

@@ -0,0 +1,92 @@
+import { CheckIcon } from "lucide-react"
+import { cloneElement, useState, type ReactElement, type ReactNode } from "react"
+import { cn } from "cn"
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "../elements/dropdown-menu.tsx"
+import { useIsMobile } from "../hooks/media.ts"
+import { SheetPanel } from "./SheetPanel.tsx"
+
+/** One row of a `MenuSheet` */
+export type MenuSheetItem = {
+  id: string
+  label: ReactNode
+  icon?: ReactNode
+  active?: boolean
+  onSelect?: () => void
+}
+
+/** A menu that is an anchored dropdown from a laptop up and a bottom sheet on a
+ * phone */
+export function MenuSheet(props: {
+  trigger: ReactElement<{ onClick?: () => void; children?: ReactNode }>
+  children?: ReactNode
+  title: ReactNode
+  items: MenuSheetItem[]
+  align?: "start" | "end"
+  onOpenChange?: (open: boolean) => void
+}) {
+  const isMobile = useIsMobile()
+  const [open, setOpen] = useState(false)
+  const changeOpen = (next: boolean) => {
+    setOpen(next)
+    props.onOpenChange?.(next)
+  }
+
+  if (isMobile) {
+    return (
+      <>
+        {cloneElement(props.trigger, { onClick: () => changeOpen(true) }, props.children)}
+        <SheetPanel open={open} onOpenChange={changeOpen} title={props.title}>
+          <ul className="flex w-full min-w-0 flex-col gap-1">
+            {props.items.map(item => (
+              <li key={item.id}>
+                <button
+                  type="button"
+                  className={cn(ROW, item.active && ROW_ACTIVE)}
+                  onClick={() => {
+                    item.onSelect?.()
+                    changeOpen(false)
+                  }}
+                >
+                  {item.icon}
+                  <span className="flex-1 truncate">{item.label}</span>
+                  {item.active && <CheckIcon className="size-4 shrink-0" />}
+                </button>
+              </li>
+            ))}
+          </ul>
+        </SheetPanel>
+      </>
+    )
+  }
+
+  return (
+    <DropdownMenu onOpenChange={props.onOpenChange}>
+      {/* Without a `render`, Base UI's trigger falls back to a bare <button> — which
+          SSR paints on a phone until `useIsMobile` flips, flashing a stray icon. */}
+      <DropdownMenuTrigger render={props.trigger}>{props.children}</DropdownMenuTrigger>
+      <DropdownMenuContent align={props.align ?? "end"}>
+        {props.items.map(item => (
+          <DropdownMenuItem
+            key={item.id}
+            onClick={item.onSelect}
+            className="cursor-pointer gap-2"
+          >
+            {item.icon}
+            <span className={item.active ? "font-medium" : undefined}>{item.label}</span>
+          </DropdownMenuItem>
+        ))}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
+
+const ROW =
+  "hover:bg-muted active:bg-muted flex h-10 w-full items-center gap-2.5 overflow-hidden rounded-md p-2 text-left text-base outline-hidden [&_svg]:size-[18px] [&_svg]:shrink-0"
+
+const ROW_ACTIVE =
+  "bg-sidebar-accent text-sidebar-accent-foreground font-semibold [&_svg]:stroke-[2.5]"

package/source/components/MermaidRenderer.tsx

@@ -3,6 +3,10 @@ import mermaid from "mermaid"
 
 mermaid.initialize({ startOnLoad: false })
 
+// Module-wide so runs never overlap, even across effect re-runs: overlapping runs on
+// one node reject with "reading 'firstChild'".
+let renderQueue = Promise.resolve()
+
 /** Renders a Mermaid diagram from a chart definition string */
 export default function MermaidRenderer(props: { children: string }) {
   const ref = useRef<HTMLDivElement>(null)
@@ -12,14 +16,21 @@ export default function MermaidRenderer(props: { children: string }) {
     if (!el) return
 
     const render = () => {
-      const isDark = document.documentElement.classList.contains("dark")
-      mermaid.initialize({
-        startOnLoad: false,
-        theme: isDark ? "dark" : "default",
-      })
-      el.textContent = props.children
-      el.removeAttribute("data-processed")
-      mermaid.run({ nodes: [el] })
+      renderQueue = renderQueue
+        .then(() => {
+          if (!el.isConnected) return
+          const isDark = document.documentElement.classList.contains("dark")
+          mermaid.initialize({
+            startOnLoad: false,
+            theme: isDark ? "dark" : "default",
+          })
+          el.textContent = props.children
+          el.removeAttribute("data-processed")
+          return mermaid.run({ nodes: [el] })
+        })
+        .catch(error => {
+          if (el.isConnected) console.error(error)
+        })
     }
 
     render()

package/source/components/NotFound.tsx

@@ -1,4 +1,5 @@
 import { Link } from "@tanstack/react-router"
+import { buttonVariants } from "../elements/button.tsx"
 
 export function NotFound({ children }: { children?: any }) {
   return (
@@ -11,14 +12,11 @@ export function NotFound({ children }: { children?: any }) {
         <button
           type="button"
           onClick={() => window.history.back()}
-          className="bg-primary text-primary-foreground px-4 py-2 text-sm font-medium hover:bg-primary/80 transition-colors"
+          className={buttonVariants({ size: "lg" })}
         >
           Go Back
         </button>
-        <Link
-          to="/"
-          className="border border-border px-4 py-2 text-sm font-medium hover:bg-card transition-colors"
-        >
+        <Link to="/" className={buttonVariants({ variant: "outline", size: "lg" })}>
           Home
         </Link>
       </div>

package/source/components/PackageTabs.tsx

@@ -31,7 +31,7 @@ export function PackageTabs(props: PackageTabsProps) {
   }
 
   return (
-    <figure className="not-prose my-4 relative rounded-xl border shadow-sm overflow-hidden text-sm bg-sidebar dark:bg-sidebar">
+    <figure className="not-prose my-4 relative rounded-card border shadow-sm overflow-hidden text-sm bg-sidebar dark:bg-sidebar">
       <div className="flex items-center border-b">
         <div className="flex flex-1 items-center">
           {managers.map(pm => (
@@ -52,7 +52,7 @@ export function PackageTabs(props: PackageTabsProps) {
         <button
           type="button"
           onClick={handleCopy}
-          className="me-2 p-1 rounded-md text-muted-foreground hover:text-foreground transition-colors"
+          className="me-2 p-1 rounded-control text-muted-foreground hover:text-foreground transition-colors"
           aria-label="Copy code"
         >
           {copied ? <Check className="size-3.5" /> : <Clipboard className="size-3.5" />}

package/source/components/PageToolbar.tsx

@@ -37,13 +37,13 @@ export function PageToolbar(props: {
 
   return (
     <>
-      <div className="mb-6 flex flex-col gap-2 text-sm">
-        <p className="text-sm font-medium mb-1">Actions</p>
+      <div data-slot="page-toolbar" className="flex flex-col gap-2 text-sm">
         {sourceHref ? (
           <a
             href={sourceHref}
             target="_blank"
             rel="noopener noreferrer"
+            data-slot="page-action"
             className={buttonClass}
           >
             <SourceIcon className="size-3.5" />
@@ -51,6 +51,7 @@ export function PageToolbar(props: {
           </a>
         ) : (
           <span
+            data-slot="page-action"
             className={`${buttonClass} opacity-50 cursor-not-allowed hover:text-muted-foreground`}
             aria-disabled="true"
           >
@@ -58,13 +59,19 @@ export function PageToolbar(props: {
             {sourceLabel}
           </span>
         )}
-        <button type="button" onClick={handleCopy} className={buttonClass}>
+        <button
+          type="button"
+          onClick={handleCopy}
+          data-slot="page-action"
+          className={buttonClass}
+        >
           {copied ? <Check className="size-3.5" /> : <Copy className="size-3.5" />}
           Copy Markdown
         </button>
         <button
           type="button"
           onClick={() => openIn("https://chatgpt.com/", { hints: "search" })}
+          data-slot="page-action"
           className={buttonClass}
         >
           <ExternalLink className="size-3.5" />
@@ -73,6 +80,7 @@ export function PageToolbar(props: {
         <button
           type="button"
           onClick={() => openIn("https://claude.ai/new")}
+          data-slot="page-action"
           className={buttonClass}
         >
           <ExternalLink className="size-3.5" />

package/source/components/PrevNext.tsx

@@ -29,7 +29,7 @@ export function PrevNext(props: { path: string }) {
         <Link
           to="/$"
           params={{ _splat: prev.path.replace(/^\/|\/$/g, "") }}
-          className="flex-1 rounded-xl border shadow-sm p-4 hover:bg-muted/50 transition-colors"
+          className="flex-1 rounded-card border shadow-sm p-4 hover:bg-muted/50 transition-colors"
         >
           <span className="flex items-center gap-1 text-sm text-muted-foreground">
             <ChevronLeft className="size-4" />
@@ -42,7 +42,7 @@ export function PrevNext(props: { path: string }) {
         <Link
           to="/$"
           params={{ _splat: next.path.replace(/^\/|\/$/g, "") }}
-          className="flex-1 rounded-xl border shadow-sm p-4 hover:bg-muted/50 transition-colors text-right"
+          className="flex-1 rounded-card border shadow-sm p-4 hover:bg-muted/50 transition-colors text-right"
         >
           <span className="flex items-center justify-end gap-1 text-sm text-muted-foreground">
             Next

package/source/components/Root.tsx

@@ -0,0 +1,13 @@
+import { useHotkey } from "@tanstack/react-hotkeys"
+
+/** Headless wrapper around every route; pages add their own chrome with `Layout` */
+export function Root(props: { children?: React.ReactNode }) {
+  useHotkey("J", () =>
+    window.scrollBy({ top: window.innerHeight * 0.8, behavior: "smooth" }),
+  )
+  useHotkey("K", () =>
+    window.scrollBy({ top: -window.innerHeight * 0.8, behavior: "smooth" }),
+  )
+
+  return props.children
+}

package/source/components/Search.tsx

@@ -1,27 +1,47 @@
 import { useState } from "react"
 import { useHotkey } from "@tanstack/react-hotkeys"
 import { Search as SearchIcon } from "lucide-react"
+import { cn } from "cn"
+import { isMobileNow } from "../hooks/media.ts"
+import { HeaderSearch } from "./HeaderSearch.tsx"
 import { SearchDialog } from "./SearchDialog.tsx"
 
-/** Search button with "/" keyboard shortcut and command palette dialog */
-export function Search() {
+/** Search button with "S" keyboard shortcut: a command palette from `lg`, an in-header field below.
+ * `compact` keeps it an icon from `lg` too, when header sections need the room */
+export function Search(props: { compact?: boolean }) {
   const [open, setOpen] = useState(false)
+  const [headerOpen, setHeaderOpen] = useState(false)
+  const openSearch = () => (isMobileNow() ? setHeaderOpen(true) : setOpen(true))
 
-  useHotkey("/", () => setOpen(true))
+  useHotkey("S", openSearch)
 
   return (
     <>
       <button
         type="button"
-        onClick={() => setOpen(true)}
-        className="flex w-full items-center gap-2 rounded-xl border border-border bg-sidebar-accent/70 px-3 py-2 text-sm text-muted-foreground shadow-xs hover:bg-background transition-colors cursor-pointer"
+        onClick={openSearch}
+        aria-label="Search"
+        aria-keyshortcuts="S"
+        title="Search"
+        className={cn(
+          "flex h-9 items-center gap-2 rounded-control border border-border bg-muted/50 px-2.5 text-sm text-muted-foreground shadow-xs hover:bg-muted transition-colors cursor-pointer",
+          !props.compact && "lg:w-56",
+        )}
       >
         <SearchIcon className="size-4" />
-        <span className="flex-1 text-left">Search...</span>
-        <kbd className="rounded border border-border bg-muted px-1.5 py-0.5 text-[10px] font-mono">
-          /
+        <span className={cn("hidden flex-1 text-left", !props.compact && "lg:inline")}>
+          Search...
+        </span>
+        <kbd
+          className={cn(
+            "hidden rounded border border-border bg-background px-1.5 py-0.5 text-[10px] font-mono",
+            !props.compact && "lg:inline",
+          )}
+        >
+          S
         </kbd>
       </button>
+      {headerOpen && <HeaderSearch onClose={() => setHeaderOpen(false)} />}
       <SearchDialog open={open} onOpenChange={setOpen} />
     </>
   )