@base-ui/react 1.1.0 → 1.3.0

package/esm/scroll-area/viewport/ScrollAreaViewport.js

@@ -16,11 +16,13 @@ import { styleDisableScrollbar } from "../../utils/styles.js";
 import { onVisible } from "../utils/onVisible.js";
 import { scrollAreaStateAttributesMapping } from "../root/stateAttributes.js";
 import { ScrollAreaViewportCssVars } from "./ScrollAreaViewportCssVars.js";
+import { normalizeScrollOffset } from "../utils/scrollEdges.js";
 
 // Module-level flag to ensure we only register the CSS properties once,
 // regardless of how many Scroll Area components are mounted.
 import { jsx as _jsx } from "react/jsx-runtime";
 let scrollAreaOverflowVarsRegistered = false;
+const HAS_RESIZE_OBSERVER = typeof ResizeObserver !== 'undefined';
 
 /**
  * Removes inheritance of the scroll area overflow CSS variables, which
@@ -79,14 +81,18 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     rootId,
     setHiddenState,
     hiddenState,
+    setHasMeasuredScrollbar,
     handleScroll,
     setHovering,
     setOverflowEdges,
     overflowEdges,
-    overflowEdgeThreshold
+    overflowEdgeThreshold,
+    scrollingX,
+    scrollingY
   } = useScrollAreaRootContext();
   const direction = useDirection();
   const programmaticScrollRef = React.useRef(true);
+  const lastMeasuredViewportMetricsRef = React.useRef([NaN, NaN, NaN, NaN]);
   const scrollEndTimeout = useTimeout();
   const waitForAnimationsTimeout = useTimeout();
   const computeThumbPosition = useStableCallback(() => {
@@ -105,11 +111,21 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     const viewportWidth = viewportEl.clientWidth;
     const scrollTop = viewportEl.scrollTop;
     const scrollLeft = viewportEl.scrollLeft;
+    const lastMeasuredViewportMetrics = lastMeasuredViewportMetricsRef.current;
+    const isFirstMeasurement = Number.isNaN(lastMeasuredViewportMetrics[0]);
+    lastMeasuredViewportMetrics[0] = viewportHeight;
+    lastMeasuredViewportMetrics[1] = scrollableContentHeight;
+    lastMeasuredViewportMetrics[2] = viewportWidth;
+    lastMeasuredViewportMetrics[3] = scrollableContentWidth;
+    if (isFirstMeasurement) {
+      setHasMeasuredScrollbar(true);
+    }
     if (scrollableContentHeight === 0 || scrollableContentWidth === 0) {
       return;
     }
-    const scrollbarYHidden = viewportHeight >= scrollableContentHeight;
-    const scrollbarXHidden = viewportWidth >= scrollableContentWidth;
+    const nextHiddenState = getHiddenState(viewportEl);
+    const scrollbarYHidden = nextHiddenState.y;
+    const scrollbarXHidden = nextHiddenState.x;
     const ratioX = viewportWidth / scrollableContentWidth;
     const ratioY = viewportHeight / scrollableContentHeight;
     const maxScrollLeft = Math.max(0, scrollableContentWidth - viewportWidth);
@@ -117,14 +133,17 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     let scrollLeftFromStart = 0;
     let scrollLeftFromEnd = 0;
     if (!scrollbarXHidden) {
+      let rawScrollLeftFromStart = 0;
       if (direction === 'rtl') {
-        scrollLeftFromStart = clamp(-scrollLeft, 0, maxScrollLeft);
+        rawScrollLeftFromStart = clamp(-scrollLeft, 0, maxScrollLeft);
       } else {
-        scrollLeftFromStart = clamp(scrollLeft, 0, maxScrollLeft);
+        rawScrollLeftFromStart = clamp(scrollLeft, 0, maxScrollLeft);
       }
+      scrollLeftFromStart = normalizeScrollOffset(rawScrollLeftFromStart, maxScrollLeft);
       scrollLeftFromEnd = maxScrollLeft - scrollLeftFromStart;
     }
-    const scrollTopFromStart = !scrollbarYHidden ? clamp(scrollTop, 0, maxScrollTop) : 0;
+    const rawScrollTopFromStart = !scrollbarYHidden ? clamp(scrollTop, 0, maxScrollTop) : 0;
+    const scrollTopFromStart = !scrollbarYHidden ? normalizeScrollOffset(rawScrollTopFromStart, maxScrollTop) : 0;
     const scrollTopFromEnd = !scrollbarYHidden ? maxScrollTop - scrollTopFromStart : 0;
     const nextWidth = scrollbarXHidden ? 0 : viewportWidth;
     const nextHeight = scrollbarYHidden ? 0 : viewportHeight;
@@ -183,11 +202,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
       const thumbOffsetX = direction === 'rtl' ? clamp(scrollRatioX * maxThumbOffsetX, -maxThumbOffsetX, 0) : clamp(scrollRatioX * maxThumbOffsetX, 0, maxThumbOffsetX);
       thumbXEl.style.transform = `translate3d(${thumbOffsetX}px,0,0)`;
     }
-    const clampedScrollLeftStart = clamp(scrollLeftFromStart, 0, maxScrollLeft);
-    const clampedScrollLeftEnd = clamp(scrollLeftFromEnd, 0, maxScrollLeft);
-    const clampedScrollTopStart = clamp(scrollTopFromStart, 0, maxScrollTop);
-    const clampedScrollTopEnd = clamp(scrollTopFromEnd, 0, maxScrollTop);
-    const overflowMetricsPx = [[ScrollAreaViewportCssVars.scrollAreaOverflowXStart, clampedScrollLeftStart], [ScrollAreaViewportCssVars.scrollAreaOverflowXEnd, clampedScrollLeftEnd], [ScrollAreaViewportCssVars.scrollAreaOverflowYStart, clampedScrollTopStart], [ScrollAreaViewportCssVars.scrollAreaOverflowYEnd, clampedScrollTopEnd]];
+    const overflowMetricsPx = [[ScrollAreaViewportCssVars.scrollAreaOverflowXStart, scrollLeftFromStart], [ScrollAreaViewportCssVars.scrollAreaOverflowXEnd, scrollLeftFromEnd], [ScrollAreaViewportCssVars.scrollAreaOverflowYStart, scrollTopFromStart], [ScrollAreaViewportCssVars.scrollAreaOverflowYEnd, scrollTopFromEnd]];
     for (const [cssVar, value] of overflowMetricsPx) {
       viewportEl.style.setProperty(cssVar, `${value}px`);
     }
@@ -204,22 +219,12 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
         });
       }
     }
-    setHiddenState(prevState => {
-      const cornerHidden = scrollbarYHidden || scrollbarXHidden;
-      if (prevState.y === scrollbarYHidden && prevState.x === scrollbarXHidden && prevState.corner === cornerHidden) {
-        return prevState;
-      }
-      return {
-        y: scrollbarYHidden,
-        x: scrollbarXHidden,
-        corner: cornerHidden
-      };
-    });
+    setHiddenState(prevState => mergeHiddenState(prevState, nextHiddenState));
     const nextOverflowEdges = {
-      xStart: !scrollbarXHidden && clampedScrollLeftStart > overflowEdgeThreshold.xStart,
-      xEnd: !scrollbarXHidden && clampedScrollLeftEnd > overflowEdgeThreshold.xEnd,
-      yStart: !scrollbarYHidden && clampedScrollTopStart > overflowEdgeThreshold.yStart,
-      yEnd: !scrollbarYHidden && clampedScrollTopEnd > overflowEdgeThreshold.yEnd
+      xStart: !scrollbarXHidden && scrollLeftFromStart > overflowEdgeThreshold.xStart,
+      xEnd: !scrollbarXHidden && scrollLeftFromEnd > overflowEdgeThreshold.xEnd,
+      yStart: !scrollbarYHidden && scrollTopFromStart > overflowEdgeThreshold.yStart,
+      yEnd: !scrollbarYHidden && scrollTopFromEnd > overflowEdgeThreshold.yEnd
     };
     setOverflowEdges(prev => {
       if (prev.xStart === nextOverflowEdges.xStart && prev.xEnd === nextOverflowEdges.xEnd && prev.yStart === nextOverflowEdges.yStart && prev.yEnd === nextOverflowEdges.yEnd) {
@@ -233,17 +238,15 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
       return undefined;
     }
     removeCSSVariableInheritance();
-    let hasInitialized = false;
+    if (HAS_RESIZE_OBSERVER) {
+      return undefined;
+    }
     return onVisible(viewportRef.current, () => {
-      if (!hasInitialized) {
-        hasInitialized = true;
-        return;
-      }
       computeThumbPosition();
     });
   }, [computeThumbPosition, viewportRef]);
   useIsoLayoutEffect(() => {
-    // Wait for scrollbar-related refs to be set
+    // Wait for scrollbar and thumb refs after hidden-state toggles, and refresh math on direction flips.
     queueMicrotask(computeThumbPosition);
   }, [computeThumbPosition, hiddenState, direction]);
   useIsoLayoutEffect(() => {
@@ -255,16 +258,20 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
   }, [viewportRef, setHovering]);
   React.useEffect(() => {
     const viewport = viewportRef.current;
-    if (typeof ResizeObserver === 'undefined' || !viewport) {
+    if (!HAS_RESIZE_OBSERVER || !viewport) {
       return undefined;
     }
     let hasInitialized = false;
     const ro = new ResizeObserver(() => {
-      // ResizeObserver fires once upon observing, so we skip the initial call
-      // to avoid double-calculating the thumb position on mount.
+      // Avoid duplicate mount-time recompute when observer data matches what the mount
+      // scheduling pass already measured. If dimensions changed before the first observer
+      // delivery, keep the recompute so overflow transitions stay in sync.
       if (!hasInitialized) {
         hasInitialized = true;
-        return;
+        const lastMeasuredViewportMetrics = lastMeasuredViewportMetricsRef.current;
+        if (lastMeasuredViewportMetrics[0] === viewport.clientHeight && lastMeasuredViewportMetrics[1] === viewport.scrollHeight && lastMeasuredViewportMetrics[2] === viewport.clientWidth && lastMeasuredViewportMetrics[3] === viewport.scrollWidth) {
+          return;
+        }
       }
       computeThumbPosition();
     });
@@ -284,7 +291,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
       if (animations.length === 0) {
         return;
       }
-      Promise.all(animations.map(animation => animation.finished)).then(computeThumbPosition).catch(() => {});
+      Promise.allSettled(animations.map(animation => animation.finished)).then(computeThumbPosition).catch(() => {});
     });
     return () => {
       ro.disconnect();
@@ -300,9 +307,8 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
       'data-id': `${rootId}-viewport`
     }),
     // https://accessibilityinsights.io/info-examples/web/scrollable-region-focusable/
-    ...((!hiddenState.x || !hiddenState.y) && {
-      tabIndex: 0
-    }),
+    // Keep non-scrollable viewports out of tab order.
+    tabIndex: hiddenState.x && hiddenState.y ? -1 : 0,
     className: styleDisableScrollbar.className,
     style: {
       overflow: 'scroll'
@@ -336,6 +342,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     onKeyDown: handleUserInteraction
   };
   const viewportState = React.useMemo(() => ({
+    scrolling: scrollingX || scrollingY,
     hasOverflowX: !hiddenState.x,
     hasOverflowY: !hiddenState.y,
     overflowXStart: overflowEdges.xStart,
@@ -343,7 +350,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     overflowYStart: overflowEdges.yStart,
     overflowYEnd: overflowEdges.yEnd,
     cornerHidden: hiddenState.corner
-  }), [hiddenState.x, hiddenState.y, hiddenState.corner, overflowEdges]);
+  }), [scrollingX, scrollingY, hiddenState.x, hiddenState.y, hiddenState.corner, overflowEdges]);
   const element = useRenderElement('div', componentProps, {
     ref: [forwardedRef, viewportRef],
     state: viewportState,
@@ -358,4 +365,19 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
     children: element
   });
 });
-if (process.env.NODE_ENV !== "production") ScrollAreaViewport.displayName = "ScrollAreaViewport";
+if (process.env.NODE_ENV !== "production") ScrollAreaViewport.displayName = "ScrollAreaViewport";
+function getHiddenState(viewport) {
+  const y = viewport.clientHeight >= viewport.scrollHeight;
+  const x = viewport.clientWidth >= viewport.scrollWidth;
+  return {
+    y,
+    x,
+    corner: y || x
+  };
+}
+function mergeHiddenState(prevState, nextState) {
+  if (prevState.y === nextState.y && prevState.x === nextState.x && prevState.corner === nextState.corner) {
+    return prevState;
+  }
+  return nextState;
+}

package/esm/scroll-area/viewport/ScrollAreaViewportContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const ScrollAreaViewportContext = /*#__PURE__*/React.createContext(undefined);

package/esm/scroll-area/viewport/ScrollAreaViewportDataAttributes.d.ts

@@ -1,4 +1,8 @@
 export declare enum ScrollAreaViewportDataAttributes {
+  /**
+   * Present when the user scrolls inside the scroll area.
+   */
+  scrolling = "data-scrolling",
   /**
    * Present when the scroll area content is wider than the viewport.
    */

package/esm/scroll-area/viewport/ScrollAreaViewportDataAttributes.js

@@ -1,4 +1,8 @@
 export let ScrollAreaViewportDataAttributes = /*#__PURE__*/function (ScrollAreaViewportDataAttributes) {
+  /**
+   * Present when the user scrolls inside the scroll area.
+   */
+  ScrollAreaViewportDataAttributes["scrolling"] = "data-scrolling";
   /**
    * Present when the scroll area content is wider than the viewport.
    */

package/esm/select/arrow/SelectArrow.d.ts

@@ -13,11 +13,20 @@ export interface SelectArrowState {
    * Whether the select popup is currently open.
    */
   open: boolean;
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side | 'none';
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether the arrow cannot be centered on the anchor.
+   */
   uncentered: boolean;
 }
-export interface SelectArrowProps extends BaseUIComponentProps<'div', SelectArrow.State> {}
+export interface SelectArrowProps extends BaseUIComponentProps<'div', SelectArrowState> {}
 export declare namespace SelectArrow {
   type State = SelectArrowState;
   type Props = SelectArrowProps;

package/esm/select/arrow/SelectArrow.js

@@ -37,12 +37,12 @@ export const SelectArrow = /*#__PURE__*/React.forwardRef(function SelectArrow(co
     alignItemWithTriggerActive
   } = useSelectPositionerContext();
   const open = useStore(store, selectors.open, true);
-  const state = React.useMemo(() => ({
+  const state = {
     open,
     side,
     align,
     uncentered: arrowUncentered
-  }), [open, side, align, arrowUncentered]);
+  };
   const element = useRenderElement('div', componentProps, {
     state,
     ref: [arrowRef, forwardedRef],

package/esm/select/arrow/SelectArrowDataAttributes.js

@@ -12,12 +12,12 @@ export let SelectArrowDataAttributes = function (SelectArrowDataAttributes) {
    * Indicates which side the popup is positioned relative to the trigger.
    * @type {'none' | 'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'}
    */
-  SelectArrowDataAttributes["side"] = "data-side";
+  SelectArrowDataAttributes[SelectArrowDataAttributes["side"] = CommonPopupDataAttributes.side] = "side";
   /**
    * Indicates how the popup is aligned relative to specified side.
    * @type {'start' | 'center' | 'end'}
    */
-  SelectArrowDataAttributes["align"] = "data-align";
+  SelectArrowDataAttributes[SelectArrowDataAttributes["align"] = CommonPopupDataAttributes.align] = "align";
   /**
    * Present when the select arrow is uncentered.
    */

package/esm/select/backdrop/SelectBackdrop.d.ts

@@ -9,10 +9,16 @@ import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
  */
 export declare const SelectBackdrop: React.ForwardRefExoticComponent<Omit<SelectBackdropProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface SelectBackdropState {
+  /**
+   * Whether the component is open.
+   */
   open: boolean;
+  /**
+   * The transition status of the component.
+   */
   transitionStatus: TransitionStatus;
 }
-export interface SelectBackdropProps extends BaseUIComponentProps<'div', SelectBackdrop.State> {}
+export interface SelectBackdropProps extends BaseUIComponentProps<'div', SelectBackdropState> {}
 export declare namespace SelectBackdrop {
   type State = SelectBackdropState;
   type Props = SelectBackdropProps;

package/esm/select/backdrop/SelectBackdrop.js

@@ -30,10 +30,10 @@ export const SelectBackdrop = /*#__PURE__*/React.forwardRef(function SelectBackd
   const open = useStore(store, selectors.open);
   const mounted = useStore(store, selectors.mounted);
   const transitionStatus = useStore(store, selectors.transitionStatus);
-  const state = React.useMemo(() => ({
+  const state = {
     open,
     transitionStatus
-  }), [open, transitionStatus]);
+  };
   const element = useRenderElement('div', componentProps, {
     state,
     ref: forwardedRef,

package/esm/select/group/SelectGroup.d.ts

@@ -8,7 +8,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  */
 export declare const SelectGroup: React.ForwardRefExoticComponent<Omit<SelectGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface SelectGroupState {}
-export interface SelectGroupProps extends BaseUIComponentProps<'div', SelectGroup.State> {}
+export interface SelectGroupProps extends BaseUIComponentProps<'div', SelectGroupState> {}
 export declare namespace SelectGroup {
   type State = SelectGroupState;
   type Props = SelectGroupProps;

package/esm/select/group/SelectGroupContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const SelectGroupContext = /*#__PURE__*/React.createContext(undefined);

package/esm/select/group-label/SelectGroupLabel.d.ts

@@ -8,7 +8,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  */
 export declare const SelectGroupLabel: React.ForwardRefExoticComponent<Omit<SelectGroupLabelProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface SelectGroupLabelState {}
-export interface SelectGroupLabelProps extends BaseUIComponentProps<'div', SelectGroupLabel.State> {}
+export interface SelectGroupLabelProps extends BaseUIComponentProps<'div', SelectGroupLabelState> {}
 export declare namespace SelectGroupLabel {
   type State = SelectGroupLabelState;
   type Props = SelectGroupLabelProps;

package/esm/select/icon/SelectIcon.d.ts

@@ -13,7 +13,7 @@ export interface SelectIconState {
    */
   open: boolean;
 }
-export interface SelectIconProps extends BaseUIComponentProps<'span', SelectIcon.State> {}
+export interface SelectIconProps extends BaseUIComponentProps<'span', SelectIconState> {}
 export declare namespace SelectIcon {
   type State = SelectIconState;
   type Props = SelectIconProps;

package/esm/select/icon/SelectIcon.js

@@ -23,9 +23,9 @@ export const SelectIcon = /*#__PURE__*/React.forwardRef(function SelectIcon(comp
     store
   } = useSelectRootContext();
   const open = useStore(store, selectors.open);
-  const state = React.useMemo(() => ({
+  const state = {
     open
-  }), [open]);
+  };
   const element = useRenderElement('span', componentProps, {
     state,
     ref: forwardedRef,

package/esm/select/index.d.ts

@@ -1,5 +1,6 @@
 export * as Select from "./index.parts.js";
 export type * from "./root/SelectRoot.js";
+export type * from "./label/SelectLabel.js";
 export type * from "./trigger/SelectTrigger.js";
 export type * from "./value/SelectValue.js";
 export type * from "./icon/SelectIcon.js";

package/esm/select/index.parts.d.ts

@@ -1,4 +1,5 @@
 export { SelectRoot as Root } from "./root/SelectRoot.js";
+export { SelectLabel as Label } from "./label/SelectLabel.js";
 export { SelectTrigger as Trigger } from "./trigger/SelectTrigger.js";
 export { SelectValue as Value } from "./value/SelectValue.js";
 export { SelectIcon as Icon } from "./icon/SelectIcon.js";

package/esm/select/index.parts.js

@@ -1,4 +1,5 @@
 export { SelectRoot as Root } from "./root/SelectRoot.js";
+export { SelectLabel as Label } from "./label/SelectLabel.js";
 export { SelectTrigger as Trigger } from "./trigger/SelectTrigger.js";
 export { SelectValue as Value } from "./value/SelectValue.js";
 export { SelectIcon as Icon } from "./icon/SelectIcon.js";

package/esm/select/item/SelectItem.d.ts

@@ -21,7 +21,7 @@ export interface SelectItemState {
    */
   highlighted: boolean;
 }
-export interface SelectItemProps extends NonNativeButtonProps, Omit<BaseUIComponentProps<'div', SelectItem.State>, 'id'> {
+export interface SelectItemProps extends NonNativeButtonProps, Omit<BaseUIComponentProps<'div', SelectItemState>, 'id'> {
   children?: React.ReactNode;
   /**
    * A unique value that identifies this select item.
@@ -32,13 +32,13 @@ export interface SelectItemProps extends NonNativeButtonProps, Omit<BaseUICompon
    * Whether the component should ignore user interaction.
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
   /**
    * Specifies the text label to use when the item is matched during keyboard text navigation.
    *
    * Defaults to the item text content if not provided.
    */
-  label?: string;
+  label?: string | undefined;
 }
 export declare namespace SelectItem {
   type State = SelectItemState;

package/esm/select/item/SelectItem.js

@@ -27,7 +27,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
   const {
     render,
     className,
-    value = null,
+    value: itemValue = null,
     label,
     disabled = false,
     nativeButton = false,
@@ -53,7 +53,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
   } = useSelectRootContext();
   const highlightTimeout = useTimeout();
   const highlighted = useStore(store, selectors.isActive, listItem.index);
-  const selected = useStore(store, selectors.isSelected, listItem.index, value);
+  const selected = useStore(store, selectors.isSelected, listItem.index, itemValue);
   const selectedByFocus = useStore(store, selectors.isSelectedByFocus, listItem.index);
   const isItemEqualToValue = useStore(store, selectors.isItemEqualToValue);
   const index = listItem.index;
@@ -65,30 +65,30 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
       return undefined;
     }
     const values = valuesRef.current;
-    values[index] = value;
+    values[index] = itemValue;
     return () => {
       delete values[index];
     };
-  }, [hasRegistered, index, value, valuesRef]);
+  }, [hasRegistered, index, itemValue, valuesRef]);
   useIsoLayoutEffect(() => {
     if (!hasRegistered) {
       return undefined;
     }
     const selectedValue = store.state.value;
-    let candidate = selectedValue;
+    let selectedCandidate = selectedValue;
     if (multiple && Array.isArray(selectedValue) && selectedValue.length > 0) {
-      candidate = selectedValue[selectedValue.length - 1];
+      selectedCandidate = selectedValue[selectedValue.length - 1];
     }
-    if (candidate !== undefined && compareItemEquality(candidate, value, isItemEqualToValue)) {
+    if (selectedCandidate !== undefined && compareItemEquality(itemValue, selectedCandidate, isItemEqualToValue)) {
       store.set('selectedIndex', index);
     }
     return undefined;
-  }, [hasRegistered, index, multiple, isItemEqualToValue, store, value]);
-  const state = React.useMemo(() => ({
+  }, [hasRegistered, index, multiple, isItemEqualToValue, store, itemValue]);
+  const state = {
     disabled,
     selected,
     highlighted
-  }), [disabled, selected, highlighted]);
+  };
   const rootProps = getItemProps({
     active: highlighted,
     selected
@@ -106,16 +106,17 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
   } = useButton({
     disabled,
     focusableWhenDisabled: true,
-    native: nativeButton
+    native: nativeButton,
+    composite: true
   });
   function commitSelection(event) {
     const selectedValue = store.state.value;
     if (multiple) {
       const currentValue = Array.isArray(selectedValue) ? selectedValue : [];
-      const nextValue = selected ? removeItem(currentValue, value, isItemEqualToValue) : [...currentValue, value];
+      const nextValue = selected ? removeItem(currentValue, itemValue, isItemEqualToValue) : [...currentValue, itemValue];
       setValue(nextValue, createChangeEventDetails(REASONS.itemPress, event));
     } else {
-      setValue(value, createChangeEventDetails(REASONS.itemPress, event));
+      setValue(itemValue, createChangeEventDetails(REASONS.itemPress, event));
       setOpen(false, createChangeEventDetails(REASONS.itemPress, event));
     }
   }
@@ -127,7 +128,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
       store.set('activeIndex', index);
     },
     onMouseEnter() {
-      if (!keyboardActiveRef.current && store.state.selectedIndex === null) {
+      if (!keyboardActiveRef.current && store.state.selectedIndex === null && highlightItemOnHover) {
         store.set('activeIndex', index);
       }
     },
@@ -155,6 +156,9 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     onKeyDown(event) {
       lastKeyRef.current = event.key;
       store.set('activeIndex', index);
+      if (event.key === ' ' && typingRef.current) {
+        event.preventDefault();
+      }
     },
     onClick(event) {
       didPointerDownRef.current = false;
@@ -163,7 +167,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
       if (event.type === 'keydown' && lastKeyRef.current === null) {
         return;
       }
-      if (disabled || lastKeyRef.current === ' ' && typingRef.current || pointerTypeRef.current !== 'touch' && !highlighted) {
+      if (disabled || event.type === 'keydown' && lastKeyRef.current === ' ' && typingRef.current || pointerTypeRef.current !== 'touch' && !highlighted) {
         return;
       }
       lastKeyRef.current = null;
@@ -176,10 +180,12 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
       pointerTypeRef.current = event.pointerType;
       didPointerDownRef.current = true;
     },
-    onMouseUp(event) {
+    onMouseUp() {
       if (disabled) {
         return;
       }
+
+      // Regular click (pointerdown on this element) if didPointerDownRef is set, otherwise drag-to-select
       if (didPointerDownRef.current) {
         didPointerDownRef.current = false;
         return;
@@ -189,7 +195,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
       if (disallowSelectedMouseUp || disallowUnselectedMouseUp || pointerTypeRef.current !== 'touch' && !highlighted) {
         return;
       }
-      commitSelection(event.nativeEvent);
+      itemRef.current?.click();
     }
   };
   const element = useRenderElement('div', componentProps, {

package/esm/select/item/SelectItemContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const SelectItemContext = /*#__PURE__*/React.createContext(undefined);

package/esm/select/item-indicator/SelectItemIndicator.d.ts

@@ -9,13 +9,21 @@ import { type TransitionStatus } from "../../utils/useTransitionStatus.js";
  */
 export declare const SelectItemIndicator: React.ForwardRefExoticComponent<Omit<SelectItemIndicatorProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
 export interface SelectItemIndicatorState {
+  /**
+   * Whether the item is selected.
+   */
   selected: boolean;
+  /**
+   * The transition status of the component.
+   */
   transitionStatus: TransitionStatus;
 }
-export interface SelectItemIndicatorProps extends BaseUIComponentProps<'span', SelectItemIndicator.State> {
+export interface SelectItemIndicatorProps extends BaseUIComponentProps<'span', SelectItemIndicatorState> {
   children?: React.ReactNode;
-  /** Whether to keep the HTML element in the DOM when the item is not selected. */
-  keepMounted?: boolean;
+  /**
+   * Whether to keep the HTML element in the DOM when the item is not selected.
+   */
+  keepMounted?: boolean | undefined;
 }
 export declare namespace SelectItemIndicator {
   type State = SelectItemIndicatorState;

package/esm/select/item-indicator/SelectItemIndicator.js

@@ -49,10 +49,10 @@ const Inner = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef((componentPr
     transitionStatus,
     setMounted
   } = useTransitionStatus(selected);
-  const state = React.useMemo(() => ({
+  const state = {
     selected,
     transitionStatus
-  }), [selected, transitionStatus]);
+  };
   const element = useRenderElement('span', componentProps, {
     ref: [forwardedRef, indicatorRef],
     state,

package/esm/select/item-indicator/SelectItemIndicatorDataAttributes.d.ts

@@ -0,0 +1,10 @@
+export declare enum SelectItemIndicatorDataAttributes {
+  /**
+   * Present when the indicator is animating in.
+   */
+  startingStyle = "data-starting-style",
+  /**
+   * Present when the indicator is animating out.
+   */
+  endingStyle = "data-ending-style",
+}

package/esm/select/item-indicator/SelectItemIndicatorDataAttributes.js

@@ -0,0 +1,12 @@
+import { TransitionStatusDataAttributes } from "../../utils/stateAttributesMapping.js";
+export let SelectItemIndicatorDataAttributes = function (SelectItemIndicatorDataAttributes) {
+  /**
+   * Present when the indicator is animating in.
+   */
+  SelectItemIndicatorDataAttributes[SelectItemIndicatorDataAttributes["startingStyle"] = TransitionStatusDataAttributes.startingStyle] = "startingStyle";
+  /**
+   * Present when the indicator is animating out.
+   */
+  SelectItemIndicatorDataAttributes[SelectItemIndicatorDataAttributes["endingStyle"] = TransitionStatusDataAttributes.endingStyle] = "endingStyle";
+  return SelectItemIndicatorDataAttributes;
+}({});

package/esm/select/item-text/SelectItemText.d.ts

@@ -8,7 +8,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  */
 export declare const SelectItemText: React.NamedExoticComponent<Omit<SelectItemTextProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface SelectItemTextState {}
-export interface SelectItemTextProps extends BaseUIComponentProps<'div', SelectItemText.State> {}
+export interface SelectItemTextProps extends BaseUIComponentProps<'div', SelectItemTextState> {}
 export declare namespace SelectItemText {
   type State = SelectItemTextState;
   type Props = SelectItemTextProps;