@itwin/itwinui-react 5.0.0-alpha.8 → 5.0.0-alpha.9

package/dist/bricks/Checkbox.js

@@ -1,6 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import cx from "classnames";
-import * as Ariakit from "@ariakit/react";
+import {
+  Checkbox as AkCheckbox
+} from "@ariakit/react/checkbox";
 import { FieldControl } from "./Field.js";
 import { forwardRef } from "./~utils.js";
 const Checkbox = forwardRef(
@@ -12,7 +14,7 @@ const Checkbox = forwardRef(
         type: "checkable",
         id,
         render: /* @__PURE__ */ jsx(
-          Ariakit.Checkbox,
+          AkCheckbox,
           {
             accessibleWhenDisabled: true,
             ...rest,

package/dist/bricks/Chip.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import cx from "classnames";
 import * as React from "react";
-import * as Ariakit from "@ariakit/react";
+import { Role } from "@ariakit/react/role";
 import { forwardRef } from "./~utils.js";
 import { IconButton } from "./IconButton.js";
 import { Dismiss } from "./Icon.js";
@@ -11,7 +11,7 @@ const Chip = forwardRef((props, forwardedRef) => {
   const labelId = `${baseId}-label`;
   const dismissIconId = `${baseId}-dismiss`;
   return /* @__PURE__ */ jsxs(
-    Ariakit.Role.div,
+    Role.div,
     {
       "data-kiwi-variant": variant,
       ...rest,

package/dist/bricks/Divider.d.ts

@@ -1,6 +1,6 @@
-import * as Ariakit from "@ariakit/react";
+import { type SeparatorProps } from "@ariakit/react/separator";
 import { type BaseProps } from "./~utils.js";
-interface DividerProps extends BaseProps<"hr">, Pick<Ariakit.SeparatorProps, "orientation"> {
+interface DividerProps extends BaseProps<"hr">, Pick<SeparatorProps, "orientation"> {
     /**
      * If true, the divider will be purely presentational and will not have any associated semantics.
      *

package/dist/bricks/Divider.js

@@ -1,10 +1,11 @@
 import { jsx } from "react/jsx-runtime";
 import cx from "classnames";
-import * as Ariakit from "@ariakit/react";
+import { Role } from "@ariakit/react/role";
+import { Separator } from "@ariakit/react/separator";
 import { forwardRef } from "./~utils.js";
 const Divider = forwardRef((props, forwardedRef) => {
   const { presentational, ...rest } = props;
-  const Comp = presentational ? Ariakit.Role : Ariakit.Separator;
+  const Comp = presentational ? Role : Separator;
   return /* @__PURE__ */ jsx(
     Comp,
     {

package/dist/bricks/DropdownMenu.d.ts

@@ -1,7 +1,8 @@
 import * as React from "react";
-import * as Ariakit from "@ariakit/react";
-import { type FocusableProps } from "./~utils.js";
-interface DropdownMenuProps extends Pick<Ariakit.MenuProviderProps, "children" | "placement" | "open" | "setOpen" | "defaultOpen"> {
+import { type AnyString, type BaseProps, type FocusableProps } from "./~utils.js";
+import { type MenuItemCheckboxProps, type MenuProviderProps } from "@ariakit/react/menu";
+import { type PredefinedSymbol } from "./Kbd.internal.js";
+interface DropdownMenuProps extends Pick<MenuProviderProps, "children" | "placement" | "open" | "setOpen" | "defaultOpen"> {
 }
 /**
  * A dropdown menu displays a list of actions or commands when the menu button is clicked.
@@ -14,9 +15,9 @@ interface DropdownMenuProps extends Pick<Ariakit.MenuProviderProps, "children" |
  *   <DropdownMenu.Button>Actions</DropdownMenu.Button>
  *
  *   <DropdownMenu.Content>
- *     <DropdownMenu.Item>Add</DropdownMenu.Item>
- *     <DropdownMenu.Item>Edit</DropdownMenu.Item>
- *     <DropdownMenu.Item>Delete</DropdownMenu.Item>
+ *     <DropdownMenu.Item label="Add" />
+ *     <DropdownMenu.Item label="Edit" />
+ *     <DropdownMenu.Item label="Delete" />
  *   </DropdownMenu.Content>
  * </DropdownMenu.Root>
  * ```
@@ -55,7 +56,21 @@ interface DropdownMenuButtonProps extends FocusableProps<"button"> {
  * ```
  */
 declare const DropdownMenuButton: React.ForwardRefExoticComponent<DropdownMenuButtonProps & React.RefAttributes<HTMLElement | HTMLButtonElement>>;
-interface DropdownMenuItemProps extends FocusableProps {
+interface DropdownMenuItemProps extends Omit<FocusableProps, "children">, Partial<Pick<DropdownMenuItemShortcutsProps, "shortcuts"> & Pick<DropdownMenuIconProps, "icon">> {
+    /** The primary text label for the menu-item. */
+    label: React.ReactNode;
+}
+/**
+ * A single menu item within the dropdown menu. Should be used as a child of `DropdownMenu.Content`.
+ *
+ * Example:
+ * ```tsx
+ * <DropdownMenu.Item label="Add" />
+ * <DropdownMenu.Item label="Edit" />
+ * ```
+ */
+declare const DropdownMenuItem: React.ForwardRefExoticComponent<DropdownMenuItemProps & React.RefAttributes<HTMLElement | HTMLDivElement>>;
+interface DropdownMenuItemShortcutsProps extends BaseProps {
     /**
      * A string defining the keyboard shortcut(s) associated with the menu item.
      *
@@ -63,33 +78,33 @@ interface DropdownMenuItemProps extends FocusableProps {
      * shortcuts="S" // A single key shortcut
      * ```
      *
-     * Multiple keys should be separated by the '+' character.
+     * Multiple keys should be separated by the `+` character. If one of the keys is
+     * recognized as a symbol name or a modifier key, it will be displayed as a symbol.
      *
      * ```tsx
-     * shortcuts="Ctrl+Shift+S" // A multi-key combination
+     * shortcuts="Control+Enter" // A multi-key shortcut, displayed as "Ctrl ⏎"
      * ```
      */
-    shortcuts?: string;
+    shortcuts: AnyString | `${PredefinedSymbol}+${AnyString}`;
 }
-/**
- * A single menu item within the dropdown menu. Should be used as a child of `DropdownMenu.Content`.
- *
- * Example:
- * ```tsx
- * <DropdownMenu.Item>Add</DropdownMenu.Item>
- * <DropdownMenu.Item>Edit</DropdownMenu.Item>
- * ```
- */
-declare const DropdownMenuItem: React.ForwardRefExoticComponent<DropdownMenuItemProps & React.RefAttributes<HTMLElement | HTMLDivElement>>;
-interface DropdownMenuCheckboxItemProps extends Omit<FocusableProps, "onChange">, Pick<Ariakit.MenuItemCheckboxProps, "checked" | "onChange" | "name" | "value"> {
+interface DropdownMenuIconProps extends BaseProps {
+    /**
+     * An optional icon displayed before the menu-item label.
+     *
+     * Can be a URL of an SVG from the `@itwin/itwinui-icons` package,
+     * or a custom JSX icon.
+     */
+    icon?: string | React.JSX.Element;
+}
+interface DropdownMenuCheckboxItemProps extends Omit<FocusableProps, "onChange" | "children">, Pick<MenuItemCheckboxProps, "checked" | "onChange" | "name" | "value">, Pick<DropdownMenuItemProps, "label" | "icon"> {
 }
 /**
  * A single menu item within the dropdown menu. Should be used as a child of `DropdownMenu.Content`.
  *
  * Example:
  * ```tsx
- * <DropdownMenu.CheckboxItem name="add">Add</DropdownMenu.Item>
- * <DropdownMenu.CheckboxItem name="edit">Edit</DropdownMenu.Item>
+ * <DropdownMenu.CheckboxItem name="add" label="Add" />
+ * <DropdownMenu.CheckboxItem name="edit" label="Edit" />
  * ```
  */
 declare const DropdownMenuCheckboxItem: React.ForwardRefExoticComponent<DropdownMenuCheckboxItemProps & React.RefAttributes<HTMLElement | HTMLDivElement>>;

package/dist/bricks/DropdownMenu.js

@@ -1,13 +1,23 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import cx from "classnames";
-import * as Ariakit from "@ariakit/react";
-import * as ListItem from "./ListItem.js";
+import * as ListItem from "./~utils.ListItem.js";
 import { Button } from "./Button.js";
 import { Kbd } from "./Kbd.js";
-import { Checkmark, DisclosureArrow } from "./Icon.js";
-import { forwardRef } from "./~utils.js";
+import { Checkmark, DisclosureArrow, Icon } from "./Icon.js";
+import {
+  forwardRef
+} from "./~utils.js";
 import { usePopoverApi } from "./~hooks.js";
+import {
+  MenuProvider,
+  useMenuContext,
+  Menu,
+  MenuButton,
+  MenuItem,
+  MenuItemCheckbox
+} from "@ariakit/react/menu";
+import { predefinedSymbols } from "./Kbd.internal.js";
 function DropdownMenu(props) {
   const {
     children,
@@ -17,7 +27,7 @@ function DropdownMenu(props) {
     defaultOpen: defaultOpenProp
   } = props;
   return /* @__PURE__ */ jsx(
-    Ariakit.MenuProvider,
+    MenuProvider,
     {
       placement,
       defaultOpen: defaultOpenProp,
@@ -29,9 +39,9 @@ function DropdownMenu(props) {
 }
 const DropdownMenuContent = forwardRef(
   (props, forwardedRef) => {
-    const popover = usePopoverApi(Ariakit.useMenuContext());
+    const popover = usePopoverApi(useMenuContext());
     return /* @__PURE__ */ jsx(
-      Ariakit.Menu,
+      Menu,
       {
         portal: popover.portal,
         unmountOnHide: true,
@@ -49,7 +59,7 @@ const DropdownMenuButton = forwardRef(
   (props, forwardedRef) => {
     const { accessibleWhenDisabled = true, children, ...rest } = props;
     return /* @__PURE__ */ jsx(
-      Ariakit.MenuButton,
+      MenuButton,
       {
         accessibleWhenDisabled: true,
         render: /* @__PURE__ */ jsxs(Button, { accessibleWhenDisabled, children: [
@@ -65,13 +75,9 @@ const DropdownMenuButton = forwardRef(
 );
 const DropdownMenuItem = forwardRef(
   (props, forwardedRef) => {
-    const { shortcuts, ...rest } = props;
-    const shortcutKeys = React.useMemo(() => {
-      return typeof shortcuts === "string" ? shortcuts.split("+").map((key) => key.trim()) : [];
-    }, [shortcuts]);
-    const hasShortcuts = shortcutKeys.length > 0;
+    const { label, shortcuts, icon, ...rest } = props;
     return /* @__PURE__ */ jsxs(
-      Ariakit.MenuItem,
+      MenuItem,
       {
         accessibleWhenDisabled: true,
         ...rest,
@@ -79,25 +85,77 @@ const DropdownMenuItem = forwardRef(
         className: cx("\u{1F95D}-dropdown-menu-item", props.className),
         ref: forwardedRef,
         children: [
-          /* @__PURE__ */ jsx(ListItem.Content, { children: props.children }),
-          hasShortcuts && /* @__PURE__ */ jsx(ListItem.Decoration, { className: "\u{1F95D}-dropdown-menu-item-shortcuts", children: shortcutKeys.map((key, index) => /* @__PURE__ */ jsx(Kbd, { variant: "ghost", children: key }, `${key + index}`)) })
+          icon ? /* @__PURE__ */ jsx(DropdownMenuIcon, { icon }) : null,
+          /* @__PURE__ */ jsx(ListItem.Content, { children: label }),
+          shortcuts ? /* @__PURE__ */ jsx(DropdownMenuItemShortcuts, { shortcuts }) : null
         ]
       }
     );
   }
 );
+const DropdownMenuItemShortcuts = forwardRef((props, forwardedRef) => {
+  const { shortcuts, ...rest } = props;
+  const shortcutKeys = React.useMemo(() => {
+    return shortcuts.split("+").map((key) => ({
+      key: key.trim(),
+      isSymbol: key in predefinedSymbols
+    }));
+  }, [shortcuts]);
+  return /* @__PURE__ */ jsx(
+    ListItem.Decoration,
+    {
+      ...rest,
+      className: cx("\u{1F95D}-dropdown-menu-item-shortcuts", props.className),
+      ref: forwardedRef,
+      children: shortcutKeys.map(({ key, isSymbol }, index) => {
+        if (isSymbol) {
+          return /* @__PURE__ */ jsx(
+            Kbd,
+            {
+              variant: "ghost",
+              symbol: key
+            },
+            `${key + index}`
+          );
+        }
+        return /* @__PURE__ */ jsx(Kbd, { variant: "ghost", children: key }, `${key + index}`);
+      })
+    }
+  );
+});
+const DropdownMenuIcon = forwardRef(
+  (props, forwardedRef) => {
+    const { icon, ...rest } = props;
+    return /* @__PURE__ */ jsx(
+      ListItem.Decoration,
+      {
+        render: /* @__PURE__ */ jsx(
+          Icon,
+          {
+            href: typeof icon === "string" ? icon : void 0,
+            render: React.isValidElement(icon) ? icon : void 0
+          }
+        ),
+        ...rest,
+        ref: forwardedRef
+      }
+    );
+  }
+);
 const DropdownMenuCheckboxItem = forwardRef((props, forwardedRef) => {
+  const { label, icon, ...rest } = props;
   return /* @__PURE__ */ jsxs(
-    Ariakit.MenuItemCheckbox,
+    MenuItemCheckbox,
     {
       accessibleWhenDisabled: true,
       value: props.defaultChecked ? "on" : void 0,
-      ...props,
+      ...rest,
       render: /* @__PURE__ */ jsx(ListItem.Root, { render: props.render }),
       className: cx("\u{1F95D}-dropdown-menu-item", props.className),
       ref: forwardedRef,
       children: [
-        /* @__PURE__ */ jsx(ListItem.Content, { children: props.children }),
+        icon ? /* @__PURE__ */ jsx(DropdownMenuIcon, { icon }) : null,
+        /* @__PURE__ */ jsx(ListItem.Content, { children: label }),
         /* @__PURE__ */ jsx(
           ListItem.Decoration,
           {

package/dist/bricks/Field.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as Ariakit from "@ariakit/react";
+import { useCollectionStore, type CollectionItemProps } from "@ariakit/react/collection";
 import { type BaseProps } from "./~utils.js";
 interface FieldProps extends BaseProps {
     /**
@@ -28,14 +28,14 @@ interface FieldProps extends BaseProps {
  * - `Switch`
  */
 export declare const Field: React.ForwardRefExoticComponent<FieldProps & React.RefAttributes<HTMLElement | HTMLDivElement>>;
-type CollectionStoreItem = NonNullable<ReturnType<ReturnType<typeof Ariakit.useCollectionStore>["item"]>>;
+type CollectionStoreItem = NonNullable<ReturnType<ReturnType<typeof useCollectionStore>["item"]>>;
 interface FieldCollectionStoreItem extends CollectionStoreItem {
     /** The type of field element being tracked */
     elementType: "label" | "control" | "description";
     /** If a control, the type of control. */
     controlType?: "textlike" | "checkable";
 }
-interface FieldCollectionItemControlProps extends Pick<Ariakit.CollectionItemProps, "render" | "id"> {
+interface FieldCollectionItemControlProps extends Pick<CollectionItemProps, "render" | "id"> {
     type: FieldCollectionStoreItem["controlType"];
 }
 /**
@@ -45,9 +45,9 @@ export declare function FieldControl(props: FieldCollectionItemControlProps): im
 /**
  * An element tracked as a label in the `Field`’s collection.
  */
-export declare function FieldLabel(props: Pick<Ariakit.CollectionItemProps, "render">): import("react/jsx-runtime").JSX.Element;
+export declare function FieldLabel(props: Pick<CollectionItemProps, "render">): import("react/jsx-runtime").JSX.Element;
 /**
  * An element tracked as a description in the `Field`’s collection.
  */
-export declare function FieldDescription(props: Pick<Ariakit.CollectionItemProps, "render" | "id">): import("react/jsx-runtime").JSX.Element;
+export declare function FieldDescription(props: Pick<CollectionItemProps, "render" | "id">): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/bricks/Field.js

@@ -1,7 +1,14 @@
 import { jsx } from "react/jsx-runtime";
 import * as React from "react";
-import * as Ariakit from "@ariakit/react";
 import cx from "classnames";
+import { Role } from "@ariakit/react/role";
+import {
+  useCollectionStore,
+  Collection,
+  useCollectionContext,
+  CollectionItem
+} from "@ariakit/react/collection";
+import { useStoreState } from "@ariakit/react/store";
 import { forwardRef } from "./~utils.js";
 const Field = forwardRef((props, forwardedRef) => {
   const { layout, ...rest } = props;
@@ -9,7 +16,7 @@ const Field = forwardRef((props, forwardedRef) => {
     FieldCollection,
     {
       render: /* @__PURE__ */ jsx(
-        Ariakit.Role.div,
+        Role.div,
         {
           ...rest,
           className: cx("\u{1F95D}-field", props.className),
@@ -21,13 +28,10 @@ const Field = forwardRef((props, forwardedRef) => {
   );
 });
 function FieldCollection(props) {
-  const fieldElementCollection = Ariakit.useCollectionStore({
+  const fieldElementCollection = useCollectionStore({
     defaultItems: []
   });
-  const renderedItems = Ariakit.useStoreState(
-    fieldElementCollection,
-    "renderedItems"
-  );
+  const renderedItems = useStoreState(fieldElementCollection, "renderedItems");
   const [controlType, controlIndex] = React.useMemo(() => {
     const controlIndex2 = renderedItems.findIndex(
       (item) => item.elementType === "control"
@@ -42,7 +46,7 @@ function FieldCollection(props) {
     return labelIndex < controlIndex ? "before" : "after";
   }, [renderedItems, controlIndex]);
   return /* @__PURE__ */ jsx(
-    Ariakit.Collection,
+    Collection,
     {
       ...props,
       store: fieldElementCollection,
@@ -52,10 +56,10 @@ function FieldCollection(props) {
   );
 }
 function FieldControl(props) {
-  const store = Ariakit.useCollectionContext();
+  const store = useCollectionContext();
   const generatedId = React.useId();
   const { id = store ? generatedId : void 0, type, ...rest } = props;
-  const renderedItems = Ariakit.useStoreState(store, "renderedItems");
+  const renderedItems = useStoreState(store, "renderedItems");
   const describedBy = React.useMemo(() => {
     const idRefList = renderedItems?.filter(
       (item) => item.elementType === "description"
@@ -71,17 +75,17 @@ function FieldControl(props) {
     [type]
   );
   return /* @__PURE__ */ jsx(
-    Ariakit.CollectionItem,
+    CollectionItem,
     {
       id,
       getItem: getData,
-      render: /* @__PURE__ */ jsx(Ariakit.Role, { ...rest, "aria-describedby": describedBy })
+      render: /* @__PURE__ */ jsx(Role, { ...rest, "aria-describedby": describedBy })
     }
   );
 }
 function FieldLabel(props) {
-  const store = Ariakit.useCollectionContext();
-  const renderedItems = Ariakit.useStoreState(store, "renderedItems");
+  const store = useCollectionContext();
+  const renderedItems = useStoreState(store, "renderedItems");
   const fieldId = React.useMemo(
     () => renderedItems?.find(
       (item) => item.elementType === "control"
@@ -96,10 +100,10 @@ function FieldLabel(props) {
     []
   );
   return /* @__PURE__ */ jsx(
-    Ariakit.CollectionItem,
+    CollectionItem,
     {
       getItem: getData,
-      render: /* @__PURE__ */ jsx(Ariakit.Role.label, { ...props, htmlFor: fieldId })
+      render: /* @__PURE__ */ jsx(Role.label, { ...props, htmlFor: fieldId })
     }
   );
 }
@@ -113,7 +117,7 @@ function FieldDescription(props) {
     }),
     []
   );
-  return /* @__PURE__ */ jsx(Ariakit.CollectionItem, { ...rest, id, getItem: getData });
+  return /* @__PURE__ */ jsx(CollectionItem, { ...rest, id, getItem: getData });
 }
 export {
   Field,

package/dist/bricks/Icon.js

@@ -1,14 +1,14 @@
 import { jsx } from "react/jsx-runtime";
 import * as React from "react";
 import cx from "classnames";
-import * as Ariakit from "@ariakit/react";
+import { Role } from "@ariakit/react/role";
 import { forwardRef } from "./~utils.js";
 const Icon = forwardRef((props, forwardedRef) => {
   const { href, size, alt, ...rest } = props;
   const iconId = toIconId(size);
   const isDecorative = !alt;
   return /* @__PURE__ */ jsx(
-    Ariakit.Role.svg,
+    Role.svg,
     {
       "aria-hidden": isDecorative ? "true" : void 0,
       role: isDecorative ? void 0 : "img",
@@ -41,7 +41,7 @@ const DisclosureArrow = forwardRef(
       {
         ...rest,
         render: /* @__PURE__ */ jsx(
-          Ariakit.Role.svg,
+          Role.svg,
           {
             width: "16",
             height: "16",
@@ -64,7 +64,7 @@ const Checkmark = forwardRef(
       {
         ...props,
         render: /* @__PURE__ */ jsx(
-          Ariakit.Role.svg,
+          Role.svg,
           {
             width: "16",
             height: "16",
@@ -93,7 +93,7 @@ const Dismiss = forwardRef(
       {
         ...props,
         render: /* @__PURE__ */ jsx(
-          Ariakit.Role.svg,
+          Role.svg,
           {
             width: "16",
             height: "16",

package/dist/bricks/IconButton.d.ts

@@ -1,3 +1,4 @@
+import * as React from "react";
 import { Button } from "./Button.js";
 interface IconButtonBaseProps extends Omit<React.ComponentProps<typeof Button>, "children" | "tone"> {
     /**
@@ -23,6 +24,21 @@ interface IconButtonBaseProps extends Omit<React.ComponentProps<typeof Button>,
      * @default "tooltip"
      */
     labelVariant?: "tooltip" | "visually-hidden";
+    /**
+     * A small dot displayed in the corner of the icon.
+     *
+     * The value of this prop gets used as the button's "accessible description".
+     *
+     * Example:
+     * ```tsx
+     * <IconButton
+     *   label="Messages"
+     *   dot="You have unread messages"
+     *   icon={…}
+     * />
+     * ```
+     */
+    dot?: string;
 }
 /**
  * An icon-only button, with a required accessible name.
@@ -56,7 +72,7 @@ interface IconButtonBaseProps extends Omit<React.ComponentProps<typeof Button>,
  * />
  * ```
  */
-export declare const IconButton: import("react").ForwardRefExoticComponent<(Omit<IconButtonBaseProps & {
+export declare const IconButton: React.ForwardRefExoticComponent<(Omit<IconButtonBaseProps & {
     variant: "ghost";
     /**
      * Whether the button is in a toggled state and currently "active" (toggled on).
@@ -75,5 +91,5 @@ export declare const IconButton: import("react").ForwardRefExoticComponent<(Omit
 }, "ref"> | Omit<IconButtonBaseProps & {
     variant?: Omit<React.ComponentProps<typeof Button>["variant"], "ghost">;
     isActive?: never;
-}, "ref">) & import("react").RefAttributes<HTMLElement | HTMLButtonElement>>;
+}, "ref">) & React.RefAttributes<HTMLElement | HTMLButtonElement>>;
 export {};

package/dist/bricks/IconButton.js

@@ -1,6 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
+import * as React from "react";
 import cx from "classnames";
-import * as Ariakit from "@ariakit/react";
+import { useToolbarContext, ToolbarItem } from "@ariakit/react/toolbar";
 import { Button } from "./Button.js";
 import { VisuallyHidden } from "./VisuallyHidden.js";
 import { Icon } from "./Icon.js";
@@ -8,19 +9,26 @@ import { Tooltip } from "./Tooltip.js";
 import { forwardRef } from "./~utils.js";
 const IconButton = forwardRef(
   (props, forwardedRef) => {
-    const { label, icon, isActive, labelVariant, ...rest } = props;
-    const toolbar = Ariakit.useToolbarContext();
+    const { label, icon, isActive, labelVariant, dot, ...rest } = props;
+    const baseId = React.useId();
+    const labelId = `${baseId}-label`;
+    const dotId = `${baseId}-dot`;
+    const toolbar = useToolbarContext();
     const button = /* @__PURE__ */ jsxs(
       Button,
       {
         "aria-pressed": isActive,
+        "aria-labelledby": labelId,
+        "aria-describedby": dot ? dotId : void 0,
         ...rest,
-        render: toolbar ? /* @__PURE__ */ jsx(Ariakit.ToolbarItem, { render: props.render }) : props.render,
+        "data-kiwi-dot": dot ? "true" : void 0,
+        render: toolbar ? /* @__PURE__ */ jsx(ToolbarItem, { render: props.render }) : props.render,
         className: cx("\u{1F95D}-icon-button", props.className),
         ref: forwardedRef,
         children: [
-          /* @__PURE__ */ jsx(VisuallyHidden, { children: label }),
-          typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { href: icon }) : icon
+          /* @__PURE__ */ jsx(VisuallyHidden, { id: labelId, children: label }),
+          typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { href: icon }) : icon,
+          dot ? /* @__PURE__ */ jsx(VisuallyHidden, { id: dotId, "aria-hidden": "true", children: dot }) : null
         ]
       }
     );

package/dist/bricks/Kbd.d.ts

@@ -1,20 +1,5 @@
 import { type BaseProps } from "./~utils.js";
-declare const predefinedSymbols: {
-    readonly Backspace: "⌫";
-    readonly Command: "⌘";
-    readonly Control: "Ctrl";
-    readonly Down: "↓";
-    readonly Eject: "⏏";
-    readonly Enter: "↵";
-    readonly Escape: "Esc";
-    readonly Left: "←";
-    readonly Option: "⌥";
-    readonly Right: "→";
-    readonly Shift: "⇧";
-    readonly Space: "␣";
-    readonly Tab: "Tab";
-    readonly Up: "↑";
-};
+import { type PredefinedSymbol } from "./Kbd.internal.js";
 interface KbdProps extends BaseProps<"kbd"> {
     /** @default "solid" */
     variant?: "solid" | "muted" | "ghost";
@@ -27,7 +12,7 @@ interface KbdProps extends BaseProps<"kbd"> {
      * <Kbd symbol="Control" />
      * ```
      */
-    symbol?: keyof typeof predefinedSymbols;
+    symbol?: PredefinedSymbol;
 }
 /**
  * A styled wrapper over the HTML `<kbd>` element. This is typically

package/dist/bricks/Kbd.internal.d.ts

@@ -0,0 +1,17 @@
+export type PredefinedSymbol = keyof typeof predefinedSymbols;
+export declare const predefinedSymbols: {
+    readonly Backspace: "⌫";
+    readonly Command: "⌘";
+    readonly Control: "Ctrl";
+    readonly Down: "↓";
+    readonly Eject: "⏏";
+    readonly Enter: "↵";
+    readonly Escape: "Esc";
+    readonly Left: "←";
+    readonly Option: "⌥";
+    readonly Right: "→";
+    readonly Shift: "⇧";
+    readonly Space: "␣";
+    readonly Tab: "Tab";
+    readonly Up: "↑";
+};

package/dist/bricks/Kbd.internal.js

@@ -0,0 +1,19 @@
+const predefinedSymbols = {
+  Backspace: "\u232B",
+  Command: "\u2318",
+  Control: "Ctrl",
+  Down: "\u2193",
+  Eject: "\u23CF",
+  Enter: "\u21B5",
+  Escape: "Esc",
+  Left: "\u2190",
+  Option: "\u2325",
+  Right: "\u2192",
+  Shift: "\u21E7",
+  Space: "\u2423",
+  Tab: "Tab",
+  Up: "\u2191"
+};
+export {
+  predefinedSymbols
+};