Skip to content

[composite] Remove unnecessary props memos #5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atomiks wants to merge 2 commits into
base: master
Choose a base branch
from
+160 −190
Open

[composite] Remove unnecessary props memos #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d22c5aa
[composite] Remove unnecessary props memos
atomiks Jun 12, 2026
9616401
Merge remote-tracking branch 'upstream/master' into codex/resolve-5023
atomiks Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions packages/react/src/internals/composite/item/useCompositeItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,23 @@ export function useCompositeItem<Metadata>(params: UseCompositeItemParameters<Me
const itemRef = React.useRef<HTMLElement | null>(null);
const mergedRef = useMergedRefs(ref, itemRef);

const compositeProps = React.useMemo<HTMLProps>(
() => ({
tabIndex: isHighlighted ? 0 : -1,
onFocus() {
onHighlightedIndexChange(index);
},
onMouseMove() {
const item = itemRef.current;
if (!highlightItemOnHover || !item) {
return;
}
const compositeProps: HTMLProps = {
tabIndex: isHighlighted ? 0 : -1,
onFocus() {
onHighlightedIndexChange(index);
},
onMouseMove() {
const item = itemRef.current;
if (!highlightItemOnHover || !item) {
return;
}

const disabled = item.hasAttribute('disabled') || item.ariaDisabled === 'true';
if (!isHighlighted && !disabled) {
item.focus();
}
},
}),
[isHighlighted, onHighlightedIndexChange, index, highlightItemOnHover],
);
const disabled = item.hasAttribute('disabled') || item.ariaDisabled === 'true';
if (!isHighlighted && !disabled) {
item.focus();
}
},
};

return {
compositeProps,
Expand Down
8 changes: 1 addition & 7 deletions packages/react/src/internals/composite/list/useCompositeListItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,5 @@ export function useCompositeListItem<Metadata>(
});
}, [externalIndex, subscribeMapChange, setIndex]);

return React.useMemo(
() => ({
ref,
index,
}),
[index, ref],
);
return { ref, index };
}
307 changes: 143 additions & 164 deletions packages/react/src/internals/composite/root/useCompositeRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,188 +179,167 @@ export function useCompositeRoot(params: UseCompositeRootParameters) {
},
);

const props = React.useMemo<HTMLProps>(
() => ({
ref: mergedRef,
onFocus(event) {
const element = rootRef.current;
const target = getTarget(event.nativeEvent);
if (!element || target == null || !isNativeInput(target)) {
return;
}
target.setSelectionRange(0, target.value.length ?? 0);
},
onKeyDown(event) {
const RELEVANT_KEYS = enableHomeAndEndKeys ? COMPOSITE_KEYS : ARROW_KEYS;
if (!RELEVANT_KEYS.has(event.key)) {
return;
}
// Stable so that `relayKeyboardEvent` does not invalidate identity-sensitive
// consumers (the `CompositeRootContext` value and trigger data forwarding).
const onKeyDown = useStableCallback((event: React.KeyboardEvent) => {
const RELEVANT_KEYS = enableHomeAndEndKeys ? COMPOSITE_KEYS : ARROW_KEYS;
if (!RELEVANT_KEYS.has(event.key)) {
return;
}

if (isModifierKeySet(event, modifierKeys)) {
return;
}
if (isModifierKeySet(event, modifierKeys)) {
return;
}

const element = rootRef.current;
if (!element) {
return;
}
const element = rootRef.current;
if (!element) {
return;
}

const isRtl = direction === 'rtl';
const isRtl = direction === 'rtl';

const horizontalForwardKey = isRtl ? ARROW_LEFT : ARROW_RIGHT;
const forwardKey = {
horizontal: horizontalForwardKey,
vertical: ARROW_DOWN,
both: horizontalForwardKey,
}[orientation];
const horizontalBackwardKey = isRtl ? ARROW_RIGHT : ARROW_LEFT;
const backwardKey = {
horizontal: horizontalBackwardKey,
vertical: ARROW_UP,
both: horizontalBackwardKey,
}[orientation];
const horizontalForwardKey = isRtl ? ARROW_LEFT : ARROW_RIGHT;
const forwardKey = {
horizontal: horizontalForwardKey,
vertical: ARROW_DOWN,
both: horizontalForwardKey,
}[orientation];
const horizontalBackwardKey = isRtl ? ARROW_RIGHT : ARROW_LEFT;
const backwardKey = {
horizontal: horizontalBackwardKey,
vertical: ARROW_UP,
both: horizontalBackwardKey,
}[orientation];

const target = getTarget(event.nativeEvent);
if (target != null && isNativeInput(target) && !isElementDisabled(target)) {
const selectionStart = target.selectionStart;
const selectionEnd = target.selectionEnd;
const textContent = target.value ?? '';
// return to native textbox behavior when
// 1 - Shift is held to make a text selection, or if there already is a text selection
if (selectionStart == null || event.shiftKey || selectionStart !== selectionEnd) {
return;
}
// 2 - arrow-ing forward and not in the last position of the text
if (event.key !== backwardKey && selectionStart < textContent.length) {
return;
}
// 3 -arrow-ing backward and not in the first position of the text
if (event.key !== forwardKey && selectionStart > 0) {
return;
}
}
const target = getTarget(event.nativeEvent);
if (target != null && isNativeInput(target) && !isElementDisabled(target)) {
const selectionStart = target.selectionStart;
const selectionEnd = target.selectionEnd;
const textContent = target.value ?? '';
// return to native textbox behavior when
// 1 - Shift is held to make a text selection, or if there already is a text selection
if (selectionStart == null || event.shiftKey || selectionStart !== selectionEnd) {
return;
}
// 2 - arrow-ing forward and not in the last position of the text
if (event.key !== backwardKey && selectionStart < textContent.length) {
return;
}
// 3 -arrow-ing backward and not in the first position of the text
if (event.key !== forwardKey && selectionStart > 0) {
return;
}
}

let nextIndex = highlightedIndex;
const minIndex = getMinListIndex(elementsRef, disabledIndices);
const maxIndex = getMaxListIndex(elementsRef, disabledIndices);
let nextIndex = highlightedIndex;
const minIndex = getMinListIndex(elementsRef, disabledIndices);
const maxIndex = getMaxListIndex(elementsRef, disabledIndices);

if (grid != null) {
nextIndex = grid({
disabledIndices,
elementsRef,
event,
highlightedIndex,
loopFocus,
maxIndex,
minIndex,
onLoop: wrappedOnLoop,
orientation,
rtl: isRtl,
});
}
if (grid != null) {
nextIndex = grid({
disabledIndices,
elementsRef,
event,
highlightedIndex,
loopFocus,
maxIndex,
minIndex,
onLoop: wrappedOnLoop,
orientation,
rtl: isRtl,
});
}

const forwardKeys = {
horizontal: [horizontalForwardKey],
vertical: [ARROW_DOWN],
both: [horizontalForwardKey, ARROW_DOWN],
}[orientation];
const forwardKeys = {
horizontal: [horizontalForwardKey],
vertical: [ARROW_DOWN],
both: [horizontalForwardKey, ARROW_DOWN],
}[orientation];

const backwardKeys = {
horizontal: [horizontalBackwardKey],
vertical: [ARROW_UP],
both: [horizontalBackwardKey, ARROW_UP],
}[orientation];

const backwardKeys = {
horizontal: [horizontalBackwardKey],
vertical: [ARROW_UP],
both: [horizontalBackwardKey, ARROW_UP],
const preventedKeys = isGrid
? RELEVANT_KEYS
: {
horizontal: enableHomeAndEndKeys ? HORIZONTAL_KEYS_WITH_EXTRA_KEYS : HORIZONTAL_KEYS,
vertical: enableHomeAndEndKeys ? VERTICAL_KEYS_WITH_EXTRA_KEYS : VERTICAL_KEYS,
both: RELEVANT_KEYS,
}[orientation];

const preventedKeys = isGrid
? RELEVANT_KEYS
: {
horizontal: enableHomeAndEndKeys ? HORIZONTAL_KEYS_WITH_EXTRA_KEYS : HORIZONTAL_KEYS,
vertical: enableHomeAndEndKeys ? VERTICAL_KEYS_WITH_EXTRA_KEYS : VERTICAL_KEYS,
both: RELEVANT_KEYS,
}[orientation];
if (enableHomeAndEndKeys) {
if (event.key === HOME) {
nextIndex = minIndex;
} else if (event.key === END) {
nextIndex = maxIndex;
}
}

if (enableHomeAndEndKeys) {
if (event.key === HOME) {
nextIndex = minIndex;
} else if (event.key === END) {
nextIndex = maxIndex;
}
if (
nextIndex === highlightedIndex &&
(forwardKeys.includes(event.key) || backwardKeys.includes(event.key))
) {
if (loopFocus && nextIndex === maxIndex && forwardKeys.includes(event.key)) {
nextIndex = minIndex;
if (onLoop) {
nextIndex = onLoop(event, highlightedIndex, nextIndex, elementsRef);
}

if (
nextIndex === highlightedIndex &&
(forwardKeys.includes(event.key) || backwardKeys.includes(event.key))
) {
if (loopFocus && nextIndex === maxIndex && forwardKeys.includes(event.key)) {
nextIndex = minIndex;
if (onLoop) {
nextIndex = onLoop(event, highlightedIndex, nextIndex, elementsRef);
}
} else if (loopFocus && nextIndex === minIndex && backwardKeys.includes(event.key)) {
nextIndex = maxIndex;
if (onLoop) {
nextIndex = onLoop(event, highlightedIndex, nextIndex, elementsRef);
}
} else {
nextIndex = findNonDisabledListIndex(elementsRef.current, {
startingIndex: nextIndex,
decrement: backwardKeys.includes(event.key),
disabledIndices,
});
}
} else if (loopFocus && nextIndex === minIndex && backwardKeys.includes(event.key)) {
nextIndex = maxIndex;
if (onLoop) {
nextIndex = onLoop(event, highlightedIndex, nextIndex, elementsRef);
}
} else {
nextIndex = findNonDisabledListIndex(elementsRef.current, {
startingIndex: nextIndex,
decrement: backwardKeys.includes(event.key),
disabledIndices,
});
}
}

if (
nextIndex !== highlightedIndex &&
!isIndexOutOfListBounds(elementsRef.current, nextIndex)
) {
if (stopEventPropagation) {
event.stopPropagation();
}
if (nextIndex !== highlightedIndex && !isIndexOutOfListBounds(elementsRef.current, nextIndex)) {
if (stopEventPropagation) {
event.stopPropagation();
}

if (preventedKeys.has(event.key)) {
event.preventDefault();
}
onHighlightedIndexChange(nextIndex, true);
if (preventedKeys.has(event.key)) {
event.preventDefault();
}
onHighlightedIndexChange(nextIndex, true);

// Wait for FocusManager `returnFocus` to execute.
queueMicrotask(() => {
elementsRef.current[nextIndex]?.focus();
});
}
},
}),
[
direction,
disabledIndices,
elementsRef,
enableHomeAndEndKeys,
grid,
highlightedIndex,
isGrid,
loopFocus,
mergedRef,
modifierKeys,
onLoop,
onHighlightedIndexChange,
orientation,
stopEventPropagation,
wrappedOnLoop,
],
);
// Wait for FocusManager `returnFocus` to execute.
queueMicrotask(() => {
elementsRef.current[nextIndex]?.focus();
});
}
});

return React.useMemo(
() => ({
props,
highlightedIndex,
onHighlightedIndexChange,
elementsRef,
disabledIndices,
onMapChange,
relayKeyboardEvent: props.onKeyDown!,
}),
[props, highlightedIndex, onHighlightedIndexChange, elementsRef, disabledIndices, onMapChange],
);
const props: HTMLProps = {
ref: mergedRef,
onFocus(event) {
const element = rootRef.current;
const target = getTarget(event.nativeEvent);
if (!element || target == null || !isNativeInput(target)) {
return;
}
target.setSelectionRange(0, target.value.length ?? 0);
},
onKeyDown,
};

return {
props,
highlightedIndex,
onHighlightedIndexChange,
elementsRef,
disabledIndices,
onMapChange,
relayKeyboardEvent: onKeyDown,
};
}

function isModifierKeySet(event: React.KeyboardEvent, ignoredModifierKeys: ModifierKey[]) {
Expand Down
Loading