@bearmenu/ui 0.5.2 → 0.6.1

package/src/components/drawer.tsx

@@ -4,18 +4,27 @@ import * as React from "react";
 import { Drawer as DrawerPrimitive } from "vaul";
 import { cn } from "../lib/utils";
 
+type DrawerDirection = "top" | "bottom" | "left" | "right";
+
+const DrawerDirectionContext = React.createContext<DrawerDirection>("bottom");
+
 const Drawer = ({
   shouldScaleBackground = false,
+  direction = "bottom",
   ...props
 }: React.ComponentProps<typeof DrawerPrimitive.Root>) => (
-  <DrawerPrimitive.Root shouldScaleBackground={shouldScaleBackground} {...props} />
+  <DrawerDirectionContext.Provider value={direction}>
+    <DrawerPrimitive.Root
+      shouldScaleBackground={shouldScaleBackground}
+      direction={direction}
+      {...props}
+    />
+  </DrawerDirectionContext.Provider>
 );
 Drawer.displayName = "Drawer";
 
 const DrawerTrigger = DrawerPrimitive.Trigger;
-
 const DrawerPortal = DrawerPrimitive.Portal;
-
 const DrawerClose = DrawerPrimitive.Close;
 
 const DrawerOverlay = React.forwardRef<
@@ -24,40 +33,78 @@ const DrawerOverlay = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Overlay
     ref={ref}
+    data-slot="drawer-overlay"
     className={cn("fixed inset-0 z-[1000] bg-black/60", className)}
     {...props}
   />
 ));
 DrawerOverlay.displayName = DrawerPrimitive.Overlay.displayName;
 
+type DrawerContentProps = React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Content> & {
+  variant?: "flush" | "floating";
+  showHandle?: boolean;
+};
+
 const DrawerContent = React.forwardRef<
   React.ElementRef<typeof DrawerPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DrawerPrimitive.Content>
->(({ className, children, ...props }, ref) => (
-  <DrawerPortal>
-    <DrawerOverlay />
-    <DrawerPrimitive.Content
-      ref={ref}
-      className={cn(
-        "fixed inset-x-0 bottom-0 z-[1000] flex h-auto max-h-[90vh] flex-col rounded-t-2xl bg-surface border-t border-border shadow-2xl",
-        className
-      )}
-      {...props}
-    >
-      <div className="mx-auto mt-4 h-2 w-[100px] rounded-full dark:bg-muted bg-primary" />
-      {children}
-    </DrawerPrimitive.Content>
-  </DrawerPortal>
-));
+  DrawerContentProps
+>(({ className, variant = "flush", showHandle, children, ...props }, ref) => {
+  const direction = React.useContext(DrawerDirectionContext);
+  const isVertical = direction === "top" || direction === "bottom";
+  const handleEnabled = showHandle ?? (direction === "bottom");
+
+  const positionClasses =
+    direction === "bottom"
+      ? "inset-x-0 bottom-0 flex-col rounded-t-2xl border-t [padding-bottom:max(env(safe-area-inset-bottom),0px)]"
+      : direction === "top"
+        ? "inset-x-0 top-0 flex-col rounded-b-2xl border-b [padding-top:max(env(safe-area-inset-top),0px)]"
+        : direction === "left"
+          ? "inset-y-0 left-0 h-full w-3/4 max-w-sm flex-col rounded-r-2xl border-r [padding-left:max(env(safe-area-inset-left),0px)]"
+          : "inset-y-0 right-0 h-full w-3/4 max-w-sm flex-col rounded-l-2xl border-l [padding-right:max(env(safe-area-inset-right),0px)]";
+
+  return (
+    <DrawerPortal>
+      <DrawerOverlay />
+      <DrawerPrimitive.Content
+        ref={ref}
+        data-slot="drawer-content"
+        className={cn(
+          "fixed z-[1000] flex border-border bg-card shadow-2xl",
+          positionClasses,
+          isVertical ? "max-h-[90vh]" : "",
+          variant === "floating" && "m-3 rounded-2xl border",
+          className
+        )}
+        {...props}
+      >
+        {handleEnabled && (
+          <div
+            aria-hidden
+            className="mx-auto mt-2 h-1.5 w-[60px] shrink-0 rounded-full bg-muted-foreground/30"
+          />
+        )}
+        {children}
+      </DrawerPrimitive.Content>
+    </DrawerPortal>
+  );
+});
 DrawerContent.displayName = "DrawerContent";
 
 const DrawerHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn("grid gap-1.5 p-4 text-center sm:text-left", className)} {...props} />
+  <div
+    data-slot="drawer-header"
+    className={cn("grid gap-1.5 p-4 text-center sm:text-left", className)}
+    {...props}
+  />
 );
 DrawerHeader.displayName = "DrawerHeader";
 
 const DrawerFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn("mt-auto flex flex-col gap-2 p-4", className)} {...props} />
+  <div
+    data-slot="drawer-footer"
+    className={cn("mt-auto flex flex-col gap-2 p-4", className)}
+    {...props}
+  />
 );
 DrawerFooter.displayName = "DrawerFooter";
 
@@ -67,6 +114,7 @@ const DrawerTitle = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Title
     ref={ref}
+    data-slot="drawer-title"
     className={cn("text-lg font-semibold leading-none tracking-tight", className)}
     {...props}
   />
@@ -79,7 +127,8 @@ const DrawerDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DrawerPrimitive.Description
     ref={ref}
-    className={cn("text-sm dark:text-muted-foreground light:text-dark", className)}
+    data-slot="drawer-description"
+    className={cn("text-sm text-muted-foreground", className)}
     {...props}
   />
 ));

package/src/components/dropdown-menu.test.tsx

@@ -0,0 +1,180 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+} from "./dropdown-menu";
+import * as React from "react";
+
+describe("DropdownMenu", () => {
+  it("is closed by default", () => {
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem>One</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    expect(screen.queryByRole("menu")).toBeNull();
+  });
+
+  it("opens on trigger click and renders items with role=menuitem", async () => {
+    const user = userEvent.setup();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem>One</DropdownMenuItem>
+          <DropdownMenuItem>Two</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    expect(screen.getByRole("menu")).toBeInTheDocument();
+    expect(screen.getAllByRole("menuitem")).toHaveLength(2);
+  });
+
+  it("fires onSelect when item is clicked", async () => {
+    const user = userEvent.setup();
+    const onSelect = vi.fn();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem onSelect={onSelect}>One</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    await user.click(screen.getByRole("menuitem", { name: "One" }));
+    expect(onSelect).toHaveBeenCalledTimes(1);
+  });
+
+  it("checkbox item has role=menuitemcheckbox and reflects checked state", async () => {
+    const user = userEvent.setup();
+    function Wrap() {
+      const [checked, setChecked] = React.useState(false);
+      return (
+        <DropdownMenu>
+          <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+          <DropdownMenuContent>
+            <DropdownMenuCheckboxItem checked={checked} onCheckedChange={setChecked}>
+              Notify
+            </DropdownMenuCheckboxItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      );
+    }
+    render(<Wrap />);
+    await user.click(screen.getByText("Open"));
+    const item = screen.getByRole("menuitemcheckbox");
+    expect(item.getAttribute("aria-checked")).toBe("false");
+    await user.click(item);
+    // Menu closes on select but state mutates — reopen to check
+    await user.click(screen.getByText("Open"));
+    expect(screen.getByRole("menuitemcheckbox").getAttribute("aria-checked")).toBe("true");
+  });
+
+  it("radio group exposes role=menuitemradio with single selection", async () => {
+    const user = userEvent.setup();
+    function Wrap() {
+      const [value, setValue] = React.useState("a");
+      return (
+        <DropdownMenu>
+          <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+          <DropdownMenuContent>
+            <DropdownMenuRadioGroup value={value} onValueChange={setValue}>
+              <DropdownMenuRadioItem value="a">A</DropdownMenuRadioItem>
+              <DropdownMenuRadioItem value="b">B</DropdownMenuRadioItem>
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      );
+    }
+    render(<Wrap />);
+    await user.click(screen.getByText("Open"));
+    const items = screen.getAllByRole("menuitemradio");
+    expect(items).toHaveLength(2);
+    expect(items[0].getAttribute("aria-checked")).toBe("true");
+    expect(items[1].getAttribute("aria-checked")).toBe("false");
+  });
+
+  it("closes on Escape", async () => {
+    const user = userEvent.setup();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem>One</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    await user.keyboard("{Escape}");
+    expect(screen.queryByRole("menu")).toBeNull();
+  });
+
+  it("supports keyboard navigation through menu items", async () => {
+    const user = userEvent.setup();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem>One</DropdownMenuItem>
+          <DropdownMenuItem>Two</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    await user.keyboard("{ArrowDown}");
+    expect(screen.getByRole("menuitem", { name: "One" })).toHaveFocus();
+    await user.keyboard("{ArrowDown}");
+    expect(screen.getByRole("menuitem", { name: "Two" })).toHaveFocus();
+  });
+
+  it("disabled item has data-disabled and does not fire onSelect", async () => {
+    const user = userEvent.setup();
+    const onSelect = vi.fn();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuItem disabled onSelect={onSelect}>
+            One
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    const item = screen.getByRole("menuitem", { name: "One" });
+    expect(item.getAttribute("data-disabled")).not.toBeNull();
+    await user.click(item);
+    expect(onSelect).not.toHaveBeenCalled();
+  });
+
+  it("renders label and separator as structural children", async () => {
+    const user = userEvent.setup();
+    render(
+      <DropdownMenu>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <DropdownMenuLabel>Group</DropdownMenuLabel>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem>One</DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+    await user.click(screen.getByText("Open"));
+    expect(screen.getByText("Group")).toBeInTheDocument();
+    expect(document.querySelector("[data-slot=dropdown-menu-separator]")).not.toBeNull();
+  });
+});

package/src/components/dropdown-menu.tsx

@@ -25,15 +25,21 @@ function DropdownMenuTrigger({
 function DropdownMenuContent({
   className,
   sideOffset = 4,
+  size = "default",
   ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Content> & {
+  size?: "sm" | "default" | "lg";
+}) {
   return (
     <DropdownMenuPrimitive.Portal>
       <DropdownMenuPrimitive.Content
         data-slot="dropdown-menu-content"
         sideOffset={sideOffset}
         className={cn(
-          "bg-card text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-xl border border-border p-1 shadow-lg",
+          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) overflow-x-hidden overflow-y-auto rounded-xl border border-border p-1 shadow-xl origin-(--radix-dropdown-menu-content-transform-origin)",
+          size === "sm" && "min-w-[6rem] text-xs [&_[data-slot=dropdown-menu-item]]:py-1",
+          size === "default" && "min-w-[8rem]",
+          size === "lg" && "min-w-[12rem] [&_[data-slot=dropdown-menu-item]]:py-2",
           className
         )}
         {...props}
@@ -73,8 +79,12 @@ function DropdownMenuCheckboxItem({
   className,
   children,
   checked = false,
+  appearance = "indicator",
   ...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem> & {
+  /** "indicator" shows a check icon (default). "control" renders a styled checkbox box. */
+  appearance?: "indicator" | "control";
+}) {
   return (
     <DropdownMenuPrimitive.CheckboxItem
       data-slot="dropdown-menu-checkbox-item"
@@ -86,9 +96,24 @@ function DropdownMenuCheckboxItem({
       {...props}
     >
       <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <DropdownMenuPrimitive.ItemIndicator>
-          <CheckIcon className="size-4" />
-        </DropdownMenuPrimitive.ItemIndicator>
+        {appearance === "control" ? (
+          <span
+            className={cn(
+              "inline-flex size-3.5 items-center justify-center rounded-sm border",
+              checked === true
+                ? "border-primary bg-primary text-primary-foreground"
+                : "border-border bg-background"
+            )}
+          >
+            <DropdownMenuPrimitive.ItemIndicator>
+              <CheckIcon className="size-3" />
+            </DropdownMenuPrimitive.ItemIndicator>
+          </span>
+        ) : (
+          <DropdownMenuPrimitive.ItemIndicator>
+            <CheckIcon className="size-4" />
+          </DropdownMenuPrimitive.ItemIndicator>
+        )}
       </span>
       {children}
     </DropdownMenuPrimitive.CheckboxItem>

package/src/components/field.stories.tsx

@@ -0,0 +1,36 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { Field, FieldControl, FieldDescription, FieldError, FieldLabel } from "./field";
+import { Input } from "./input";
+
+const meta = {
+  title: "Components/Field",
+  component: Field,
+  tags: ["autodocs"],
+} satisfies Meta<typeof Field>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  render: () => (
+    <Field className="w-80">
+      <FieldLabel>Email</FieldLabel>
+      <FieldControl>
+        <Input placeholder="you@example.com" />
+      </FieldControl>
+      <FieldDescription>We'll never share your email.</FieldDescription>
+    </Field>
+  ),
+};
+
+export const Invalid: Story = {
+  render: () => (
+    <Field className="w-80" invalid>
+      <FieldLabel>Email</FieldLabel>
+      <FieldControl>
+        <Input placeholder="you@example.com" defaultValue="not-an-email" />
+      </FieldControl>
+      <FieldError>Please enter a valid email address.</FieldError>
+    </Field>
+  ),
+};

package/src/components/field.test.tsx

@@ -0,0 +1,157 @@
+import { describe, it, expect } from "vitest";
+import { render, screen } from "@testing-library/react";
+import {
+  Field,
+  FieldLabel,
+  FieldControl,
+  FieldDescription,
+  FieldError,
+  FieldSet,
+  FieldLegend,
+} from "./field";
+import { Input } from "./input";
+
+describe("Field a11y wiring", () => {
+  it("auto-generates an id and wires label htmlFor to control id", () => {
+    render(
+      <Field>
+        <FieldLabel>Email</FieldLabel>
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+      </Field>
+    );
+    const label = screen.getByText("Email") as HTMLLabelElement;
+    const input = screen.getByTestId("i");
+    const id = input.id;
+    expect(id).toBeTruthy();
+    expect(label.getAttribute("for")).toBe(id);
+  });
+
+  it("uses a provided id over the generated one", () => {
+    render(
+      <Field id="custom-id">
+        <FieldLabel>L</FieldLabel>
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+      </Field>
+    );
+    expect(screen.getByTestId("i").id).toBe("custom-id");
+  });
+
+  it("wires aria-describedby to the description by default", () => {
+    render(
+      <Field id="f1">
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+        <FieldDescription>Helper text</FieldDescription>
+      </Field>
+    );
+    const input = screen.getByTestId("i");
+    const desc = screen.getByText("Helper text");
+    expect(desc.id).toBe("f1-description");
+    expect(input.getAttribute("aria-describedby")).toBe("f1-description");
+  });
+
+  it("renders FieldError and wires aria-invalid + aria-describedby when invalid", () => {
+    render(
+      <Field id="f2" invalid>
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+        <FieldDescription>Helper</FieldDescription>
+        <FieldError>Required</FieldError>
+      </Field>
+    );
+    const input = screen.getByTestId("i");
+    const err = screen.getByRole("alert");
+    expect(input.getAttribute("aria-invalid")).toBe("true");
+    expect(err.textContent).toBe("Required");
+    expect(err.id).toBe("f2-error");
+    expect(input.getAttribute("aria-describedby")).toBe("f2-description f2-error");
+  });
+
+  it("does not render FieldError when not invalid", () => {
+    render(
+      <Field id="f3">
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+        <FieldError>Error msg</FieldError>
+      </Field>
+    );
+    expect(screen.queryByRole("alert")).toBeNull();
+  });
+
+  it("does not render FieldError when invalid but no children", () => {
+    render(
+      <Field id="f4" invalid>
+        <FieldControl>
+          <Input data-testid="i" />
+        </FieldControl>
+        <FieldError>{null}</FieldError>
+      </Field>
+    );
+    expect(screen.queryByRole("alert")).toBeNull();
+  });
+
+  it("applies destructive class to label when invalid", () => {
+    render(
+      <Field invalid>
+        <FieldLabel>L</FieldLabel>
+        <FieldControl>
+          <Input />
+        </FieldControl>
+      </Field>
+    );
+    expect(screen.getByText("L").className).toContain("text-destructive");
+  });
+
+  it("sets data-invalid on the field wrapper when invalid", () => {
+    render(
+      <Field invalid data-testid="wrapper">
+        <FieldControl>
+          <Input />
+        </FieldControl>
+      </Field>
+    );
+    expect(screen.getByTestId("wrapper").getAttribute("data-invalid")).toBe("true");
+  });
+
+  it("applies horizontal orientation class", () => {
+    render(
+      <Field orientation="horizontal" data-testid="wrapper">
+        <FieldControl>
+          <Input />
+        </FieldControl>
+      </Field>
+    );
+    expect(screen.getByTestId("wrapper").className).toContain("flex-row");
+  });
+
+  it("applies vertical orientation class by default", () => {
+    render(
+      <Field data-testid="wrapper">
+        <FieldControl>
+          <Input />
+        </FieldControl>
+      </Field>
+    );
+    expect(screen.getByTestId("wrapper").className).toContain("flex-col");
+  });
+});
+
+describe("FieldSet / FieldLegend", () => {
+  it("renders fieldset + legend correctly", () => {
+    render(
+      <FieldSet data-testid="fs">
+        <FieldLegend>Group</FieldLegend>
+      </FieldSet>
+    );
+    const fs = screen.getByTestId("fs");
+    expect(fs.tagName).toBe("FIELDSET");
+    expect(screen.getByText("Group").tagName).toBe("LEGEND");
+  });
+});