boltdocs 1.6.0 → 1.7.1

package/src/client/theme/ui/OnThisPage/OnThisPage.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef, useCallback } from "react";
 import { useLocation } from "react-router-dom";
-import { Pencil, CircleHelp } from "lucide-react";
+import { Pencil, CircleHelp, TextAlignStart } from "lucide-react";
 
 interface TocHeading {
   id: string;
@@ -19,16 +19,16 @@ export function OnThisPage({
   communityHelp?: string;
   filePath?: string;
 }) {
-  const [activeId, setActiveId] = useState<string>("");
+  const [activeId, setActiveId] = useState<string | null>(null);
   const [indicatorStyle, setIndicatorStyle] = useState<React.CSSProperties>({});
   const observerRef = useRef<IntersectionObserver | null>(null);
   const location = useLocation();
   const listRef = useRef<HTMLUListElement>(null);
+  const visibleIdsRef = useRef<Set<string>>(new Set());
 
   // Reset active ID when path changes
   useEffect(() => {
     if (headings.length > 0) {
-      // Check if there's a hash in the URL
       const hash = window.location.hash.substring(1);
       if (hash && headings.some((h) => h.id === hash)) {
         setActiveId(hash);
@@ -38,19 +38,21 @@ export function OnThisPage({
     }
   }, [location.pathname, headings]);
 
-  // Update indicator position
+  // Update indicator position for the single active ID
   useEffect(() => {
     if (!activeId || !listRef.current) return;
 
-    const activeElement = listRef.current.querySelector(
+    const activeLink = listRef.current.querySelector(
       `a[href="#${activeId}"]`,
     ) as HTMLElement;
 
-    if (activeElement) {
-      const { offsetTop, offsetHeight } = activeElement;
+    if (activeLink) {
+      const top = activeLink.offsetTop;
+      const height = activeLink.offsetHeight;
+
       setIndicatorStyle({
-        transform: `translateY(${offsetTop}px)`,
-        height: `${offsetHeight}px`,
+        transform: `translateY(${top}px)`,
+        height: `${height}px`,
         opacity: 1,
       });
     }
@@ -60,30 +62,49 @@ export function OnThisPage({
   useEffect(() => {
     if (headings.length === 0) return;
 
+    // Reset visible tracking on re-run
+    visibleIdsRef.current.clear();
+
     if (observerRef.current) {
       observerRef.current.disconnect();
     }
 
     const callback: IntersectionObserverCallback = (entries) => {
-      // Find all entries that are intersecting
-      const visibleEntries = entries.filter((entry) => entry.isIntersecting);
-
-      if (visibleEntries.length > 0) {
-        // If we have visible entries, find the one closest to the top of the viewport
-        const closest = visibleEntries.reduce((prev, curr) => {
-          return Math.abs(curr.boundingClientRect.top - 100) <
-            Math.abs(prev.boundingClientRect.top - 100)
-            ? curr
-            : prev;
-        });
-        setActiveId(closest.target.id);
+      entries.forEach((entry) => {
+        if (entry.isIntersecting) {
+          visibleIdsRef.current.add(entry.target.id);
+        } else {
+          visibleIdsRef.current.delete(entry.target.id);
+        }
+      });
+
+      // Selection logic: first visible heading in document order
+      const firstVisible = headings.find((h) => visibleIdsRef.current.has(h.id));
+
+      if (firstVisible) {
+        setActiveId(firstVisible.id);
+      } else {
+        // Fallback: If nothing is visible, determine if we are at the top or bottom
+        const firstEl = document.getElementById(headings[0].id);
+        if (firstEl) {
+          const rect = firstEl.getBoundingClientRect();
+          if (rect.top > 200) {
+            setActiveId(headings[0].id);
+            return;
+          }
+        }
+        
+        // If we are deep in the doc, don't change it (keep previous)
       }
     };
 
-    observerRef.current = new IntersectionObserver(callback, {
-      rootMargin: "-100px 0px -70% 0px",
+    const observerOptions: IntersectionObserverInit = {
+      root: document.querySelector(".boltdocs-content"),
+      rootMargin: "-20% 0px -70% 0px",
       threshold: [0, 1],
-    });
+    };
+
+    observerRef.current = new IntersectionObserver(callback, observerOptions);
 
     const observeHeadings = () => {
       headings.forEach(({ id }) => {
@@ -94,18 +115,13 @@ export function OnThisPage({
       });
     };
 
-    // Initial observation
     observeHeadings();
-
-    // Re-observe if content changes
     const timeoutId = setTimeout(observeHeadings, 1000);
 
-    // Scroll listener to detect bottom of page
     const handleScroll = () => {
       const scrollPosition = window.innerHeight + window.pageYOffset;
       const bodyHeight = document.documentElement.scrollHeight;
 
-      // If we're within 50px of the bottom, activate the last heading
       if (scrollPosition >= bodyHeight - 50) {
         setActiveId(headings[headings.length - 1].id);
       }
@@ -120,7 +136,7 @@ export function OnThisPage({
     };
   }, [headings, location.pathname]);
 
-  // Autoscroll TOC list when activeId changes
+  // Autoscroll TOC list when the activeId changes
   useEffect(() => {
     if (!activeId || !listRef.current) return;
 
@@ -129,9 +145,7 @@ export function OnThisPage({
     ) as HTMLElement;
 
     if (activeLink) {
-      const container = listRef.current.closest(
-        ".boltdocs-on-this-page",
-      ) as HTMLElement;
+      const container = listRef.current.parentElement as HTMLElement;
       if (!container) return;
 
       const linkRect = activeLink.getBoundingClientRect();
@@ -143,7 +157,7 @@ export function OnThisPage({
 
       if (!isVisible) {
         activeLink.scrollIntoView({
-          behavior: "smooth",
+          behavior: "auto",
           block: "nearest",
         });
       }
@@ -155,14 +169,7 @@ export function OnThisPage({
       e.preventDefault();
       const el = document.getElementById(id);
       if (el) {
-        const offset = 80;
-        const bodyRect = document.body.getBoundingClientRect().top;
-        const elementRect = el.getBoundingClientRect().top;
-        const elementPosition = elementRect - bodyRect;
-        const offsetPosition = elementPosition - offset;
-
-        window.scrollTo({
-          top: offsetPosition,
+        el.scrollIntoView({
           behavior: "smooth",
         });
 
@@ -179,21 +186,23 @@ export function OnThisPage({
     <nav className="boltdocs-on-this-page" aria-label="Table of contents">
       <p className="on-this-page-title">On this page</p>
       <div className="on-this-page-container">
-        <div className="toc-indicator" style={indicatorStyle} />
-        <ul className="on-this-page-list" ref={listRef}>
-          {headings.map((h) => (
-            <li key={h.id} className={h.level === 3 ? "toc-indent" : ""}>
-              <a
-                href={`#${h.id}`}
-                className={`toc-link ${activeId === h.id ? "active" : ""}`}
-                aria-current={activeId === h.id ? "true" : undefined}
-                onClick={(e) => handleClick(e, h.id)}
-              >
-                {h.text}
-              </a>
-            </li>
-          ))}
-        </ul>
+        <div className="on-this-page-list-container">
+          <div className="toc-indicator" style={indicatorStyle} />
+          <ul className="on-this-page-list" ref={listRef}>
+            {headings.map((h) => (
+              <li key={h.id} className={h.level === 3 ? "toc-indent" : ""}>
+                <a
+                  href={`#${h.id}`}
+                  className={`toc-link ${activeId === h.id ? "active" : ""}`}
+                  aria-current={activeId === h.id ? "true" : undefined}
+                  onClick={(e) => handleClick(e, h.id)}
+                >
+                  {h.text}
+                </a>
+              </li>
+            ))}
+          </ul>
+        </div>
       </div>
 
       {/* Need help? section */}

package/src/client/theme/ui/OnThisPage/toc.css

@@ -5,12 +5,12 @@
   width: var(--ld-toc-width);
   flex-shrink: 0;
   padding: 1.5rem 1rem;
-  position: sticky;
-  top: var(--ld-navbar-height);
-  height: calc(100vh - var(--ld-navbar-height));
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: var(--ld-bg-mute) transparent;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  /* Hardware acceleration */
+  transform: translate3d(0, 0, 0);
+  backface-visibility: hidden;
 }
 
 .on-this-page-title {
@@ -21,11 +21,28 @@
   color: var(--ld-text-dim);
   margin: 0 0 0.75rem;
   padding-left: 0.75rem;
+  flex-shrink: 0;
 }
 
 .on-this-page-container {
   position: relative;
   padding-left: 2px;
+  flex: 0 1 auto;
+  min-height: 0; /* Important for children overflow */
+  display: flex;
+  flex-direction: column;
+}
+
+.on-this-page-list-container {
+  overflow-y: auto;
+  max-height: 50vh; /* Constrain height for large docs */
+  flex: 0 1 auto;
+  position: relative;
+  scrollbar-width: none;
+}
+
+.on-this-page-list-container::-webkit-scrollbar {
+  display: none;
 }
 
 .on-this-page-list {
@@ -67,7 +84,9 @@
   border-left: 2px solid transparent;
   margin-left: -2px;
   line-height: 1.4;
-  transition: color 0.2s;
+  transition:
+    color 0.2s,
+    font-weight 0.2s;
 }
 
 .toc-link:hover {
@@ -81,9 +100,10 @@
 
 /* ─── Need Help Section ──────────────────────────────────── */
 .toc-help {
-  margin-top: 2rem;
+  margin-top: 1.5rem;
   padding-top: 1rem;
   border-top: 1px solid var(--ld-border-subtle);
+  flex-shrink: 0;
 }
 
 .toc-help-title {
@@ -121,8 +141,8 @@
 }
 
 .toc-help-link:hover {
-  color: var(--ld-text-muted);
-  background-color: rgba(255, 255, 255, 0.03);
+  color: var(--ld-text-main);
+  background-color: var(--ld-bg-mute);
 }
 
 .toc-help-link svg {

package/src/client/theme/ui/ProgressBar/ProgressBar.css

@@ -0,0 +1,17 @@
+.boltdocs-progress-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 2px;
+  z-index: 1000;
+  pointer-events: none;
+  background: transparent;
+}
+
+.boltdocs-progress-bar {
+  height: 100%;
+  background: linear-gradient(90deg, var(--ld-color-primary), var(--ld-gradient-to, var(--ld-color-primary)));
+  box-shadow: 0 0 8px var(--ld-color-primary-glow);
+  transition: width 0.1s ease-out;
+}

package/src/client/theme/ui/ProgressBar/ProgressBar.tsx

@@ -0,0 +1,51 @@
+import React, { useEffect, useState } from "react";
+import "./ProgressBar.css";
+
+export function ProgressBar() {
+  const [progress, setProgress] = useState(0);
+
+  useEffect(() => {
+    let container: Element | null = null;
+    let timer: any;
+
+    const handleScroll = () => {
+      if (!container) return;
+      const { scrollTop, scrollHeight, clientHeight } = container;
+      if (scrollHeight <= clientHeight) {
+        setProgress(0);
+        return;
+      }
+      const scrollPercent = (scrollTop / (scrollHeight - clientHeight)) * 100;
+      setProgress(Math.min(100, Math.max(0, scrollPercent)));
+    };
+
+    const attachListener = () => {
+      container = document.querySelector(".boltdocs-content");
+      if (container) {
+        container.addEventListener("scroll", handleScroll);
+        handleScroll();
+        if (timer) clearInterval(timer);
+        return true;
+      }
+      return false;
+    };
+
+    if (!attachListener()) {
+      timer = setInterval(attachListener, 100);
+    }
+
+    return () => {
+      if (container) container.removeEventListener("scroll", handleScroll);
+      if (timer) clearInterval(timer);
+    };
+  }, []);
+
+  return (
+    <div className="boltdocs-progress-container">
+      <div 
+        className="boltdocs-progress-bar" 
+        style={{ width: `${progress}%` }} 
+      />
+    </div>
+  );
+}

package/src/client/theme/ui/ProgressBar/index.ts

@@ -0,0 +1 @@
+export * from "./ProgressBar";

package/src/client/theme/ui/SearchDialog/SearchDialog.tsx

@@ -49,7 +49,7 @@ export function SearchDialog({ routes }: { routes: ComponentRoute[] }) {
 
     const results: SearchResult[] = [];
     const lowerQuery = query.toLowerCase();
-
+    
     for (const route of routes) {
       if (route.title && route.title.toLowerCase().includes(lowerQuery)) {
         results.push({
@@ -71,6 +71,16 @@ export function SearchDialog({ routes }: { routes: ComponentRoute[] }) {
           }
         }
       }
+
+      if (route._content && route._content.toLowerCase().includes(lowerQuery)) {
+        // If it's a content match but not a title/heading match, add it
+        // We only add the page itself for now
+        results.push({
+          title: route.title,
+          path: route.path,
+          groupTitle: route.groupTitle,
+        });
+      }
     }
 
     // Deduplicate results by path

package/src/client/theme/ui/Sidebar/Sidebar.tsx

@@ -1,9 +1,10 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { useLocation } from "react-router-dom";
 import { Link } from "../Link";
 import { BoltdocsConfig } from "../../../../node/config";
 import { PoweredBy } from "../PoweredBy";
-import { ChevronRight, ChevronLeft, PanelLeft } from "lucide-react";
+import { ChevronRight } from "lucide-react";
+import * as LucideIcons from "lucide-react";
 
 interface RouteItem {
   path: string;
@@ -12,12 +13,16 @@ interface RouteItem {
   groupTitle?: string;
   sidebarPosition?: number;
   badge?: string | { text: string; expires?: string };
+  icon?: string;
+  tab?: string;
+  groupIcon?: string;
 }
 
 interface SidebarGroup {
   slug: string;
   title: string;
   routes: RouteItem[];
+  icon?: string;
 }
 
 /**
@@ -50,8 +55,6 @@ function renderBadge(badgeRaw: RouteItem["badge"]) {
 
   if (!text) return null;
 
-  if (!text) return null;
-
   let typeClass = "badge-default";
   const lowerText = text.toLowerCase();
   if (lowerText === "new") {
@@ -65,6 +68,43 @@ function renderBadge(badgeRaw: RouteItem["badge"]) {
   return <span className={`sidebar-badge ${typeClass}`}>{text}</span>;
 }
 
+/**
+ * Renders an icon from a string (Lucide name or SVG).
+ */
+function renderIcon(iconName?: string, size = 16) {
+  if (!iconName) return null;
+
+  const trimmed = iconName.trim();
+
+  // Check if it's a raw SVG
+  if (trimmed.startsWith("<svg") || trimmed.includes("http")) {
+    if (trimmed.startsWith("<svg")) {
+      return (
+        <span
+          className="sidebar-icon svg-icon"
+          dangerouslySetInnerHTML={{ __html: trimmed }}
+        />
+      );
+    }
+    return (
+      <img
+        src={trimmed}
+        className="sidebar-icon"
+        style={{ width: size, height: size }}
+        alt=""
+      />
+    );
+  }
+
+  // Check if it's a Lucide icon
+  const IconComponent = (LucideIcons as any)[iconName];
+  if (IconComponent) {
+    return <IconComponent size={size} className="sidebar-icon lucide-icon" />;
+  }
+
+  return null;
+}
+
 /**
  * The sidebar navigation component.
  * Groups documentation routes logically based on the `group` property.
@@ -76,20 +116,28 @@ function renderBadge(badgeRaw: RouteItem["badge"]) {
 export function Sidebar({
   routes,
   config,
-  isCollapsed,
-  onToggle,
 }: {
   routes: RouteItem[];
   config: BoltdocsConfig;
-  isCollapsed?: boolean;
-  onToggle?: () => void;
 }) {
   const location = useLocation();
 
+  // Find active tab based on the current route's metadata
+  const currentRoute = routes.find((r) => r.path === location.pathname);
+  const activeTabId = currentRoute?.tab?.toLowerCase();
+
+  // Filter routes by active tab if any tab is active
+  const filteredRoutes = activeTabId
+    ? routes.filter((r) => {
+        if (!r.tab) return true; // Fallback for untabbed routes
+        return r.tab.toLowerCase() === activeTabId;
+      })
+    : routes;
+
   const ungrouped: RouteItem[] = [];
-  const groupMap = new Map<string, SidebarGroup>();
+  const groupMap = new Map<string, SidebarGroup & { icon?: string }>();
 
-  for (const route of routes) {
+  for (const route of filteredRoutes) {
     if (!route.group) {
       ungrouped.push(route);
     } else {
@@ -98,6 +146,7 @@ export function Sidebar({
           slug: route.group,
           title: route.groupTitle || route.group,
           routes: [],
+          icon: (route as any).groupIcon,
         });
       }
       groupMap.get(route.group)!.routes.push(route);
@@ -108,52 +157,38 @@ export function Sidebar({
 
   return (
     <aside className="boltdocs-sidebar">
-      {onToggle && (
-        <div className="sidebar-collapse">
-          <button
-            className="sidebar-collapse-btn"
-            onClick={onToggle}
-            aria-label={isCollapsed ? "Expand Sidebar" : "Collapse Sidebar"}
-            title={isCollapsed ? "Expand Sidebar" : "Collapse Sidebar"}
-          >
-            <PanelLeft size={18} />
-          </button>
-        </div>
-      )}
+      <nav aria-label="Main Navigation">
+        <ul className="sidebar-list">
+          {ungrouped.map((route) => (
+            <li key={route.path}>
+              <Link
+                to={route.path === "" ? "/" : route.path}
+                className={`sidebar-link ${location.pathname === route.path ? "active" : ""}`}
+                aria-current={
+                  location.pathname === route.path ? "page" : undefined
+                }
+              >
+                <div className="sidebar-link-content">
+                  <div className="sidebar-link-title-container">
+                    {renderIcon((route as any).icon)}
+                    <span>{route.title}</span>
+                  </div>
+                  {renderBadge(route.badge)}
+                </div>
+              </Link>
+            </li>
+          ))}
+        </ul>
 
-      {!isCollapsed && (
-        <>
-          <nav aria-label="Main Navigation">
-            <ul className="sidebar-list">
-              {ungrouped.map((route) => (
-                <li key={route.path}>
-                  <Link
-                    to={route.path === "" ? "/" : route.path}
-                    className={`sidebar-link ${location.pathname === route.path ? "active" : ""}`}
-                    aria-current={
-                      location.pathname === route.path ? "page" : undefined
-                    }
-                  >
-                    <div className="sidebar-link-content">
-                      <span>{route.title}</span>
-                      {renderBadge(route.badge)}
-                    </div>
-                  </Link>
-                </li>
-              ))}
-            </ul>
-
-            {groups.map((group) => (
-              <SidebarGroupSection
-                key={group.slug}
-                group={group}
-                currentPath={location.pathname}
-              />
-            ))}
-          </nav>
-          {config.themeConfig?.poweredBy !== false && <PoweredBy />}
-        </>
-      )}
+        {groups.map((group) => (
+          <SidebarGroupSection
+            key={group.slug}
+            group={group}
+            currentPath={location.pathname}
+          />
+        ))}
+      </nav>
+      {config.themeConfig?.poweredBy !== false && <PoweredBy />}
     </aside>
   );
 }
@@ -176,7 +211,9 @@ function SidebarGroupSection({
         aria-expanded={open}
         aria-controls={`sidebar-group-${group.slug}`}
       >
-        <span className="sidebar-group-title">{group.title}</span>
+        <div className="sidebar-group-header-content">
+          <span className="sidebar-group-title">{group.title}</span>
+        </div>
         <span className={`sidebar-group-chevron ${open ? "open" : ""}`}>
           <ChevronRight size={16} />
         </span>
@@ -191,7 +228,10 @@ function SidebarGroupSection({
                 aria-current={currentPath === route.path ? "page" : undefined}
               >
                 <div className="sidebar-link-content">
-                  <span>{route.title}</span>
+                  <div className="sidebar-link-title-container">
+                    {renderIcon((route as any).icon)}
+                    <span>{route.title}</span>
+                  </div>
                   {renderBadge(route.badge)}
                 </div>
               </Link>