@dalexto/lexsys-registry 0.1.1 → 0.1.3

package/templates/blocks/Sidebar/Sidebar.tsx

@@ -4,8 +4,21 @@
  * Reference Sidebar block — compound navigation shell with desktop and mobile drawer.
  */
 
-import { createContext, useContext } from "react"
-import { Button } from "@/components/primitives/Button"
+import {
+  Children,
+  createContext,
+  isValidElement,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+  useSyncExternalStore,
+  type KeyboardEvent,
+  type MouseEventHandler,
+  type ReactNode,
+} from "react"
+import { Badge } from "@/components/primitives/Badge/Badge"
+import { Button } from "@/components/primitives/Button/Button"
 import {
   Drawer,
   DrawerBackdrop,
@@ -17,44 +30,265 @@ import {
   DrawerTitle,
   DrawerTrigger,
   DrawerViewport,
-} from "@/components/primitives/Drawer"
+} from "@/components/primitives/Drawer/Drawer"
+import { Collapsible as BaseCollapsible } from "@base-ui/react/collapsible"
+import { ChevronDown } from "lucide-react"
+import {
+  Collapsible,
+  CollapsiblePanel,
+} from "@/components/primitives/Collapsible/Collapsible"
+import { Input } from "@/components/primitives/Input/Input"
+import { Separator } from "@/components/primitives/Separator/Separator"
 import {
   ScrollArea,
   ScrollAreaContent,
   ScrollAreaViewport,
-} from "@/components/primitives/ScrollArea"
+} from "@/components/primitives/ScrollArea/ScrollArea"
+import { isSidebarNavActive } from "./Sidebar.utils.js"
 import type {
+  SidebarCollapseTriggerProps,
   SidebarContentProps,
+  SidebarContextValue,
+  SidebarExpandableProps,
   SidebarFooterProps,
+  SidebarGroupCollapsiblePanelProps,
+  SidebarGroupCollapsibleProps,
+  SidebarGroupCollapsibleTriggerProps,
   SidebarGroupContentProps,
   SidebarGroupLabelProps,
   SidebarGroupProps,
   SidebarHeaderProps,
+  SidebarGroupActionProps,
+  SidebarItemActionProps,
+  SidebarItemAdornmentsProps,
+  SidebarItemTrailingProps,
+  SidebarItemBadgeProps,
   SidebarItemButtonProps,
+  SidebarItemExpandTriggerProps,
+  SidebarItemIconProps,
+  SidebarItemRowProps,
   SidebarItemLinkProps,
   SidebarItemProps,
+  SidebarItemShortcutProps,
+  SidebarInputProps,
+  SidebarSeparatorProps,
+  SidebarItemSkeletonProps,
+  SidebarSubItemButtonProps,
+  SidebarSubItemLinkProps,
+  SidebarSubListProps,
   SidebarListProps,
   SidebarMobileHeaderProps,
   SidebarProps,
+  SidebarProviderProps,
+  SidebarRailProps,
   SidebarTriggerProps,
 } from "./Sidebar.types"
 import {
   sidebarBrandClasses,
+  sidebarCollapsedItemClasses,
+  sidebarCollapsedGroupLabelClasses,
   sidebarDesktopClasses,
   sidebarDrawerFooterClasses,
+  sidebarExpandableClasses,
   sidebarFooterClasses,
+  sidebarGroupActionClasses,
+  sidebarGroupCollapsibleClasses,
+  sidebarGroupCollapsiblePanelClasses,
+  sidebarGroupCollapsibleTriggerClasses,
   sidebarGroupContentClasses,
   sidebarGroupLabelClasses,
   sidebarGroupClasses,
+  sidebarItemActionClasses,
+  sidebarItemBadgeClasses,
+  sidebarItemDisclosureRowClasses,
+  sidebarItemIconClasses,
+  sidebarItemRowClasses,
+  sidebarItemTrailingClasses,
+  sidebarItemShortcutClasses,
+  sidebarNavItemExpandTriggerClasses,
+  sidebarItemBadgeCollapsedClasses,
+  sidebarItemBadgeDotClasses,
+  sidebarItemBadgeLabelClasses,
+  sidebarItemClasses,
+  sidebarItemSkeletonClasses,
+  sidebarItemSkeletonIconClasses,
+  sidebarItemSkeletonLabelClasses,
+  sidebarInputClasses,
+  sidebarSeparatorClasses,
   sidebarMainClasses,
+  sidebarMobileBarClasses,
   sidebarMobileHeaderClasses,
   sidebarNavItemClasses,
+  sidebarNavItemDisclosureLeadClasses,
   sidebarNavListClasses,
   sidebarNavClasses,
+  sidebarSubListClasses,
+  sidebarSubNavItemClasses,
+  sidebarRailClasses,
   sidebarRootClasses,
 } from "./Sidebar.variants"
 import { cn } from "@/lib/utils"
 
+const MD_MEDIA_QUERY = "(min-width: 768px)"
+
+const SIDEBAR_NAV_ITEM_SELECTOR =
+  "a.lex-sidebar__item, button.lex-sidebar__item"
+
+const getSidebarNavItems = (nav: HTMLElement): HTMLElement[] => {
+  return Array.from(
+    nav.querySelectorAll<HTMLElement>(SIDEBAR_NAV_ITEM_SELECTOR),
+  ).filter((item) => {
+    if (item.hasAttribute("disabled")) {
+      return false
+    }
+
+    if (item.getAttribute("aria-disabled") === "true") {
+      return false
+    }
+
+    if (item.closest("[hidden], [aria-hidden='true']")) {
+      return false
+    }
+
+    return true
+  })
+}
+
+const handleSidebarNavKeyDown = (event: KeyboardEvent<HTMLElement>): void => {
+  const { key, currentTarget } = event
+
+  if (!["ArrowDown", "ArrowUp", "Home", "End"].includes(key)) {
+    return
+  }
+
+  const items = getSidebarNavItems(currentTarget)
+
+  if (items.length === 0) {
+    return
+  }
+
+  const activeIndex = items.indexOf(document.activeElement as HTMLElement)
+  let nextIndex = activeIndex
+
+  if (key === "ArrowDown") {
+    nextIndex = activeIndex === -1 ? 0 : (activeIndex + 1) % items.length
+  } else if (key === "ArrowUp") {
+    nextIndex =
+      activeIndex === -1
+        ? items.length - 1
+        : (activeIndex - 1 + items.length) % items.length
+  } else if (key === "Home") {
+    nextIndex = 0
+  } else if (key === "End") {
+    nextIndex = items.length - 1
+  }
+
+  if (nextIndex !== activeIndex || activeIndex === -1) {
+    event.preventDefault()
+    items[nextIndex]?.focus()
+  }
+}
+
+const getSidebarActiveLinkProps = (active?: boolean, disabled?: boolean) => {
+  if (disabled) {
+    return undefined
+  }
+
+  return active ? ({ "aria-current": "page" } as const) : undefined
+}
+
+const SidebarItemDisabledContext = createContext(false)
+
+const useSidebarItemDisabled = () => useContext(SidebarItemDisabledContext)
+
+const resolveSidebarNavItemDisabled = (
+  explicit?: boolean,
+  inherited?: boolean,
+) => explicit ?? inherited ?? false
+
+const getSidebarDisabledAnchorProps = (disabled: boolean) => {
+  if (!disabled) {
+    return {}
+  }
+
+  return {
+    "aria-disabled": true as const,
+    "data-disabled": "",
+    tabIndex: -1,
+  }
+}
+
+const getSidebarDisabledAnchorClickHandler = (
+  disabled: boolean,
+  onClick?: MouseEventHandler<HTMLAnchorElement>,
+): MouseEventHandler<HTMLAnchorElement> | undefined => {
+  if (!disabled) {
+    return onClick
+  }
+
+  return (event) => {
+    event.preventDefault()
+    event.stopPropagation()
+  }
+}
+
+const getDesktopMediaQuery = () => {
+  if (
+    typeof window === "undefined" ||
+    typeof window.matchMedia !== "function"
+  ) {
+    return null
+  }
+
+  return window.matchMedia(MD_MEDIA_QUERY)
+}
+
+const subscribeDesktopMedia = (onStoreChange: () => void) => {
+  const mediaQuery = getDesktopMediaQuery()
+
+  if (!mediaQuery) {
+    return () => undefined
+  }
+
+  mediaQuery.addEventListener("change", onStoreChange)
+  return () => mediaQuery.removeEventListener("change", onStoreChange)
+}
+
+const getIsDesktopSnapshot = () => getDesktopMediaQuery()?.matches ?? true
+
+const getIsDesktopServerSnapshot = () => true
+
+const readPersistedCollapsed = (persistKey: string): boolean => {
+  if (typeof window === "undefined") return false
+  return localStorage.getItem(persistKey) === "true"
+}
+
+const defaultSidebarContext: SidebarContextValue = {
+  open: false,
+  setOpen: () => undefined,
+  collapsed: false,
+  setCollapsed: () => undefined,
+  toggleSidebar: () => undefined,
+  isMobile: false,
+  collapsible: "none",
+  side: "left",
+}
+
+const SidebarContext = createContext<SidebarContextValue | null>(null)
+
+const useSidebarContext = () =>
+  useContext(SidebarContext) ?? defaultSidebarContext
+
+const useSidebar = () => {
+  const context = useContext(SidebarContext)
+
+  if (!context) {
+    throw new Error("useSidebar must be used within SidebarProvider")
+  }
+
+  return context
+}
+
 interface SidebarMobileContextValue {
   closeOnSelect: boolean
 }
@@ -65,16 +299,157 @@ const SidebarMobileContext = createContext<SidebarMobileContextValue>({
 
 const useSidebarMobileContext = () => useContext(SidebarMobileContext)
 
-const Sidebar = ({ ref, className, children, ...props }: SidebarProps) => {
+const SidebarProvider = ({
+  children,
+  defaultOpen = false,
+  open: openProp,
+  onOpenChange,
+  defaultCollapsed = false,
+  collapsed: collapsedProp,
+  onCollapsedChange,
+  collapsible = "none",
+  side = "left",
+  persistKey,
+}: SidebarProviderProps) => {
+  const [uncontrolledOpen, setUncontrolledOpen] = useState(defaultOpen)
+  const [uncontrolledCollapsed, setUncontrolledCollapsed] = useState(() => {
+    if (persistKey) {
+      return readPersistedCollapsed(persistKey)
+    }
+
+    return defaultCollapsed
+  })
+
+  const open = openProp ?? uncontrolledOpen
+  const collapsed = collapsedProp ?? uncontrolledCollapsed
+  const isDesktop = useSyncExternalStore(
+    subscribeDesktopMedia,
+    getIsDesktopSnapshot,
+    getIsDesktopServerSnapshot,
+  )
+  const isMobile = !isDesktop
+
+  const setOpen = useCallback(
+    (nextOpen: boolean) => {
+      if (openProp === undefined) {
+        setUncontrolledOpen(nextOpen)
+      }
+
+      onOpenChange?.(nextOpen)
+    },
+    [onOpenChange, openProp],
+  )
+
+  const setCollapsed = useCallback(
+    (nextCollapsed: boolean) => {
+      if (collapsedProp === undefined) {
+        setUncontrolledCollapsed(nextCollapsed)
+      }
+
+      if (persistKey && typeof window !== "undefined") {
+        localStorage.setItem(persistKey, String(nextCollapsed))
+      }
+
+      onCollapsedChange?.(nextCollapsed)
+    },
+    [collapsedProp, onCollapsedChange, persistKey],
+  )
+
+  const toggleSidebar = useCallback(() => {
+    if (isMobile) {
+      setOpen(!open)
+      return
+    }
+
+    if (collapsible !== "none") {
+      setCollapsed(!collapsed)
+    }
+  }, [collapsed, collapsible, isMobile, open, setCollapsed, setOpen])
+
+  const value = useMemo<SidebarContextValue>(
+    () => ({
+      open,
+      setOpen,
+      collapsed,
+      setCollapsed,
+      toggleSidebar,
+      isMobile,
+      collapsible,
+      side,
+    }),
+    [
+      collapsed,
+      collapsible,
+      isMobile,
+      open,
+      setCollapsed,
+      setOpen,
+      side,
+      toggleSidebar,
+    ],
+  )
+
+  return (
+    <SidebarContext.Provider value={value}>{children}</SidebarContext.Provider>
+  )
+}
+
+SidebarProvider.displayName = "SidebarProvider"
+
+const isSidebarMobileHeaderChild = (child: ReactNode): boolean => {
+  return (
+    isValidElement(child) &&
+    (child.type as { displayName?: string }).displayName ===
+      "SidebarMobileHeader"
+  )
+}
+
+const partitionSidebarChildren = (children: ReactNode) => {
+  const mobileHeader: ReactNode[] = []
+  const rest: ReactNode[] = []
+
+  Children.forEach(children, (child) => {
+    if (isSidebarMobileHeaderChild(child)) {
+      mobileHeader.push(child)
+      return
+    }
+
+    rest.push(child)
+  })
+
+  return { mobileHeader, rest }
+}
+
+const Sidebar = ({
+  ref,
+  className,
+  children,
+  collapsible: collapsibleProp,
+  side: sideProp,
+  ...props
+}: SidebarProps) => {
+  const {
+    open,
+    setOpen,
+    collapsed,
+    collapsible: contextCollapsible,
+    side: contextSide,
+  } = useSidebarContext()
+
+  const collapsible = collapsibleProp ?? contextCollapsible
+  const side = sideProp ?? contextSide
+  const shellOptions = { collapsed, collapsible, side }
+  const { mobileHeader, rest } = partitionSidebarChildren(children)
+
   const sidebarBody = (
     <SidebarMobileContext.Provider value={{ closeOnSelect: false }}>
-      {children}
+      {rest}
     </SidebarMobileContext.Provider>
   )
 
   const drawerBody = (
     <SidebarMobileContext.Provider value={{ closeOnSelect: true }}>
-      {children}
+      {rest}
       <div className={sidebarDrawerFooterClasses()}>
         <DrawerClose render={<Button variant="secondary" size="sm" />}>
           Close
@@ -84,13 +459,32 @@ const Sidebar = ({ ref, className, children, ...props }: SidebarProps) => {
   )
 
   return (
-    <aside ref={ref} className={cn(sidebarRootClasses(), className)} {...props}>
-      <Drawer swipeDirection="left">
-        <div className={sidebarDesktopClasses()}>{sidebarBody}</div>
+    <aside
+      ref={ref}
+      className={cn(sidebarRootClasses(shellOptions), className)}
+      data-collapsed={collapsed ? "true" : "false"}
+      data-collapsible={collapsible}
+      data-side={side}
+      {...props}
+    >
+      <Drawer
+        open={open}
+        onOpenChange={setOpen}
+        swipeDirection={side === "right" ? "right" : "left"}
+      >
+        {mobileHeader.length > 0 ? (
+          <div className={cn(sidebarMobileBarClasses(), "md:hidden")}>
+            {mobileHeader}
+          </div>
+        ) : null}
+        <div className={cn("relative", sidebarDesktopClasses(shellOptions))}>
+          {sidebarBody}
+          {collapsible !== "none" ? <SidebarRail /> : null}
+        </div>
         <DrawerPortal>
           <DrawerBackdrop />
-          <DrawerViewport side="left">
-            <DrawerPopup side="left" size="sm">
+          <DrawerViewport side={side}>
+            <DrawerPopup side={side} size="sm">
               <DrawerClose aria-label="Close navigation" />
               <DrawerContent className={sidebarMainClasses()}>
                 <DrawerTitle className="sr-only">Navigation</DrawerTitle>
@@ -124,10 +518,51 @@ const SidebarHeader = ({
 
 SidebarHeader.displayName = "SidebarHeader"
 
+const SidebarInput = ({
+  ref,
+  className,
+  size = "sm",
+  variant = "ghost",
+  type = "search",
+  ...props
+}: SidebarInputProps) => {
+  return (
+    <Input
+      ref={ref}
+      type={type}
+      size={size}
+      variant={variant}
+      className={cn(sidebarInputClasses(), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarInput.displayName = "SidebarInput"
+
+const SidebarSeparator = ({
+  ref,
+  className,
+  orientation = "horizontal",
+  ...props
+}: SidebarSeparatorProps) => {
+  return (
+    <Separator
+      ref={ref}
+      orientation={orientation}
+      className={cn(sidebarSeparatorClasses(), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarSeparator.displayName = "SidebarSeparator"
+
 const SidebarContent = ({
   ref,
   className,
   children,
+  onKeyDown,
   ...props
 }: SidebarContentProps) => {
   return (
@@ -138,6 +573,10 @@ const SidebarContent = ({
             ref={ref}
             aria-label="Application navigation"
             className={className}
+            onKeyDown={(event) => {
+              handleSidebarNavKeyDown(event)
+              onKeyDown?.(event)
+            }}
             {...props}
           >
             {children}
@@ -173,6 +612,24 @@ const SidebarTrigger = ({
   className,
   ...props
 }: SidebarTriggerProps) => {
+  const { isMobile, collapsible, toggleSidebar } = useSidebarContext()
+
+  if (!isMobile && collapsible !== "none") {
+    return (
+      <Button
+        ref={ref}
+        type="button"
+        variant={variant}
+        size={size}
+        className={className}
+        onClick={toggleSidebar}
+        {...props}
+      >
+        {children}
+      </Button>
+    )
+  }
+
   return (
     <DrawerTrigger
       render={
@@ -192,6 +649,59 @@ const SidebarTrigger = ({
 
 SidebarTrigger.displayName = "SidebarTrigger"
 
+const SidebarCollapseTrigger = ({
+  ref,
+  children = "Toggle sidebar",
+  variant = "ghost",
+  size = "sm",
+  className,
+  ...props
+}: SidebarCollapseTriggerProps) => {
+  const { collapsed, setCollapsed, isMobile, collapsible } = useSidebarContext()
+
+  if (isMobile || collapsible === "none") {
+    return null
+  }
+
+  return (
+    <Button
+      ref={ref}
+      type="button"
+      variant={variant}
+      size={size}
+      className={cn("hidden shrink-0 md:inline-flex", className)}
+      aria-label={collapsed ? "Expand sidebar" : "Collapse sidebar"}
+      onClick={() => setCollapsed(!collapsed)}
+      {...props}
+    >
+      {children}
+    </Button>
+  )
+}
+
+SidebarCollapseTrigger.displayName = "SidebarCollapseTrigger"
+
+const SidebarRail = ({ ref, className, ...props }: SidebarRailProps) => {
+  const { collapsible, toggleSidebar, isMobile, side } = useSidebarContext()
+
+  if (isMobile || collapsible === "none") {
+    return null
+  }
+
+  return (
+    <button
+      ref={ref}
+      type="button"
+      aria-label="Toggle sidebar rail"
+      className={cn(sidebarRailClasses({ side }), className)}
+      onClick={toggleSidebar}
+      {...props}
+    />
+  )
+}
+
+SidebarRail.displayName = "SidebarRail"
+
 const SidebarMobileHeader = ({
   ref,
   className,
@@ -211,6 +721,25 @@ const SidebarMobileHeader = ({
 
 SidebarMobileHeader.displayName = "SidebarMobileHeader"
 
+const SidebarExpandable = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarExpandableProps) => {
+  return (
+    <span
+      ref={ref}
+      className={cn(sidebarExpandableClasses(), className)}
+      {...props}
+    >
+      {children}
+    </span>
+  )
+}
+
+SidebarExpandable.displayName = "SidebarExpandable"
+
 const SidebarGroup = ({
   ref,
   className,
@@ -235,7 +764,11 @@ const SidebarGroupLabel = ({
   return (
     <div
       ref={ref}
-      className={cn(sidebarGroupLabelClasses(), className)}
+      className={cn(
+        sidebarGroupLabelClasses(),
+        sidebarCollapsedGroupLabelClasses(),
+        className,
+      )}
       {...props}
     >
       {children}
@@ -264,6 +797,59 @@ const SidebarGroupContent = ({
 
 SidebarGroupContent.displayName = "SidebarGroupContent"
 
+const SidebarGroupCollapsible = ({
+  ref,
+  className,
+  ...props
+}: SidebarGroupCollapsibleProps) => {
+  return (
+    <Collapsible
+      ref={ref}
+      variant="plain"
+      className={cn(sidebarGroupCollapsibleClasses(), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarGroupCollapsible.displayName = "SidebarGroupCollapsible"
+
+const SidebarGroupCollapsibleTrigger = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarGroupCollapsibleTriggerProps) => {
+  return (
+    <BaseCollapsible.Trigger
+      ref={ref}
+      className={cn(sidebarGroupCollapsibleTriggerClasses(), className)}
+      {...props}
+    >
+      {children}
+      <ChevronDown aria-hidden="true" />
+    </BaseCollapsible.Trigger>
+  )
+}
+
+SidebarGroupCollapsibleTrigger.displayName = "SidebarGroupCollapsibleTrigger"
+
+const SidebarGroupCollapsiblePanel = ({
+  ref,
+  className,
+  ...props
+}: SidebarGroupCollapsiblePanelProps) => {
+  return (
+    <CollapsiblePanel
+      ref={ref}
+      className={cn(sidebarGroupCollapsiblePanelClasses(), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarGroupCollapsiblePanel.displayName = "SidebarGroupCollapsiblePanel"
+
 const SidebarList = ({
   ref,
   className,
@@ -283,12 +869,21 @@ const SidebarItem = ({
   ref,
   className,
   children,
+  disabled = false,
   ...props
 }: SidebarItemProps) => {
   return (
-    <li ref={ref} className={className} {...props}>
-      {children}
-    </li>
+    <SidebarItemDisabledContext.Provider value={disabled}>
+      <li
+        ref={ref}
+        className={cn(sidebarItemClasses(), className)}
+        data-disabled={disabled ? "" : undefined}
+        aria-disabled={disabled || undefined}
+        {...props}
+      >
+        {children}
+      </li>
+    </SidebarItemDisabledContext.Provider>
   )
 }
 
@@ -297,16 +892,34 @@ SidebarItem.displayName = "SidebarItem"
 const SidebarItemLink = ({
   ref,
   active,
+  disabled,
+  chrome = "default",
   className,
   children,
+  onClick,
   ...props
 }: SidebarItemLinkProps) => {
   const { closeOnSelect } = useSidebarMobileContext()
-  const linkClassName = cn(sidebarNavItemClasses(active), className)
+  const inheritedDisabled = useSidebarItemDisabled()
+  const isDisabled = resolveSidebarNavItemDisabled(disabled, inheritedDisabled)
+  const linkClassName = cn(
+    chrome === "disclosureLead"
+      ? sidebarNavItemDisclosureLeadClasses(active, isDisabled)
+      : sidebarNavItemClasses(active, isDisabled),
+    sidebarCollapsedItemClasses(),
+    className,
+  )
+
+  const linkProps = {
+    ...props,
+    ...getSidebarDisabledAnchorProps(isDisabled),
+    ...getSidebarActiveLinkProps(active, isDisabled),
+    onClick: getSidebarDisabledAnchorClickHandler(isDisabled, onClick),
+  }
 
   if (!closeOnSelect) {
     return (
-      <a ref={ref} className={linkClassName} {...props}>
+      <a ref={ref} className={linkClassName} {...linkProps}>
         {children}
       </a>
     )
@@ -315,7 +928,7 @@ const SidebarItemLink = ({
   return (
     <DrawerClose
       appearance="inline"
-      render={<a ref={ref} className={linkClassName} {...props} />}
+      render={<a ref={ref} className={linkClassName} {...linkProps} />}
     >
       {children}
     </DrawerClose>
@@ -327,17 +940,35 @@ SidebarItemLink.displayName = "SidebarItemLink"
 const SidebarItemButton = ({
   ref,
   active,
+  disabled,
   className,
   children,
   type = "button",
   ...props
 }: SidebarItemButtonProps) => {
   const { closeOnSelect } = useSidebarMobileContext()
-  const buttonClassName = cn(sidebarNavItemClasses(active), className)
+  const inheritedDisabled = useSidebarItemDisabled()
+  const isDisabled = resolveSidebarNavItemDisabled(disabled, inheritedDisabled)
+  const buttonClassName = cn(
+    sidebarNavItemClasses(active, isDisabled),
+    sidebarCollapsedItemClasses(),
+    className,
+  )
+  const buttonProps = {
+    ...props,
+    disabled: isDisabled,
+    "data-disabled": isDisabled ? "" : undefined,
+    "aria-disabled": isDisabled || undefined,
+  }
 
   if (!closeOnSelect) {
     return (
-      <button ref={ref} type={type} className={buttonClassName} {...props}>
+      <button
+        ref={ref}
+        type={type}
+        className={buttonClassName}
+        {...buttonProps}
+      >
         {children}
       </button>
     )
@@ -347,7 +978,12 @@ const SidebarItemButton = ({
     <DrawerClose
       appearance="inline"
       render={
-        <button ref={ref} type={type} className={buttonClassName} {...props} />
+        <button
+          ref={ref}
+          type={type}
+          className={buttonClassName}
+          {...buttonProps}
+        />
       }
     >
       {children}
@@ -357,18 +993,408 @@ const SidebarItemButton = ({
 
 SidebarItemButton.displayName = "SidebarItemButton"
 
+const SidebarItemSkeleton = ({
+  ref,
+  className,
+  showIcon = true,
+  indent = false,
+  ...props
+}: SidebarItemSkeletonProps) => {
+  return (
+    <div
+      ref={ref}
+      aria-hidden
+      className={cn(sidebarItemSkeletonClasses(indent), className)}
+      {...props}
+    >
+      {showIcon ? <span className={sidebarItemSkeletonIconClasses()} /> : null}
+      <span className={sidebarItemSkeletonLabelClasses()} />
+    </div>
+  )
+}
+
+SidebarItemSkeleton.displayName = "SidebarItemSkeleton"
+
+const getSidebarItemBadgeLabel = (children: ReactNode): string | undefined => {
+  if (typeof children === "string" || typeof children === "number") {
+    return String(children)
+  }
+
+  return undefined
+}
+
+const SidebarItemBadge = ({
+  ref,
+  variant = "neutral",
+  appearance,
+  size = "sm",
+  dot,
+  className,
+  children,
+  ...props
+}: SidebarItemBadgeProps) => {
+  const badgeLabel = getSidebarItemBadgeLabel(children)
+
+  if (dot) {
+    return (
+      <span
+        ref={ref}
+        role="status"
+        aria-label={badgeLabel}
+        className={cn(
+          sidebarItemBadgeClasses(),
+          sidebarItemBadgeDotClasses(variant),
+          className,
+        )}
+        {...props}
+      />
+    )
+  }
+
+  return (
+    <Badge
+      ref={ref}
+      variant={variant}
+      appearance={appearance}
+      size={size}
+      className={cn(
+        sidebarItemBadgeClasses(),
+        sidebarItemBadgeCollapsedClasses(),
+        className,
+      )}
+      {...props}
+    >
+      <span className={sidebarItemBadgeLabelClasses()}>{children}</span>
+    </Badge>
+  )
+}
+
+SidebarItemBadge.displayName = "SidebarItemBadge"
+
+const SidebarItemIcon = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarItemIconProps) => {
+  return (
+    <span
+      ref={ref}
+      className={cn(sidebarItemIconClasses(), className)}
+      {...props}
+    >
+      {children}
+    </span>
+  )
+}
+
+SidebarItemIcon.displayName = "SidebarItemIcon"
+
+const SidebarItemRow = ({
+  ref,
+  variant = "default",
+  className,
+  children,
+  ...props
+}: SidebarItemRowProps) => {
+  return (
+    <div
+      ref={ref}
+      className={cn(
+        variant === "disclosure"
+          ? sidebarItemDisclosureRowClasses()
+          : sidebarItemRowClasses(),
+        className,
+      )}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+}
+
+SidebarItemRow.displayName = "SidebarItemRow"
+
+const SidebarItemTrailing = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarItemTrailingProps) => {
+  return (
+    <div
+      ref={ref}
+      className={cn(sidebarItemTrailingClasses(), className)}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+}
+
+SidebarItemTrailing.displayName = "SidebarItemTrailing"
+
+/** @deprecated Use `SidebarItemTrailing` inside the item shell. */
+const SidebarItemAdornments = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarItemAdornmentsProps) => {
+  return (
+    <SidebarItemTrailing ref={ref} className={className} {...props}>
+      {children}
+    </SidebarItemTrailing>
+  )
+}
+
+SidebarItemAdornments.displayName = "SidebarItemAdornments"
+
+const SidebarItemExpandTrigger = ({
+  ref,
+  variant = "default",
+  className,
+  open = false,
+  children,
+  type = "button",
+  ...props
+}: SidebarItemExpandTriggerProps) => {
+  return (
+    <button
+      ref={ref}
+      type={type}
+      className={cn(
+        sidebarNavItemExpandTriggerClasses(open, variant),
+        className,
+      )}
+      {...props}
+    >
+      {children ?? <ChevronDown aria-hidden />}
+    </button>
+  )
+}
+
+SidebarItemExpandTrigger.displayName = "SidebarItemExpandTrigger"
+
+const SidebarItemAction = ({
+  ref,
+  showOnHover = true,
+  className,
+  ...props
+}: SidebarItemActionProps) => {
+  return (
+    <Button
+      ref={ref}
+      type="button"
+      variant="ghost"
+      size="xs"
+      className={cn(sidebarItemActionClasses(showOnHover), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarItemAction.displayName = "SidebarItemAction"
+
+const SidebarItemShortcut = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarItemShortcutProps) => {
+  return (
+    <kbd
+      ref={ref}
+      className={cn(sidebarItemShortcutClasses(), className)}
+      {...props}
+    >
+      {children}
+    </kbd>
+  )
+}
+
+SidebarItemShortcut.displayName = "SidebarItemShortcut"
+
+const SidebarGroupAction = ({
+  ref,
+  className,
+  ...props
+}: SidebarGroupActionProps) => {
+  return (
+    <Button
+      ref={ref}
+      type="button"
+      variant="ghost"
+      size="xs"
+      className={cn(sidebarGroupActionClasses(), className)}
+      {...props}
+    />
+  )
+}
+
+SidebarGroupAction.displayName = "SidebarGroupAction"
+
+const SidebarSubList = ({
+  ref,
+  className,
+  children,
+  ...props
+}: SidebarSubListProps) => {
+  return (
+    <ul ref={ref} className={cn(sidebarSubListClasses(), className)} {...props}>
+      {children}
+    </ul>
+  )
+}
+
+SidebarSubList.displayName = "SidebarSubList"
+
+const SidebarSubItemLink = ({
+  ref,
+  active,
+  disabled,
+  className,
+  children,
+  onClick,
+  ...props
+}: SidebarSubItemLinkProps) => {
+  const { closeOnSelect } = useSidebarMobileContext()
+  const inheritedDisabled = useSidebarItemDisabled()
+  const isDisabled = resolveSidebarNavItemDisabled(disabled, inheritedDisabled)
+  const linkClassName = cn(
+    sidebarSubNavItemClasses(active, isDisabled),
+    className,
+  )
+  const linkProps = {
+    ...props,
+    ...getSidebarDisabledAnchorProps(isDisabled),
+    ...getSidebarActiveLinkProps(active, isDisabled),
+    onClick: getSidebarDisabledAnchorClickHandler(isDisabled, onClick),
+  }
+
+  if (!closeOnSelect) {
+    return (
+      <a ref={ref} className={linkClassName} {...linkProps}>
+        {children}
+      </a>
+    )
+  }
+
+  return (
+    <DrawerClose
+      appearance="inline"
+      render={<a ref={ref} className={linkClassName} {...linkProps} />}
+    >
+      {children}
+    </DrawerClose>
+  )
+}
+
+SidebarSubItemLink.displayName = "SidebarSubItemLink"
+
+const SidebarSubItemButton = ({
+  ref,
+  active,
+  disabled,
+  className,
+  children,
+  type = "button",
+  ...props
+}: SidebarSubItemButtonProps) => {
+  const { closeOnSelect } = useSidebarMobileContext()
+  const inheritedDisabled = useSidebarItemDisabled()
+  const isDisabled = resolveSidebarNavItemDisabled(disabled, inheritedDisabled)
+  const buttonClassName = cn(
+    sidebarSubNavItemClasses(active, isDisabled),
+    className,
+  )
+  const buttonProps = {
+    ...props,
+    disabled: isDisabled,
+    "data-disabled": isDisabled ? "" : undefined,
+    "aria-disabled": isDisabled || undefined,
+  }
+
+  if (!closeOnSelect) {
+    return (
+      <button
+        ref={ref}
+        type={type}
+        className={buttonClassName}
+        {...buttonProps}
+      >
+        {children}
+      </button>
+    )
+  }
+
+  return (
+    <DrawerClose
+      appearance="inline"
+      render={
+        <button
+          ref={ref}
+          type={type}
+          className={buttonClassName}
+          {...buttonProps}
+        />
+      }
+    >
+      {children}
+    </DrawerClose>
+  )
+}
+
+SidebarSubItemButton.displayName = "SidebarSubItemButton"
+
 export {
   Sidebar,
+  SidebarProvider,
+  useSidebar,
   SidebarHeader,
+  SidebarInput,
+  SidebarSeparator,
   SidebarContent,
   SidebarFooter,
   SidebarGroup,
   SidebarGroupLabel,
   SidebarGroupContent,
+  SidebarGroupCollapsible,
+  SidebarGroupCollapsibleTrigger,
+  SidebarGroupCollapsiblePanel,
   SidebarList,
   SidebarItem,
   SidebarItemLink,
   SidebarItemButton,
+  SidebarItemSkeleton,
+  SidebarItemBadge,
+  SidebarItemIcon,
+  SidebarItemRow,
+  SidebarItemTrailing,
+  SidebarItemAdornments,
+  SidebarItemExpandTrigger,
+  SidebarItemAction,
+  SidebarItemShortcut,
+  SidebarGroupAction,
+  SidebarSubList,
+  SidebarSubItemLink,
+  SidebarSubItemButton,
   SidebarTrigger,
+  SidebarCollapseTrigger,
+  SidebarRail,
   SidebarMobileHeader,
+  SidebarExpandable,
+  isSidebarNavActive,
 }
+
+export type { SidebarNavActiveOptions } from "./Sidebar.types.js"
+export {
+  sidebarItemRowClasses,
+  sidebarItemDisclosureRowClasses,
+  sidebarItemTrailingClasses,
+  sidebarItemAdornmentsClasses,
+  sidebarMobileBarClasses,
+  sidebarNavItemRowLeadClasses,
+  sidebarNavItemDisclosureLeadClasses,
+  sidebarNavItemExpandTriggerClasses,
+} from "./Sidebar.variants.js"