Skip to content

[select][menu][combobox] Improve mount performance of large lists #5819

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

Merged
atomiks merged 2 commits into from
Sep 29, 2026
Merged

[select][menu][combobox] Improve mount performance of large lists #5819

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
07767d2
[menu] Read item node id from the store instead of the positioner con…
atomiks Sep 29, 2026
0d0280d
[all components] Skip compareDocumentPosition for adjacent CompositeL…
atomiks Sep 29, 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
9 changes: 9 additions & 0 deletions packages/react/src/internals/composite/list/CompositeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,15 @@ function hasMovedNode(entries: MutationRecord[]) {
}

function sortByDocumentPosition(a: Element, b: Element) {
// Adjacent siblings are the common case for lists that are already in order, and
// `compareDocumentPosition` scans siblings from the parent's first child, so sorting
// a long flat list would otherwise be quadratic.
if (a.nextElementSibling === b) {
return -1;
}
if (b.nextElementSibling === a) {
return 1;
}
// `DOCUMENT_POSITION_CONTAINED_BY` is always reported alongside `FOLLOWING`, and `CONTAINS`
// alongside `PRECEDING`, so testing `FOLLOWING` alone orders siblings and nested items alike.
return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1;
Expand Down
5 changes: 2 additions & 3 deletions packages/react/src/menu/checkbox-item/MenuCheckboxItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { useRenderElement } from '../../internals/useRenderElement';
import { useBaseUiId } from '../../internals/useBaseUiId';
import type { BaseUIComponentProps, NonNativeButtonProps } from '../../internals/types';
import { itemMapping } from '../utils/stateAttributesMapping';
import { useMenuPositionerContext } from '../positioner/MenuPositionerContext';
import { createChangeEventDetails } from '../../internals/createBaseUIEventDetails';
import { REASONS } from '../../internals/reasons';
import type { MenuRoot } from '../root/MenuRoot';
Expand Down Expand Up @@ -41,13 +40,13 @@ export const MenuCheckboxItem = React.forwardRef(function MenuCheckboxItem(
} = componentProps;

const listItem = useCompositeListItem({ guess: true, label });
const menuPositionerContext = useMenuPositionerContext(true);
const id = useBaseUiId(idProp);

const { store } = useMenuRootContext();
const rootDisabled = store.useState('disabled');
const disabled = disabledProp || rootDisabled;
const highlighted = store.useState('isActive', listItem.index);
const nodeId = store.useState('floatingNodeId');
const itemProps = store.useState('itemProps');

const [checked, setChecked] = useControlled({
Expand All @@ -64,7 +63,7 @@ export const MenuCheckboxItem = React.forwardRef(function MenuCheckboxItem(
id,
store,
nativeButton,
nodeId: menuPositionerContext?.context.nodeId,
nodeId,
itemMetadata: REGULAR_ITEM,
});

Expand Down
5 changes: 2 additions & 3 deletions packages/react/src/menu/item/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useRenderElement } from '../../internals/useRenderElement';
import { useBaseUiId } from '../../internals/useBaseUiId';
import type { BaseUIComponentProps, NonNativeButtonProps } from '../../internals/types';
import { useCompositeListItem } from '../../internals/composite/list/useCompositeListItem';
import { useMenuPositionerContext } from '../positioner/MenuPositionerContext';

/**
* An individual interactive item in the menu.
Expand All @@ -31,13 +30,13 @@ export const MenuItem = React.forwardRef(function MenuItem(
} = componentProps;

const listItem = useCompositeListItem({ guess: true, label });
const menuPositionerContext = useMenuPositionerContext(true);
const id = useBaseUiId(idProp);

const { store } = useMenuRootContext();
const rootDisabled = store.useState('disabled');
const disabled = disabledProp || rootDisabled;
const highlighted = store.useState('isActive', listItem.index);
const nodeId = store.useState('floatingNodeId');
const itemProps = store.useState('itemProps');

const { getItemProps, itemRef } = useMenuItem({
Expand All @@ -47,7 +46,7 @@ export const MenuItem = React.forwardRef(function MenuItem(
id,
store,
nativeButton,
nodeId: menuPositionerContext?.context.nodeId,
nodeId,
itemMetadata: REGULAR_ITEM,
});

Expand Down
5 changes: 1 addition & 4 deletions packages/react/src/menu/link-item/MenuLinkItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useRenderElement } from '../../internals/useRenderElement';
import { useBaseUiId } from '../../internals/useBaseUiId';
import type { BaseUIComponentProps, HTMLProps } from '../../internals/types';
import { useCompositeListItem } from '../../internals/composite/list/useCompositeListItem';
import { useMenuPositionerContext } from '../positioner/MenuPositionerContext';
import { useMenuItemCommonProps } from '../item/useMenuItemCommonProps';
import { REGULAR_ITEM } from '../item/useMenuItem';
import { useButton } from '../../internals/use-button';
Expand Down Expand Up @@ -34,13 +33,11 @@ export const MenuLinkItem = React.forwardRef(function MenuLinkItem(
const linkRef = React.useRef<HTMLAnchorElement | null>(null);

const listItem = useCompositeListItem({ guess: true, label });
const menuPositionerContext = useMenuPositionerContext(true);
const nodeId = menuPositionerContext?.context.nodeId;

const id = useBaseUiId(idProp);

const { store } = useMenuRootContext();
const highlighted = store.useState('isActive', listItem.index);
const nodeId = store.useState('floatingNodeId');
const itemProps = store.useState('itemProps');
const typingRef = store.context.typingRef;

Expand Down
5 changes: 2 additions & 3 deletions packages/react/src/menu/radio-item/MenuRadioItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { MenuRadioItemContext } from './MenuRadioItemContext';
import { itemMapping } from '../utils/stateAttributesMapping';
import { useCompositeListItem } from '../../internals/composite/list/useCompositeListItem';
import { REGULAR_ITEM, useMenuItem } from '../item/useMenuItem';
import { useMenuPositionerContext } from '../positioner/MenuPositionerContext';
import { createChangeEventDetails } from '../../internals/createBaseUIEventDetails';
import { REASONS } from '../../internals/reasons';

Expand Down Expand Up @@ -38,11 +37,11 @@ export const MenuRadioItem = React.forwardRef(function MenuRadioItem(
} = componentProps;

const listItem = useCompositeListItem({ guess: true, label });
const menuPositionerContext = useMenuPositionerContext(true);
const id = useBaseUiId(idProp);

const { store } = useMenuRootContext();
const highlighted = store.useState('isActive', listItem.index);
const nodeId = store.useState('floatingNodeId');
const itemProps = store.useState('itemProps');

const {
Expand All @@ -62,7 +61,7 @@ export const MenuRadioItem = React.forwardRef(function MenuRadioItem(
id,
store,
nativeButton,
nodeId: menuPositionerContext?.context.nodeId,
nodeId,
itemMetadata: REGULAR_ITEM,
});

Expand Down
Loading