@itwin/itwinui-react 5.0.0-alpha.11 → 5.0.0-alpha.13

package/dist/bricks/Field.js

@@ -3,14 +3,18 @@ import * as React from "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) => {
+import {
+  FieldCollection,
+  FieldControlTypeContext
+} from "./Field.internal.js";
+import { Label } from "./Label.js";
+import { Description } from "./Description.js";
+const FieldRoot = forwardRef((props, forwardedRef) => {
   const { layout, ...rest } = props;
   return /* @__PURE__ */ jsx(
     FieldCollection,
@@ -27,75 +31,41 @@ const Field = forwardRef((props, forwardedRef) => {
     }
   );
 });
-function FieldCollection(props) {
-  const fieldElementCollection = useCollectionStore({
-    defaultItems: []
-  });
-  const renderedItems = useStoreState(fieldElementCollection, "renderedItems");
-  const [controlType, controlIndex] = React.useMemo(() => {
-    const controlIndex2 = renderedItems.findIndex(
-      (item) => item.elementType === "control"
+const FieldLabel = forwardRef(
+  (props, forwardedRef) => {
+    const store = useCollectionContext();
+    const renderedItems = useStoreState(
+      store,
+      "renderedItems"
     );
-    return [renderedItems[controlIndex2]?.controlType, controlIndex2];
-  }, [renderedItems]);
-  const labelPlacement = React.useMemo(() => {
-    const labelIndex = renderedItems.findIndex(
-      (item) => item.elementType === "label"
+    const fieldId = React.useMemo(
+      () => renderedItems?.find((item) => item.elementType === "control")?.id,
+      [renderedItems]
     );
-    if (controlIndex === -1 || labelIndex === -1) return;
-    return labelIndex < controlIndex ? "before" : "after";
-  }, [renderedItems, controlIndex]);
-  return /* @__PURE__ */ jsx(
-    Collection,
-    {
-      ...props,
-      store: fieldElementCollection,
-      "data-kiwi-label-placement": labelPlacement,
-      "data-kiwi-control-type": controlType
-    }
-  );
-}
-function FieldControl(props) {
-  const store = useCollectionContext();
+    const getData = React.useCallback(
+      (data) => ({
+        ...data,
+        elementType: "label"
+      }),
+      []
+    );
+    return /* @__PURE__ */ jsx(
+      CollectionItem,
+      {
+        getItem: getData,
+        render: /* @__PURE__ */ jsx(Label, { ...props, htmlFor: fieldId }),
+        ref: forwardedRef
+      }
+    );
+  }
+);
+const FieldDescription = forwardRef((props, forwardedRef) => {
   const generatedId = React.useId();
-  const { id = store ? generatedId : void 0, type, ...rest } = props;
-  const renderedItems = useStoreState(store, "renderedItems");
-  const describedBy = React.useMemo(() => {
-    const idRefList = renderedItems?.filter(
-      (item) => item.elementType === "description"
-    )?.map((item) => item.id).join(" ");
-    return idRefList || void 0;
-  }, [renderedItems]);
-  const getData = React.useCallback(
-    (data) => ({
-      ...data,
-      elementType: "control",
-      controlType: type
-    }),
-    [type]
-  );
-  return /* @__PURE__ */ jsx(
-    CollectionItem,
-    {
-      id,
-      getItem: getData,
-      render: /* @__PURE__ */ jsx(Role, { ...rest, "aria-describedby": describedBy })
-    }
-  );
-}
-function FieldLabel(props) {
-  const store = useCollectionContext();
-  const renderedItems = useStoreState(store, "renderedItems");
-  const fieldId = React.useMemo(
-    () => renderedItems?.find(
-      (item) => item.elementType === "control"
-    )?.id,
-    [renderedItems]
-  );
+  const { id = generatedId, ...rest } = props;
   const getData = React.useCallback(
     (data) => ({
       ...data,
-      elementType: "label"
+      elementType: "description"
     }),
     []
   );
@@ -103,25 +73,86 @@ function FieldLabel(props) {
     CollectionItem,
     {
       getItem: getData,
-      render: /* @__PURE__ */ jsx(Role.label, { ...props, htmlFor: fieldId })
+      id,
+      render: /* @__PURE__ */ jsx(Description, { ...rest }),
+      ref: forwardedRef
     }
   );
-}
-function FieldDescription(props) {
-  const generatedId = React.useId();
-  const { id = generatedId, ...rest } = props;
-  const getData = React.useCallback(
-    (data) => ({
-      ...data,
-      elementType: "description"
-    }),
-    []
-  );
-  return /* @__PURE__ */ jsx(CollectionItem, { ...rest, id, getItem: getData });
-}
+});
+const FieldControl = forwardRef(
+  (props, forwardedRef) => {
+    const [controlType, setControlType] = React.useState();
+    const store = useCollectionContext();
+    const generatedId = React.useId();
+    const { id = store ? generatedId : void 0, ...rest } = props;
+    const renderedItems = useStoreState(
+      store,
+      "renderedItems"
+    );
+    const describedBy = React.useMemo(() => {
+      const idRefList = renderedItems?.filter(
+        (item) => item.elementType === "description" || item.elementType === "error"
+      )?.map((item) => item.id).join(" ");
+      return idRefList || void 0;
+    }, [renderedItems]);
+    const getData = React.useCallback(
+      (data) => ({
+        ...data,
+        elementType: "control",
+        controlType
+      }),
+      [controlType]
+    );
+    const invalid = React.useMemo(
+      () => renderedItems?.some(
+        (item) => item.elementType === "error"
+      ),
+      [renderedItems]
+    );
+    return /* @__PURE__ */ jsx(FieldControlTypeContext.Provider, { value: setControlType, children: /* @__PURE__ */ jsx(
+      CollectionItem,
+      {
+        id,
+        getItem: getData,
+        render: /* @__PURE__ */ jsx(
+          Role,
+          {
+            ...rest,
+            "aria-invalid": invalid ? "true" : void 0,
+            "aria-describedby": describedBy
+          }
+        ),
+        ref: forwardedRef
+      }
+    ) });
+  }
+);
+const FieldErrorMessage = forwardRef(
+  (props, forwardedRef) => {
+    const generatedId = React.useId();
+    const { id = generatedId, ...rest } = props;
+    const getData = React.useCallback(
+      (data) => ({
+        ...data,
+        elementType: "error"
+      }),
+      []
+    );
+    return /* @__PURE__ */ jsx(
+      CollectionItem,
+      {
+        id,
+        getItem: getData,
+        render: /* @__PURE__ */ jsx(Description, { ...rest, tone: "critical" }),
+        ref: forwardedRef
+      }
+    );
+  }
+);
 export {
-  Field,
-  FieldControl,
-  FieldDescription,
-  FieldLabel
+  FieldControl as Control,
+  FieldDescription as Description,
+  FieldErrorMessage as ErrorMessage,
+  FieldLabel as Label,
+  FieldRoot as Root
 };

package/dist/bricks/Icon.d.ts

@@ -71,4 +71,10 @@ export declare const Dismiss: React.ForwardRefExoticComponent<DismissProps & Rea
 interface StatusWarningProps extends Omit<BaseProps<"svg">, "children"> {
 }
 export declare const StatusWarning: React.ForwardRefExoticComponent<StatusWarningProps & React.RefAttributes<HTMLElement | SVGSVGElement>>;
+interface MoreHorizontalProps extends Omit<BaseProps<"svg">, "children"> {
+}
+export declare const MoreHorizontal: React.ForwardRefExoticComponent<MoreHorizontalProps & React.RefAttributes<HTMLElement | SVGSVGElement>>;
+interface ChevronDownProps extends Omit<BaseProps<"svg">, "children"> {
+}
+export declare const ChevronDown: React.ForwardRefExoticComponent<ChevronDownProps & React.RefAttributes<HTMLElement | SVGSVGElement>>;
 export {};

package/dist/bricks/Icon.js

@@ -215,10 +215,65 @@ const StatusWarning = forwardRef(
     );
   }
 );
+const MoreHorizontal = forwardRef(
+  (props, forwardedRef) => {
+    return /* @__PURE__ */ jsx(
+      Icon,
+      {
+        ...props,
+        render: /* @__PURE__ */ jsx(
+          Role.svg,
+          {
+            width: "16",
+            height: "16",
+            viewBox: "0 0 16 16",
+            fill: "none",
+            render: props.render,
+            children: /* @__PURE__ */ jsx(
+              "path",
+              {
+                fill: "currentColor",
+                fillRule: "evenodd",
+                d: "M3 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm6-1a1 1 0 1 1-2 0 1 1 0 0 1 2 0Zm5 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z",
+                clipRule: "evenodd"
+              }
+            )
+          }
+        ),
+        ref: forwardedRef
+      }
+    );
+  }
+);
+const ChevronDown = forwardRef(
+  (props, forwardedRef) => {
+    return /* @__PURE__ */ jsx(
+      Icon,
+      {
+        ...props,
+        render: /* @__PURE__ */ jsx(
+          Role.svg,
+          {
+            width: "16",
+            height: "16",
+            fill: "currentColor",
+            viewBox: "0 0 16 16",
+            render: props.render,
+            children: /* @__PURE__ */ jsx("path", { d: "M4.146 6.146a.5.5 0 0 1 .708 0L8 9.293l3.146-3.147a.5.5 0 0 1 .708.708l-3.5 3.5a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 0 1 0-.708Z" })
+          }
+        ),
+        className: cx("\u{1F95D}-chevron-down", props.className),
+        ref: forwardedRef
+      }
+    );
+  }
+);
 export {
   Checkmark,
+  ChevronDown,
   DisclosureArrow,
   Dismiss,
   Icon,
+  MoreHorizontal,
   StatusWarning
 };

package/dist/bricks/IconButton.js

@@ -1,19 +1,18 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import cx from "classnames";
-import { useToolbarContext, ToolbarItem } from "@ariakit/react/toolbar";
 import { Button } from "./Button.js";
 import { VisuallyHidden } from "./VisuallyHidden.js";
 import { Icon } from "./Icon.js";
 import { Tooltip } from "./Tooltip.js";
 import { forwardRef } from "./~utils.js";
+import { Dot } from "./~utils.Dot.js";
 const IconButton = forwardRef(
   (props, forwardedRef) => {
     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,
       {
@@ -21,14 +20,12 @@ const IconButton = forwardRef(
         "aria-labelledby": labelId,
         "aria-describedby": dot ? dotId : void 0,
         ...rest,
-        "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, { 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
+          dot ? /* @__PURE__ */ jsx(Dot, { id: dotId, className: "\u{1F95D}-icon-button-dot", children: dot }) : null
         ]
       }
     );

package/dist/bricks/Label.d.ts

@@ -2,24 +2,17 @@ import { type BaseProps } from "./~utils.js";
 interface LabelProps extends BaseProps<"label"> {
 }
 /**
- * A styled wrapper over the HTML `<label>` element, used for labelling form controls.
+ * A styled wrapper over the HTML `<label>` element, used for labelling form
+ * controls.
  *
- * Can be used standalone:
-
+ * Example usage:
  * ```tsx
  * <Label htmlFor="my-input">Label</Label>
  * <TextBox.Input id="my-input" />
  * ```
  *
- * Or within a `Field` component to automatically manage ID associations:
- *
- * ```tsx
- * <Field>
- *   <Label>Label</Label>
- *   <TextBox.Input />
- * </Field>
- * ```
- *
+ * See `Field.Label` for convenient usage with form controls (e.g. automatic
+ * association with adjacent form control).
  */
 export declare const Label: import("react").ForwardRefExoticComponent<LabelProps & import("react").RefAttributes<HTMLElement | HTMLLabelElement>>;
 export {};

package/dist/bricks/Label.js

@@ -2,19 +2,13 @@ import { jsx } from "react/jsx-runtime";
 import cx from "classnames";
 import { Role } from "@ariakit/react/role";
 import { forwardRef } from "./~utils.js";
-import { FieldLabel } from "./Field.js";
 const Label = forwardRef((props, forwardedRef) => {
   return /* @__PURE__ */ jsx(
-    FieldLabel,
+    Role.label,
     {
-      render: /* @__PURE__ */ jsx(
-        Role.label,
-        {
-          ...props,
-          className: cx("\u{1F95D}-label", props.className),
-          ref: forwardedRef
-        }
-      )
+      ...props,
+      className: cx("\u{1F95D}-label", props.className),
+      ref: forwardedRef
     }
   );
 });

package/dist/bricks/ProgressBar.d.ts

@@ -1,5 +1,11 @@
 import { type BaseProps } from "./~utils.js";
-interface ProgressBarProps extends Omit<BaseProps, "aria-labelledby">, Required<Pick<BaseProps, "aria-labelledby">> {
+interface ProgressBarProps extends Omit<BaseProps, "aria-labelledby"> {
+    /**
+     * Label for the progress bar.
+     *
+     * This prop is required because `role="progressbar"` requires an accessible name.
+     */
+    "aria-labelledby": string;
     /**
      * The size of the progress bar.
      * @default "medium"

package/dist/bricks/Radio.d.ts

@@ -7,13 +7,22 @@ interface RadioProps extends InputBaseProps, RadioOwnProps {
 /**
  * A styled radio input element, typically used for selecting a single option from a list.
  *
- * Works well with the `Field` and `Label` components.
+ * Use with the `Field` components to automatically handle ID associations for
+ * labels and descriptions:
+ * ```tsx
+ * <Field.Root>
+ *   <Field.Label>Choose one</Field.Label>
+ *   <Field.Control render={<Radio />} />
+ * </Field.Root>
+ * ```
  *
+ * Without the `Field` components you will need to manually associate labels,
+ * descriptions, etc.:
  * ```tsx
- * <Field>
- *   <Label>Choose one</Label>
- *   <Radio />
- * </Field>
+ * <Radio id="editor-vim" name="editor" value="vim" />
+ * <Label htmlFor="editor-vim">Vim</Label>
+ * <Radio id="editor-emacs" name="editor" value="emacs" />
+ * <Label htmlFor="editor-emacs">Emacs</Label>
  * ```
  *
  * Underneath, it's an HTML radio input, i.e. `<input type="radio">`, so it supports the same props,

package/dist/bricks/Radio.js

@@ -3,24 +3,17 @@ import cx from "classnames";
 import {
   Radio as AkRadio
 } from "@ariakit/react/radio";
-import { FieldControl } from "./Field.js";
 import { forwardRef } from "./~utils.js";
+import { useFieldControlType } from "./Field.internal.js";
 const Radio = forwardRef((props, forwardedRef) => {
-  const { id, ...rest } = props;
+  useFieldControlType("checkable");
   return /* @__PURE__ */ jsx(
-    FieldControl,
+    AkRadio,
     {
-      type: "checkable",
-      id,
-      render: /* @__PURE__ */ jsx(
-        AkRadio,
-        {
-          accessibleWhenDisabled: true,
-          ...rest,
-          className: cx("\u{1F95D}-checkbox", "\u{1F95D}-radio", props.className),
-          ref: forwardedRef
-        }
-      )
+      accessibleWhenDisabled: true,
+      ...props,
+      className: cx("\u{1F95D}-checkbox", "\u{1F95D}-radio", props.className),
+      ref: forwardedRef
     }
   );
 });

package/dist/bricks/Select.d.ts

@@ -3,20 +3,37 @@ import { type FocusableProps } from "./~utils.js";
 /**
  * Compound component for a select element, which allows the user to select a value from a list of options.
  *
- * Works well with the `Field` and `Label` components.
+ * Use with the `Field` components to automatically handle ID associations for
+ * labels and descriptions:
+ * ```tsx
+ * <Field.Root>
+ *   <Field.Label>Fruit</Field.Label>
+ *   <Field.Control
+ *     render={(controlProps) => (
+ *       <Select.Root>
+ *         <Select.HtmlSelect name="fruit" {...controlProps}>
+ *           <option value="kiwi">Kiwi</option>
+ *           <option value="mango">Mango</option>
+ *           <option value="papaya">Papaya</option>
+ *         </Select.HtmlSelect>
+ *       </Select.Root>
+ *     )}
+ *   />
+ * </Field.Root>
+ * ```
  *
- * Example usage:
+ * Without the `Field` components you will need to manually associate labels,
+ * descriptions, etc.:
  * ```tsx
- * <Field>
- *   <Label>Select an option</Label>
- *   <Select.Root>
- *     <Select.HtmlSelect>
- *       <option value="1">Option 1</option>
- *       <option value="2">Option 2</option>
- *       <option value="3">Option 3</option>
- *     </Select.HtmlSelect>
- *   </Select.Root>
- * </Field>
+ * <Label htmlFor="fruit">Fruit</Label>
+ * <Description id="fruit-description">Something to include in a fruit salad.</Description>
+ * <Select.Root>
+ *   <Select.HtmlSelect id="fruit" aria-labelledby="fruit-description">
+ *     <option value="kiwi">Kiwi</option>
+ *     <option value="mango">Mango</option>
+ *     <option value="papaya">Papaya</option>
+ *   </Select.HtmlSelect>
+ * </Select.Root>
  * ```
  */
 declare const SelectRoot: React.ForwardRefExoticComponent<Pick<import("@ariakit/react/role").RoleProps, "render"> & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref">, "render"> & React.RefAttributes<HTMLElement | HTMLDivElement>>;

package/dist/bricks/Select.js

@@ -7,11 +7,12 @@ import {
   isBrowser
 } from "./~utils.js";
 import { DisclosureArrow } from "./Icon.js";
-import { FieldControl } from "./Field.js";
+import { useFieldControlType } from "./Field.internal.js";
 const supportsHas = isBrowser && CSS?.supports?.("selector(:has(+ *))");
 const HtmlSelectContext = React.createContext(() => {
 });
 const SelectRoot = forwardRef((props, forwardedRef) => {
+  useFieldControlType("textlike");
   const [isHtmlSelect, setIsHtmlSelect] = React.useState(false);
   return /* @__PURE__ */ jsx(HtmlSelectContext.Provider, { value: setIsHtmlSelect, children: /* @__PURE__ */ jsx(
     Role.div,
@@ -25,7 +26,7 @@ const SelectRoot = forwardRef((props, forwardedRef) => {
 });
 const HtmlSelect = forwardRef(
   (props, forwardedRef) => {
-    const { id, variant = "solid", ...rest } = props;
+    const { variant = "solid", ...rest } = props;
     const setIsHtmlSelect = React.useContext(HtmlSelectContext);
     React.useEffect(
       function updateContext() {
@@ -35,20 +36,13 @@ const HtmlSelect = forwardRef(
     );
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
-        FieldControl,
+        Role.select,
         {
-          type: "textlike",
-          id,
-          render: /* @__PURE__ */ jsx(
-            Role.select,
-            {
-              ...rest,
-              className: cx("\u{1F95D}-button", "\u{1F95D}-select", props.className),
-              "data-kiwi-tone": "neutral",
-              "data-kiwi-variant": variant,
-              ref: forwardedRef
-            }
-          )
+          ...rest,
+          className: cx("\u{1F95D}-button", "\u{1F95D}-select", props.className),
+          "data-kiwi-tone": "neutral",
+          "data-kiwi-variant": variant,
+          ref: forwardedRef
         }
       ),
       /* @__PURE__ */ jsx(DisclosureArrow, { className: "\u{1F95D}-select-arrow" })

package/dist/bricks/Switch.d.ts

@@ -11,13 +11,20 @@ interface SwitchProps extends InputBaseProps, CheckboxOwnProps {
 /**
  * A toggle switch element, typically used for enabling or disabling a feature.
  *
- * Works well with the `Field` and `Label` components.
+ * Use with the `Field` components to automatically handle ID associations for
+ * labels and descriptions:
+ * ```tsx
+ * <Field.Root>
+ *   <Field.Label>Enable feature</Field.Label>
+ *   <Field.Control render={<Switch />} />
+ * </Field.Root>
+ * ```
  *
+ * Without the `Field` components you will need to manually associate labels,
+ * descriptions, etc.:
  * ```tsx
- * <Field>
- *   <Label>Enable feature</Label>
- *   <Switch />
- * </Field>
+ * <Switch id="dark-mode" />
+ * <Label htmlFor="dark-mode">Dark mode</Label>
  * ```
  *
  * Underneath, it's an HTML checkbox, i.e. `<input type="checkbox">`, so it supports the same props,

package/dist/bricks/Switch.js

@@ -3,26 +3,19 @@ import cx from "classnames";
 import {
   Checkbox as AkCheckbox
 } from "@ariakit/react/checkbox";
-import { FieldControl } from "./Field.js";
 import { forwardRef } from "./~utils.js";
+import { useFieldControlType } from "./Field.internal.js";
 const Switch = forwardRef(
   (props, forwardedRef) => {
-    const { id, ...rest } = props;
+    useFieldControlType("checkable");
     return /* @__PURE__ */ jsx(
-      FieldControl,
+      AkCheckbox,
       {
-        type: "checkable",
-        id,
-        render: /* @__PURE__ */ jsx(
-          AkCheckbox,
-          {
-            accessibleWhenDisabled: true,
-            ...rest,
-            className: cx("\u{1F95D}-switch", props.className),
-            role: "switch",
-            ref: forwardedRef
-          }
-        )
+        accessibleWhenDisabled: true,
+        ...props,
+        className: cx("\u{1F95D}-switch", props.className),
+        role: "switch",
+        ref: forwardedRef
       }
     );
   }