@stainless-api/docs 0.1.0-beta.32 → 0.1.0-beta.34

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @stainless-api/docs
 
+## 0.1.0-beta.34
+
+### Patch Changes
+
+- f5173e9: fix: theme flickering
+
+## 0.1.0-beta.33
+
+### Patch Changes
+
+- 7ef572c: feat: updated dropdowns
+- Updated dependencies [7ef572c]
+  - @stainless-api/docs-ui@0.1.0-beta.27
+  - @stainless-api/ui-primitives@0.1.0-beta.20
+
 ## 0.1.0-beta.32
 
 ### Patch Changes

package/components/variables.css

@@ -91,11 +91,6 @@
   --stldocs-title-padding-y: 2.5rem;
 
   --stldocs-z-index-theme-select: 1000;
-  --stldocs-button-border-radius: var(--sl-button-border-radius);
-  --stldocs-button-size: var(--sl-button-size);
-  --stldocs-button-padding-x: var(--sl-button-padding-x);
-  --stldocs-button-padding-y: var(--sl-button-padding-y);
-
   --sl-content-pad-x: 1rem;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stainless-api/docs",
-  "version": "0.1.0-beta.32",
+  "version": "0.1.0-beta.34",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,8 @@
     "./stainless-docs/mintlify-compat": "./stl-docs/components/mintlify-compat/index.ts",
     "./mintlify-compat.css": "./styles/mintlify-compat.css",
     "./font-imports": "./styles/fonts.css",
-    "./components": "./stl-docs/components/index.ts"
+    "./components": "./stl-docs/components/index.ts",
+    "./components/scripts": "./stl-docs/components/scripts.ts"
   },
   "keywords": [],
   "author": "",
@@ -50,8 +51,8 @@
     "remark-gfm": "^4.0.1",
     "remark-stringify": "^11.0.0",
     "unified": "^11.0.5",
-    "@stainless-api/docs-ui": "0.1.0-beta.26",
-    "@stainless-api/ui-primitives": "0.1.0-beta.19"
+    "@stainless-api/docs-ui": "0.1.0-beta.27",
+    "@stainless-api/ui-primitives": "0.1.0-beta.20"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.5",
@@ -65,8 +66,8 @@
     "typescript": "5.9.3",
     "vite": "^6.3.6",
     "zod": "^4.0.0",
-    "@stainless/sdk-json": "^0.1.0-beta.0",
-    "@stainless/eslint-config": "0.1.0-beta.0"
+    "@stainless/eslint-config": "0.1.0-beta.0",
+    "@stainless/sdk-json": "^0.1.0-beta.0"
   },
   "scripts": {
     "vendor-deps": "pnpm tsx scripts/vendor_deps.ts",

package/plugin/components/SDKSelect.astro

@@ -138,15 +138,17 @@ const readmeSlug = language === 'http' ? BASE_PATH : `${BASE_PATH}/${language}`;
 <script>
   import { navigate } from 'astro:transitions/client';
   import { updateSelectedLanguage } from '../languages';
-  import { initDropdown } from '@stainless-api/docs-ui/src/components/scripts/dropdown';
+  import { initDropdown } from '@stainless-api/docs/components/scripts';
   import { BASE_PATH } from 'virtual:stl-starlight-virtual-module';
   import { getPageLoadEvent } from '../helpers/getPageLoadEvent';
 
   document.addEventListener(getPageLoadEvent(), () => {
+    const sdkSelect = document.getElementById('sidebar-sdk-select');
+    if (!sdkSelect) return;
     initDropdown({
-      dropdownId: 'sidebar-sdk-select',
+      root: sdkSelect,
       onSelect: (value) => {
-        const originalLanguage = document.getElementById('sidebar-sdk-select')?.dataset.currentValue;
+        const originalLanguage = sdkSelect.dataset.currentValue;
         navigate(updateSelectedLanguage(BASE_PATH, originalLanguage, value));
       },
     });

package/plugin/components/search/SearchAlgolia.astro

@@ -2,22 +2,23 @@
 import { Icon } from '@astrojs/starlight/components';
 import { DocsSearch } from './SearchIsland';
 import { SEARCH } from 'virtual:stl-starlight-virtual-module';
+import { Button } from '@stainless-api/ui-primitives';
 ---
 
 <site-search>
-  <button
-    popovertarget="stldocs-search"
+  <Button
+    popoverTarget="stldocs-search"
     data-open-modal
     aria-label={Astro.locals.t('search.label')}
     aria-keyshortcuts="Control+K"
-    class="stldocs-button stldocs-button-secondary"
+    variant="outline"
   >
     <Icon name="magnifier" />
     <span class="sl-hidden md:sl-block" aria-hidden="true">{Astro.locals.t('search.label')}</span>
     <kbd class="sl-hidden md:sl-flex" style="display: none;">
       <kbd>{Astro.locals.t('search.ctrlKey')}</kbd><kbd>K</kbd>
     </kbd>
-  </button>
+  </Button>
 
   <DocsSearch
     client:only="react"

package/plugin/globalJs/ai-dropdown-options.ts

@@ -209,14 +209,16 @@ export function wireAIDropdown() {
     // we hide the Cursor option on non-desktop devices
     for (const option of flatOptions) {
       if (option.clientHidden === true) {
-        const el = document.querySelector(`[data-value="${option.id}"]`);
+        const el = document.querySelector(
+          `[data-dropdown-id="ai-dropdown-button"] [data-value="${option.id}"]`,
+        );
         if (el) {
           el.remove();
         }
       }
     }
 
-    const dropdowns = document.querySelectorAll('[data-dropdown-id]');
+    const dropdowns = document.querySelectorAll('[data-dropdown-id="ai-dropdown-button"]');
 
     dropdowns.forEach((dropdown) => {
       initDropdownButton({

package/plugin/globalJs/navigation.ts

@@ -4,7 +4,7 @@ import { updateSelectedLanguage } from '../languages';
 import { navigate } from 'astro:transitions/client';
 import { getPageLoadEvent } from '../helpers/getPageLoadEvent.ts';
 
-import { initDropdown } from '@stainless-api/docs-ui/src/components/scripts/dropdown';
+import { initDropdown } from '@stainless-api/docs/components/scripts';
 
 history.scrollRestoration = 'auto';
 
@@ -22,10 +22,13 @@ window.addEventListener('popstate', (ev: PopStateEvent) => {
 });
 
 document.addEventListener(getPageLoadEvent(), () => {
+  const rootElement = document.getElementById('stldocs-snippet-select');
+  if (!rootElement) return;
+
   initDropdown({
-    dropdownId: 'stldocs-snippet-select',
+    root: rootElement,
     onSelect: (value) => {
-      const originalLanguage = document.getElementById('stldocs-snippet-select')?.dataset.currentValue;
+      const originalLanguage = rootElement?.dataset.currentValue;
       navigate(updateSelectedLanguage(BASE_PATH, originalLanguage, value));
     },
   });

package/plugin/react/Routing.tsx

@@ -33,14 +33,13 @@ import {
   SDKResource,
   type SDKRequestTitleProps,
   SDKBreadcrumbs,
-  Dropdown,
-  DropdownTrigger,
-  DropdownMenu,
-  DropdownItem,
   SDKIcon,
   SDKOverview,
   SDKLanguageBlock,
 } from '@stainless-api/docs-ui/src/components';
+
+import { Dropdown } from '@stainless-api/docs/components';
+
 import {
   BASE_PATH,
   EXCLUDE_LANGUAGES,
@@ -56,6 +55,7 @@ import { SnippetCode, SnippetContainer, SnippetRequestContainer } from '../compo
 import type { StlStarlightMiddleware } from '../middlewareBuilder/stainlessMiddleware';
 import { ComponentProvider } from '@stainless-api/docs-ui/src/contexts/component';
 import { AIDropdown } from '../../stl-docs/components/AIDropdown';
+import { ChevronsUpDownIcon } from 'lucide-react';
 
 export function generateDocsRoutes(spec: SDKJSON.Spec) {
   const paths = generateRouteList({
@@ -177,30 +177,36 @@ export function SDKSelectReactComponent({
 }) {
   return (
     <Dropdown id={id} data-current-value={selected} className={className}>
-      <DropdownTrigger
-        className="dropdown-toggle"
-        type="button"
-        id="stl-docs-snippet-title-button"
-        aria-expanded="false"
-        withChevron
-      >
-        <SDKIcon language={getLanguageSnippet(selected)} size={16} />
-        <span className="stl-snippet-dropdown-button-text">{LanguageNames[selected]}</span>
-      </DropdownTrigger>
-      <DropdownMenu
+      <Dropdown.Trigger>
+        <Dropdown.TriggerSelectedItem>
+          <Dropdown.Icon>
+            <SDKIcon language={getLanguageSnippet(selected)} />
+          </Dropdown.Icon>
+          <span className="stl-snippet-dropdown-button-text">{LanguageNames[selected]}</span>
+        </Dropdown.TriggerSelectedItem>
+        <Dropdown.TriggerIcon>
+          <ChevronsUpDownIcon size={16} />
+        </Dropdown.TriggerIcon>
+      </Dropdown.Trigger>
+      <Dropdown.Menu
         className="dropdown-menu stl-sdk-select-dropdown-menu"
-        position="below"
         aria-labelledby="stl-docs-snippet-title-button"
       >
         {languages.map((item) => (
-          <DropdownItem key={item} value={item} selected={item === selected}>
-            <div>
+          <Dropdown.MenuItem key={item} value={item} isSelected={item === selected}>
+            <Dropdown.Icon>
               <SDKIcon language={getLanguageSnippet(item)} size={16} />
+            </Dropdown.Icon>
+            <Dropdown.MenuItemText>{LanguageNames[item]}</Dropdown.MenuItemText>
+            <Dropdown.MenuItemTemplate>
+              <Dropdown.Icon>
+                <SDKIcon language={getLanguageSnippet(item)} size={16} />
+              </Dropdown.Icon>
               <span className="stl-snippet-dropdown-button-text">{LanguageNames[item]}</span>
-            </div>
-          </DropdownItem>
+            </Dropdown.MenuItemTemplate>
+          </Dropdown.MenuItem>
         ))}
-      </DropdownMenu>
+      </Dropdown.Menu>
     </Dropdown>
   );
 }

package/stl-docs/components/AIDropdown.tsx

@@ -50,7 +50,7 @@ export function AIDropdown() {
           <React.Fragment key={group.reactKey}>
             {group.options.map((option) => (
               <DropdownButton.MenuItem value={option.id} isExternalLink={option.external} key={option.id}>
-                <DropdownButton.MenuItemIcon>{iconMap[option.icon]}</DropdownButton.MenuItemIcon>
+                <DropdownButton.Icon>{iconMap[option.icon]}</DropdownButton.Icon>
                 <ItemLabel label={option.label} />
               </DropdownButton.MenuItem>
             ))}

package/stl-docs/components/ThemeSelect.astro

@@ -1,10 +1,6 @@
 ---
-import {
-  Dropdown,
-  DropdownTrigger,
-  DropdownMenu,
-  DropdownItem,
-} from '@stainless-api/docs-ui/src/components/dropdown';
+import { Dropdown } from '@stainless-api/docs/components';
+import { ChevronsUpDownIcon } from 'lucide-react';
 
 const options = [
   {
@@ -19,7 +15,7 @@ const options = [
 >
   <path
           d="M21 5C21 4.44771 20.5523 4 20 4H4C3.44772 4 3 4.44772 3 5V15C3 15.5523 3.44772 16 4 16H20C20.5523 16 21 15.5523 21 15V5ZM23 15C23 16.6569 21.6569 18 20 18H13V20H16C16.5523 20 17 20.4477 17 21C17 21.5523 16.5523 22 16 22H8C7.44772 22 7 21.5523 7 21C7 20.4477 7.44772 20 8 20H11V18H4C2.34315 18 1 16.6569 1 15V5C1 3.34315 2.34315 2 4 2H20C21.6569 2 23 3.34315 23 5V15Z"
-          fill="#262626"></path></svg
+          fill="var(--stl-ui-foreground)"></path></svg
 >`,
   },
   {
@@ -34,7 +30,7 @@ const options = [
 >
   <path
           d="M11 22V20C11 19.4477 11.4477 19 12 19C12.5523 19 13 19.4477 13 20V22C13 22.5523 12.5523 23 12 23C11.4477 23 11 22.5523 11 22ZM5.63281 16.9531C6.02332 16.5626 6.65635 16.5626 7.04688 16.9531C7.4374 17.3436 7.4374 17.9767 7.04688 18.3672L5.6377 19.7773C5.24717 20.1679 4.61318 20.1679 4.22266 19.7773C3.83232 19.387 3.83259 18.7538 4.22266 18.3633L5.63281 16.9531ZM16.9531 16.9531C17.3191 16.5871 17.8982 16.5637 18.291 16.8838L18.3672 16.9531L19.7773 18.3633L19.8457 18.4385C20.1663 18.8313 20.1435 19.4111 19.7773 19.7773C19.4113 20.1433 18.8322 20.1658 18.4395 19.8457L18.3633 19.7773L16.9531 18.3672L16.8848 18.291C16.5643 17.8983 16.5871 17.3193 16.9531 16.9531ZM15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15C13.6569 15 15 13.6569 15 12ZM4 11C4.55228 11 5 11.4477 5 12C5 12.5523 4.55228 13 4 13H2C1.44772 13 1 12.5523 1 12C1 11.4477 1.44772 11 2 11H4ZM22 11C22.5523 11 23 11.4477 23 12C23 12.5523 22.5523 13 22 13H20C19.4477 13 19 12.5523 19 12C19 11.4477 19.4477 11 20 11H22ZM7.04688 5.63281C7.4374 6.02334 7.4374 6.65635 7.04688 7.04688C6.65634 7.43728 6.0233 7.43736 5.63281 7.04688L4.22266 5.63672L5.6377 4.22266L7.04688 5.63281ZM18.3633 4.22266C18.7538 3.83235 19.3869 3.83224 19.7773 4.22266C20.1678 4.61311 20.1677 5.24618 19.7773 5.63672L18.3672 7.04688C17.9767 7.4374 17.3436 7.4374 16.9531 7.04688C16.5626 6.65635 16.5626 6.02332 16.9531 5.63281L18.3633 4.22266ZM4.22266 4.22266C4.61318 3.83213 5.24717 3.83213 5.6377 4.22266L4.22266 5.63672C3.83254 5.24621 3.83238 4.61307 4.22266 4.22266ZM11 4V2C11 1.44772 11.4477 1 12 1C12.5523 1 13 1.44772 13 2V4C13 4.55228 12.5523 5 12 5C11.4477 5 11 4.55228 11 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12Z"
-          fill="#262626"></path></svg
+          fill="var(--stl-ui-foreground)"></path></svg
 >`,
   },
   {
@@ -49,46 +45,80 @@ const options = [
 >
   <path
     d="M9.13569 7.5C9.13569 6.37669 9.39314 5.28007 9.87397 4.28809C9.05381 4.51419 8.27063 4.87087 7.55561 5.34863C6.24009 6.22764 5.21483 7.47676 4.60932 8.93848C4.00386 10.4002 3.84465 12.0088 4.15327 13.5605C4.46195 15.1124 5.2239 16.5384 6.34272 17.6572C7.46154 18.776 8.88756 19.538 10.4394 19.8467C11.9912 20.1553 13.5997 19.9961 15.0615 19.3906C16.5232 18.7851 17.7723 17.7599 18.6513 16.4443C19.1292 15.7291 19.4848 14.9454 19.7109 14.125C18.719 14.6057 17.6231 14.8643 16.4999 14.8643C14.5469 14.8643 12.6739 14.088 11.2929 12.707C9.91191 11.326 9.13569 9.45304 9.13569 7.5ZM11.1357 7.5C11.1357 8.92261 11.701 10.287 12.707 11.293C13.7129 12.2989 15.0773 12.8643 16.4999 12.8643C17.9226 12.8643 19.287 12.2989 20.2929 11.293C20.5789 11.007 21.0091 10.9214 21.3828 11.0762C21.7564 11.231 22 11.5956 22 12C22 13.9778 21.4132 15.9112 20.3144 17.5557C19.2156 19.2001 17.6543 20.4824 15.8271 21.2393C13.9998 21.9961 11.9886 22.1935 10.0488 21.8076C8.10909 21.4217 6.32711 20.4697 4.92866 19.0713C3.53021 17.6728 2.57822 15.8909 2.19233 13.9512C1.80648 12.0114 2.00382 10.0001 2.76069 8.17285C3.51756 6.34567 4.79987 4.78434 6.44429 3.68555C8.08878 2.58673 10.0221 2 11.9999 2C12.4044 2 12.769 2.24359 12.9238 2.61719C13.0786 2.99086 12.993 3.42103 12.707 3.70703C11.701 4.71297 11.1357 6.07739 11.1357 7.5Z"
-    fill="#262626"></path></svg
+    fill="var(--stl-ui-foreground)"></path></svg
 >`,
   },
 ];
 ---
 
-<div class="stldocs-root theme-select-root">
-  <Dropdown className="theme-select-container" data-theme-select>
-    <DropdownTrigger withChevron>
-      <span class="stl-dropdown-icon">
-        {options.map(({ icon }) => <Fragment set:html={icon} />)}
-      </span>
-    </DropdownTrigger>
-    <DropdownMenu role="listbox">
-      {
-        options.map(({ value, label, icon }) => (
-          <DropdownItem role="option" value={value}>
-            <div>
-              <span class="stl-dropdown-icon">
-                <Fragment set:html={icon} />
-              </span>
-              <span class="stl-dropdown-label">{label}</span>
-            </div>
-          </DropdownItem>
-        ))
-      }
-    </DropdownMenu>
-  </Dropdown>
-</div>
+<Dropdown data-theme-select>
+  <Dropdown.Trigger>
+    <Dropdown.TriggerSelectedItem>
+      <span class="stl-dropdown-icon"></span>
+    </Dropdown.TriggerSelectedItem>
+    <Dropdown.TriggerIcon>
+      <ChevronsUpDownIcon size={16} />
+    </Dropdown.TriggerIcon>
+  </Dropdown.Trigger>
+  <Dropdown.Menu>
+    {
+      options.map(({ value, label, icon }) => (
+        <Dropdown.MenuItem value={value}>
+          <Dropdown.Icon>
+            <Fragment set:html={icon} />
+          </Dropdown.Icon>
+          <Dropdown.MenuItemText>{label}</Dropdown.MenuItemText>
+          <Dropdown.MenuItemTemplate>
+            <span class="stl-dropdown-icon">
+              <Fragment set:html={icon} />
+            </span>
+          </Dropdown.MenuItemTemplate>
+        </Dropdown.MenuItem>
+      ))
+    }
+  </Dropdown.Menu>
+</Dropdown>
 
-{/* Inlined to avoid FOUC. Uses global scope from `ThemeProvider.astro` */}
+{/* Inlined to avoid FOUC. All theme selects are initialized here */}
 <script is:inline>
-  document.addEventListener('astro:page-load', () => {
-    StarlightThemeProvider.updatePickers();
-  });
-  StarlightThemeProvider.updatePickers();
+  window.didInitThemePickers = window.didInitThemePickers ?? false;
+
+  // Only run once.
+  if (!window.didInitThemePickers) {
+    window.didInitThemePickers = true;
+
+    // The stored theme will be either 'auto', 'light', 'dark' or null.
+    const storedTheme = typeof localStorage !== 'undefined' && localStorage.getItem('starlight-theme');
+
+    // This theme is either 'light' or 'dark'. It's used for setting the data-theme attribute.
+    const theme =
+      !storedTheme || storedTheme === 'auto'
+        ? window.matchMedia('(prefers-color-scheme: light)').matches
+          ? 'light'
+          : 'dark'
+        : storedTheme;
+
+    document.documentElement.dataset.theme = theme === 'light' ? 'light' : 'dark';
+
+    const themeSelects = document.querySelectorAll('[data-theme-select]');
+    const selectedThemeValue = storedTheme || 'auto';
+
+    themeSelects.forEach((select) => {
+      const tmpl = select.querySelector(`[data-value="${selectedThemeValue}"] template`);
+      const selectedSlot = select.querySelector('[data-part="trigger-selected"]');
+
+      selectedSlot.innerHTML = '';
+      if (tmpl) {
+        selectedSlot.appendChild(tmpl.content.cloneNode(true));
+        return;
+      }
+    });
+  }
 </script>
 
 <script>
   import { getPageLoadEvent } from '../../plugin/helpers/getPageLoadEvent';
+  import { initDropdown } from '@stainless-api/docs/components/scripts';
 
   const storageKey = 'starlight-theme';
 
@@ -100,82 +130,25 @@ const options = [
   const loadTheme = (): Theme => parseTheme(localStorage.getItem(storageKey));
 
   const storeTheme = (theme: Theme) => {
-    localStorage.setItem(storageKey, theme === 'light' || theme === 'dark' ? theme : '');
+    localStorage.setItem(storageKey, parseTheme(theme));
   };
 
   const getPreferredColorScheme = (): Theme =>
     window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark';
 
-  const highlightSelected = (doc: Document, theme: Theme) => {
-    doc.querySelectorAll('.theme-select-container.stldocs-dropdown').forEach((container) => {
-      const icons = container.querySelectorAll('.stl-dropdown-icon svg');
-      icons.forEach((icon, index) => {
-        const themeForIcon = ['auto', 'light', 'dark'][index];
-        icon.classList.toggle('selected', theme === themeForIcon);
-      });
-
-      container.querySelectorAll('.stldocs-dropdown-item').forEach((option) => {
-        const label = option.querySelector('.stl-dropdown-label')?.textContent?.toLowerCase();
-        option.classList.toggle('selected', label === theme);
-      });
-
-      const menu = container.querySelector('.stldocs-dropdown-menu');
-      menu?.classList.remove('open');
-    });
-  };
-
   const applyTheme = (doc: Document, theme: Theme) => {
     const effective = theme === 'auto' ? getPreferredColorScheme() : theme;
     doc.documentElement.dataset.theme = effective;
     storeTheme(theme);
-    StarlightThemeProvider?.updatePickers?.(theme);
-    highlightSelected(doc, theme);
   };
 
   function setupThemeMode(doc: Document) {
-    // Attach to all instances of .theme-select-container.stldocs-dropdown. We need this because
-    // the theme component is used in the mobile dropdown and the desktop sidebar.
-    doc.querySelectorAll('.theme-select-container.stldocs-dropdown').forEach((container) => {
-      const trigger = container.querySelector('.stldocs-dropdown-trigger');
-      const menu = container.querySelector('.stldocs-dropdown-menu');
-
-      if (trigger && menu) {
-        trigger.addEventListener('click', (e) => {
-          e.stopPropagation();
-
-          doc.querySelectorAll('.theme-select-container .stldocs-dropdown-menu.open').forEach((otherMenu) => {
-            if (otherMenu !== menu) otherMenu.classList.remove('open');
-          });
-
-          menu.classList.toggle('open');
-        });
-
-        container.querySelectorAll('.stldocs-dropdown-item').forEach((option) => {
-          option.addEventListener('click', () => {
-            const label = option.querySelector('.stl-dropdown-label')?.textContent?.toLowerCase() ?? '';
-            if (['auto', 'light', 'dark'].includes(label)) {
-              applyTheme(doc, label as Theme);
-            }
-          });
-        });
-      }
-    });
-
-    // Close dropdown if you click outside
-    doc.addEventListener('click', (e) => {
-      doc.querySelectorAll('.theme-select-container .stldocs-dropdown-menu.open').forEach((menu) => {
-        if (e.target instanceof HTMLElement && !menu.contains(e.target)) {
-          menu.classList.remove('open');
-        }
-      });
-    });
-
-    // React to system preference changes
     matchMedia('(prefers-color-scheme: light)').addEventListener('change', () => {
       if (loadTheme() === 'auto') applyTheme(doc, 'auto');
     });
 
     applyTheme(doc, loadTheme());
+    return loadTheme();
   }
 
   document.addEventListener('astro:before-swap', (event) => {
@@ -183,16 +156,19 @@ const options = [
   });
 
   document.addEventListener(getPageLoadEvent(), () => {
-    setupThemeMode(document);
+    const initialTheme = setupThemeMode(document);
+    const themeSelects = document.querySelectorAll<HTMLElement>('[data-theme-select]');
+    themeSelects.forEach((select) => {
+      initDropdown({
+        root: select,
+        onSelect: (value: string) => applyTheme(document, value as Theme),
+        initialValue: initialTheme as string,
+      });
+    });
   });
 </script>
 
 <style is:global>
-  .theme-select-root {
-    background-color: unset;
-    display: flex;
-    align-items: center;
-  }
   .stl-dropdown-icon svg {
     width: 16px;
     height: 16px;
@@ -202,14 +178,6 @@ const options = [
     }
   }
 
-  .stldocs-dropdown-trigger .stl-dropdown-icon svg {
-    display: none;
-
-    &.selected {
-      display: flex;
-    }
-  }
-  .stldocs-root .stl-dropdown-icon,
   .stl-dropdown-icon {
     display: flex;
     align-items: center;
@@ -218,9 +186,7 @@ const options = [
     height: 16px;
   }
 
-  .stldocs-root span.stl-dropdown-icon,
-  span.stl-dropdown-icon,
-  span.stl-dropdown-chevron {
+  span.stl-dropdown-icon {
     padding-left: 0;
     padding-right: 0%;
   }

package/stl-docs/components/index.ts

@@ -1,2 +1 @@
 export * from '@stainless-api/ui-primitives';
-export * from '@stainless-api/ui-primitives/scripts';

package/stl-docs/components/nav-tabs/NavDropdown.astro

@@ -1,77 +1,48 @@
 ---
-import {
-  Dropdown,
-  DropdownTrigger,
-  DropdownMenu,
-  DropdownItem,
-} from '@stainless-api/docs-ui/src/components/dropdown';
-import { Icon } from '@astrojs/starlight/components';
+import { Dropdown } from '@stainless-api/docs/components';
 import { buildNavLinks } from './buildNavLinks';
-
-export interface Props {
-  useHamburgerIcon?: boolean;
-}
-
-const { useHamburgerIcon = false } = Astro.props as Props;
-const BUTTON_ID = 'nav-dropdown-button';
+import { ChevronsUpDownIcon } from 'lucide-react';
 
 const navLinks = buildNavLinks(Astro.locals.starlightRoute);
 
 const buttonText = (navLinks.find((item) => item.active) ?? navLinks[0]!).label;
 ---
 
-<div class="stldocs-root nav-dropdown-root">
-  <Dropdown id="nav-dropdown">
-    <DropdownTrigger
-      className={`dropdown-toggle stldocs-button-tertiary nav-dropdown-button`}
-      type="button"
-      id={BUTTON_ID}
-      aria-expanded="false"
-      withChevron={!useHamburgerIcon}
-      isIcon
-    >
-      {useHamburgerIcon ? <Icon name="bars" size="16px" /> : buttonText}
-    </DropdownTrigger>
-    <DropdownMenu className="dropdown-menu" position="below" aria-labelledby={BUTTON_ID}>
-      {
-        navLinks.map((item) => (
-          <DropdownItem key={item.link} href={item.link} className="dropdown-item">
-            {item.label}
-          </DropdownItem>
-        ))
-      }
-    </DropdownMenu>
-  </Dropdown>
-</div>
+<Dropdown id="nav-dropdown" className="nav-dropdown-root">
+  <Dropdown.Trigger>
+    <Dropdown.TriggerSelectedItem>{buttonText}</Dropdown.TriggerSelectedItem>
+    <Dropdown.TriggerIcon>
+      <ChevronsUpDownIcon size={16} />
+    </Dropdown.TriggerIcon>
+  </Dropdown.Trigger>
+  <Dropdown.Menu className="dropdown-menu">
+    {
+      navLinks.map((item) => (
+        <Dropdown.MenuItem
+          key={item.link}
+          href={item.link}
+          className="dropdown-item"
+          value={item.label}
+          isSelected={item.label === buttonText}
+        >
+          {item.label}
+          <Dropdown.MenuItemTemplate>{item.label}</Dropdown.MenuItemTemplate>
+        </Dropdown.MenuItem>
+      ))
+    }
+  </Dropdown.Menu>
+</Dropdown>
 
 <script>
-  import { initDropdown } from '@stainless-api/docs-ui/src/components/scripts/dropdown';
+  import { initDropdown } from '@stainless-api/docs/components/scripts';
   import { getPageLoadEvent } from '../../../plugin/helpers/getPageLoadEvent';
 
   document.addEventListener(getPageLoadEvent(), () => {
     initDropdown({
-      dropdownId: 'nav-dropdown',
-      isFixed: true,
+      root: document.getElementById('nav-dropdown'),
     });
   });
 </script>
-<style is:global>
-  .nav-dropdown-root .dropdown-menu.stldocs-dropdown-menu {
-    display: none;
-    position: fixed;
-    z-index: 1000;
-    width: 200px;
-    margin: 0.125rem 0 0;
-    font-size: 1rem;
-    text-align: left;
-    list-style: none;
-    background-clip: padding-box;
-  }
-
-  .nav-dropdown-root .dropdown-menu.open {
-    display: block;
-  }
-</style>
 
 <style>
   :root {
@@ -98,9 +69,4 @@ const buttonText = (navLinks.find((item) => item.active) ?? navLinks[0]!).label;
   .nav-dropdown-root {
     background-color: var(--sl-color-bg-nav);
   }
-
-  .nav-dropdown-button {
-    color: var(--sl-color-text);
-    font-weight: 500;
-  }
 </style>

package/stl-docs/components/nav-tabs/NavTabs.astro

@@ -7,80 +7,98 @@ import clsx from 'clsx';
 const navLinks = buildNavLinks(Astro.locals.starlightRoute);
 ---
 
-<div id="nav-links-container">
-  <ul class="nav-links" id="nav-links-list">
-    <li class="mobile-menu-item" data-mobile-only>
-      <NavDropdown />
-    </li>
-    {
-      navLinks.map((item) => (
-        <li data-desktop-only>
-          <Button
-            href={item.link}
-            className={clsx('nav-link')}
-            variant={item.active ? 'accent-muted' : 'ghost'}
-          >
-            <span>{item.label}</span>
-          </Button>
-        </li>
-      ))
-    }
-  </ul>
-  <!-- The test container is used to measure the width of the nav links and see if they fit -->
-  <!-- TODO: probably want to clean this up bc it's duplicated code -->
-  <ul class="nav-links" id="nav-links-test-container">
-    {
-      navLinks.map((item) => (
-        <li>
-          <Button href={item.link} className={clsx('nav-link')} variant={item.active ? 'accent' : 'ghost'}>
-            <span>{item.label}</span>
-          </Button>
-        </li>
-      ))
-    }
-  </ul>
+<div id="nav-links-container" class="nav-links-container">
+  <div class="desktop-nav-links-container">
+    <ul class="nav-links" id="nav-links-list">
+      {
+        navLinks.map((item) => (
+          <li data-desktop-only>
+            <Button
+              href={item.link}
+              className={clsx('nav-link')}
+              variant={item.active ? 'accent-muted' : 'ghost'}
+            >
+              <span>{item.label}</span>
+            </Button>
+          </li>
+        ))
+      }
+    </ul>
+  </div>
+  <div class="mobile-nav-dropdown" data-mobile-only>
+    <NavDropdown />
+  </div>
 </div>
 
 <script>
   import { getPageLoadEvent } from '../../../plugin/helpers/getPageLoadEvent';
 
-  function getRequiredWidth() {
-    const navLinksTestContainer = document.getElementById('nav-links-test-container');
-    if (!navLinksTestContainer) return 1000000; // fallback to a large number
+  // We need to measure the nav links to see if they fit. We create an offscreen hidden clone for measurement.
+  function createOffscreenClone(element: HTMLElement): HTMLElement {
+    const clone = element.cloneNode(true) as HTMLElement;
+    clone.removeAttribute('id');
+    clone.id = 'cloned-nav-links-measurement';
+    clone.style.position = 'absolute';
+    clone.style.visibility = 'hidden';
+    clone.style.top = '0';
+    clone.style.left = '0';
+    clone.style.width = 'auto';
+    clone.style.whiteSpace = 'nowrap';
+    clone.style.pointerEvents = 'none';
+    clone.style.zIndex = '-9999';
+
+    clone.querySelectorAll('[data-desktop-only], [data-mobile-only]').forEach((el) => {
+      el.removeAttribute('data-desktop-only');
+    });
 
-    const rw = navLinksTestContainer.scrollWidth;
-    navLinksTestContainer.remove();
-    return rw;
+    document.body.appendChild(clone);
+    return clone;
   }
 
   function initNavbar() {
-    const masterContainer = document.getElementById('nav-links-container');
-    if (!masterContainer) return;
+    const navLinksContainer = document.getElementById('nav-links-container');
+    if (!navLinksContainer) {
+      console.error(`NavTabs: #nav-links-container not found`);
+      return;
+    }
+
+    const navLinksList = document.getElementById('nav-links-list');
+    if (!navLinksList) {
+      console.error(`NavTabs: #nav-links-list not found`);
+      return;
+    }
 
-    const navLinksContainer = document.getElementById('nav-links-list');
-    if (!navLinksContainer) return;
+    const measurementClone = createOffscreenClone(navLinksList);
+    const requiredWidth = measurementClone.clientWidth;
 
-    const requiredWidth = getRequiredWidth();
+    let currentMode: 'desktop' | 'mobile' | null = null;
 
     function checkIfFits() {
-      if (!masterContainer) return;
       if (!navLinksContainer) return;
-      const availableWidth = masterContainer.clientWidth;
-      const canFit = availableWidth >= requiredWidth;
+
+      // 16px buffer helps it feel less crowded before switching modes
+      const bufferSpace = 16;
+      const availableWidth = navLinksContainer.clientWidth;
+      const canFit = availableWidth - bufferSpace >= requiredWidth;
 
       const mode = canFit ? 'desktop' : 'mobile';
 
-      localStorage.setItem('stl-nav-links-mode', mode);
+      // Only update if mode actually changed
+      if (mode === currentMode) return;
 
-      document.documentElement.classList.remove('stl-nav-links-mode-desktop');
-      document.documentElement.classList.remove('stl-nav-links-mode-mobile');
+      currentMode = mode;
 
+      localStorage.setItem('stl-nav-links-mode', mode);
+
+      document.documentElement.classList.remove('stl-nav-links-mode-desktop', 'stl-nav-links-mode-mobile');
       document.documentElement.classList.add('stl-nav-links-mode-' + mode);
     }
 
-    window.addEventListener('resize', () => {
+    const resizeObserver = new ResizeObserver(() => {
       checkIfFits();
     });
+
+    resizeObserver.observe(navLinksContainer);
     checkIfFits();
   }
 
@@ -109,18 +127,17 @@ const navLinks = buildNavLinks(Astro.locals.starlightRoute);
 </style>
 
 <style>
-  /* :root {
-    --menu-font-size: calc(var(--sl-text-body));
-  } */
+  .nav-links-container {
+    flex-grow: 1;
+    margin-left: 1rem;
+    margin-right: 1rem;
+  }
 
-  #nav-links-container {
-    visibility: hidden;
+  .desktop-nav-links-container {
     display: flex;
     flex-grow: 1;
     justify-content: flex-start;
     overflow: hidden;
-    margin-left: 1rem;
-    margin-right: 1rem;
   }
 
   .nav-links {
@@ -133,13 +150,6 @@ const navLinks = buildNavLinks(Astro.locals.starlightRoute);
     overflow: hidden;
   }
 
-  #nav-links-test-container {
-    position: absolute;
-    top: 0;
-    left: 0;
-    visibility: hidden;
-  }
-
   .nav-links li {
     display: flex;
     align-items: center;
@@ -156,8 +166,12 @@ const navLinks = buildNavLinks(Astro.locals.starlightRoute);
     }
   }
 
+  .mobile-nav-dropdown {
+    flex-grow: 1;
+  }
+
   @media (min-width: 50rem) {
-    #nav-links-container {
+    .desktop-nav-links-container {
       display: flex;
       visibility: visible;
     }

package/stl-docs/components/scripts.ts

@@ -0,0 +1 @@
+export * from '@stainless-api/ui-primitives/scripts';

package/styles/overrides.css

@@ -17,8 +17,7 @@ starlight-theme-select select {
   overflow: hidden;
 }
 
-.custom-select-wrapper select,
-.stldocs-button-secondary {
+.custom-select-wrapper select {
   background-color: var(--sl-color-bg-ui);
   border: 1px solid var(--sl-color-hairline);
   border-radius: var(--sl-button-border-radius);

package/styles/page.css

@@ -23,6 +23,8 @@
 
   .mobile-preferences {
     margin-top: 1rem;
+    display: flex;
+    justify-content: flex-end;
   }
 }
 

package/styles/sdk_select.css

@@ -1,9 +1,12 @@
-.stldocs-root {
-  .stldocs-dropdown-menu.stl-sdk-select-dropdown-menu {
-    min-width: 200px;
-  }
-}
 .stl-sdk-select {
+  .stl-ui-dropdown {
+    width: 100%;
+
+    .stl-ui-dropdown__button {
+      width: 100%;
+      justify-content: space-between;
+    }
+  }
   .stldocs-icon.http path {
     fill: var(--stldocs-color-text);
   }

package/styles/search.css

@@ -22,6 +22,7 @@ site-search {
 
     &:hover {
       border-color: var(--sl-color-hairline-shade);
+      background: color-mix(in oklch, var(--stl-ui-foreground) 5%, var(--stl-ui-inverse-foreground));
     }
 
     span {
@@ -36,10 +37,6 @@ site-search {
       width: var(--sl-text-sm);
       height: var(--sl-text-sm);
     }
-
-    &.stldocs-button {
-      padding: 0;
-    }
   }
 
   button > kbd {
@@ -67,11 +64,6 @@ site-search {
       max-width: 30rem;
       justify-content: start;
 
-      &.stldocs-button {
-        padding-inline-start: var(--sl-button-padding-x);
-        padding-inline-end: var(--sl-button-padding-x);
-      }
-
       > :last-child {
         margin-inline-start: auto;
       }

package/styles/sidebar.css

@@ -63,11 +63,7 @@
       color: var(--stl-ui-foreground);
     }
   }
-  .stl-sdk-select .stldocs-dropdown-trigger {
-    /* dropdown should match link padding, accounting for 1px border */
-    padding: calc(var(--stl-sidebar-item-padding-block) - 1px)
-      calc(var(--stl-sidebar-item-padding-inline) - 1px);
-  }
+
   li a {
     color: var(--stl-ui-foreground-secondary);
     font-weight: 400;
@@ -217,10 +213,6 @@
   position: relative;
 }
 
-.stl-sdk-select .dropdown-toggle {
-  width: 100%;
-}
-
 .stl-sidebar-header-links {
   display: flex;
   gap: 1rem;