@base-ui/react 1.1.0 → 1.3.0

package/esm/drawer/viewport/DrawerViewportContext.d.ts

@@ -0,0 +1,11 @@
+import * as React from 'react';
+interface DrawerViewportContextValue {
+  swiping: boolean;
+  getDragStyles: () => React.CSSProperties;
+  swipeStrength: number | null;
+  setSwipeDismissed: (dismissed: boolean) => void;
+}
+export declare const DrawerViewportContext: React.Context<DrawerViewportContextValue | null>;
+export declare function useDrawerViewportContext(optional?: false): DrawerViewportContextValue;
+export declare function useDrawerViewportContext(optional: true): DrawerViewportContextValue | null;
+export {};

package/esm/drawer/viewport/DrawerViewportContext.js

@@ -0,0 +1,13 @@
+'use client';
+
+import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
+import * as React from 'react';
+export const DrawerViewportContext = /*#__PURE__*/React.createContext(null);
+if (process.env.NODE_ENV !== "production") DrawerViewportContext.displayName = "DrawerViewportContext";
+export function useDrawerViewportContext(optional) {
+  const context = React.useContext(DrawerViewportContext);
+  if (optional === false && context === null) {
+    throw new Error(process.env.NODE_ENV !== "production" ? 'Base UI: DrawerViewportContext is missing. Drawer parts must be placed within <Drawer.Viewport>.' : _formatErrorMessage(92));
+  }
+  return context;
+}

package/esm/drawer/viewport/DrawerViewportDataAttributes.d.ts

@@ -0,0 +1,22 @@
+export declare enum DrawerViewportDataAttributes {
+  /**
+   * Present when the drawer is open.
+   */
+  open = "data-open",
+  /**
+   * Present when the drawer is closed.
+   */
+  closed = "data-closed",
+  /**
+   * Present when the drawer is animating in.
+   */
+  startingStyle = "data-starting-style",
+  /**
+   * Present when the drawer is animating out.
+   */
+  endingStyle = "data-ending-style",
+  /**
+   * Present when the drawer is nested within another drawer.
+   */
+  nested = "data-nested",
+}

package/esm/drawer/viewport/DrawerViewportDataAttributes.js

@@ -0,0 +1,24 @@
+import { CommonPopupDataAttributes } from "../../utils/popupStateMapping.js";
+export let DrawerViewportDataAttributes = function (DrawerViewportDataAttributes) {
+  /**
+   * Present when the drawer is open.
+   */
+  DrawerViewportDataAttributes[DrawerViewportDataAttributes["open"] = CommonPopupDataAttributes.open] = "open";
+  /**
+   * Present when the drawer is closed.
+   */
+  DrawerViewportDataAttributes[DrawerViewportDataAttributes["closed"] = CommonPopupDataAttributes.closed] = "closed";
+  /**
+   * Present when the drawer is animating in.
+   */
+  DrawerViewportDataAttributes[DrawerViewportDataAttributes["startingStyle"] = CommonPopupDataAttributes.startingStyle] = "startingStyle";
+  /**
+   * Present when the drawer is animating out.
+   */
+  DrawerViewportDataAttributes[DrawerViewportDataAttributes["endingStyle"] = CommonPopupDataAttributes.endingStyle] = "endingStyle";
+  /**
+   * Present when the drawer is nested within another drawer.
+   */
+  DrawerViewportDataAttributes["nested"] = "data-nested";
+  return DrawerViewportDataAttributes;
+}({});

package/esm/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/esm/field/control/FieldControl.js

@@ -1,9 +1,9 @@
 'use client';
 
 import * as React from 'react';
-import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { useControlled } from '@base-ui/utils/useControlled';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
+import { ownerDocument } from '@base-ui/utils/owner';
 import { useFieldRootContext } from "../root/FieldRootContext.js";
 import { useLabelableContext } from "../../labelable-provider/LabelableContext.js";
 import { useLabelableId } from "../../labelable-provider/useLabelableId.js";
@@ -12,6 +12,8 @@ import { useRenderElement } from "../../utils/useRenderElement.js";
 import { useField } from "../useField.js";
 import { createChangeEventDetails } from "../../utils/createBaseUIEventDetails.js";
 import { REASONS } from "../../utils/reasons.js";
+import { activeElement } from "../../floating-ui-react/utils.js";
+
 /**
  * The form control to label and validate.
  * Renders an `<input>` element.
@@ -32,20 +34,13 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
     disabled: disabledProp = false,
     onValueChange,
     defaultValue,
+    autoFocus = false,
     ...elementProps
   } = componentProps;
   const {
     state: fieldState,
     name: fieldName,
-    disabled: fieldDisabled
-  } = useFieldRootContext();
-  const disabled = fieldDisabled || disabledProp;
-  const name = fieldName ?? nameProp;
-  const state = React.useMemo(() => ({
-    ...fieldState,
-    disabled
-  }), [fieldState, disabled]);
-  const {
+    disabled: fieldDisabled,
     setTouched,
     setDirty,
     validityData,
@@ -54,6 +49,12 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
     validationMode,
     validation
   } = useFieldRootContext();
+  const disabled = fieldDisabled || disabledProp;
+  const name = fieldName ?? nameProp;
+  const state = {
+    ...fieldState,
+    disabled
+  };
   const {
     labelId
   } = useLabelableContext();
@@ -68,20 +69,20 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
       setFilled(false);
     }
   }, [validation.inputRef, setFilled, valueProp]);
-  const [value, setValueUnwrapped] = useControlled({
+  const inputRef = React.useRef(null);
+  useIsoLayoutEffect(() => {
+    if (autoFocus && inputRef.current === activeElement(ownerDocument(inputRef.current))) {
+      setFocused(true);
+    }
+  }, [autoFocus, setFocused]);
+  const [valueUnwrapped] = useControlled({
     controlled: valueProp,
     default: defaultValue,
     name: 'FieldControl',
     state: 'value'
   });
   const isControlled = valueProp !== undefined;
-  const setValue = useStableCallback((nextValue, eventDetails) => {
-    onValueChange?.(nextValue, eventDetails);
-    if (eventDetails.isCanceled) {
-      return;
-    }
-    setValueUnwrapped(nextValue);
-  });
+  const value = isControlled ? valueUnwrapped : undefined;
   useField({
     id,
     name,
@@ -91,7 +92,7 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
     controlRef: validation.inputRef
   });
   const element = useRenderElement('input', componentProps, {
-    ref: forwardedRef,
+    ref: [forwardedRef, inputRef],
     state,
     props: [{
       id,
@@ -99,6 +100,7 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
       name,
       ref: validation.inputRef,
       'aria-labelledby': labelId,
+      autoFocus,
       ...(isControlled ? {
         value
       } : {
@@ -106,7 +108,7 @@ export const FieldControl = /*#__PURE__*/React.forwardRef(function FieldControl(
       }),
       onChange(event) {
         const inputValue = event.currentTarget.value;
-        setValue(inputValue, createChangeEventDetails(REASONS.none, event.nativeEvent));
+        onValueChange?.(inputValue, createChangeEventDetails(REASONS.none, event.nativeEvent));
         setDirty(inputValue !== validityData.initialValue);
         setFilled(inputValue !== '');
       },

package/esm/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/esm/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/esm/field/error/FieldError.js

@@ -8,6 +8,14 @@ import { fieldValidityMapping } from "../utils/constants.js";
 import { useFormContext } from "../../form/FormContext.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
 import { useBaseUiId } from "../../utils/useBaseUiId.js";
+import { useOpenChangeComplete } from "../../utils/useOpenChangeComplete.js";
+import { transitionStatusMapping } from "../../utils/stateAttributesMapping.js";
+import { useTransitionStatus } from "../../utils/useTransitionStatus.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+const stateAttributesMapping = {
+  ...fieldValidityMapping,
+  ...transitionStatusMapping
+};
 
 /**
  * An error message displayed if the field control fails validation.
@@ -26,7 +34,7 @@ export const FieldError = /*#__PURE__*/React.forwardRef(function FieldError(comp
   const id = useBaseUiId(idProp);
   const {
     validityData,
-    state,
+    state: fieldState,
     name
   } = useFieldRootContext(false);
   const {
@@ -44,6 +52,11 @@ export const FieldError = /*#__PURE__*/React.forwardRef(function FieldError(comp
   } else {
     rendered = validityData.state.valid === false;
   }
+  const {
+    mounted,
+    transitionStatus,
+    setMounted
+  } = useTransitionStatus(rendered);
   useIsoLayoutEffect(() => {
     if (!rendered || !id) {
       return undefined;
@@ -53,18 +66,48 @@ export const FieldError = /*#__PURE__*/React.forwardRef(function FieldError(comp
       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__*/_jsx("ul", {
+    children: validityData.errors.map(message => /*#__PURE__*/_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);
+  }
+  useOpenChangeComplete({
+    open: rendered,
+    ref: errorRef,
+    onComplete() {
+      if (!rendered) {
+        setMounted(false);
+      }
+    }
+  });
+  const state = {
+    ...fieldState,
+    transitionStatus
+  };
   const element = 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: fieldValidityMapping
+    stateAttributesMapping,
+    enabled: mounted
   });
-  if (!rendered) {
+  if (!mounted) {
     return null;
   }
   return element;

package/esm/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/esm/field/error/FieldErrorDataAttributes.js

@@ -1,4 +1,5 @@
-export let FieldErrorDataAttributes = /*#__PURE__*/function (FieldErrorDataAttributes) {
+import { TransitionStatusDataAttributes } from "../../utils/stateAttributesMapping.js";
+export let FieldErrorDataAttributes = function (FieldErrorDataAttributes) {
   /**
    * Present when the field is disabled.
    */
@@ -27,5 +28,13 @@ export let FieldErrorDataAttributes = /*#__PURE__*/function (FieldErrorDataAttri
    * Present when the field control is focused.
    */
   FieldErrorDataAttributes["focused"] = "data-focused";
+  /**
+   * Present when the error message is animating in.
+   */
+  FieldErrorDataAttributes[FieldErrorDataAttributes["startingStyle"] = TransitionStatusDataAttributes.startingStyle] = "startingStyle";
+  /**
+   * Present when the error message is animating out.
+   */
+  FieldErrorDataAttributes[FieldErrorDataAttributes["endingStyle"] = TransitionStatusDataAttributes.endingStyle] = "endingStyle";
   return FieldErrorDataAttributes;
 }({});

package/esm/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/esm/field/item/FieldItem.js

@@ -32,7 +32,7 @@ export const FieldItem = /*#__PURE__*/React.forwardRef(function FieldItem(compon
   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]);
@@ -43,7 +43,7 @@ export const FieldItem = /*#__PURE__*/React.forwardRef(function FieldItem(compon
     stateAttributesMapping: fieldValidityMapping
   });
   return /*#__PURE__*/_jsx(LabelableProvider, {
-    initialControlId: initialControlId,
+    controlId: controlId,
     children: /*#__PURE__*/_jsx(FieldItemContext.Provider, {
       value: fieldItemContext,
       children: element

package/esm/field/item/FieldItemContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import * as React from 'react';
 export const FieldItemContext = /*#__PURE__*/React.createContext({
   disabled: false

package/esm/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/esm/field/label/FieldLabel.js

@@ -2,16 +2,12 @@
 
 import * as React from 'react';
 import { error } from '@base-ui/utils/error';
-import { isHTMLElement } from '@floating-ui/utils/dom';
-import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
-import { ownerDocument } from '@base-ui/utils/owner';
-import { useStableCallback } from '@base-ui/utils/useStableCallback';
-import { getTarget } from "../../floating-ui-react/utils.js";
+import { SafeReact } from '@base-ui/utils/safeReact';
 import { useFieldRootContext } from "../root/FieldRootContext.js";
-import { useLabelableContext } from "../../labelable-provider/LabelableContext.js";
 import { fieldValidityMapping } from "../utils/constants.js";
-import { useBaseUiId } from "../../utils/useBaseUiId.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
+import { useLabelableContext } from "../../labelable-provider/LabelableContext.js";
+import { useLabel } from "../../labelable-provider/useLabel.js";
 
 /**
  * An accessible label that is automatically associated with the field control.
@@ -29,34 +25,12 @@ export const FieldLabel = /*#__PURE__*/React.forwardRef(function FieldLabel(comp
   } = componentProps;
   const fieldRootContext = useFieldRootContext(false);
   const {
-    controlId,
-    setLabelId,
     labelId
   } = useLabelableContext();
-  const id = useBaseUiId(idProp);
   const labelRef = React.useRef(null);
-  const handleInteraction = useStableCallback(event => {
-    const target = 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 = ownerDocument(event.currentTarget).getElementById(controlId);
-    if (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 = useLabel({
+    id: labelId ?? idProp,
+    native: nativeLabel
   });
   if (process.env.NODE_ENV !== 'production') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -67,35 +41,21 @@ export const FieldLabel = /*#__PURE__*/React.forwardRef(function FieldLabel(comp
       const isLabelTag = labelRef.current.tagName === 'LABEL';
       if (nativeLabel) {
         if (!isLabelTag) {
-          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.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`.';
+          error(`${message}${ownerStackMessage}`);
         }
       } else if (isLabelTag) {
-        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.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`.';
+        error(`${message}${ownerStackMessage}`);
       }
     }, [nativeLabel]);
   }
-  useIsoLayoutEffect(() => {
-    if (id) {
-      setLabelId(id);
-    }
-    return () => {
-      setLabelId(undefined);
-    };
-  }, [id, setLabelId]);
   const element = 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: fieldValidityMapping
   });
   return element;