Skip to content

Commit ce2bc58

Browse files
authored
[activity] rename unstable_Offscreen to unstable_Activity (#27640)
`Activity` is the current candidate name. This PR starts the rename work by renaming the exported unstable component name. NOTE: downstream consumers need to rename the import when updating to this commit.
1 parent a17467e commit ce2bc58

24 files changed

+283
-285
lines changed

packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
'use strict';
1212

13+
let Activity;
1314
let React = require('react');
1415
let ReactDOM;
1516
let ReactDOMClient;
1617
let ReactDOMServer;
17-
let Scheduler;
1818
let ReactFeatureFlags;
19+
let Scheduler;
1920
let Suspense;
2021
let SuspenseList;
21-
let Offscreen;
2222
let useSyncExternalStore;
2323
let act;
2424
let IdleEventPriority;
@@ -112,8 +112,8 @@ describe('ReactDOMServerPartialHydration', () => {
112112
act = require('internal-test-utils').act;
113113
ReactDOMServer = require('react-dom/server');
114114
Scheduler = require('scheduler');
115+
Activity = React.unstable_Activity;
115116
Suspense = React.Suspense;
116-
Offscreen = React.unstable_Offscreen;
117117
useSyncExternalStore = React.useSyncExternalStore;
118118
if (gate(flags => flags.enableSuspenseList)) {
119119
SuspenseList = React.unstable_SuspenseList;
@@ -778,7 +778,7 @@ describe('ReactDOMServerPartialHydration', () => {
778778
expect(span).not.toBe(span2);
779779

780780
if (gate(flags => flags.dfsEffectsRefactor)) {
781-
// The effects list refactor causes this to be null because the Suspense Offscreen's child
781+
// The effects list refactor causes this to be null because the Suspense Activity's child
782782
// is null. However, since we can't hydrate Suspense in legacy this change in behavior is ok
783783
expect(ref.current).toBe(null);
784784
} else {
@@ -3151,15 +3151,15 @@ describe('ReactDOMServerPartialHydration', () => {
31513151
expect(ref.current.innerHTML).toBe('Hidden child');
31523152
});
31533153

3154-
// @gate enableOffscreen
3155-
it('a visible Offscreen component acts like a fragment', async () => {
3154+
// @gate enableActivity
3155+
it('a visible Activity component acts like a fragment', async () => {
31563156
const ref = React.createRef();
31573157

31583158
function App() {
31593159
return (
3160-
<Offscreen mode="visible">
3160+
<Activity mode="visible">
31613161
<span ref={ref}>Child</span>
3162-
</Offscreen>
3162+
</Activity>
31633163
);
31643164
}
31653165

@@ -3169,7 +3169,7 @@ describe('ReactDOMServerPartialHydration', () => {
31693169
const container = document.createElement('div');
31703170
container.innerHTML = finalHTML;
31713171

3172-
// Visible Offscreen boundaries behave exactly like fragments: a
3172+
// Visible Activity boundaries behave exactly like fragments: a
31733173
// pure indirection.
31743174
expect(container).toMatchInlineSnapshot(`
31753175
<div>
@@ -3187,8 +3187,8 @@ describe('ReactDOMServerPartialHydration', () => {
31873187
expect(ref.current).toBe(span);
31883188
});
31893189

3190-
// @gate enableOffscreen
3191-
it('a hidden Offscreen component is skipped over during server rendering', async () => {
3190+
// @gate enableActivity
3191+
it('a hidden Activity component is skipped over during server rendering', async () => {
31923192
const visibleRef = React.createRef();
31933193

31943194
function HiddenChild() {
@@ -3201,9 +3201,9 @@ describe('ReactDOMServerPartialHydration', () => {
32013201
return (
32023202
<>
32033203
<span ref={visibleRef}>Visible</span>
3204-
<Offscreen mode="hidden">
3204+
<Activity mode="hidden">
32053205
<HiddenChild />
3206-
</Offscreen>
3206+
</Activity>
32073207
</>
32083208
);
32093209
}

packages/react-reconciler/src/ReactFiber.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import type {SuspenseInstance} from './ReactFiberConfig';
1818
import type {
1919
OffscreenProps,
2020
OffscreenInstance,
21-
} from './ReactFiberOffscreenComponent';
21+
} from './ReactFiberActivityComponent';
2222
import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
2323

2424
import {
@@ -71,7 +71,7 @@ import {
7171
CacheComponent,
7272
TracingMarkerComponent,
7373
} from './ReactWorkTags';
74-
import {OffscreenVisible} from './ReactFiberOffscreenComponent';
74+
import {OffscreenVisible} from './ReactFiberActivityComponent';
7575
import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
7676
import {isDevToolsPresent} from './ReactFiberDevToolsHook';
7777
import {

packages/react-reconciler/src/ReactFiberBeginWork.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import type {
2727
OffscreenState,
2828
OffscreenQueue,
2929
OffscreenInstance,
30-
} from './ReactFiberOffscreenComponent';
31-
import {OffscreenDetached} from './ReactFiberOffscreenComponent';
30+
} from './ReactFiberActivityComponent';
31+
import {OffscreenDetached} from './ReactFiberActivityComponent';
3232
import type {
3333
Cache,
3434
CacheComponentState,

packages/react-reconciler/src/ReactFiberCommitWork.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import type {SuspenseState, RetryQueue} from './ReactFiberSuspenseComponent';
2323
import type {UpdateQueue} from './ReactFiberClassUpdateQueue';
2424
import type {FunctionComponentUpdateQueue} from './ReactFiberHooks';
2525
import type {Wakeable} from 'shared/ReactTypes';
26-
import {isOffscreenManual} from './ReactFiberOffscreenComponent';
26+
import {isOffscreenManual} from './ReactFiberActivityComponent';
2727
import type {
2828
OffscreenState,
2929
OffscreenInstance,
3030
OffscreenQueue,
3131
OffscreenProps,
32-
} from './ReactFiberOffscreenComponent';
32+
} from './ReactFiberActivityComponent';
3333
import type {HookFlags} from './ReactHookEffectTags';
3434
import type {Cache} from './ReactFiberCacheComponent';
3535
import type {RootState} from './ReactFiberRoot';
@@ -209,7 +209,7 @@ import {
209209
OffscreenVisible,
210210
OffscreenDetached,
211211
OffscreenPassiveEffectsConnected,
212-
} from './ReactFiberOffscreenComponent';
212+
} from './ReactFiberActivityComponent';
213213
import {
214214
TransitionRoot,
215215
TransitionTracingMarker,

packages/react-reconciler/src/ReactFiberCompleteWork.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ import type {
2424
SuspenseListRenderState,
2525
RetryQueue,
2626
} from './ReactFiberSuspenseComponent';
27-
import type {OffscreenQueue} from './ReactFiberOffscreenComponent';
28-
import {isOffscreenManual} from './ReactFiberOffscreenComponent';
29-
import type {OffscreenState} from './ReactFiberOffscreenComponent';
27+
import type {
28+
OffscreenState,
29+
OffscreenQueue,
30+
} from './ReactFiberActivityComponent';
31+
import {isOffscreenManual} from './ReactFiberActivityComponent';
3032
import type {TracingMarkerInstance} from './ReactFiberTracingMarkerComponent';
3133
import type {Cache} from './ReactFiberCacheComponent';
3234
import {

packages/react-reconciler/src/ReactFiberConcurrentUpdates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import type {
1717
Update as ClassUpdate,
1818
} from './ReactFiberClassUpdateQueue';
1919
import type {Lane, Lanes} from './ReactFiberLane';
20-
import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
20+
import type {OffscreenInstance} from './ReactFiberActivityComponent';
2121

2222
import {
2323
warnAboutUpdateOnNotYetMountedFiberInDEV,
@@ -27,7 +27,7 @@ import {
2727
import {NoLane, NoLanes, mergeLanes, markHiddenUpdate} from './ReactFiberLane';
2828
import {NoFlags, Placement, Hydrating} from './ReactFiberFlags';
2929
import {HostRoot, OffscreenComponent} from './ReactWorkTags';
30-
import {OffscreenVisible} from './ReactFiberOffscreenComponent';
30+
import {OffscreenVisible} from './ReactFiberActivityComponent';
3131

3232
export type ConcurrentUpdate = {
3333
next: ConcurrentUpdate,

packages/react-reconciler/src/ReactFiberSuspenseContext.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import type {Fiber} from './ReactInternalTypes';
1111
import type {StackCursor} from './ReactFiberStack';
1212
import type {SuspenseProps, SuspenseState} from './ReactFiberSuspenseComponent';
13-
import type {OffscreenState} from './ReactFiberOffscreenComponent';
13+
import type {OffscreenState} from './ReactFiberActivityComponent';
1414

1515
import {enableSuspenseAvoidThisFallback} from 'shared/ReactFeatureFlags';
1616
import {createCursor, push, pop} from './ReactFiberStack';

packages/react-reconciler/src/ReactFiberThrow.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {Lane, Lanes} from './ReactFiberLane';
1212
import type {CapturedValue} from './ReactCapturedValue';
1313
import type {Update} from './ReactFiberClassUpdateQueue';
1414
import type {Wakeable} from 'shared/ReactTypes';
15-
import type {OffscreenQueue} from './ReactFiberOffscreenComponent';
15+
import type {OffscreenQueue} from './ReactFiberActivityComponent';
1616
import type {RetryQueue} from './ReactFiberSuspenseComponent';
1717

1818
import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';

packages/react-reconciler/src/ReactFiberTracingMarkerComponent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {
1212
Fiber,
1313
FiberRoot,
1414
} from './ReactInternalTypes';
15-
import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
15+
import type {OffscreenInstance} from './ReactFiberActivityComponent';
1616
import type {StackCursor} from './ReactFiberStack';
1717

1818
import {enableTransitionTracing} from 'shared/ReactFeatureFlags';

packages/react-reconciler/src/ReactFiberWorkLoop.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type {
2121
Transition,
2222
TransitionAbort,
2323
} from './ReactFiberTracingMarkerComponent';
24-
import type {OffscreenInstance} from './ReactFiberOffscreenComponent';
24+
import type {OffscreenInstance} from './ReactFiberActivityComponent';
2525
import type {RenderTaskFn} from './ReactFiberRootScheduler';
2626

2727
import {

0 commit comments

Comments
 (0)