-
Notifications
You must be signed in to change notification settings - Fork 49.6k
[Flight] Add <Activity>
#34697
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.
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
eps1lon
merged 1 commit into
facebook:main
from
eps1lon:sebbie/10-02-_flight_add_activity_
Oct 2, 2025
+140
−2
Merged
[Flight] Add <Activity>
#34697
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
packages/react-reconciler/src/__tests__/ActivityReactServer-test.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @emails react-core | ||
* @jest-environment node | ||
*/ | ||
|
||
'use strict'; | ||
|
||
let act; | ||
let Activity; | ||
let React; | ||
let ReactServer; | ||
let ReactNoop; | ||
let ReactNoopFlightClient; | ||
let ReactNoopFlightServer; | ||
|
||
describe('ActivityReactServer', () => { | ||
beforeEach(() => { | ||
jest.resetModules(); | ||
jest.mock('react', () => require('react/react.react-server')); | ||
ReactServer = require('react'); | ||
Activity = ReactServer.Activity; | ||
ReactNoopFlightServer = require('react-noop-renderer/flight-server'); | ||
|
||
jest.resetModules(); | ||
__unmockReact(); | ||
React = require('react'); | ||
ReactNoopFlightClient = require('react-noop-renderer/flight-client'); | ||
ReactNoop = require('react-noop-renderer'); | ||
const InternalTestUtils = require('internal-test-utils'); | ||
act = InternalTestUtils.act; | ||
}); | ||
|
||
afterEach(() => { | ||
jest.restoreAllMocks(); | ||
}); | ||
|
||
it('can be rendered in React Server', async () => { | ||
function App() { | ||
return ReactServer.createElement( | ||
Activity, | ||
{mode: 'hidden'}, | ||
ReactServer.createElement('div', null, 'Hello, Dave!'), | ||
); | ||
} | ||
|
||
const transport = ReactNoopFlightServer.render( | ||
ReactServer.createElement(App, null), | ||
); | ||
|
||
await act(async () => { | ||
const app = await ReactNoopFlightClient.read(transport); | ||
|
||
ReactNoop.render(app); | ||
}); | ||
|
||
expect(ReactNoop).toMatchRenderedOutput( | ||
<div hidden={true}>Hello, Dave!</div>, | ||
); | ||
}); | ||
}); |
64 changes: 64 additions & 0 deletions
64
packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @emails react-core | ||
* @jest-environment node | ||
*/ | ||
|
||
'use strict'; | ||
|
||
let act; | ||
let ViewTransition; | ||
let React; | ||
let ReactServer; | ||
let ReactNoop; | ||
let ReactNoopFlightClient; | ||
let ReactNoopFlightServer; | ||
|
||
describe('ViewTransitionReactServer', () => { | ||
beforeEach(() => { | ||
jest.resetModules(); | ||
jest.mock('react', () => require('react/react.react-server')); | ||
ReactServer = require('react'); | ||
ViewTransition = ReactServer.unstable_ViewTransition; | ||
ReactNoopFlightServer = require('react-noop-renderer/flight-server'); | ||
|
||
jest.resetModules(); | ||
__unmockReact(); | ||
React = require('react'); | ||
ReactNoopFlightClient = require('react-noop-renderer/flight-client'); | ||
ReactNoop = require('react-noop-renderer'); | ||
const InternalTestUtils = require('internal-test-utils'); | ||
act = InternalTestUtils.act; | ||
}); | ||
|
||
afterEach(() => { | ||
jest.restoreAllMocks(); | ||
}); | ||
|
||
// @gate enableViewTransition || fb | ||
it('can be rendered in React Server', async () => { | ||
function App() { | ||
return ReactServer.createElement( | ||
ViewTransition, | ||
{}, | ||
ReactServer.createElement('div', null, 'Hello, Dave!'), | ||
); | ||
} | ||
|
||
const transport = ReactNoopFlightServer.render( | ||
ReactServer.createElement(App, null), | ||
); | ||
|
||
await act(async () => { | ||
const app = await ReactNoopFlightClient.read(transport); | ||
|
||
ReactNoop.render(app); | ||
}); | ||
|
||
expect(ReactNoop).toMatchRenderedOutput(<div>Hello, Dave!</div>); | ||
}); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added this so that we remember to do the same for ViewTransition when we ship it to Canary.