Skip to content

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

TypeScript

fix(core): correct prop forwarding precedence in 4 components (#4725)

Cindy Zhangf1ed7fc8240e
diff --git a/packages/core/src/CommandPalette/CommandPaletteItem.tsx b/packages/core/src/CommandPalette/CommandPaletteItem.tsx
index 6544b6a29e..dee4af339a 100644
--- a/packages/core/src/CommandPalette/CommandPaletteItem.tsx
+++ b/packages/core/src/CommandPalette/CommandPaletteItem.tsx
@@ -15,6 +15,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 {composeEventHandlers} from '../utils/composeEventHandlers';
import {
colorVars,
spacingVars,
@@ -127,6 +128,8 @@ export function CommandPaletteItem({
xstyle,
className,
style,
+ onClick: onClickProp,
+ onMouseEnter: onMouseEnterProp,
...props
}: CommandPaletteItemProps) {
const ctx = useCommandPaletteContext();
@@ -186,13 +189,14 @@ export function CommandPaletteItem({
return (
<div
ref={mergeRefs(ref, itemRef)}
+ {...props}
id={ctx && itemIndex >= 0 ? ctx.getItemId(itemIndex) : undefined}
role="option"
aria-selected={isSelected}
aria-disabled={isDisabled || undefined}
data-value={value}
- onClick={handleClick}
- onMouseEnter={handleMouseEnter}
+ onClick={composeEventHandlers(onClickProp, handleClick)}
+ onMouseEnter={composeEventHandlers(onMouseEnterProp, handleMouseEnter)}
{...mergeProps(
themeProps('command-palette-item'),
stylex.props(
@@ -205,8 +209,7 @@ export function CommandPaletteItem({
),
className,
style,
- )}
- {...props}>
+ )}>
{children}
</div>
);
diff --git a/packages/core/src/CommandPalette/CommandPaletteList.tsx b/packages/core/src/CommandPalette/CommandPaletteList.tsx
index e6800b5528..4a5e4c1204 100644
--- a/packages/core/src/CommandPalette/CommandPaletteList.tsx
+++ b/packages/core/src/CommandPalette/CommandPaletteList.tsx
@@ -87,6 +87,7 @@ export function CommandPaletteList({
return (
<div
ref={ref}
+ {...props}
id={ctx?.listId}
role="listbox"
aria-label={label}
@@ -95,8 +96,7 @@ export function CommandPaletteList({
stylex.props(styles.list, xstyle),
className,
style,
- )}
- {...props}>
+ )}>
{children}
</div>
);
diff --git a/packages/core/src/ComplexSelector/ComplexSelector.tsx b/packages/core/src/ComplexSelector/ComplexSelector.tsx
index 3b2df8ff85..171f6058c7 100644
--- a/packages/core/src/ComplexSelector/ComplexSelector.tsx
+++ b/packages/core/src/ComplexSelector/ComplexSelector.tsx
@@ -42,6 +42,7 @@ import {
typeScaleVars,
} from '../theme/tokens.stylex';
import {mergeProps} from '../utils';
+import {composeEventHandlers} from '../utils/composeEventHandlers';
import type {SizeValue} from '../utils/types';
import {themeProps} from '../utils/themeProps';
@@ -277,6 +278,7 @@ export function ComplexSelector<Value>({
className,
style,
'data-testid': testId,
+ onClick: onClickProp,
...props
}: ComplexSelectorProps<Value>) {
const t = useTranslator();
@@ -340,11 +342,11 @@ export function ComplexSelector<Value>({
ref={popover.triggerRef}
data-testid={testId}
{...props}
- onClick={() => {
+ onClick={composeEventHandlers(onClickProp, () => {
if (!isDisabled) {
popover.toggle();
}
- }}
+ })}
{...mergeProps(
themeProps('complex-selector', {
size,
diff --git a/packages/core/src/ContextMenu/ContextMenu.tsx b/packages/core/src/ContextMenu/ContextMenu.tsx
index ff850cca4e..272d688f1d 100644
--- a/packages/core/src/ContextMenu/ContextMenu.tsx
+++ b/packages/core/src/ContextMenu/ContextMenu.tsx
@@ -466,9 +466,9 @@ export function ContextMenu({
<>
<div
ref={mergeRefs(ref, triggerRef)}
+ {...triggerProps}
onContextMenu={handleContextMenu}
{...longPressHandlers}
- {...triggerProps}
data-testid={testId}
{...stylex.props(
styles.trigger,