@nikala-ui/core 0.9.11 → 0.10.0

package/src/registry/components/ui/aspect-ratio.tsx

@@ -0,0 +1,31 @@
+import { splitProps, type Component, type JSX } from "solid-js";
+import { cn } from "@/lib/cn";
+
+export interface AspectRatioProps extends JSX.HTMLAttributes<HTMLDivElement> {
+  ratio?: number;
+  class?: string;
+  children?: JSX.Element;
+}
+
+/**
+ * Nikala UI AspectRatio Component.
+ * Displays content within a specific aspect ratio (e.g. 16/9, 4/3, 1/1) using CSS aspect-ratio.
+ */
+export const AspectRatio: Component<AspectRatioProps> = (props) => {
+  const [local, rest] = splitProps(props, ["ratio", "class", "children", "style"]);
+
+  const computedRatio = () => (local.ratio !== undefined ? local.ratio : 16 / 9);
+
+  return (
+    <div
+      class={cn("relative w-full overflow-hidden", local.class)}
+      style={{
+        "aspect-ratio": `${computedRatio()}`,
+        ...(typeof local.style === "object" ? local.style : {}),
+      }}
+      {...rest}
+    >
+      {local.children}
+    </div>
+  );
+};

package/src/registry/components/ui/button.tsx

@@ -1,6 +1,7 @@
-import { splitProps, type Component, type JSX } from "solid-js";
+import { Show, splitProps, type Component, type JSX } from "solid-js";
 import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@/lib/cn";
+import { Spinner } from "./spinner";
 
 /**
  * Class variance authority configuration for button styling variants and sizes.
@@ -46,6 +47,8 @@ export const buttonVariants = cva(
 export interface ButtonProps
   extends JSX.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
+  /** Shows a loading spinner and prevents repeated clicks while active. */
+  loading?: boolean;
   class?: string;
 }
 
@@ -54,14 +57,26 @@ export interface ButtonProps
  */
 export const Button: Component<ButtonProps> = (props) => {
   // Use splitProps to preserve SolidJS reactivity for destructured props
-  const [local, rest] = splitProps(props, ["variant", "size", "class", "children"]);
+  const [local, rest] = splitProps(props, [
+    "variant",
+    "size",
+    "class",
+    "children",
+    "loading",
+    "disabled",
+  ]);
 
   return (
     <button
       class={cn(buttonVariants({ variant: local.variant, size: local.size }), local.class)}
+      disabled={local.disabled || local.loading}
+      aria-busy={local.loading ? "true" : undefined}
       {...rest}
     >
+      <Show when={local.loading}>
+        <Spinner size="sm" class="text-current" />
+      </Show>
       {local.children}
     </button>
   );
-};
+};

package/src/registry/components/ui/collapsible.tsx

@@ -0,0 +1,73 @@
+import { splitProps, type JSX, type ValidComponent } from "solid-js";
+import * as CollapsiblePrimitive from "@kobalte/core/collapsible";
+import type { PolymorphicProps } from "@kobalte/core/polymorphic";
+import { cn } from "@/lib/cn";
+
+export type CollapsibleRootProps<T extends ValidComponent = "div"> =
+  CollapsiblePrimitive.CollapsibleRootProps<T> & {
+    class?: string;
+  };
+
+/**
+ * Root Collapsible component built on Kobalte primitives.
+ */
+export const Collapsible = <T extends ValidComponent = "div">(
+  props: PolymorphicProps<T, CollapsibleRootProps<T>>
+) => {
+  const [local, rest] = splitProps(props as CollapsibleRootProps, ["class"]);
+  return (
+    <CollapsiblePrimitive.Root
+      class={cn("w-full", local.class)}
+      {...(rest as any)}
+    />
+  );
+};
+
+export type CollapsibleTriggerProps<T extends ValidComponent = "button"> =
+  CollapsiblePrimitive.CollapsibleTriggerProps<T> & {
+    class?: string;
+    children?: JSX.Element;
+  };
+
+/**
+ * Trigger element that toggles the Collapsible open/closed state.
+ */
+export const CollapsibleTrigger = <T extends ValidComponent = "button">(
+  props: PolymorphicProps<T, CollapsibleTriggerProps<T>>
+) => {
+  const [local, rest] = splitProps(props as CollapsibleTriggerProps, ["class", "children"]);
+  return (
+    <CollapsiblePrimitive.Trigger
+      class={cn("flex w-full items-center justify-between cursor-pointer", local.class)}
+      {...rest}
+    >
+      {local.children}
+    </CollapsiblePrimitive.Trigger>
+  );
+};
+
+export type CollapsibleContentProps<T extends ValidComponent = "div"> =
+  CollapsiblePrimitive.CollapsibleContentProps<T> & {
+    class?: string;
+    children?: JSX.Element;
+  };
+
+/**
+ * Collapsible content panel revealed when opened.
+ */
+export const CollapsibleContent = <T extends ValidComponent = "div">(
+  props: PolymorphicProps<T, CollapsibleContentProps<T>>
+) => {
+  const [local, rest] = splitProps(props as CollapsibleContentProps, ["class", "children"]);
+  return (
+    <CollapsiblePrimitive.Content
+      class={cn(
+        "overflow-hidden transition-all data-expanded:animate-collapsible-down data-closed:animate-collapsible-up",
+        local.class
+      )}
+      {...rest}
+    >
+      {local.children}
+    </CollapsiblePrimitive.Content>
+  );
+};

package/src/registry/components/ui/combobox.tsx

@@ -1,86 +1,44 @@
 import { splitProps, type JSX, type ValidComponent } from "solid-js";
+import { Check, ChevronDown, X } from "lucide-solid";
+import { ScrollArea } from "./scroll-area";
 import * as ComboboxPrimitive from "@kobalte/core/combobox";
 import { cn } from "@/lib/cn";
 
 export type ComboboxRootProps<Option = any, OptGroup = any, T extends ValidComponent = "div"> =
-  ComboboxPrimitive.ComboboxRootProps<Option, OptGroup, T> & {
-    class?: string;
-    children?: JSX.Element;
-    triggerMode?: "input" | "focus" | "both" | "manual";
-  };
+  ComboboxPrimitive.ComboboxRootProps<Option, OptGroup, T>;
 
 /**
- * Root Combobox component providing search, single/multi-selection, and group support.
- * `triggerMode="focus"` or `triggerMode="both"` enables opening dropdown on input click/focus.
+ * Root Combobox primitive component wrapper.
  */
 export const Combobox = <Option = any, OptGroup = any, T extends ValidComponent = "div">(
   props: ComboboxRootProps<Option, OptGroup, T>
 ) => {
-  const [local, rest] = splitProps(props as ComboboxRootProps, ["class", "children", "triggerMode"]);
-
-  return (
-    <ComboboxPrimitive.Root
-      triggerMode={local.triggerMode ?? "input"}
-      class={cn("relative w-full", local.class)}
-      {...(rest as any)}
-    >
-      {local.children}
-    </ComboboxPrimitive.Root>
-  );
+  return <ComboboxPrimitive.Root {...props} />;
 };
 
 export type ComboboxControlProps<Option = any, T extends ValidComponent = "div"> =
   ComboboxPrimitive.ComboboxControlProps<Option, T> & {
     class?: string;
     children?: JSX.Element;
-    clearable?: boolean;
-    onClear?: () => void;
   };
 
 /**
- * Input container for Combobox supporting search input, selected tags, and clear button.
+ * Input container box supporting single or multi-select tokens.
  */
 export const ComboboxControl = <Option = any, T extends ValidComponent = "div">(
   props: ComboboxControlProps<Option, T>
 ) => {
-  const [local, rest] = splitProps(props as ComboboxControlProps, [
-    "class",
-    "children",
-    "clearable",
-    "onClear",
-  ]);
+  const [local, rest] = splitProps(props as ComboboxControlProps, ["class", "children"]);
 
   return (
     <ComboboxPrimitive.Control
       class={cn(
-        "flex min-h-9 w-full flex-wrap items-center justify-between rounded-md border border-input bg-muted px-3 py-1 text-sm shadow-sm transition-colors focus-within:ring-1 focus-within:ring-primary focus-within:border-primary disabled:cursor-not-allowed disabled:opacity-50 gap-1.5 text-foreground",
+        "flex min-h-9 w-full flex-wrap items-center gap-1.5 rounded-md border border-input bg-muted px-3 py-1.5 text-sm shadow-2xs ring-offset-background focus-within:ring-1 focus-within:ring-primary focus-within:border-primary disabled:cursor-not-allowed disabled:opacity-50 text-foreground cursor-text transition-colors",
         local.class
       )}
       {...(rest as any)}
     >
-      <div class="flex flex-wrap items-center gap-1.5 flex-1 min-w-0">
-        {local.children}
-      </div>
-
-      <div class="flex items-center gap-1 shrink-0 self-center">
-        {local.clearable && (
-          <button
-            type="button"
-            tabIndex={-1}
-            onClick={(e) => {
-              e.stopPropagation();
-              if (local.onClear) local.onClear();
-            }}
-            class="rounded-sm p-0.5 opacity-60 hover:opacity-100 hover:bg-accent text-foreground transition-opacity focus:outline-none cursor-pointer"
-            aria-label="Clear selection"
-          >
-            <svg class="h-3.5 w-3.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-              <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-            </svg>
-          </button>
-        )}
-        <ComboboxTrigger />
-      </div>
+      {local.children}
     </ComboboxPrimitive.Control>
   );
 };
@@ -92,8 +50,7 @@ export type ComboboxInputProps<T extends ValidComponent = "input"> =
   };
 
 /**
- * Search input field embedded within ComboboxControl.
- * Supports `openOnFocus` to automatically trigger the dropdown when focused or clicked.
+ * Filter search input field.
  */
 export const ComboboxInput = <T extends ValidComponent = "input">(
   props: ComboboxInputProps<T>
@@ -178,12 +135,10 @@ export const ComboboxToken = <Option = any>(props: ComboboxTokenProps<Option>) =
           e.stopPropagation();
           if (local.onRemove) local.onRemove();
         }}
-        class="rounded-xs p-0.5 hover:bg-muted-foreground/20 text-muted-foreground hover:text-foreground transition-colors focus:outline-none cursor-pointer"
-        aria-label="Remove tag"
+        class="rounded-xs opacity-70 hover:opacity-100 focus:outline-none cursor-pointer text-muted-foreground hover:text-foreground"
       >
-        <svg class="h-3 w-3" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-          <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-        </svg>
+        <X class="h-3 w-3" />
+        <span class="sr-only">Remove</span>
       </button>
     </span>
   );
@@ -206,12 +161,14 @@ export const ComboboxContent = <T extends ValidComponent = "div">(
     <ComboboxPrimitive.Portal>
       <ComboboxPrimitive.Content
         class={cn(
-          "relative z-50 min-w-8rem overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md animate-in fade-in-80 data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-[closed]:zoom-out-95 data-[expanded]:zoom-in-95",
+          "relative z-50 min-w-8rem overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md animate-in fade-in-80 data-expanded:animate-in data-closed:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-closed:zoom-out-95 data-expanded:zoom-in-95 max-h-60",
           local.class
         )}
         {...(rest as any)}
       >
-        <ComboboxPrimitive.Listbox class="max-h-60 overflow-y-auto p-1 outline-none" />
+        <ScrollArea class="max-h-60 w-full">
+          <ComboboxPrimitive.Listbox class="p-1 outline-none" />
+        </ScrollArea>
       </ComboboxPrimitive.Content>
     </ComboboxPrimitive.Portal>
   );
@@ -234,19 +191,17 @@ export const ComboboxItem = <T extends ValidComponent = "li">(
   return (
     <ComboboxPrimitive.Item
       class={cn(
-        "relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none data-disabled:pointer-events-none data-disabled:opacity-50 data-highlighted:bg-accent data-highlighted:text-accent-foreground text-popover-foreground transition-colors",
+        "relative flex w-full cursor-pointer select-none items-center justify-between rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:opacity-50 text-foreground transition-colors",
         local.class
       )}
-      {...rest}
+      {...(rest as any)}
     >
-      <ComboboxPrimitive.ItemIndicator class="absolute left-2 flex h-4 w-4 items-center justify-center text-primary">
-        <svg class="h-4 w-4 fill-none stroke-current stroke-2" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7" />
-        </svg>
-      </ComboboxPrimitive.ItemIndicator>
-      <ComboboxPrimitive.ItemLabel class="flex items-center gap-2 w-full truncate">
+      <ComboboxPrimitive.ItemLabel class="flex-1 truncate">
         {local.children}
       </ComboboxPrimitive.ItemLabel>
+      <ComboboxPrimitive.ItemIndicator class="ml-2 flex h-4 w-4 items-center justify-center text-primary">
+        <Check class="h-4 w-4 stroke-2" />
+      </ComboboxPrimitive.ItemIndicator>
     </ComboboxPrimitive.Item>
   );
 };
@@ -277,19 +232,3 @@ export const ComboboxGroup = <T extends ValidComponent = "li">(
     </ComboboxPrimitive.Section>
   );
 };
-
-/**
- * Empty state notice when no matching search items exist.
- */
-export const ComboboxEmpty = (props: { class?: string; children?: JSX.Element }) => {
-  return (
-    <div class={cn("py-6 text-center text-sm text-muted-foreground", props.class)}>
-      {props.children || "No matching items found."}
-    </div>
-  );
-};
-
-/**
- * Hidden native select element for form integrations.
- */
-export const ComboboxHiddenSelect = ComboboxPrimitive.HiddenSelect;

package/src/registry/components/ui/command.tsx

@@ -10,17 +10,22 @@ import {
   type Accessor,
 } from "solid-js";
 import { createKeybindings } from "@nikala-ui/hooks";
-import { Dialog } from "@kobalte/core/dialog";
 import { Search, ArrowUp, ArrowDown, CornerDownLeft } from "lucide-solid";
 import { cn } from "@/lib/cn";
-import { Kbd, KbdGroup } from "../ui/kbd";
-import { InputGroup, InputGroupInput, InputGroupAddon } from "../ui/input-group";
-import { List, ListGroup, ListHeader, ListItem, type ListItemProps } from "../ui/list";
+import { Kbd, KbdGroup } from "./kbd";
+import { InputGroup, InputGroupInput, InputGroupAddon } from "./input-group";
+import { List, ListGroup, ListHeader, ListItem, type ListItemProps } from "./list";
+import { Dialog, DialogOverlay, DialogContent } from "./dialog";
+import { ScrollArea } from "./scroll-area";
 
 /* --- Command Context State --- */
 interface CommandContextValue {
   search: Accessor<string>;
   setSearch: (value: string) => void;
+  activeIndex: Accessor<number>;
+  setActiveIndex: (fn: (prev: number) => number) => void;
+  registerItemIndex: () => number;
+  onItemSelect: (fn: () => void) => void;
 }
 
 const CommandContext = createContext<CommandContextValue>();
@@ -28,30 +33,78 @@ const CommandContext = createContext<CommandContextValue>();
 export const useCommand = () => {
   const ctx = useContext(CommandContext);
   if (!ctx) {
-    throw new Error("useCommand must be used within a <Command />");
+    throw new Error("useCommand must be used within a <Command /> root component.");
   }
   return ctx;
 };
 
-/* --- Root Command Container --- */
-export interface CommandProps extends JSX.HTMLAttributes<HTMLDivElement> {
+/* --- Command Root --- */
+export interface CommandProps extends Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> {
   class?: string;
+  children?: JSX.Element | ((ctx: CommandContextValue) => JSX.Element);
 }
 
 export const Command: Component<CommandProps> = (props) => {
   const [local, rest] = splitProps(props, ["class", "children"]);
   const [search, setSearch] = createSignal("");
+  const [activeIndex, setActiveIndex] = createSignal(0);
+  let itemCounter = 0;
+  const itemCallbacks: Record<number, () => void> = {};
+  let containerRef: HTMLDivElement | undefined;
+
+  const registerItemIndex = () => {
+    const idx = itemCounter;
+    itemCounter += 1;
+    return idx;
+  };
+
+  const onItemSelect = (fn: () => void) => {
+    itemCallbacks[activeIndex()] = fn;
+  };
+
+  const handleKeyDown = (e: KeyboardEvent) => {
+    if (e.key === "ArrowDown") {
+      e.preventDefault();
+      setActiveIndex((prev) => Math.min(prev + 1, Math.max(0, itemCounter - 1)));
+    } else if (e.key === "ArrowUp") {
+      e.preventDefault();
+      setActiveIndex((prev) => Math.max(prev - 1, 0));
+    } else if (e.key === "Enter") {
+      e.preventDefault();
+      const fn = itemCallbacks[activeIndex()];
+      if (fn) fn();
+      const current = containerRef?.querySelector('[data-command-active="true"]') as HTMLElement;
+      if (current) {
+        current.click();
+      }
+    }
+  };
+
+  const ctx: CommandContextValue = {
+    search,
+    setSearch: (val) => {
+      setSearch(val);
+      setActiveIndex(0);
+    },
+    activeIndex,
+    setActiveIndex: (fn) => setActiveIndex(fn),
+    registerItemIndex,
+    onItemSelect,
+  };
 
   return (
-    <CommandContext.Provider value={{ search, setSearch }}>
+    <CommandContext.Provider value={ctx}>
       <div
+        ref={containerRef}
+        onKeyDown={handleKeyDown}
         class={cn(
-          "flex flex-col w-full h-full rounded-lg bg-popover text-popover-foreground overflow-hidden border border-border shadow-md",
+          "flex flex-col w-full h-full rounded-lg bg-popover text-popover-foreground overflow-hidden border border-border shadow-md outline-none",
           local.class
         )}
+        tabIndex={0}
         {...rest}
       >
-        {local.children}
+        {typeof local.children === "function" ? (local.children as any)(ctx) : local.children}
       </div>
     </CommandContext.Provider>
   );
@@ -62,7 +115,7 @@ export interface CommandDialogProps {
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   enableHotkey?: boolean;
-  children?: JSX.Element;
+  children?: JSX.Element | ((ctx: CommandContextValue) => JSX.Element);
   class?: string;
 }
 
@@ -91,14 +144,12 @@ export const CommandDialog: Component<CommandDialogProps> = (props) => {
 
   return (
     <Dialog open={isOpen()} onOpenChange={setOpen}>
-      <Dialog.Portal>
-        <Dialog.Overlay class="fixed inset-0 z-50 bg-black/60 backdrop-blur-xs data-expanded:animate-in data-closed:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0" />
-        <div class="fixed inset-0 z-50 flex items-start justify-center pt-16 sm:pt-24 px-4">
-          <Dialog.Content class="w-full max-w-xl rounded-lg border border-border bg-popover text-popover-foreground shadow-2xl outline-none data-expanded:animate-in data-closed:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-closed:zoom-out-95 data-expanded:zoom-in-95">
-            <Command class={props.class}>{props.children}</Command>
-          </Dialog.Content>
-        </div>
-      </Dialog.Portal>
+      <DialogOverlay class="fixed inset-0 z-50 bg-black/60 backdrop-blur-xs data-expanded:animate-in data-closed:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0" />
+      <div class="fixed inset-0 z-50 flex items-start justify-center pt-16 sm:pt-24 px-4">
+        <DialogContent class="w-full max-w-xl rounded-lg border border-border bg-popover text-popover-foreground shadow-2xl outline-none data-expanded:animate-in data-closed:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-closed:zoom-out-95 data-expanded:zoom-in-95 p-0">
+          <Command class={props.class}>{props.children}</Command>
+        </DialogContent>
+      </div>
     </Dialog>
   );
 };
@@ -120,6 +171,7 @@ export const CommandInput: Component<CommandInputProps> = (props) => {
       </InputGroupAddon>
 
       <InputGroupInput
+        ref={(el) => setTimeout(() => el.focus(), 50)}
         value={search()}
         onInput={(e) => {
           setSearch(e.currentTarget.value);
@@ -144,12 +196,12 @@ export const CommandList: Component<CommandListProps> = (props) => {
   const [local, rest] = splitProps(props, ["class", "children"]);
 
   return (
-    <div
-      class={cn("max-h-82.5 overflow-y-auto p-1.5 scrollbar-thin", local.class)}
+    <ScrollArea
+      class={cn("max-h-82.5 p-1.5", local.class)}
       {...rest}
     >
       <List>{local.children}</List>
-    </div>
+    </ScrollArea>
   );
 };
 
@@ -200,87 +252,123 @@ export interface CommandItemProps extends ListItemProps {
 }
 
 export const CommandItem: Component<CommandItemProps> = (props) => {
+  let itemRef: HTMLDivElement | undefined;
   const [local, rest] = splitProps(props, [
     "title",
     "subtitle",
     "keywords",
+    "disabled",
     "onSelect",
-    "onClick",
     "class",
+    "children",
   ]);
-  const { search } = useCommand();
 
-  /* Auto fuzzy-filter item based on search query */
-  const matchesSearch = () => {
-    const query = search().toLowerCase().trim();
-    if (!query) return true;
+  const ctx = useCommand();
+  const index = ctx.registerItemIndex();
 
-    const titleMatch = local.title?.toLowerCase().includes(query);
-    const subtitleMatch = local.subtitle?.toLowerCase().includes(query);
-    const keywordMatch = local.keywords?.some((k) =>
-      k.toLowerCase().includes(query)
-    );
+  const isActive = () => ctx.activeIndex() === index;
 
-    return Boolean(titleMatch || subtitleMatch || keywordMatch);
+  /* Automatic scroll into view when navigating with Arrow keys */
+  const scrollIntoViewIfNeeded = () => {
+    if (isActive() && itemRef) {
+      itemRef.scrollIntoView({ block: "nearest", behavior: "smooth" });
+    }
   };
 
-  const handleClick = (e: MouseEvent) => {
-    if (typeof local.onSelect === "function") {
-      local.onSelect();
-    }
-    if (typeof local.onClick === "function") {
-      local.onClick(e as any);
+  const isVisible = () => {
+    const query = ctx.search().toLowerCase().trim();
+    if (!query) return true;
+
+    const titleStr = typeof local.title === "string" ? local.title.toLowerCase() : "";
+    const subStr = typeof local.subtitle === "string" ? local.subtitle.toLowerCase() : "";
+
+    if (titleStr.includes(query) || subStr.includes(query)) return true;
+
+    if (local.keywords) {
+      return local.keywords.some((k) => k.toLowerCase().includes(query));
     }
+
+    return false;
+  };
+
+  const handleSelect = () => {
+    if (local.disabled) return;
+    if (local.onSelect) local.onSelect();
   };
 
   return (
-    <Show when={matchesSearch()}>
+    <Show when={isVisible()}>
       <ListItem
+        ref={(el) => {
+          itemRef = el;
+          scrollIntoViewIfNeeded();
+        }}
         title={local.title}
         subtitle={local.subtitle}
-        onClick={handleClick}
-        class={local.class}
+        data-command-active={isActive() ? "true" : "false"}
+        class={cn(
+          "relative flex cursor-pointer select-none items-center rounded-md px-2 py-1.5 text-sm outline-none transition-colors",
+          isActive()
+            ? "bg-accent text-accent-foreground font-medium"
+            : "text-popover-foreground hover:bg-muted/50",
+          local.disabled && "pointer-events-none opacity-50",
+          local.class
+        )}
+        onClick={handleSelect}
+        onMouseEnter={() => ctx.setActiveIndex(() => index)}
         {...rest}
-      />
+      >
+        {local.children}
+      </ListItem>
     </Show>
   );
 };
 
-/* --- Command Footer --- */
+/* --- Command Footer Indicator Bar --- */
 export interface CommandFooterProps extends JSX.HTMLAttributes<HTMLDivElement> {
   class?: string;
 }
 
 export const CommandFooter: Component<CommandFooterProps> = (props) => {
-  const [local, rest] = splitProps(props, ["class"]);
+  const [local, rest] = splitProps(props, ["class", "children"]);
 
   return (
     <div
       class={cn(
-        "flex items-center justify-between border-t border-border bg-muted/30 px-3 py-2 text-xs text-muted-foreground select-none",
+        "flex items-center justify-between border-t border-border px-3 py-2 text-xs text-muted-foreground bg-muted/40",
         local.class
       )}
       {...rest}
     >
-      <div class="flex items-center gap-3">
-        <span class="flex items-center gap-1">
-          <KbdGroup>
-            <Kbd size="sm"><ArrowUp class="w-2.5 h-2.5" /></Kbd>
-            <Kbd size="sm"><ArrowDown class="w-2.5 h-2.5" /></Kbd>
-          </KbdGroup>
-          <span>Navigate</span>
-        </span>
-
-        <span class="flex items-center gap-1">
-          <Kbd size="sm"><CornerDownLeft class="w-2.5 h-2.5" /></Kbd>
-          <span>Select</span>
-        </span>
-      </div>
-
-      <span class="flex items-center gap-1">
-        <Kbd size="sm">Esc</Kbd>
-        <span>Close</span>
-      </span>
+      {local.children || (
+        <>
+          <div class="flex items-center gap-2">
+            <span class="inline-flex items-center gap-1">
+              <KbdGroup>
+                <Kbd size="sm">
+                  <ArrowUp class="w-2.5 h-2.5" />
+                </Kbd>
+                <Kbd size="sm">
+                  <ArrowDown class="w-2.5 h-2.5" />
+                </Kbd>
+              </KbdGroup>
+              <span>Navigate</span>
+            </span>
+
+            <span class="inline-flex items-center gap-1">
+              <Kbd size="sm">
+                <CornerDownLeft class="w-2.5 h-2.5" />
+              </Kbd>
+              <span>Select</span>
+            </span>
+          </div>
+
+          <span class="inline-flex items-center gap-1">
+            <Kbd size="sm">ESC</Kbd>
+            <span>Close</span>
+          </span>
+        </>
+      )}
     </div>
   );
 };