@base-ui/react 1.1.0 → 1.3.0

package/esm/utils/useValueChanged.js

@@ -1,3 +1,5 @@
+'use client';
+
 import * as React from 'react';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';

package/field/control/FieldControl.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FieldRoot } from "../root/FieldRoot.js";
+import { type FieldRootState } from "../root/FieldRoot.js";
 import { BaseUIComponentProps } from "../../utils/types.js";
 import { REASONS } from "../../utils/reasons.js";
 import type { BaseUIChangeEventDetails } from "../../utils/createBaseUIEventDetails.js";
@@ -13,14 +13,14 @@ import type { BaseUIChangeEventDetails } from "../../utils/createBaseUIEventDeta
  *
  * Documentation: [Base UI Field](https://base-ui.com/react/components/field)
  */
-export declare const FieldControl: React.ForwardRefExoticComponent<Omit<FieldControlProps, "ref"> & React.RefAttributes<HTMLInputElement>>;
-export type FieldControlState = FieldRoot.State;
-export interface FieldControlProps extends BaseUIComponentProps<'input', FieldControl.State> {
+export declare const FieldControl: React.ForwardRefExoticComponent<Omit<FieldControlProps, "ref"> & React.RefAttributes<HTMLElement>>;
+export interface FieldControlState extends FieldRootState {}
+export interface FieldControlProps extends BaseUIComponentProps<'input', FieldControlState> {
   /**
    * Callback fired when the `value` changes. Use when controlled.
    */
-  onValueChange?: (value: string, eventDetails: FieldControl.ChangeEventDetails) => void;
-  defaultValue?: React.ComponentProps<'input'>['defaultValue'];
+  onValueChange?: ((value: string, eventDetails: FieldControl.ChangeEventDetails) => void) | undefined;
+  defaultValue?: React.ComponentProps<'input'>['defaultValue'] | undefined;
 }
 export type FieldControlChangeEventReason = typeof REASONS.none;
 export type FieldControlChangeEventDetails = BaseUIChangeEventDetails<FieldControl.ChangeEventReason>;

package/field/control/FieldControl.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FieldControl = void 0;
 var React = _interopRequireWildcard(require("react"));
-var _useStableCallback = require("@base-ui/utils/useStableCallback");
 var _useControlled = require("@base-ui/utils/useControlled");
 var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
+var _owner = require("@base-ui/utils/owner");
 var _FieldRootContext = require("../root/FieldRootContext");
 var _LabelableContext = require("../../labelable-provider/LabelableContext");
 var _useLabelableId = require("../../labelable-provider/useLabelableId");
@@ -18,6 +18,7 @@ var _useRenderElement = require("../../utils/useRenderElement");
 var _useField = require("../useField");
 var _createBaseUIEventDetails = require("../../utils/createBaseUIEventDetails");
 var _reasons = require("../../utils/reasons");
+var _utils = require("../../floating-ui-react/utils");
 /**
  * The form control to label and validate.
  * Renders an `<input>` element.
@@ -38,20 +39,13 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
     disabled: disabledProp = false,
     onValueChange,
     defaultValue,
+    autoFocus = false,
     ...elementProps
   } = componentProps;
   const {
     state: fieldState,
     name: fieldName,
-    disabled: fieldDisabled
-  } = (0, _FieldRootContext.useFieldRootContext)();
-  const disabled = fieldDisabled || disabledProp;
-  const name = fieldName ?? nameProp;
-  const state = React.useMemo(() => ({
-    ...fieldState,
-    disabled
-  }), [fieldState, disabled]);
-  const {
+    disabled: fieldDisabled,
     setTouched,
     setDirty,
     validityData,
@@ -60,6 +54,12 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
     validationMode,
     validation
   } = (0, _FieldRootContext.useFieldRootContext)();
+  const disabled = fieldDisabled || disabledProp;
+  const name = fieldName ?? nameProp;
+  const state = {
+    ...fieldState,
+    disabled
+  };
   const {
     labelId
   } = (0, _LabelableContext.useLabelableContext)();
@@ -74,20 +74,20 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
       setFilled(false);
     }
   }, [validation.inputRef, setFilled, valueProp]);
-  const [value, setValueUnwrapped] = (0, _useControlled.useControlled)({
+  const inputRef = React.useRef(null);
+  (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
+    if (autoFocus && inputRef.current === (0, _utils.activeElement)((0, _owner.ownerDocument)(inputRef.current))) {
+      setFocused(true);
+    }
+  }, [autoFocus, setFocused]);
+  const [valueUnwrapped] = (0, _useControlled.useControlled)({
     controlled: valueProp,
     default: defaultValue,
     name: 'FieldControl',
     state: 'value'
   });
   const isControlled = valueProp !== undefined;
-  const setValue = (0, _useStableCallback.useStableCallback)((nextValue, eventDetails) => {
-    onValueChange?.(nextValue, eventDetails);
-    if (eventDetails.isCanceled) {
-      return;
-    }
-    setValueUnwrapped(nextValue);
-  });
+  const value = isControlled ? valueUnwrapped : undefined;
   (0, _useField.useField)({
     id,
     name,
@@ -97,7 +97,7 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
     controlRef: validation.inputRef
   });
   const element = (0, _useRenderElement.useRenderElement)('input', componentProps, {
-    ref: forwardedRef,
+    ref: [forwardedRef, inputRef],
     state,
     props: [{
       id,
@@ -105,6 +105,7 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
       name,
       ref: validation.inputRef,
       'aria-labelledby': labelId,
+      autoFocus,
       ...(isControlled ? {
         value
       } : {
@@ -112,7 +113,7 @@ const FieldControl = exports.FieldControl = /*#__PURE__*/React.forwardRef(functi
       }),
       onChange(event) {
         const inputValue = event.currentTarget.value;
-        setValue(inputValue, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.none, event.nativeEvent));
+        onValueChange?.(inputValue, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.none, event.nativeEvent));
         setDirty(inputValue !== validityData.initialValue);
         setFilled(inputValue !== '');
       },

package/field/description/FieldDescription.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FieldRoot } from "../root/FieldRoot.js";
+import { type FieldRootState } from "../root/FieldRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * A paragraph with additional information about the field.
@@ -8,8 +8,8 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Field](https://base-ui.com/react/components/field)
  */
 export declare const FieldDescription: React.ForwardRefExoticComponent<Omit<FieldDescriptionProps, "ref"> & React.RefAttributes<HTMLParagraphElement>>;
-export type FieldDescriptionState = FieldRoot.State;
-export interface FieldDescriptionProps extends BaseUIComponentProps<'p', FieldDescription.State> {}
+export interface FieldDescriptionState extends FieldRootState {}
+export interface FieldDescriptionProps extends BaseUIComponentProps<'p', FieldDescriptionState> {}
 export declare namespace FieldDescription {
   type State = FieldDescriptionState;
   type Props = FieldDescriptionProps;

package/field/error/FieldError.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { FieldRoot } from "../root/FieldRoot.js";
+import { type FieldRootState } from "../root/FieldRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
+import { type TransitionStatus } from "../../utils/useTransitionStatus.js";
 /**
  * An error message displayed if the field control fails validation.
  * Renders a `<div>` element.
@@ -8,15 +9,20 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Field](https://base-ui.com/react/components/field)
  */
 export declare const FieldError: React.ForwardRefExoticComponent<Omit<FieldErrorProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export type FieldErrorState = FieldRoot.State;
-export interface FieldErrorProps extends BaseUIComponentProps<'div', FieldError.State> {
+export interface FieldErrorState extends FieldRootState {
+  /**
+   * The transition status of the component.
+   */
+  transitionStatus: TransitionStatus;
+}
+export interface FieldErrorProps extends BaseUIComponentProps<'div', FieldErrorState> {
   /**
    * Determines whether to show the error message according to the field’s
    * [ValidityState](https://developer.mozilla.org/en-US/docs/Web/API/ValidityState).
    * Specifying `true` will always show the error message, and lets external libraries
    * control the visibility.
    */
-  match?: boolean | keyof ValidityState;
+  match?: boolean | keyof ValidityState | undefined;
 }
 export declare namespace FieldError {
   type State = FieldErrorState;

package/field/error/FieldError.js

@@ -14,6 +14,15 @@ var _constants = require("../utils/constants");
 var _FormContext = require("../../form/FormContext");
 var _useRenderElement = require("../../utils/useRenderElement");
 var _useBaseUiId = require("../../utils/useBaseUiId");
+var _useOpenChangeComplete = require("../../utils/useOpenChangeComplete");
+var _stateAttributesMapping = require("../../utils/stateAttributesMapping");
+var _useTransitionStatus = require("../../utils/useTransitionStatus");
+var _jsxRuntime = require("react/jsx-runtime");
+const stateAttributesMapping = {
+  ..._constants.fieldValidityMapping,
+  ..._stateAttributesMapping.transitionStatusMapping
+};
+
 /**
  * An error message displayed if the field control fails validation.
  * Renders a `<div>` element.
@@ -31,7 +40,7 @@ const FieldError = exports.FieldError = /*#__PURE__*/React.forwardRef(function F
   const id = (0, _useBaseUiId.useBaseUiId)(idProp);
   const {
     validityData,
-    state,
+    state: fieldState,
     name
   } = (0, _FieldRootContext.useFieldRootContext)(false);
   const {
@@ -49,6 +58,11 @@ const FieldError = exports.FieldError = /*#__PURE__*/React.forwardRef(function F
   } else {
     rendered = validityData.state.valid === false;
   }
+  const {
+    mounted,
+    transitionStatus,
+    setMounted
+  } = (0, _useTransitionStatus.useTransitionStatus)(rendered);
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (!rendered || !id) {
       return undefined;
@@ -58,18 +72,48 @@ const FieldError = exports.FieldError = /*#__PURE__*/React.forwardRef(function F
       setMessageIds(v => v.filter(item => item !== id));
     };
   }, [rendered, id, setMessageIds]);
+  const errorRef = React.useRef(null);
+  const [lastRenderedMessage, setLastRenderedMessage] = React.useState(null);
+  const [lastRenderedMessageKey, setLastRenderedMessageKey] = React.useState(null);
+  const errorMessage = formError || (validityData.errors.length > 1 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
+    children: validityData.errors.map(message => /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
+      children: message
+    }, message))
+  }) : validityData.error);
+  let errorKey = validityData.error;
+  if (formError != null) {
+    errorKey = Array.isArray(formError) ? JSON.stringify(formError) : formError;
+  } else if (validityData.errors.length > 1) {
+    errorKey = JSON.stringify(validityData.errors);
+  }
+  if (rendered && errorKey !== lastRenderedMessageKey) {
+    setLastRenderedMessageKey(errorKey);
+    setLastRenderedMessage(errorMessage);
+  }
+  (0, _useOpenChangeComplete.useOpenChangeComplete)({
+    open: rendered,
+    ref: errorRef,
+    onComplete() {
+      if (!rendered) {
+        setMounted(false);
+      }
+    }
+  });
+  const state = {
+    ...fieldState,
+    transitionStatus
+  };
   const element = (0, _useRenderElement.useRenderElement)('div', componentProps, {
-    ref: forwardedRef,
+    ref: [forwardedRef, errorRef],
     state,
     props: [{
       id,
-      children: formError || (validityData.errors.length > 1 ? /*#__PURE__*/React.createElement('ul', {}, validityData.errors.map(message => /*#__PURE__*/React.createElement('li', {
-        key: message
-      }, message))) : validityData.error)
+      children: rendered ? errorMessage : lastRenderedMessage
     }, elementProps],
-    stateAttributesMapping: _constants.fieldValidityMapping
+    stateAttributesMapping,
+    enabled: mounted
   });
-  if (!rendered) {
+  if (!mounted) {
     return null;
   }
   return element;

package/field/error/FieldErrorDataAttributes.d.ts

@@ -27,4 +27,12 @@ export declare enum FieldErrorDataAttributes {
    * Present when the field control is focused.
    */
   focused = "data-focused",
+  /**
+   * Present when the error message is animating in.
+   */
+  startingStyle = "data-starting-style",
+  /**
+   * Present when the error message is animating out.
+   */
+  endingStyle = "data-ending-style",
 }

package/field/error/FieldErrorDataAttributes.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FieldErrorDataAttributes = void 0;
-let FieldErrorDataAttributes = exports.FieldErrorDataAttributes = /*#__PURE__*/function (FieldErrorDataAttributes) {
+var _stateAttributesMapping = require("../../utils/stateAttributesMapping");
+let FieldErrorDataAttributes = exports.FieldErrorDataAttributes = function (FieldErrorDataAttributes) {
   /**
    * Present when the field is disabled.
    */
@@ -33,5 +34,13 @@ let FieldErrorDataAttributes = exports.FieldErrorDataAttributes = /*#__PURE__*/f
    * Present when the field control is focused.
    */
   FieldErrorDataAttributes["focused"] = "data-focused";
+  /**
+   * Present when the error message is animating in.
+   */
+  FieldErrorDataAttributes[FieldErrorDataAttributes["startingStyle"] = _stateAttributesMapping.TransitionStatusDataAttributes.startingStyle] = "startingStyle";
+  /**
+   * Present when the error message is animating out.
+   */
+  FieldErrorDataAttributes[FieldErrorDataAttributes["endingStyle"] = _stateAttributesMapping.TransitionStatusDataAttributes.endingStyle] = "endingStyle";
   return FieldErrorDataAttributes;
 }({});

package/field/item/FieldItem.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FieldRoot } from "../root/FieldRoot.js";
+import { type FieldRootState } from "../root/FieldRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * Groups individual items in a checkbox group or radio group with a label and description.
@@ -8,15 +8,16 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Field](https://base-ui.com/react/components/field)
  */
 export declare const FieldItem: React.ForwardRefExoticComponent<Omit<FieldItemProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface FieldItemProps extends BaseUIComponentProps<'div', FieldItem.State> {
+export interface FieldItemState extends FieldRootState {}
+export interface FieldItemProps extends BaseUIComponentProps<'div', FieldItemState> {
   /**
    * Whether the wrapped control should ignore user interaction.
    * The `disabled` prop on `<Field.Root>` takes precedence over this.
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
 }
 export declare namespace FieldItem {
-  type State = FieldRoot.State;
+  type State = FieldItemState;
   type Props = FieldItemProps;
 }

package/field/item/FieldItem.js

@@ -37,7 +37,7 @@ const FieldItem = exports.FieldItem = /*#__PURE__*/React.forwardRef(function Fie
   const parentId = checkboxGroupContext?.parent.id;
   // this a more reliable check
   const hasParentCheckbox = checkboxGroupContext?.allValues !== undefined;
-  const initialControlId = hasParentCheckbox ? parentId : undefined;
+  const controlId = hasParentCheckbox ? parentId : undefined;
   const fieldItemContext = React.useMemo(() => ({
     disabled
   }), [disabled]);
@@ -48,7 +48,7 @@ const FieldItem = exports.FieldItem = /*#__PURE__*/React.forwardRef(function Fie
     stateAttributesMapping: _constants.fieldValidityMapping
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_labelableProvider.LabelableProvider, {
-    initialControlId: initialControlId,
+    controlId: controlId,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FieldItemContext.FieldItemContext.Provider, {
       value: fieldItemContext,
       children: element

package/field/item/FieldItemContext.js

@@ -1,4 +1,5 @@
 "use strict";
+'use client';
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {

package/field/label/FieldLabel.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FieldRoot } from "../root/FieldRoot.js";
+import type { FieldRootState } from "../root/FieldRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * An accessible label that is automatically associated with the field control.
@@ -8,8 +8,8 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Field](https://base-ui.com/react/components/field)
  */
 export declare const FieldLabel: React.ForwardRefExoticComponent<Omit<FieldLabelProps, "ref"> & React.RefAttributes<HTMLElement>>;
-export type FieldLabelState = FieldRoot.State;
-export interface FieldLabelProps extends BaseUIComponentProps<'label', FieldLabel.State> {
+export interface FieldLabelState extends FieldRootState {}
+export interface FieldLabelProps extends BaseUIComponentProps<'label', FieldLabelState> {
   /**
    * Whether the component renders a native `<label>` element when replacing it via the `render` prop.
    * Set to `false` if the rendered element is not a label (e.g. `<div>`).
@@ -17,7 +17,7 @@ export interface FieldLabelProps extends BaseUIComponentProps<'label', FieldLabe
    * This is useful to avoid inheriting label behaviors on `<button>` controls (such as `<Select.Trigger>` and `<Combobox.Trigger>`), including avoiding `:hover` on the button when hovering the label, and preventing clicks on the label from firing on the button.
    * @default true
    */
-  nativeLabel?: boolean;
+  nativeLabel?: boolean | undefined;
 }
 export declare namespace FieldLabel {
   type State = FieldLabelState;

package/field/label/FieldLabel.js

@@ -8,16 +8,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.FieldLabel = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _error = require("@base-ui/utils/error");
-var _dom = require("@floating-ui/utils/dom");
-var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
-var _owner = require("@base-ui/utils/owner");
-var _useStableCallback = require("@base-ui/utils/useStableCallback");
-var _utils = require("../../floating-ui-react/utils");
+var _safeReact = require("@base-ui/utils/safeReact");
 var _FieldRootContext = require("../root/FieldRootContext");
-var _LabelableContext = require("../../labelable-provider/LabelableContext");
 var _constants = require("../utils/constants");
-var _useBaseUiId = require("../../utils/useBaseUiId");
 var _useRenderElement = require("../../utils/useRenderElement");
+var _LabelableContext = require("../../labelable-provider/LabelableContext");
+var _useLabel = require("../../labelable-provider/useLabel");
 /**
  * An accessible label that is automatically associated with the field control.
  * Renders a `<label>` element.
@@ -34,34 +30,12 @@ const FieldLabel = exports.FieldLabel = /*#__PURE__*/React.forwardRef(function F
   } = componentProps;
   const fieldRootContext = (0, _FieldRootContext.useFieldRootContext)(false);
   const {
-    controlId,
-    setLabelId,
     labelId
   } = (0, _LabelableContext.useLabelableContext)();
-  const id = (0, _useBaseUiId.useBaseUiId)(idProp);
   const labelRef = React.useRef(null);
-  const handleInteraction = (0, _useStableCallback.useStableCallback)(event => {
-    const target = (0, _utils.getTarget)(event.nativeEvent);
-    if (target?.closest('button,input,select,textarea')) {
-      return;
-    }
-
-    // Prevent text selection when double clicking label.
-    if (!event.defaultPrevented && event.detail > 1) {
-      event.preventDefault();
-    }
-    if (nativeLabel || !controlId) {
-      return;
-    }
-    const controlElement = (0, _owner.ownerDocument)(event.currentTarget).getElementById(controlId);
-    if ((0, _dom.isHTMLElement)(controlElement)) {
-      controlElement.focus({
-        // Available from Chrome 144+ (January 2026).
-        // Safari and Firefox already support it.
-        // @ts-expect-error not available in types yet
-        focusVisible: true
-      });
-    }
+  const labelProps = (0, _useLabel.useLabel)({
+    id: labelId ?? idProp,
+    native: nativeLabel
   });
   if (process.env.NODE_ENV !== 'production') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -72,35 +46,21 @@ const FieldLabel = exports.FieldLabel = /*#__PURE__*/React.forwardRef(function F
       const isLabelTag = labelRef.current.tagName === 'LABEL';
       if (nativeLabel) {
         if (!isLabelTag) {
-          (0, _error.error)('<Field.Label> was not rendered as a <label> element, which does not match the `nativeLabel` prop on the component. Ensure that the element passed to the `render` prop of <Field.Label> is a real <label>, or set the `nativeLabel` prop on the component to `false`.');
+          const ownerStackMessage = _safeReact.SafeReact.captureOwnerStack?.() || '';
+          const message = '<Field.Label> expected a <label> element because the `nativeLabel` prop is true. ' + 'Rendering a non-<label> disables native label association, so `htmlFor` will not ' + 'work. Use a real <label> in the `render` prop, or set `nativeLabel` to `false`.';
+          (0, _error.error)(`${message}${ownerStackMessage}`);
         }
       } else if (isLabelTag) {
-        (0, _error.error)('<Field.Label> was rendered as a <label> element, which does not match the `nativeLabel` prop on the component. Ensure that the element passed to the `render` prop of <Field.Label> is not a real <label>, or set the `nativeLabel` prop on the component to `true`.');
+        const ownerStackMessage = _safeReact.SafeReact.captureOwnerStack?.() || '';
+        const message = '<Field.Label> expected a non-<label> element because the `nativeLabel` prop is false. ' + 'Rendering a <label> assumes native label behavior while Base UI treats it as ' + 'non-native, which can cause unexpected pointer behavior. Use a non-<label> in the ' + '`render` prop, or set `nativeLabel` to `true`.';
+        (0, _error.error)(`${message}${ownerStackMessage}`);
       }
     }, [nativeLabel]);
   }
-  (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
-    if (id) {
-      setLabelId(id);
-    }
-    return () => {
-      setLabelId(undefined);
-    };
-  }, [id, setLabelId]);
   const element = (0, _useRenderElement.useRenderElement)('label', componentProps, {
     ref: [forwardedRef, labelRef],
     state: fieldRootContext.state,
-    props: [{
-      id: labelId
-    }, nativeLabel ? {
-      htmlFor: controlId ?? undefined,
-      onMouseDown: handleInteraction
-    } : {
-      onClick: handleInteraction,
-      onPointerDown(event) {
-        event.preventDefault();
-      }
-    }, elementProps],
+    props: [labelProps, elementProps],
     stateAttributesMapping: _constants.fieldValidityMapping
   });
   return element;

package/field/root/FieldRoot.d.ts

@@ -31,33 +31,50 @@ export interface FieldRootActions {
   validate: () => void;
 }
 export interface FieldRootState {
-  /** Whether the component should ignore user interaction. */
+  /**
+   * Whether the component should ignore user interaction.
+   */
   disabled: boolean;
+  /**
+   * Whether the field has been touched.
+   */
   touched: boolean;
+  /**
+   * Whether the field value has changed from its initial value.
+   */
   dirty: boolean;
+  /**
+   * Whether the field is valid.
+   */
   valid: boolean | null;
+  /**
+   * Whether the field has a value.
+   */
   filled: boolean;
+  /**
+   * Whether the field is focused.
+   */
   focused: boolean;
 }
-export interface FieldRootProps extends BaseUIComponentProps<'div', FieldRoot.State> {
+export interface FieldRootProps extends BaseUIComponentProps<'div', FieldRootState> {
   /**
    * Whether the component should ignore user interaction.
    * Takes precedence over the `disabled` prop on the `<Field.Control>` component.
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
   /**
    * Identifies the field when a form is submitted.
    * Takes precedence over the `name` prop on the `<Field.Control>` component.
    */
-  name?: string;
+  name?: string | undefined;
   /**
    * A function for custom validation. Return a string or an array of strings with
    * the error message(s) if the value is invalid, or `null` if the value is valid.
    * Asynchronous functions are supported, but they do not prevent form submission
    * when using `validationMode="onSubmit"`.
    */
-  validate?: (value: unknown, formValues: Form.Values) => string | string[] | null | Promise<string | string[] | null>;
+  validate?: ((value: unknown, formValues: Form.Values) => string | string[] | null | Promise<string | string[] | null>) | undefined;
   /**
    * Determines when the field should be validated.
    * This takes precedence over the `validationMode` prop on `<Form>`.
@@ -68,33 +85,33 @@ export interface FieldRootProps extends BaseUIComponentProps<'div', FieldRoot.St
    *
    * @default 'onSubmit'
    */
-  validationMode?: Form.ValidationMode;
+  validationMode?: Form.ValidationMode | undefined;
   /**
    * How long to wait between `validate` callbacks if
    * `validationMode="onChange"` is used. Specified in milliseconds.
    * @default 0
    */
-  validationDebounceTime?: number;
+  validationDebounceTime?: number | undefined;
   /**
    * Whether the field is invalid.
    * Useful when the field state is controlled by an external library.
    */
-  invalid?: boolean;
+  invalid?: boolean | undefined;
   /**
    * Whether the field's value has been changed from its initial value.
    * Useful when the field state is controlled by an external library.
    */
-  dirty?: boolean;
+  dirty?: boolean | undefined;
   /**
    * Whether the field has been touched.
    * Useful when the field state is controlled by an external library.
    */
-  touched?: boolean;
+  touched?: boolean | undefined;
   /**
    * A ref to imperative actions.
    * - `validate`: Validates the field when called.
    */
-  actionsRef?: React.RefObject<FieldRoot.Actions | null>;
+  actionsRef?: React.RefObject<FieldRoot.Actions | null> | undefined;
 }
 export declare namespace FieldRoot {
   type State = FieldRootState;

package/field/root/FieldRoot.js

@@ -66,7 +66,8 @@ var _jsxRuntime = require("react/jsx-runtime");
     setTouchedUnwrapped(value);
   });
   const shouldValidateOnChange = (0, _useStableCallback.useStableCallback)(() => validationMode === 'onChange' || validationMode === 'onSubmit' && submitAttemptedRef.current);
-  const invalid = Boolean(invalidProp || name && {}.hasOwnProperty.call(errors, name) && errors[name] !== undefined);
+  const hasFormError = !!name && Object.hasOwn(errors, name) && errors[name] !== undefined;
+  const invalid = invalidProp === true || hasFormError;
   const [validityData, setValidityData] = React.useState({
     state: _constants.DEFAULT_VALIDITY_STATE,
     error: '',

package/field/root/FieldRootContext.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { FieldRoot, FieldValidityData } from "./FieldRoot.js";
+import type { FieldValidityData, FieldRootState } from "./FieldRoot.js";
 import type { Form } from "../../form/index.js";
 import type { UseFieldValidationReturnValue } from "./useFieldValidation.js";
 export interface FieldRootContext {
@@ -20,8 +20,8 @@ export interface FieldRootContext {
   validationMode: Form.ValidationMode;
   validationDebounceTime: number;
   shouldValidateOnChange: () => boolean;
-  state: FieldRoot.State;
-  markedDirtyRef: React.MutableRefObject<boolean>;
+  state: FieldRootState;
+  markedDirtyRef: React.RefObject<boolean>;
   validation: UseFieldValidationReturnValue;
 }
 export declare const FieldRootContext: React.Context<FieldRootContext>;