fix(a11y): inconsistent focus states

.changeset/focus-accessibility-sync.md

@@ -0,0 +1,13 @@
+---
+"@cloudflare/kumo": patch
+"@cloudflare/kumo-docs-astro": patch
+---
+
+Improved focus and keyboard accessibility styles across Kumo components and docs navigation.
+
+- Added the `kumo-focus` semantic token to the theme generator config and generated `theme-kumo.css` output.
+- Updated focus ring behavior across interactive components (including `Button`, `Input`, `InputGroup`, `Select`, `Checkbox`, `Radio`, `Switch`, `Sidebar`, `Tabs`, `Menubar`, and related controls) for more consistent and visible keyboard focus visibility.
+- Text-entry controls use a lighter opacity `kumo-focus` ring to keep pointer and keyboard focus visually consistent where browsers apply `:focus-visible` heuristics to typed-input controls.
+- Refined `Select` and `Input` styling/state combinations to align focus visuals with current semantic token usage.
+- Updated docs `SidebarNav` keyboard-focus affordances (links, section toggles, search trigger) and adjusted collapsible list overflow so focus rings remain visible.
+- Replace raw colors in `Select` with kumo semantic tokens.

packages/kumo-docs-astro/src/components/SidebarNav.tsx

@@ -102,7 +102,7 @@ declare const __BUILD_COMMIT__: string;
 declare const __BUILD_DATE__: string;
 
 const LI_STYLE =
-  "block rounded-lg text-kumo-strong hover:text-kumo-default hover:bg-kumo-tint p-2 my-[.05rem] cursor-pointer transition-colors no-underline relative z-10";
+  "block rounded-lg text-kumo-strong hover:text-kumo-default hover:bg-kumo-tint p-2 my-[.05rem] cursor-pointer transition-colors no-underline relative z-10 focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-kumo-brand";
 const LI_ACTIVE_STYLE = "font-semibold text-kumo-default bg-kumo-tint";
 
 interface SidebarNavProps {
@@ -126,6 +126,9 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
 
   const toggleSidebar = () => setSidebarOpen((v) => !v);
   const toggleMobileMenu = () => setMobileMenuOpen((v) => !v);
+  const preventPointerFocus = (e: React.MouseEvent<HTMLElement>) => {
+    e.preventDefault();
+  };
 
   // Keyboard shortcut: Cmd+K / Ctrl+K + custom event from headers
   useEffect(() => {
@@ -194,7 +197,7 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
     <>
       <button
         onClick={() => setSearchOpen(true)}
-        className="mb-3 flex w-full items-center gap-2 rounded-lg bg-kumo-control px-3 py-2 text-sm text-kumo-subtle ring-1 ring-kumo-hairline transition-all hover:ring-kumo-hairline"
+        className="mb-3 flex w-full items-center gap-2 rounded-lg bg-kumo-control px-3 py-2 text-sm text-kumo-subtle ring-1 ring-kumo-line transition-all hover:ring-kumo-hairline focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-kumo-brand"
       >
         <MagnifyingGlassIcon size={16} className="shrink-0" />
         <span>Search...</span>
@@ -205,6 +208,7 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
           <li key={item.href}>
             <a
               href={item.href}
+              onMouseDown={preventPointerFocus}
               className={cn(
                 LI_STYLE,
                 isActivePath(activePath, item.href) && LI_ACTIVE_STYLE,
@@ -222,7 +226,7 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
         {/* Components Section */}
         <button
           type="button"
-          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint"
+          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-kumo-brand"
           onClick={() => setComponentsOpen(!componentsOpen)}
         >
           <span>Components</span>
@@ -236,14 +240,15 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
         </button>
         <ul
           className={cn(
-            "flex flex-col gap-px overflow-hidden transition-all duration-300 ease-in-out mt-1",
+            "mt-1 flex flex-col gap-px overflow-y-hidden overflow-x-visible transition-all duration-300 ease-in-out",
             componentsOpen ? "max-h-[2000px] opacity-100" : "max-h-0 opacity-0",
           )}
         >
           {componentItems.map((item) => (
             <li key={item.href}>
               <a
                 href={item.href}
+                onMouseDown={preventPointerFocus}
                 className={cn(
                   LI_STYLE,
                   "pl-4",
@@ -261,7 +266,7 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
       <div className="mb-4">
         <button
           type="button"
-          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint"
+          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-kumo-brand"
           onClick={() => setChartsOpen(!chartsOpen)}
         >
           <span>Charts</span>
@@ -275,14 +280,15 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
         </button>
         <ul
           className={cn(
-            "flex flex-col gap-px overflow-hidden transition-all duration-300 ease-in-out mt-1",
+            "mt-1 flex flex-col gap-px overflow-y-hidden overflow-x-visible transition-all duration-300 ease-in-out",
             chartsOpen ? "max-h-[500px] opacity-100" : "max-h-0 opacity-0",
           )}
         >
           {chartItems.map((item) => (
             <li key={item.href}>
               <a
                 href={item.href}
+                onMouseDown={preventPointerFocus}
                 className={cn(
                   LI_STYLE,
                   "pl-4",
@@ -300,7 +306,7 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
         {/* Blocks Section */}
         <button
           type="button"
-          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint"
+          className="flex w-full cursor-pointer items-center justify-between rounded-lg px-2 py-2 text-sm font-medium text-kumo-default transition-colors hover:bg-kumo-tint focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-kumo-brand"
           onClick={() => setBlocksOpen(!blocksOpen)}
         >
           <span>Blocks</span>
@@ -314,14 +320,15 @@ export function SidebarNav({ currentPath }: SidebarNavProps) {
         </button>
         <ul
           className={cn(
-            "flex flex-col gap-px overflow-hidden transition-all duration-300 ease-in-out mt-1",
+            "mt-1 flex flex-col gap-px overflow-y-hidden overflow-x-visible transition-all duration-300 ease-in-out",
             blocksOpen ? "max-h-[500px] opacity-100" : "max-h-0 opacity-0",
           )}
         >
           {blockItems.map((item) => (
             <li key={item.href}>
               <a
                 href={item.href}
+                onMouseDown={preventPointerFocus}
                 className={cn(
                   LI_STYLE,
                   "pl-4",

packages/kumo/scripts/theme-generator/config.ts

@@ -330,6 +330,16 @@ export const THEME_CONFIG: ThemeConfig = {
         },
       },
     },
+    "kumo-focus": {
+      newName: "",
+      description: "Primary focus ring/border color",
+      theme: {
+        kumo: {
+          light: "var(--color-kumo-neutral-950, oklch(15% 0 0))",
+          dark: "var(--color-kumo-neutral-150, oklch(93.5% 0 0))",
+        },
+      },
+    },
     "kumo-shadow-edge": {
       newName: "",
       description: "Tight spread shadow color for control thumbs/knobs",

packages/kumo/src/components/button/button.tsx

@@ -48,7 +48,7 @@ export const KUMO_BUTTON_VARIANTS = {
   variant: {
     primary: {
       classes:
-        "bg-kumo-brand !text-white hover:bg-kumo-brand-hover focus:bg-kumo-brand-hover disabled:bg-kumo-brand/50",
+        "bg-kumo-brand !text-white hover:bg-kumo-brand-hover disabled:bg-kumo-brand/50",
       description: "High-emphasis button for primary actions",
     },
     secondary: {
@@ -130,6 +130,7 @@ export function buttonVariants({
     // Base styles
     "group flex w-max shrink-0 items-center font-medium select-none",
     "border-0 shadow-xs",
+    "focus:outline-none focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand",
     "cursor-pointer",
     // Disabled state
     "disabled:cursor-not-allowed disabled:text-kumo-subtle",
@@ -244,7 +245,6 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
         ref={ref}
         className={cn(
           buttonVariants({ variant, size, shape }),
-          "focus:opacity-100 focus-visible:ring-1 focus-visible:ring-kumo-hairline *:in-focus:opacity-100", // Focus styles
           disabled && "cursor-not-allowed opacity-50",
           className,
         )}

packages/kumo/src/components/checkbox/checkbox.tsx

@@ -15,7 +15,7 @@ export const KUMO_CHECKBOX_VARIANTS = {
   variant: {
     default: {
       classes:
-        "[&:focus-within>span]:ring-kumo-hairline [&:hover>span]:ring-kumo-hairline",
+        "[&:focus-within>span]:ring-kumo-focus [&:hover>span]:ring-kumo-hairline",
       description: "Default checkbox appearance",
     },
     error: {
@@ -285,9 +285,10 @@ const CheckboxBase = forwardRef<HTMLButtonElement, CheckboxProps>(
         disabled={disabled}
         onCheckedChange={handleCheckedChange}
         className={cn(
-          "relative flex h-4 w-4 items-center justify-center rounded-sm border-0 bg-kumo-base ring after:absolute after:-inset-x-3 after:-inset-y-2",
+          "relative flex h-4 w-4 items-center justify-center rounded-sm border-0 bg-kumo-base ring focus:outline-none after:absolute after:-inset-x-3 after:-inset-y-2",
           variant === "error" ? "ring-kumo-danger" : "ring-kumo-hairline",
           !disabled &&
+            "hover:ring-kumo-hairline focus:ring-kumo-focus focus:ring-2 focus-visible:ring-2 focus-visible:ring-kumo-brand",
             "hover:ring-kumo-hairline focus-visible:ring-kumo-hairline",
           "data-[checked]:bg-kumo-contrast data-[checked]:ring-kumo-contrast data-[indeterminate]:bg-kumo-contrast data-[indeterminate]:ring-kumo-contrast",
           disabled && "cursor-not-allowed opacity-50",
@@ -391,7 +392,7 @@ const CheckboxItem = forwardRef<HTMLButtonElement, CheckboxItemProps>(
             "peer relative flex h-4 w-4 items-center justify-center rounded-sm border-0 bg-kumo-base ring after:absolute after:-inset-x-3 after:-inset-y-2",
             variant === "error" ? "ring-kumo-danger" : "ring-kumo-hairline",
             !disabled &&
-              "group-hover:ring-kumo-hairline hover:ring-kumo-hairline focus-visible:ring-kumo-hairline",
+              "group-hover:ring-kumo-hairline hover:ring-kumo-hairline focus:ring-kumo-focus focus:ring-2 focus-visible:ring-2 focus-visible:ring-kumo-brand",
             "data-[checked]:bg-kumo-contrast data-[checked]:ring-kumo-contrast data-[indeterminate]:bg-kumo-contrast data-[indeterminate]:ring-kumo-contrast",
           )}
         >

packages/kumo/src/components/clipboard-text/clipboard-text.tsx

@@ -249,7 +249,7 @@ export const ClipboardText = forwardRef<HTMLDivElement, ClipboardTextProps>(
         ref={buttonRef}
         size={sizeConfig.buttonSize}
         variant="ghost"
-        className="rounded-none border-l! border-kumo-hairline! px-3 relative overflow-hidden transition-all duration-200"
+        className="rounded-none border-l! border-kumo-line! px-3 relative overflow-hidden transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand"
         onClick={copyToClipboard}
         aria-label={copyAction}
       >

packages/kumo/src/components/collapsible/collapsible.tsx

@@ -14,6 +14,7 @@ export function collapsibleVariants(_props: KumoCollapsibleVariantsProps = {}) {
     "bg-transparent border-none shadow-none p-0 m-0",
     // Base styles for the trigger
     "flex cursor-pointer items-center gap-1 text-sm text-kumo-link select-none",
+    "focus:outline-none focus-visible:ring-2 focus-visible:ring-kumo-brand rounded-sm",
   );
 }
 

packages/kumo/src/components/command-palette/command-palette.tsx

@@ -767,7 +767,7 @@ function PanelInput({
         placeholder={placeholder}
         className={cn(
           "flex-1 border-none bg-transparent text-base kumo-input-placeholder",
-          "outline-none focus-visible:outline-none",
+          "outline-none focus:ring-kumo-focus/50 focus:ring-[1.5px]",
           className,
         )}
         onKeyDown={handleKeyDown}

packages/kumo/src/components/date-range-picker/date-range-picker.tsx

@@ -604,7 +604,7 @@ function DateRangeMonthHeader({
           aria-label="Edit month and year"
           defaultValue={`${month} ${year}`}
           className={cn(
-            "w-full rounded-md border-none bg-transparent py-1.5 text-center font-semibold text-kumo-default transition-all duration-200 focus:outline-none",
+            "w-full rounded-md border-none bg-transparent py-1.5 text-center font-semibold text-kumo-default transition-all duration-200 focus:outline-none focus:ring-kumo-focus/50 focus:ring-[1.5px]",
             sizeConfig.textSize,
           )}
           onBlur={(e) => {

packages/kumo/src/components/dropdown/dropdown.tsx

@@ -65,7 +65,7 @@ const DropdownMenuSubTrigger = React.forwardRef<
     className={cn(
       "flex cursor-default items-center rounded-sm text-base outline-hidden select-none", // base styles
       "px-2 py-1.5", // spacing
-      "focus:bg-kumo-tint", // focus state
+      "focus:bg-kumo-tint focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand", // focus state
       "data-[state=open]:bg-kumo-tint", // open state
       inset && "pl-8", // conditional inset
       className,
@@ -237,7 +237,7 @@ const DropdownMenuItem = React.forwardRef<
       <DropdownMenuPrimitive.Item
         ref={ref}
         className={cn(
-          "relative flex cursor-default items-center rounded-md px-2 py-1.5 text-base outline-hidden select-none focus:text-kumo-default data-disabled:pointer-events-none data-disabled:opacity-50 data-highlighted:bg-kumo-overlay",
+          "relative flex cursor-default items-center rounded-md px-2 py-1.5 text-base outline-hidden select-none focus:text-kumo-default focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand data-disabled:pointer-events-none data-disabled:opacity-50 data-highlighted:bg-kumo-overlay",
           inset && "pl-8",
           dropdownVariants({ variant }),
           className,
@@ -301,7 +301,7 @@ const DropdownMenuLinkItem = React.forwardRef<
         ref={ref}
         className={cn(
           "relative flex cursor-default items-center rounded-md px-2 py-1.5 text-base outline-hidden select-none",
-          "focus:text-kumo-default data-disabled:pointer-events-none data-disabled:opacity-50 data-highlighted:bg-kumo-overlay",
+          "focus:text-kumo-default focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand data-disabled:pointer-events-none data-disabled:opacity-50 data-highlighted:bg-kumo-overlay",
           "text-inherit no-underline",
           inset && "pl-8",
           dropdownVariants({ variant }),
@@ -325,7 +325,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
   <DropdownMenuPrimitive.CheckboxItem
     ref={ref}
     className={cn(
-      "relative flex cursor-default items-center rounded-sm py-1.5 pr-2 pl-8 text-base outline-hidden transition-colors select-none focus:bg-kumo-tint focus:text-kumo-default data-disabled:pointer-events-none data-disabled:opacity-50",
+      "relative flex cursor-default items-center rounded-sm py-1.5 pr-2 pl-8 text-base outline-hidden transition-colors select-none focus:bg-kumo-tint focus:text-kumo-default focus:ring-kumo-focus/50 focus-visible:ring-2 focus-visible:ring-kumo-brand data-disabled:pointer-events-none data-disabled:opacity-50",
       className,
     )}
     checked={checked}

packages/kumo/src/components/input/input.tsx

@@ -29,11 +29,11 @@ export const KUMO_INPUT_VARIANTS = {
   },
   variant: {
     default: {
-      classes: "focus:ring-kumo-hairline",
+      classes: "focus:ring-kumo-focus/50 focus:ring-[1.5px]",
       description: "Default input appearance",
     },
     error: {
-      classes: "!ring-kumo-danger focus:ring-kumo-danger",
+      classes: "!ring-kumo-danger focus:ring-kumo-danger/50 focus:ring-[1.5px]",
       description: "Error state for validation failures",
     },
   },
@@ -106,16 +106,22 @@ export function inputVariants({
 }: KumoInputVariantsProps = {}) {
   return cn(
     // Base styles
-    "border-0 bg-kumo-control text-kumo-default ring ring-kumo-hairline",
+    "border-0 bg-kumo-control text-kumo-default ring ring-kumo-line outline-none focus:outline-none",
     // Disabled state and placeholder styles (using vanilla CSS class for Chrome compatibility)
     "kumo-input-placeholder disabled:text-kumo-subtle",
     // Apply size styles from KUMO_INPUT_VARIANTS
     KUMO_INPUT_VARIANTS.size[size].classes,
     // Apply variant styles from KUMO_INPUT_VARIANTS
     KUMO_INPUT_VARIANTS.variant[variant].classes,
     // Focus state handling
-    parentFocusIndicator && "focus-within:ring-kumo-hairline",
-    focusIndicator && "focus:ring-kumo-hairline",
+    parentFocusIndicator &&
+      (variant === "error"
+        ? "focus-within:ring-kumo-danger/50 focus-within:ring-[1.5px]"
+        : "focus-within:ring-kumo-focus/50 focus-within:ring-[1.5px]"),
+    focusIndicator &&
+      (variant === "error"
+        ? "focus:ring-kumo-danger/50 focus:ring-[1.5px]"
+        : "focus:ring-kumo-focus/50 focus:ring-[1.5px]"),
   );
 }
 

packages/kumo/src/components/menubar/menubar.tsx

@@ -46,10 +46,9 @@ const MenuOption = ({
     <button
       aria-label={tooltip}
       className={cn(
-        "focus:inset-ring-focus relative -ml-px flex h-full w-11 cursor-pointer items-center justify-center rounded-md border-none bg-kumo-elevated first:rounded-l-lg last:rounded-r-lg transition-colors focus:z-1 focus:outline-none focus-visible:z-1 focus-visible:inset-ring-[0.5]",
+        "relative -ml-px flex h-full w-11 cursor-pointer items-center justify-center rounded-md border-none bg-kumo-recessed first:rounded-l-lg last:rounded-r-lg transition-colors focus:z-3 focus:outline-none focus:ring-kumo-focus/50 focus-visible:z-3 focus-visible:ring-2 focus-visible:ring-kumo-brand",
         {
-          "z-2 bg-kumo-base shadow-xs transition-colors ring ring-kumo-line/40":
-            isActive === id,
+          "z-2 bg-kumo-base shadow-xs transition-colors": isActive === id,
         },
       )}
       onClick={onClick}