Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix: stabilize merged refs across core (#5267)

nynexman4464540f19e6284d
diff --git a/.changeset/migrate-inline-merge-refs.md b/.changeset/migrate-inline-merge-refs.md
new file mode 100644
index 0000000000..9d360048fe
--- /dev/null
+++ b/.changeset/migrate-inline-merge-refs.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Migrate core components from inline mergeRefs calls to stable useMergedRefs callbacks.
+
+@nynexman4464
diff --git a/packages/core/src/AppShell/AppShell.tsx b/packages/core/src/AppShell/AppShell.tsx
index 45c7d64aea..69cf839289 100644
--- a/packages/core/src/AppShell/AppShell.tsx
+++ b/packages/core/src/AppShell/AppShell.tsx
@@ -50,7 +50,7 @@ import {AppShellMobileContext} from './AppShellMobileContext';
import type {AppShellMobileContextValue} from './AppShellMobileContext';
import type {SpacingStep} from '../utils/types';
import type {BaseProps} from '../BaseProps';
-import {mergeProps, mergeRefs, isRenderable} from '../utils';
+import {mergeProps, isRenderable} from '../utils';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useMediaQuery} from '../hooks/useMediaQuery';
import {observeResize, unobserveResize} from '../utils/sharedResizeObserver';
@@ -58,6 +58,7 @@ import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
import type {AppShellVariantMap} from './index';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const HasActivity = typeof React.Activity !== 'undefined';
const ActivityWrapper = HasActivity
? ({
@@ -792,7 +793,7 @@ export function AppShell({
<AppShellMobileContext value={mobileContextValue}>
<div
{...rest}
- ref={mergeRefs(ref, shellRef)}
+ ref={useMergedRefs(ref, shellRef)}
data-testid={dataTestId}
{...mergeProps(
themeProps('app-shell', {variant}),
diff --git a/packages/core/src/AvatarGroup/AvatarGroup.tsx b/packages/core/src/AvatarGroup/AvatarGroup.tsx
index a02bce26dc..d5ef43e622 100644
--- a/packages/core/src/AvatarGroup/AvatarGroup.tsx
+++ b/packages/core/src/AvatarGroup/AvatarGroup.tsx
@@ -28,7 +28,7 @@ import {useId, useMemo, useState, type ReactNode} from 'react';
import type {BaseProps} from '../BaseProps';
import {resolveSize, type AvatarSize} from '../Avatar';
import * as stylex from '@stylexjs/stylex';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {composeEventHandlers} from '../utils/composeEventHandlers';
import {AvatarGroupContext} from './AvatarGroupContext';
import {themeProps} from '../utils/themeProps';
@@ -37,6 +37,7 @@ import {useListFocus} from '../hooks/useListFocus';
import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';
import {VisuallyHidden} from '../VisuallyHidden';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const OVERLAP_RATIO = 0.25;
export interface AvatarGroupProps extends BaseProps<HTMLDivElement> {
@@ -143,7 +144,7 @@ export function AvatarGroup({
<AvatarGroupContext value={contextValue}>
<div
{...props}
- ref={mergeRefs(ref, listRef)}
+ ref={useMergedRefs(ref, listRef)}
role="group"
aria-label={ariaLabel}
aria-describedby={describedBy}
diff --git a/packages/core/src/BottomSheet/BottomSheetSwitcher.tsx b/packages/core/src/BottomSheet/BottomSheetSwitcher.tsx
index 5e07984d7c..8295e93369 100644
--- a/packages/core/src/BottomSheet/BottomSheetSwitcher.tsx
+++ b/packages/core/src/BottomSheet/BottomSheetSwitcher.tsx
@@ -51,7 +51,7 @@ import {
useFocusTrap,
useScrollLock,
} from '../hooks';
-import {composeEventHandlers, mergeProps, mergeRefs} from '../utils';
+import {composeEventHandlers, mergeProps} from '../utils';
import {BottomSheetEdgeTint} from './BottomSheetEdgeTint';
import {
BottomSheetSwitcherContext,
@@ -60,6 +60,7 @@ import {
type BottomSheetSwitcherTransitionEvent,
} from './BottomSheetSwitcherContext';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
dialog: {
position: 'fixed',
@@ -621,7 +622,7 @@ export function BottomSheetSwitcher({
<dialog
{...props}
{...dialogPresentationProps}
- ref={mergeRefs(ref, dialogRef, containerRef)}
+ ref={useMergedRefs(ref, dialogRef, containerRef)}
aria-label={ariaLabel}
aria-modal={isModal ? 'true' : undefined}
onCancel={composeEventHandlers(onCancel, handleCancel)}
diff --git a/packages/core/src/Breadcrumbs/BreadcrumbItem.tsx b/packages/core/src/Breadcrumbs/BreadcrumbItem.tsx
index 91fd4ac639..d7fe27dcdc 100644
--- a/packages/core/src/Breadcrumbs/BreadcrumbItem.tsx
+++ b/packages/core/src/Breadcrumbs/BreadcrumbItem.tsx
@@ -43,7 +43,7 @@ import {
import {BreadcrumbContext, type BreadcrumbsVariant} from './Breadcrumbs';
import {useLinkComponent} from '../Link/useLinkComponent';
import type {LinkComponentType} from '../Link/types';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
@@ -65,6 +65,7 @@ import {
} from '../DropdownMenu/menuItemRoles';
import type {DropdownMenuOption} from '../DropdownMenu/DropdownMenu';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Props
// =============================================================================
@@ -347,6 +348,8 @@ export function BreadcrumbItem({
}
});
+ const mergedItemRef = useMergedRefs(ref, liRef);
+
const content = (
<>
{startIcon && <span {...stylex.props(itemStyles.icon)}>{startIcon}</span>}
@@ -357,7 +360,7 @@ export function BreadcrumbItem({
if (isCurrent) {
return (
<li
- ref={mergeRefs(ref, liRef)}
+ ref={mergedItemRef}
{...mergeProps(
themeProps('breadcrumb-item', {variant: ctx.variant}),
stylex.props(
@@ -406,7 +409,7 @@ export function BreadcrumbItem({
// The effect handles adding aria-current for auto-last detection.
return (
<li
- ref={mergeRefs(ref, liRef)}
+ ref={mergedItemRef}
{...mergeProps(
themeProps('breadcrumb-item', {variant: ctx.variant}),
stylex.props(
@@ -616,7 +619,7 @@ function BreadcrumbMenuTrigger({
return (
<>
<button
- ref={mergeRefs(
+ ref={useMergedRefs(
ref as React.Ref<HTMLButtonElement>,
buttonRef,
popover.triggerRef,
diff --git a/packages/core/src/ButtonGroup/ButtonGroup.tsx b/packages/core/src/ButtonGroup/ButtonGroup.tsx
index 335d38fc79..6bea9d6b83 100644
--- a/packages/core/src/ButtonGroup/ButtonGroup.tsx
+++ b/packages/core/src/ButtonGroup/ButtonGroup.tsx
@@ -28,12 +28,13 @@ import {radiusVars, shadowVars} from '../theme/tokens.stylex';
import type {Elevation} from '../utils/types';
import {SizeProvider, useSize} from '../SizeContext/SizeContext';
import {useListFocus} from '../hooks/useListFocus';
-import {mergeProps, mergeRefs, composeEventHandlers} from '../utils';
+import {mergeProps, composeEventHandlers} from '../utils';
import type {BaseProps} from '../BaseProps';
import {ButtonGroupContext} from './ButtonGroupContext';
import type {ButtonGroupOrientation} from './ButtonGroupContext';
import {themeProps} from '../utils/themeProps';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Props
// =============================================================================
@@ -191,7 +192,7 @@ export function ButtonGroup({
<ButtonGroupContext value={contextValue}>
<SizeProvider value={size}>
<div
- ref={mergeRefs(ref, listRef)}
+ ref={useMergedRefs(ref, listRef)}
{...props}
{...mergeProps(
themeProps('button-group', {size, orientation, elevation}),
diff --git a/packages/core/src/Carousel/Carousel.tsx b/packages/core/src/Carousel/Carousel.tsx
index fc2ab469cd..0a668d17f5 100644
--- a/packages/core/src/Carousel/Carousel.tsx
+++ b/packages/core/src/Carousel/Carousel.tsx
@@ -46,11 +46,12 @@ import {useLayer} from '../Layer';
import {useScrollOverflow} from '../hooks/useScrollOverflow';
import {isRtlElement} from '../hooks/isRtlElement';
import type {BaseProps} from '../BaseProps';
-import {mergeProps, mergeRefs, rtlStyles} from '../utils';
+import {mergeProps, rtlStyles} from '../utils';
import type {SpacingStep} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
/**
* Imperative control surface for the Carousel, accessed via the `handleRef`
* prop. Methods drive the same native-scroll machinery as the built-in
@@ -506,7 +507,7 @@ export function Carousel({
return (
<div
- ref={mergeRefs(ref, layer.ref as React.Ref<HTMLDivElement>)}
+ ref={useMergedRefs(ref, layer.ref as React.Ref<HTMLDivElement>)}
data-testid={testId}
{...htmlProps}
{...mergeProps(
diff --git a/packages/core/src/Chat/ChatLayout.tsx b/packages/core/src/Chat/ChatLayout.tsx
index b58707d439..d45a912992 100644
--- a/packages/core/src/Chat/ChatLayout.tsx
+++ b/packages/core/src/Chat/ChatLayout.tsx
@@ -33,7 +33,7 @@ import {type ReactNode, useMemo, useRef} from 'react';
import * as stylex from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useChatStreamScroll} from './useChatStreamScroll';
import {useChatNewMessages} from './useChatNewMessages';
import {ChatLayoutScrollButton} from './ChatLayoutScrollButton';
@@ -41,6 +41,7 @@ import {ChatLayoutContext} from './ChatContext';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Types
// =============================================================================
@@ -343,7 +344,7 @@ export function ChatLayout({
<ChatLayoutContext value={layoutContext}>
<div
{...rest}
- ref={mergeRefs(ref, rootRef)}
+ ref={useMergedRefs(ref, rootRef)}
data-testid={testId}
{...mergeProps(
themeProps('chat-layout', {density}),
diff --git a/packages/core/src/CheckboxInput/CheckboxInput.tsx b/packages/core/src/CheckboxInput/CheckboxInput.tsx
index 0d40bd16a8..4ea12e4f46 100644
--- a/packages/core/src/CheckboxInput/CheckboxInput.tsx
+++ b/packages/core/src/CheckboxInput/CheckboxInput.tsx
@@ -44,7 +44,7 @@ import type {IconType} from '../Icon';
import type {InputStatus} from '../Field/types';
import {Spinner} from '../Spinner';
import {useTooltip} from '../Tooltip';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {indicatorScope} from '../Indicator/indicator.markers.stylex';
import {useIndicatorFocusRing} from '../hooks/useIndicatorFocusRing';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
@@ -52,6 +52,7 @@ import {useIndicator} from '../Indicator';
import {themeProps} from '../utils/themeProps';
import {CheckboxListContext} from '../CheckboxList/CheckboxListContext';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
container: {
display: 'flex',
@@ -409,7 +410,7 @@ export function CheckboxInput({
{...focusProps}>
<input
{...rest}
- ref={mergeRefs(
+ ref={useMergedRefs(
ref,
indeterminateRef,
disabledMessageTooltip.positionRef,
diff --git a/packages/core/src/ClickableCard/ClickableCard.tsx b/packages/core/src/ClickableCard/ClickableCard.tsx
index dbca94c294..4a2875e25b 100644
--- a/packages/core/src/ClickableCard/ClickableCard.tsx
+++ b/packages/core/src/ClickableCard/ClickableCard.tsx
@@ -39,7 +39,7 @@ import {
easeVars,
} from '../theme/tokens.stylex';
import type {SizeValue, SpacingStep, Elevation} from '../utils/types';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {Card} from '../Card/Card';
import type {CardVariant} from '../Card/Card';
import {useClickableContainer} from '../hooks/useClickableContainer';
@@ -48,6 +48,7 @@ import {useLinkComponent} from '../Link/useLinkComponent';
import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Styles — only the interactive layer, Card handles everything else
// =============================================================================
@@ -297,7 +298,7 @@ export function ClickableCard({
return (
<Card
- ref={mergeRefs(ref, containerRef)}
+ ref={useMergedRefs(ref, containerRef)}
width={width}
height={height}
maxWidth={maxWidth}
diff --git a/packages/core/src/CommandPalette/CommandPaletteInput.tsx b/packages/core/src/CommandPalette/CommandPaletteInput.tsx
index b67f25376f..af83638411 100644
--- a/packages/core/src/CommandPalette/CommandPaletteInput.tsx
+++ b/packages/core/src/CommandPalette/CommandPaletteInput.tsx
@@ -16,7 +16,7 @@ import {useCallback, useEffect, useRef, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {Icon} from '../Icon';
import {Spinner} from '../Spinner';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {
colorVars,
typeScaleVars,
@@ -29,6 +29,7 @@ import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
wrapper: {
display: 'flex',
@@ -216,7 +217,7 @@ export function CommandPaletteInput({
<Icon icon="search" size="sm" color="inherit" />
</span>
<input
- ref={mergeRefs(ref, inputRef)}
+ ref={useMergedRefs(ref, inputRef)}
type="text"
role="combobox"
aria-expanded={ctx?.isOpen ?? true}
diff --git a/packages/core/src/CommandPalette/CommandPaletteItem.tsx b/packages/core/src/CommandPalette/CommandPaletteItem.tsx
index 955a056898..9133de46c8 100644
--- a/packages/core/src/CommandPalette/CommandPaletteItem.tsx
+++ b/packages/core/src/CommandPalette/CommandPaletteItem.tsx
@@ -14,7 +14,7 @@
import {useCallback, useEffect, useMemo, useRef, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import type {BaseProps} from '../BaseProps';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {composeEventHandlers} from '../utils/composeEventHandlers';
import {
colorVars,
@@ -27,6 +27,7 @@ import {useCommandPaletteContext} from './CommandPaletteContext';
import {useDialogContext} from '../Dialog/DialogContext';
import {themeProps} from '../utils/themeProps';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const HOVER_HOVER = '@media (hover: hover)';
const styles = stylex.create({
@@ -191,7 +192,7 @@ export function CommandPaletteItem({
return (
<div
- ref={mergeRefs(ref, itemRef)}
+ ref={useMergedRefs(ref, itemRef)}
{...props}
id={ctx && itemIndex >= 0 ? ctx.getItemId(itemIndex) : undefined}
role="option"
diff --git a/packages/core/src/ContextMenu/ContextMenu.tsx b/packages/core/src/ContextMenu/ContextMenu.tsx
index 52527a0dc1..37c5c4572b 100644
--- a/packages/core/src/ContextMenu/ContextMenu.tsx
+++ b/packages/core/src/ContextMenu/ContextMenu.tsx
@@ -63,7 +63,7 @@ import {
easeVars,
shadowVars,
} from '../theme/tokens.stylex';
-import {mergeProps, mergeRefs, isImeKeyEvent} from '../utils';
+import {mergeProps, isImeKeyEvent} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {StyleXStyles} from '../theme/types';
import {themeProps} from '../utils/themeProps';
@@ -75,6 +75,7 @@ import type {
DropdownMenuSection,
} from '../DropdownMenu/DropdownMenu';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
// Trigger wrapper: suppress the iOS long-press callout/selection so the
// long-press opens our context menu instead of the native text/callout UI.
@@ -467,7 +468,7 @@ export function ContextMenu({
return (
<>
<div
- ref={mergeRefs(ref, triggerRef)}
+ ref={useMergedRefs(ref, triggerRef)}
{...triggerProps}
onContextMenu={handleContextMenu}
{...longPressHandlers}
@@ -482,7 +483,7 @@ export function ContextMenu({
)}>
{children}
<span
- ref={mergeRefs(cursorAnchorRef, layer.ref)}
+ ref={useMergedRefs(cursorAnchorRef, layer.ref)}
aria-hidden="true"
{...mergeProps(stylex.props(styles.cursorAnchor), {
style: {
diff --git a/packages/core/src/DateInput/DateInput.tsx b/packages/core/src/DateInput/DateInput.tsx
index 6fd06c5a3f..57d8d83d78 100644
--- a/packages/core/src/DateInput/DateInput.tsx
+++ b/packages/core/src/DateInput/DateInput.tsx
@@ -161,7 +161,7 @@ export type {
InputStatus as DateInputStatus,
InputStatusType as DateInputStatusType,
} from '../Field';
-import {mergeProps, mergeRefs, isFocusDetached} from '../utils';
+import {mergeProps, isFocusDetached} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
import {themeProps} from '../utils/themeProps';
@@ -169,6 +169,7 @@ import {focusOutlineStyles} from '../utils/focusOutline.stylex';
import {stableClassName} from '../naming';
import {useTranslator, InternationalizationContext} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export interface DateInputProps extends Omit<
BaseProps,
'onChange' | 'defaultValue'
@@ -739,7 +740,7 @@ function PointerDateField({
/>
</button>
<input
- ref={mergeRefs(ref, inputRef)}
+ ref={useMergedRefs(ref, inputRef)}
id={id}
type="text"
role="combobox"
diff --git a/packages/core/src/DateTimeInput/DateTimeInput.tsx b/packages/core/src/DateTimeInput/DateTimeInput.tsx
index 23f94ca5bc..9464cbe375 100644
--- a/packages/core/src/DateTimeInput/DateTimeInput.tsx
+++ b/packages/core/src/DateTimeInput/DateTimeInput.tsx
@@ -72,7 +72,6 @@ import {
adjustTime,
isImeKeyEvent,
mergeProps,
- mergeRefs,
isFocusDetached,
} from '../utils';
import {
@@ -91,6 +90,7 @@ import {themeProps} from '../utils/themeProps';
import {focusOutlineStyles} from '../utils/focusOutline.stylex';
import {useTranslator, InternationalizationContext} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export type ISODateTimeString = string & {
readonly __brand: 'ISODateTimeString';
};
@@ -1009,7 +1009,7 @@ export function DateTimeInput({
/>
</button>
<input
- ref={mergeRefs(ref, dateInputRef)}
+ ref={useMergedRefs(ref, dateInputRef)}
id={dateInputId}
type="text"
role="combobox"
diff --git a/packages/core/src/Dialog/Dialog.tsx b/packages/core/src/Dialog/Dialog.tsx
index 44e06b286a..0aa495ee55 100644
--- a/packages/core/src/Dialog/Dialog.tsx
+++ b/packages/core/src/Dialog/Dialog.tsx
@@ -54,13 +54,14 @@ import {
overlayPaddingReset,
} from '../Layout/padding.stylex';
import type {SpacingStep} from '../utils/types';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {devWarn} from '../utils/devWarning';
import {DialogContext} from './DialogContext';
import {themeProps} from '../utils/themeProps';
import type {DialogVariantMap} from './index';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
+import {useMergedRefs} from '../hooks/useMergedRefs';
/**
* Calculate a directional translate offset for dialog entry animation.
* Returns a normalized vector from the trigger element toward the viewport
@@ -464,6 +465,8 @@ export function Dialog({
[titleId, hasConsumerName],
);
+ const mergedDialogRef = useMergedRefs(ref, attachDialog);
+
// Capture the element that was focused when the dialog opened,
// for directional animation origin and focus restoration on close.
const triggerElementRef = useRef<HTMLElement | null>(null);
@@ -674,7 +677,7 @@ export function Dialog({
return (
<dialog
- ref={mergeRefs(ref, attachDialog)}
+ ref={mergedDialogRef}
{...safeProps}
{...mergeProps(
themeProps('dialog', {variant}),
diff --git a/packages/core/src/FileInput/FileInput.tsx b/packages/core/src/FileInput/FileInput.tsx
index 87e5d4e0d8..527f19cb86 100644
--- a/packages/core/src/FileInput/FileInput.tsx
+++ b/packages/core/src/FileInput/FileInput.tsx
@@ -54,13 +54,14 @@ export type {
InputStatus as FileInputStatus,
InputStatusType as FileInputStatusType,
} from '../Field';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
import type {TranslatorFn} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
function formatFileSize(bytes: number): string {
if (bytes < 1024) {
return `${bytes} B`;
@@ -827,7 +828,7 @@ export function FileInput({
</VisuallyHidden>
<input
{...rest}
- ref={mergeRefs(ref, inputRef)}
+ ref={useMergedRefs(ref, inputRef)}
id={id}
type="file"
accept={accept}
diff --git a/packages/core/src/Item/Item.tsx b/packages/core/src/Item/Item.tsx
index 67d103ff9d..e4ef22f71e 100644
--- a/packages/core/src/Item/Item.tsx
+++ b/packages/core/src/Item/Item.tsx
@@ -27,7 +27,8 @@ import {
typeScaleVars,
} from '../theme/tokens.stylex';
import type {BaseProps} from '../BaseProps';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
+import {useMergedRefs} from '../hooks/useMergedRefs';
import {computeTargetAndRel} from '../Link/computeTargetAndRel';
import {useLinkComponent} from '../Link/useLinkComponent';
import {useClickableContainer} from '../hooks/useClickableContainer';
@@ -579,11 +580,11 @@ export function Item({
</>
);
+ const mergedRef = useMergedRefs(ref, containerRef);
+
return (
<Component
- ref={
- (isDelegate ? mergeRefs(ref, containerRef) : ref) as React.Ref<never>
- }
+ ref={(isDelegate ? mergedRef : ref) as React.Ref<never>}
{...restProps}
aria-selected={(allowsAriaSelected && isSelected) || undefined}
// aria-selected is invalid on roles that don't permit it (listitem, a
diff --git a/packages/core/src/Lightbox/Lightbox.tsx b/packages/core/src/Lightbox/Lightbox.tsx
index cb6ca58eab..526b11f5d1 100644
--- a/packages/core/src/Lightbox/Lightbox.tsx
+++ b/packages/core/src/Lightbox/Lightbox.tsx
@@ -33,7 +33,7 @@ import {IconButton} from '../IconButton';
import {useAnnounce} from '../hooks/useAnnounce';
import {useScrollLock} from '../hooks/useScrollLock';
import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';
-import {mergeProps, mergeRefs, rtlStyles} from '../utils';
+import {mergeProps, rtlStyles} from '../utils';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
import {focusOutlineStyles} from '../utils/focusOutline.stylex';
@@ -42,6 +42,7 @@ import {LayerDepthProvider} from '../Layer/LayerDepthContext';
import {useLayerDismissal} from '../Layer/useLayerDismissal';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
/**
* Media type for lightbox items.
*/
@@ -318,6 +319,7 @@ export function Lightbox({
}: LightboxProps) {
const t = useTranslator();
const dialogRef = useRef<HTMLDialogElement>(null);
+ const mergedDialogRef = useMergedRefs(ref, dialogRef);
const containerRef = useRef<HTMLDivElement>(null);
const imageWrapperRef = useRef<HTMLDivElement>(null);
const triggerElementRef = useRef<Element | null>(null);
@@ -601,7 +603,7 @@ export function Lightbox({
return (
<dialog
- ref={mergeRefs(ref, dialogRef)}
+ ref={mergedDialogRef}
onCancel={handleCancel}
onClick={e => {
handleBackdropClick(e);
diff --git a/packages/core/src/MobileNav/MobileNav.tsx b/packages/core/src/MobileNav/MobileNav.tsx
index c3d089bafc..a3d0781fc2 100644
--- a/packages/core/src/MobileNav/MobileNav.tsx
+++ b/packages/core/src/MobileNav/MobileNav.tsx
@@ -57,7 +57,7 @@ import {
holdScrollbarGutter,
type ScrollbarGutterHold,
} from '../hooks/scrollbarGutter';
-import {mergeProps, mergeRefs, composeEventHandlers} from '../utils';
+import {mergeProps, composeEventHandlers} from '../utils';
import {overlayPaddingReset} from '../Layout/padding.stylex';
import {LayerDepthProvider} from '../Layer/LayerDepthContext';
import {useLayerDismissal} from '../Layer/useLayerDismissal';
@@ -65,6 +65,7 @@ import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Styles
// =============================================================================
@@ -583,7 +584,7 @@ export function MobileNav({
return (
<dialog
- ref={mergeRefs(ref, dialogRef)}
+ ref={useMergedRefs(ref, dialogRef)}
id={dialogId}
{...mergeProps(
themeProps('mobile-nav', {side: resolvedSide}),
diff --git a/packages/core/src/NavMenu/NavHeadingMenu.tsx b/packages/core/src/NavMenu/NavHeadingMenu.tsx
index f0ea8ad2db..710d8dc798 100644
--- a/packages/core/src/NavMenu/NavHeadingMenu.tsx
+++ b/packages/core/src/NavMenu/NavHeadingMenu.tsx
@@ -15,7 +15,7 @@
import React, {useCallback, useMemo, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {useListFocus} from '../hooks/useListFocus';
import {useTypeahead} from '../hooks/useTypeahead';
@@ -26,6 +26,7 @@ import {
type NavHeadingMenuSize,
} from './NavMenuContext';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
root: {
display: 'flex',
@@ -162,7 +163,7 @@ export function NavHeadingMenu({
return (
<NavHeadingMenuContext value={ctx}>
<div
- ref={mergeRefs(ref, listRef)}
+ ref={useMergedRefs(ref, listRef)}
role="menu"
onKeyDown={listKeyDown}
data-testid={testId}
diff --git a/packages/core/src/Outline/Outline.tsx b/packages/core/src/Outline/Outline.tsx
index 16a8492a69..7596abce1e 100644
--- a/packages/core/src/Outline/Outline.tsx
+++ b/packages/core/src/Outline/Outline.tsx
@@ -37,7 +37,7 @@ import {
import {useLinkComponent} from '../Link/useLinkComponent';
import {useListFocus} from '../hooks/useListFocus';
import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {useScrollSpy} from './useScrollSpy';
import type {OutlineItem} from './types';
@@ -45,6 +45,7 @@ import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export type {OutlineItem} from './types';
export interface OutlineProps extends BaseProps<HTMLElement> {
@@ -443,7 +444,7 @@ export function Outline({
return (
<nav
{...props}
- ref={mergeRefs(rootRef, ref)}
+ ref={useMergedRefs(rootRef, ref)}
aria-label={label}
data-testid={testId}
{...mergeProps(
diff --git a/packages/core/src/OverflowList/OverflowList.tsx b/packages/core/src/OverflowList/OverflowList.tsx
index 3001d728a3..128d47b9fd 100644
--- a/packages/core/src/OverflowList/OverflowList.tsx
+++ b/packages/core/src/OverflowList/OverflowList.tsx
@@ -22,11 +22,12 @@ import {type ReactNode, type ReactElement, Children} from 'react';
import type {BaseProps} from '../BaseProps';
import type {SpacingStep} from '../utils/types';
import * as stylex from '@stylexjs/stylex';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useOverflow} from '../hooks/useOverflow';
import {spacingVars} from '../theme/tokens.stylex';
import {themeProps} from '../utils/themeProps';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
container: {
display: 'flex',
@@ -280,7 +281,7 @@ export function OverflowList({
{/* Visible container */}
<div
- ref={mergeRefs(ref, containerRef)}
+ ref={useMergedRefs(ref, containerRef)}
{...mergeProps(
themeProps('overflow-list'),
stylex.props(
diff --git a/packages/core/src/Overlay/Overlay.tsx b/packages/core/src/Overlay/Overlay.tsx
index 2d65e75b3f..426f8070eb 100644
--- a/packages/core/src/Overlay/Overlay.tsx
+++ b/packages/core/src/Overlay/Overlay.tsx
@@ -17,7 +17,7 @@
import type {ReactNode, Ref} from 'react';
import * as stylex from '@stylexjs/stylex';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useOverlay} from './useOverlay';
import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';
import {overlayScope, overlayContainerStyles} from './overlay.markers.stylex';
@@ -30,6 +30,7 @@ import type {
OverlayShowOn,
} from './OverlayScrim';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export interface OverlayProps extends Pick<
BaseProps<HTMLDivElement>,
'xstyle' | 'className' | 'style'
@@ -113,7 +114,7 @@ export function Overlay({
return (
<div
- ref={mergeRefs(ref, overlay.containerRef)}
+ ref={useMergedRefs(ref, overlay.containerRef)}
{...mergeProps(
themeProps('overlay'),
stylex.props(overlayScope, overlayContainerStyles.root, xstyle),
diff --git a/packages/core/src/PowerSearch/PowerSearch.tsx b/packages/core/src/PowerSearch/PowerSearch.tsx
index 29c560258c..b7b752165d 100644
--- a/packages/core/src/PowerSearch/PowerSearch.tsx
+++ b/packages/core/src/PowerSearch/PowerSearch.tsx
@@ -46,7 +46,6 @@ import {
typeScaleVars,
fontWeightVars,
} from '../theme/tokens.stylex';
-import {mergeRefs} from '../utils';
import {useSize} from '../SizeContext/SizeContext';
import {useInternalConfig} from './useInternalConfig';
import {usePowerSearchSource} from './usePowerSearchSource';
@@ -75,6 +74,7 @@ import type {
PowerSearchComponents,
} from './types';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Icon mapping for typeahead entries
// =============================================================================
@@ -1029,7 +1029,10 @@ export function PowerSearch({
return (
<>
<div
- ref={mergeRefs(ref, popover.triggerRef as React.Ref<HTMLDivElement>)}
+ ref={useMergedRefs(
+ ref,
+ popover.triggerRef as React.Ref<HTMLDivElement>,
+ )}
{...themeProps('power-search')}>
<Tokenizer
handleRef={tokenizerRef}
diff --git a/packages/core/src/Resizable/ResizeHandle.tsx b/packages/core/src/Resizable/ResizeHandle.tsx
index aa68019a30..a161b65ef1 100644
--- a/packages/core/src/Resizable/ResizeHandle.tsx
+++ b/packages/core/src/Resizable/ResizeHandle.tsx
@@ -35,11 +35,12 @@ import {
spacingVars,
} from '../theme/tokens.stylex';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
-import {mergeProps, mergeRefs, rtlStyles} from '../utils';
+import {mergeProps, rtlStyles} from '../utils';
import type {ResizableProps} from './useResizable';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const KEYBOARD_STEP = 10;
const KEYBOARD_LARGE_STEP = 50;
@@ -549,7 +550,7 @@ export function ResizeHandle({
return (
<div
- ref={mergeRefs(ref, handleRef)}
+ ref={useMergedRefs(ref, handleRef)}
role="separator"
aria-orientation={isHorizontal ? 'vertical' : 'horizontal'}
aria-valuenow={ariaValueNow}
diff --git a/packages/core/src/SegmentedControl/SegmentedControl.tsx b/packages/core/src/SegmentedControl/SegmentedControl.tsx
index 506767d746..f73e304b33 100644
--- a/packages/core/src/SegmentedControl/SegmentedControl.tsx
+++ b/packages/core/src/SegmentedControl/SegmentedControl.tsx
@@ -26,11 +26,12 @@ import type {
SegmentedControlSize,
SegmentedControlLayout,
} from './SegmentedControlContext';
-import {mergeProps, mergeRefs, composeEventHandlers} from '../utils';
+import {mergeProps, composeEventHandlers} from '../utils';
import {useSize} from '../SizeContext/SizeContext';
import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export interface SegmentedControlProps extends Omit<
BaseProps<HTMLDivElement>,
'onChange'
@@ -258,7 +259,7 @@ export function SegmentedControl({
return (
<SegmentedControlContext value={contextValue}>
<div
- ref={mergeRefs(ref, listRef, disabledMessageTooltip.ref)}
+ ref={useMergedRefs(ref, listRef, disabledMessageTooltip.ref)}
{...rest}
role="radiogroup"
aria-label={label}
diff --git a/packages/core/src/SelectableCard/SelectableCard.tsx b/packages/core/src/SelectableCard/SelectableCard.tsx
index 25ed09c73b..0efee6fb17 100644
--- a/packages/core/src/SelectableCard/SelectableCard.tsx
+++ b/packages/core/src/SelectableCard/SelectableCard.tsx
@@ -40,7 +40,7 @@ import * as stylex from '@stylexjs/stylex';
import type {StyleXStyles} from '@stylexjs/stylex';
import {colorVars, durationVars, easeVars} from '../theme/tokens.stylex';
import type {Elevation, SizeValue, SpacingStep} from '../utils/types';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {Card} from '../Card/Card';
import type {CardVariant} from '../Card/Card';
import {useClickableContainer} from '../hooks/useClickableContainer';
@@ -48,6 +48,7 @@ import type {BaseProps} from '../BaseProps';
import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Styles — selection + interaction; Card handles the rest
// =============================================================================
@@ -346,7 +347,7 @@ export function SelectableCard({
return (
<Card
- ref={mergeRefs(ref, containerRef)}
+ ref={useMergedRefs(ref, containerRef)}
width={width}
height={height}
maxWidth={maxWidth}
diff --git a/packages/core/src/SideNav/SideNav.tsx b/packages/core/src/SideNav/SideNav.tsx
index 702b428197..fd8ff1c897 100644
--- a/packages/core/src/SideNav/SideNav.tsx
+++ b/packages/core/src/SideNav/SideNav.tsx
@@ -32,7 +32,7 @@ import type {BaseProps} from '../BaseProps';
import * as stylex from '@stylexjs/stylex';
import type {StyleXStyles} from '@stylexjs/stylex';
import {spacingVars} from '../theme/tokens.stylex';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {
SideNavCollapseContext,
type SideNavCollapseState,
@@ -49,6 +49,7 @@ import {themeProps} from '../utils/themeProps';
import {SizeProvider} from '../SizeContext/SizeContext';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Constants
// =============================================================================
@@ -349,6 +350,7 @@ export function SideNav({
useState(defaultIsCollapsed);
const collapsed = isControlled ? controlledCollapsed : uncontrolledCollapsed;
const navRef = useRef<HTMLElement>(null);
+ const mergedNavRef = useMergedRefs(ref, navRef);
const collapseStateRef = useRef<SideNavCollapseState>({
isCollapsed: collapsed,
toggle: () => {},
@@ -517,7 +519,7 @@ export function SideNav({
const navElement = (
<nav
- ref={mergeRefs(ref, navRef)}
+ ref={mergedNavRef}
role="navigation"
aria-label={t('@astryx.sideNav.label')}
data-testid={testId}
diff --git a/packages/core/src/SideNav/SideNavItem.tsx b/packages/core/src/SideNav/SideNavItem.tsx
index 10b50d4d9f..a05ba4ebb1 100644
--- a/packages/core/src/SideNav/SideNavItem.tsx
+++ b/packages/core/src/SideNav/SideNavItem.tsx
@@ -47,7 +47,7 @@ import {useLinkComponent} from '../Link/useLinkComponent';
import type {LinkComponentType} from '../Link/types';
import {usePopover} from '../Popover/usePopover';
import {useMenuHover} from '../hooks/useMenuHover';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {Tooltip} from '../Tooltip';
import {navItemStyles, type NavItemSize} from '../NavItem/navItemStyles.stylex';
@@ -61,6 +61,7 @@ import {useAppShellMobile} from '../AppShell/AppShellMobileContext';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Styles
// =============================================================================
@@ -408,6 +409,7 @@ export function SideNavItem({
hasCloseButton: false,
dialogLabel: t('@astryx.sideNavItem.submenuLabel', {label}),
});
+ const mergedTriggerRef = useMergedRefs(ref, popover.triggerRef);
// Collapse state for items with children
const itemCollapsibleConfig = useMemo(
@@ -524,7 +526,7 @@ export function SideNavItem({
return (
<div {...stylex.props(styles.root, xstyle)}>
<button
- ref={mergeRefs(ref, popover.triggerRef)}
+ ref={mergedTriggerRef}
type="button"
{...rest}
{...hoverTriggerProps}
diff --git a/packages/core/src/Slider/Slider.tsx b/packages/core/src/Slider/Slider.tsx
index 58c00634ec..715ea846bd 100644
--- a/packages/core/src/Slider/Slider.tsx
+++ b/packages/core/src/Slider/Slider.tsx
@@ -40,13 +40,14 @@ import {Tooltip} from '../Tooltip/Tooltip';
import {useTooltip} from '../Tooltip';
import {VisuallyHidden} from '../VisuallyHidden';
import type {InputStatus} from '../Field/types';
-import {mergeProps, mergeRefs, rtlStyles} from '../utils';
+import {mergeProps, rtlStyles} from '../utils';
import {focusOutlineStyles} from '../utils/focusOutline.stylex';
import {isRtlElement} from '../hooks/isRtlElement';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
import {themeProps} from '../utils/themeProps';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Types
// =============================================================================
@@ -964,7 +965,7 @@ export function Slider({ref, ...props}: SliderProps) {
/>
))}
<div
- ref={mergeRefs(ref, trackRef, disabledMessageTooltip.ref)}
+ ref={useMergedRefs(ref, trackRef, disabledMessageTooltip.ref)}
{...(isRange
? {role: 'group', 'aria-labelledby': labelID}
: undefined)}
diff --git a/packages/core/src/Switch/Switch.tsx b/packages/core/src/Switch/Switch.tsx
index 519bfeec22..c9b7f803e9 100644
--- a/packages/core/src/Switch/Switch.tsx
+++ b/packages/core/src/Switch/Switch.tsx
@@ -41,7 +41,7 @@ import type {IconType} from '../Icon';
import type {InputStatus} from '../Field/types';
import {Spinner} from '../Spinner';
import {useTooltip} from '../Tooltip';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {switchScope} from './switch.markers.stylex';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
@@ -49,6 +49,7 @@ import {themeProps} from '../utils/themeProps';
import {VisuallyHidden} from '../VisuallyHidden';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const wrapperSizeStyles = stylex.create({
sm: {
width: 32,
@@ -551,7 +552,7 @@ export function Switch({
const switchElement = (
<div {...stylex.props(styles.switchWrapper, wrapperSizeStyles[size])}>
<input
- ref={mergeRefs(ref, disabledMessageTooltip.positionRef)}
+ ref={useMergedRefs(ref, disabledMessageTooltip.positionRef)}
id={id}
type="checkbox"
role="switch"
diff --git a/packages/core/src/TabList/TabList.tsx b/packages/core/src/TabList/TabList.tsx
index 3d85778157..b5f7d3b0af 100644
--- a/packages/core/src/TabList/TabList.tsx
+++ b/packages/core/src/TabList/TabList.tsx
@@ -24,13 +24,14 @@ import type {BaseProps} from '../BaseProps';
import {TabListContext} from './TabListContext';
import type {TabListSize} from './TabListContext';
import {useSize} from '../SizeContext/SizeContext';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useListFocus} from '../hooks/useListFocus';
import {useKeyboardHint} from '../hooks/useKeyboardHint';
import {EDGE_COMP_ATTR} from '../Layout/edgeCompensation.stylex';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
/**
* Selector matching the focusable stops in the tab strip: every Tab
* (`[data-tab-value]`) and every TabMenu trigger (`[data-tab-menu]`),
@@ -207,7 +208,7 @@ export function TabList({
return (
<TabListContext value={contextValue}>
<nav
- ref={mergeRefs(ref, listRef)}
+ ref={useMergedRefs(ref, listRef)}
{...restProps}
aria-label={ariaLabel}
onKeyDown={handleRootKeyDown}
diff --git a/packages/core/src/TextArea/TextArea.tsx b/packages/core/src/TextArea/TextArea.tsx
index e5696cd5e7..8cbeaf0213 100644
--- a/packages/core/src/TextArea/TextArea.tsx
+++ b/packages/core/src/TextArea/TextArea.tsx
@@ -46,7 +46,7 @@ import {
import {Icon, renderIconSlot, type IconType} from '../Icon';
import {Spinner} from '../Spinner';
import {useTooltip} from '../Tooltip';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
import {useInputContainer} from '../hooks/useInputContainer';
@@ -58,6 +58,7 @@ import {themeProps} from '../utils/themeProps';
import {characterCount} from '../utils/characters';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const COUNTER_WARNING_THRESHOLD = 0.8;
const styles = stylex.create({
@@ -580,7 +581,7 @@ export function TextArea({
)}
<textarea
{...rest}
- ref={mergeRefs(ref, textareaRef)}
+ ref={useMergedRefs(ref, textareaRef)}
id={id}
name={isDisabled ? undefined : htmlName}
value={optimisticValue}
diff --git a/packages/core/src/TextInput/TextInput.tsx b/packages/core/src/TextInput/TextInput.tsx
index a99e288329..3885e86949 100644
--- a/packages/core/src/TextInput/TextInput.tsx
+++ b/packages/core/src/TextInput/TextInput.tsx
@@ -97,7 +97,7 @@ export type {
InputStatus as TextInputStatus,
InputStatusType as TextInputStatusType,
} from '../Field';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useSize} from '../SizeContext/SizeContext';
import {useInputContainer} from '../hooks/useInputContainer';
import {useInputStatusIcon} from '../hooks/useInputStatusIcon';
@@ -108,6 +108,7 @@ import type {SizeValue} from '../utils/types';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export type TextInputType = 'text' | 'password' | 'email';
export interface TextInputProps extends Omit<
@@ -421,7 +422,7 @@ export function TextInput({
{inputGroup && <VisuallyHidden id={inputLabelID}>{label}</VisuallyHidden>}
<input
{...rest}
- ref={mergeRefs(ref, inputRef)}
+ ref={useMergedRefs(ref, inputRef)}
id={id}
name={isDisabled ? undefined : htmlName}
type={type}
diff --git a/packages/core/src/TimeInput/TimeInput.tsx b/packages/core/src/TimeInput/TimeInput.tsx
index a3b75e52e0..b8ed5ad50f 100644
--- a/packages/core/src/TimeInput/TimeInput.tsx
+++ b/packages/core/src/TimeInput/TimeInput.tsx
@@ -58,7 +58,6 @@ import {
isImeKeyEvent,
isTimeInRange,
mergeProps,
- mergeRefs,
getInputARIA,
} from '../utils';
import type {BaseProps} from '../BaseProps';
@@ -74,6 +73,7 @@ import {useTooltip} from '../Tooltip';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
const styles = stylex.create({
icon: {
display: 'flex',
@@ -648,7 +648,7 @@ export function TimeInput({
</VisuallyHidden>
)}
<input
- ref={mergeRefs(ref, inputRef)}
+ ref={useMergedRefs(ref, inputRef)}
id={id}
type="text"
value={displayValue}
diff --git a/packages/core/src/Timestamp/Timestamp.tsx b/packages/core/src/Timestamp/Timestamp.tsx
index 8e6128be35..6518bd5849 100644
--- a/packages/core/src/Timestamp/Timestamp.tsx
+++ b/packages/core/src/Timestamp/Timestamp.tsx
@@ -20,7 +20,7 @@ import {lazy, Suspense, useEffect, useRef, useState} from 'react';
import * as stylex from '@stylexjs/stylex';
import {Text} from '../Text';
import type {TextType, TextSize, TextColor, TextWeight} from '../theme/types';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import {useDevWarning} from '../hooks/useDevWarning';
import {useTranslator} from '../i18n';
import {useLocale} from '../i18n/useLocale';
@@ -33,6 +33,7 @@ import type {
TimestampTooltipLine,
} from './tooltipEntries';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// Load the overlay lazily so a card-less Timestamp — the default — never
// bundles HoverCard or the copy affordance's Icon/IconButton. Mirrors the code
// split the read-only Tooltip path used before it.
@@ -422,6 +423,7 @@ export function Timestamp({
const t = useTranslator();
const locale = useLocale();
const timeRef = useRef<HTMLTimeElement>(null);
+ const mergedTimeRef = useMergedRefs(ref, timeRef);
const [now, setNow] = useState(() => new Date());
const date = parseValue(value);
@@ -526,7 +528,7 @@ export function Timestamp({
xstyle={xstyle}
{...timestampProps}>
<time
- ref={mergeRefs(ref, timeRef)}
+ ref={mergedTimeRef}
dateTime={isoString}
// `ariaLabelText` is '' only for an invalid date, which bails out
// before rendering — but keep the guard local: an empty aria-label
diff --git a/packages/core/src/Token/TokenLink.tsx b/packages/core/src/Token/TokenLink.tsx
index 63532a5d19..bc4a455822 100644
--- a/packages/core/src/Token/TokenLink.tsx
+++ b/packages/core/src/Token/TokenLink.tsx
@@ -27,10 +27,10 @@
import type {ReactNode, CSSProperties, Ref, HTMLAttributes} from 'react';
import {useRef} from 'react';
-import {mergeRefs} from '../utils';
import {useClickableContainer} from '../hooks/useClickableContainer';
import type {LinkComponentType} from '../Link/types';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export interface TokenLinkProps extends HTMLAttributes<HTMLElement> {
/** Ref forwarded to the container element. */
ref?: Ref<HTMLElement>;
@@ -86,7 +86,7 @@ export function TokenLink({
return (
<span
- ref={mergeRefs(ref, containerRef)}
+ ref={useMergedRefs(ref, containerRef)}
onClick={isDisabled ? undefined : onClick}
onMouseUp={isDisabled ? undefined : onMouseUp}
{...containerProps}>
diff --git a/packages/core/src/TopNav/TopNavMegaMenu.tsx b/packages/core/src/TopNav/TopNavMegaMenu.tsx
index cabfb4f46f..7125c8bcb7 100644
--- a/packages/core/src/TopNav/TopNavMegaMenu.tsx
+++ b/packages/core/src/TopNav/TopNavMegaMenu.tsx
@@ -53,7 +53,7 @@ import {usePopover} from '../Popover/usePopover';
import {useMenuHover} from '../hooks/useMenuHover';
import {Grid} from '../Grid/Grid';
import {Icon} from '../Icon';
-import {mergeProps, mergeRefs} from '../utils';
+import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {navItemStyles} from '../NavItem/navItemStyles.stylex';
import {useTopNavSlot} from './TopNavContext';
@@ -61,6 +61,7 @@ import {useTopNavRenderMode} from './TopNavRenderContext';
import {themeProps} from '../utils/themeProps';
import {focusOutlineProps} from '../utils/focusOutline.stylex';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Styles
// =============================================================================
@@ -451,7 +452,7 @@ function DefaultMegaMenu({
return (
<>
<button
- ref={mergeRefs(triggerButtonRef, setTriggerEl, ref)}
+ ref={useMergedRefs(triggerButtonRef, setTriggerEl, ref)}
type="button"
{...popover.triggerProps}
{...hoverTriggerProps}
diff --git a/packages/core/src/Typeahead/BaseTypeahead.tsx b/packages/core/src/Typeahead/BaseTypeahead.tsx
index d9c4f123b3..fe98c70d62 100644
--- a/packages/core/src/Typeahead/BaseTypeahead.tsx
+++ b/packages/core/src/Typeahead/BaseTypeahead.tsx
@@ -41,12 +41,13 @@ import {
fontWeightVars,
typeScaleVars,
} from '../theme/tokens.stylex';
-import {getKey, mergeProps, mergeRefs} from '../utils';
+import {getKey, mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {SearchableItem, SearchSource} from './types';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
// =============================================================================
// Types
// =============================================================================
@@ -760,7 +761,7 @@ export const BaseTypeahead = function BaseTypeahead<T extends SearchableItem>({
return (
<>
<input
- ref={mergeRefs(ref, inputRef, fallbackAnchorRef)}
+ ref={useMergedRefs(ref, inputRef, fallbackAnchorRef)}
id={inputId}
type="text"
role="combobox"
diff --git a/packages/core/src/Typeahead/Typeahead.tsx b/packages/core/src/Typeahead/Typeahead.tsx
index 503d3b2f20..aa32008f82 100644
--- a/packages/core/src/Typeahead/Typeahead.tsx
+++ b/packages/core/src/Typeahead/Typeahead.tsx
@@ -45,13 +45,14 @@ import {VisuallyHidden} from '../VisuallyHidden';
import {spacingVars, sizeVars} from '../theme/tokens.stylex';
import {groupStyles} from '../InputGroup/groupStyles';
import {useInputGroup} from '../InputGroup/InputGroupContext';
-import {getInputARIA, isImeKeyEvent, mergeProps, mergeRefs} from '../utils';
+import {getInputARIA, isImeKeyEvent, mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import type {SizeValue} from '../utils/types';
import type {SearchableItem, SearchSource} from './types';
import {themeProps} from '../utils/themeProps';
import {useTranslator} from '../i18n';
+import {useMergedRefs} from '../hooks/useMergedRefs';
export type {
InputStatus as TypeaheadStatus,
InputStatusType as TypeaheadStatusType,
@@ -418,7 +419,7 @@ export function Typeahead<T extends SearchableItem>({
const typeaheadContent = (
<>
<div
- ref={mergeRefs(
+ ref={useMergedRefs(
wrapperRef,
disabledMessageTooltip.ref,
inputGroup ? ref : undefined,