Skip to content

chore: follow up to horizontal layouts #9854

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
devongovett merged 3 commits into from
Mar 30, 2026
+11 −9
Merged

chore: follow up to horizontal layouts #9854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47cf909
chore: review
nwidynski Mar 27, 2026
2ece1c7
chore: review
nwidynski Mar 30, 2026
212161d
Merge branch 'main' into chore-layout-review
devongovett Mar 30, 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
2 changes: 1 addition & 1 deletion packages/react-aria-components/stories/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const MyListBoxItem = (props: ListBoxItemProps) => {
return (
<ListBoxItem
{...props}
style={{wordBreak: 'break-word', ...props.style}}
style={{wordBreak: 'break-word', minWidth: 'max-content', ...props.style}}
className={({isFocused, isSelected, isHovered, isFocusVisible}) => classNames(styles, 'item', {
focused: isFocused,
selected: isSelected,
Expand Down
18 changes: 10 additions & 8 deletions packages/react-stately/src/layout/ListLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,28 @@ export class ListLayout<T, O extends ListLayoutOptions = ListLayoutOptions> exte
}

getVisibleLayoutInfos(rect: Rect): LayoutInfo[] {
let visibleRect = rect.copy();
let offsetProperty = this.orientation === 'horizontal' ? 'x' : 'y';
let heightProperty = this.orientation === 'horizontal' ? 'width' : 'height';

// Adjust rect to keep number of visible rows consistent.
// (only if height > 1 or width > 1 for getDropTargetFromPoint)
if (visibleRect[heightProperty] > 1) {
if (rect[heightProperty] > 1) {
let rowHeight = (this.rowSize ?? this.estimatedRowSize ?? DEFAULT_HEIGHT) + this.gap;
visibleRect[offsetProperty] = Math.floor(visibleRect[offsetProperty] / rowHeight) * rowHeight;
visibleRect[heightProperty] = Math.ceil(visibleRect[heightProperty] / rowHeight) * rowHeight;
// Clone only before mutating
rect = rect.copy();
rect[offsetProperty] = Math.floor(rect[offsetProperty] / rowHeight) * rowHeight;
rect[heightProperty] = Math.ceil(rect[heightProperty] / rowHeight) * rowHeight;
}

// If layout hasn't yet been done for the requested rect, union the
// new rect with the existing valid rect, and recompute.
this.layoutIfNeeded(visibleRect);
this.layoutIfNeeded(rect);

let res: LayoutInfo[] = [];

let addNodes = (nodes: LayoutNode[]) => {
for (let node of nodes) {
if (this.isVisible(node, visibleRect)) {
if (this.isVisible(node, rect)) {
res.push(node.layoutInfo);

if (node.children) {
Expand Down Expand Up @@ -323,6 +324,9 @@ export class ListLayout<T, O extends ListLayoutOptions = ListLayoutOptions> exte

protected buildCollection(offset: number = this.padding): LayoutNode[] {
let collection = this.virtualizer!.collection;
let offsetProperty = this.orientation === 'horizontal' ? 'x' : 'y';
let maxOffsetProperty = this.orientation === 'horizontal' ? 'maxX' : 'maxY';

// filter out content nodes since we don't want them to affect the height
// Tree specific for now, if we add content nodes to other collection items, we might need to reconsider this
let collectionNodes = toArray(collection, (node) => node.type !== 'content');
Expand All @@ -334,8 +338,6 @@ export class ListLayout<T, O extends ListLayoutOptions = ListLayoutOptions> exte
}

for (let node of collectionNodes) {
let offsetProperty = this.orientation === 'horizontal' ? 'x' : 'y';
let maxOffsetProperty = this.orientation === 'horizontal' ? 'maxX' : 'maxY';
let rowHeight = (this.rowSize ?? this.estimatedRowSize ?? DEFAULT_HEIGHT) + this.gap;
// Skip rows before the valid rectangle unless they are already cached.
if (node.type === 'item' && offset + rowHeight < this.requestedRect[offsetProperty] && !this.isValid(node, offset)) {
Expand Down
Loading