Skip to content

fix: collections inside Activity #9176

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+91 −66
Draft

fix: collections inside Activity #9176

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
6e75b6d
fix: collections inside Activity
snowystinger Nov 12, 2025
1e652ac
fix a react rule
snowystinger Nov 13, 2025
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
11 changes: 4 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@
"postcss": "^8.4.24",
"postcss-custom-properties": "^13.2.0",
"postcss-import": "^15.1.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-frame-component": "^5.0.0",
"react-test-renderer": "^19.1.0",
"react-test-renderer": "^19.2.0",
"recast": "^0.23",
"recursive-readdir": "^2.2.2",
"regenerator-runtime": "0.13.3",
Expand Down Expand Up @@ -213,8 +213,6 @@
"react-refresh": "0.9.0",
"browserslist": "4.24.0",
"caniuse-lite": "1.0.30001563",
"@types/react": "19.1.8",
"@types/react-dom": "19.1.6",
"recast": "0.23.6",
"ast-types": "0.16.1",
"svgo": "^3",
Expand All @@ -228,8 +226,7 @@
"remark-mdx": "patch:remark-mdx@npm%3A2.0.0-rc.2#~/.yarn/patches/remark-mdx-npm-2.0.0-rc.2-7a71234e1f.patch",
"remark-parse": "patch:remark-parse@npm%3A10.0.1#~/.yarn/patches/remark-parse-npm-10.0.1-e654d7df78.patch",
"lightningcss": "1.30.1",
"react-server-dom-parcel": "canary",
"react-test-renderer": "19.1.0"
"react-server-dom-parcel": "canary"
},
"@parcel/transformer-css": {
"cssModules": {
Expand Down
5 changes: 3 additions & 2 deletions packages/@react-aria/collections/src/CollectionBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ export function CollectionBuilder<C extends BaseCollection<object>>(props: Colle

// Otherwise, render a hidden copy of the children so that we can build the collection before constructing the state.
// This should always come before the real DOM content so we have built the collection by the time it renders during SSR.
return <CollectionBuilderCreateHiddenTree {...props} />;
}

// This is fine. CollectionDocumentContext never changes after mounting.
// eslint-disable-next-line react-hooks/rules-of-hooks
function CollectionBuilderCreateHiddenTree<C extends BaseCollection<object>>(props: CollectionBuilderProps<C>) {
let {collection, document} = useCollectionDocument(props.createCollection);
return (
<>
Expand Down
4 changes: 2 additions & 2 deletions packages/dev/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"highlight.js": "9.18.1",
"markdown-to-jsx": "^6.11.0",
"quicklink": "^2.3.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-lowlight": "^2.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/dev/s2-docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"json5": "^2.2.3",
"lz-string": "^1.5.0",
"markdown-to-jsx": "^6.11.0",
"react": "^19",
"react": "^19.2.0",
"react-aria": "^3.40.0",
"react-aria-components": "^1.7.1",
"react-dom": "^19",
"react-dom": "^19.2.0",
"react-stately": "^3.38.0",
"remark-mdx": "^3.1.0",
"remark-parse": "^11.0.0",
Expand Down
36 changes: 35 additions & 1 deletion packages/react-aria-components/test/ListBox.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ describe('ListBox', () => {
act(() => jest.runAllTimers());

expect(onReorder).toHaveBeenCalledTimes(1);

// Verify we're no longer in drag mode
options = getAllByRole('option');
expect(options.filter(opt => opt.classList.contains('react-aria-DropIndicator'))).toHaveLength(0);
Expand Down Expand Up @@ -1861,4 +1861,38 @@ describe('ListBox', () => {
expect(onClick).toHaveBeenCalledTimes(1);
});
});

if (React.version.startsWith('19')) {
describe('Activity', () => {
function ActivityListbox(props) {
let [mode, setMode] = React.useState('hidden');

return (
<>
<Button onPress={() => setMode(mode === 'hidden' ? 'visible' : 'hidden')}>
Set {mode === 'hidden' ? 'visible' : 'hidden'}
</Button>

<React.Activity mode={mode}>
<p>List should be visible</p>

<ListBox aria-label="Activity Listbox">
<ListBoxItem>Item 1</ListBoxItem>
<ListBoxItem>Item 2</ListBoxItem>
<ListBoxItem>Item 3</ListBoxItem>
<ListBoxItem>Item 4</ListBoxItem>
<ListBoxItem>Item 5</ListBoxItem>
</ListBox>
</React.Activity>
</>
);
}
it('should support activity', async () => {
let {getAllByRole, getByRole} = render(<ActivityListbox />);
let button = getByRole('button');
await user.click(button);
expect(getAllByRole('option')).toHaveLength(5);
});
});
}
});
8 changes: 4 additions & 4 deletions starters/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
"clsx": "^2.1.1",
"lightningcss-loader": "^2.1.0",
"lucide-react": "^0.517.0",
"react": "^19.1.0",
"react": "^19.2.0",
"react-aria-components": "latest",
"react-dom": "^19.1.0",
"react-dom": "^19.2.0",
"storybook": "^8.6.14",
"storybook-dark-mode": "^4.0.2",
"typescript": "5.3.3"
},
"resolutions": {
"react": "19.1.0",
"react-dom": "19.1.0",
"react": "19.2.0",
"react-dom": "19.2.0",
"@types/mime": "3.0.4",
"jackspeak": "2.1.1"
}
Expand Down
89 changes: 41 additions & 48 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6945,8 +6945,8 @@ __metadata:
highlight.js: "npm:9.18.1"
markdown-to-jsx: "npm:^6.11.0"
quicklink: "npm:^2.3.0"
react: "npm:^19.1.0"
react-dom: "npm:^19.1.0"
react: "npm:^19.2.0"
react-dom: "npm:^19.2.0"
react-lowlight: "npm:^2.0.0"
peerDependencies:
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
Expand Down Expand Up @@ -7473,10 +7473,10 @@ __metadata:
json5: "npm:^2.2.3"
lz-string: "npm:^1.5.0"
markdown-to-jsx: "npm:^6.11.0"
react: "npm:^19"
react: "npm:^19.2.0"
react-aria: "npm:^3.40.0"
react-aria-components: "npm:^1.7.1"
react-dom: "npm:^19"
react-dom: "npm:^19.2.0"
react-stately: "npm:^3.38.0"
remark-mdx: "npm:^3.1.0"
remark-parse: "npm:^11.0.0"
Expand Down Expand Up @@ -10618,21 +10618,21 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:19.1.6":
version: 19.1.6
resolution: "@types/react-dom@npm:19.1.6"
"@types/react-dom@npm:^19.0.0":
version: 19.2.3
resolution: "@types/react-dom@npm:19.2.3"
peerDependencies:
"@types/react": ^19.0.0
checksum: 10c0/7ba74eee2919e3f225e898b65fdaa16e54952aaf9e3472a080ddc82ca54585e46e60b3c52018d21d4b7053f09d27b8293e9f468b85f9932ff452cd290cc131e8
"@types/react": ^19.2.0
checksum: 10c0/b486ebe0f4e2fb35e2e108df1d8fc0927ca5d6002d5771e8a739de11239fe62d0e207c50886185253c99eb9dedfeeb956ea7429e5ba17f6693c7acb4c02f8cd1
languageName: node
linkType: hard

"@types/react@npm:19.1.8":
version: 19.1.8
resolution: "@types/react@npm:19.1.8"
"@types/react@npm:>=16, @types/react@npm:^19.0.0":
version: 19.2.4
resolution: "@types/react@npm:19.2.4"
dependencies:
csstype: "npm:^3.0.2"
checksum: 10c0/4908772be6dc941df276931efeb0e781777fa76e4d5d12ff9f75eb2dcc2db3065e0100efde16fde562c5bafa310cc8f50c1ee40a22640459e066e72cd342143e
checksum: 10c0/c878262c4bce047e53a44ef644088fce359ebdfdca7060a4ac1717c8362563b9506a7ebae145977836e95d5948b8f8b426dcd516044c3a3c0563a6f1b60408ce
languageName: node
linkType: hard

Expand Down Expand Up @@ -24493,14 +24493,14 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react-dom@npm:^19, react-dom@npm:^19.1.0":
version: 19.1.0
resolution: "react-dom@npm:19.1.0"
"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react-dom@npm:^19.2.0":
version: 19.2.0
resolution: "react-dom@npm:19.2.0"
dependencies:
scheduler: "npm:^0.26.0"
scheduler: "npm:^0.27.0"
peerDependencies:
react: ^19.1.0
checksum: 10c0/3e26e89bb6c67c9a6aa86cb888c7a7f8258f2e347a6d2a15299c17eb16e04c19194e3452bc3255bd34000a61e45e2cb51e46292392340432f133e5a5d2dfb5fc
react: ^19.2.0
checksum: 10c0/fa2cae05248d01288e91523b590ce4e7635b1e13f1344e225f850d722a8da037bf0782f63b1c1d46353334e0c696909b82e582f8cad607948fde6f7646cc18d9
languageName: node
linkType: hard

Expand Down Expand Up @@ -24536,10 +24536,10 @@ __metadata:
languageName: node
linkType: hard

"react-is@npm:^19.1.0":
version: 19.1.1
resolution: "react-is@npm:19.1.1"
checksum: 10c0/3dba763fcd69835ae263dcd6727d7ffcc44c1d616f04b7329e67aefdc66a567af4f8dcecdd29454c7a707c968aa1eb85083a83fb616f01675ef25e71cf082f97
"react-is@npm:^19.2.0":
version: 19.2.0
resolution: "react-is@npm:19.2.0"
checksum: 10c0/a63cb346aeced8ac0e671b0f9b33720d2906de02a066ca067075d871a5d4c64cdb328f495baf9b5842d5868c0d5edd1ce18465a7358b52f4b6aa983479c9bfa2
languageName: node
linkType: hard

Expand Down Expand Up @@ -24684,10 +24684,10 @@ __metadata:
postcss: "npm:^8.4.24"
postcss-custom-properties: "npm:^13.2.0"
postcss-import: "npm:^15.1.0"
react: "npm:^19.1.0"
react-dom: "npm:^19.1.0"
react: "npm:^19.2.0"
react-dom: "npm:^19.2.0"
react-frame-component: "npm:^5.0.0"
react-test-renderer: "npm:^19.1.0"
react-test-renderer: "npm:^19.2.0"
recast: "npm:^0.23"
recursive-readdir: "npm:^2.2.2"
regenerator-runtime: "npm:0.13.3"
Expand Down Expand Up @@ -24745,15 +24745,15 @@ __metadata:
languageName: unknown
linkType: soft

"react-test-renderer@npm:19.1.0":
version: 19.1.0
resolution: "react-test-renderer@npm:19.1.0"
"react-test-renderer@npm:^19.2.0":
version: 19.2.0
resolution: "react-test-renderer@npm:19.2.0"
dependencies:
react-is: "npm:^19.1.0"
scheduler: "npm:^0.26.0"
react-is: "npm:^19.2.0"
scheduler: "npm:^0.27.0"
peerDependencies:
react: ^19.1.0
checksum: 10c0/34ed4a37ba8b0beb96c048de6ff28574f018a18dd1042c24f8f46142d48eb5b27f82ff7c2823d082932fd3983c5a3529ab8cc8f15191d4306df0082f9f84678f
react: ^19.2.0
checksum: 10c0/cc116b908489316f06881bf7392c5fad4b5f66be42d2f04788f4179a19e86674d54f1006b33fe9eba28bde6edb4cb38764ab75b416f28d02e0182c5552c97551
languageName: node
linkType: hard

Expand All @@ -24772,17 +24772,10 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^19, react@npm:^19.1.0":
version: 19.1.0
resolution: "react@npm:19.1.0"
checksum: 10c0/530fb9a62237d54137a13d2cfb67a7db6a2156faed43eecc423f4713d9b20c6f2728b026b45e28fcd72e8eadb9e9ed4b089e99f5e295d2f0ad3134251bdd3698
languageName: node
linkType: hard

"react@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0":
version: 19.1.1
resolution: "react@npm:19.1.1"
checksum: 10c0/8c9769a2dfd02e603af6445058325e6c8a24b47b185d0e461f66a6454765ddcaecb3f0a90184836c68bb509f3c38248359edbc42f0d07c23eb500a5c30c87b4e
"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react@npm:^19.2.0":
version: 19.2.0
resolution: "react@npm:19.2.0"
checksum: 10c0/1b6d64eacb9324725bfe1e7860cb7a6b8a34bc89a482920765ebff5c10578eb487e6b46b2f0df263bd27a25edbdae2c45e5ea5d81ae61404301c1a7192c38330
languageName: node
linkType: hard

Expand Down Expand Up @@ -25749,10 +25742,10 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.26.0":
version: 0.26.0
resolution: "scheduler@npm:0.26.0"
checksum: 10c0/5b8d5bfddaae3513410eda54f2268e98a376a429931921a81b5c3a2873aab7ca4d775a8caac5498f8cbc7d0daeab947cf923dbd8e215d61671f9f4e392d34356
"scheduler@npm:^0.27.0":
version: 0.27.0
resolution: "scheduler@npm:0.27.0"
checksum: 10c0/4f03048cb05a3c8fddc45813052251eca00688f413a3cee236d984a161da28db28ba71bd11e7a3dd02f7af84ab28d39fb311431d3b3772fed557945beb00c452
languageName: node
linkType: hard

Expand Down