Skip to content

Commit 0dc0ddc

Browse files
trueadmtrueadm
authored
Rename AsyncMode -> ConcurrentMode (#13732)
* Rename AsyncMode -> ConcurrentMode
1 parent 7601c37 commit 0dc0ddc

29 files changed

+211
-170
lines changed

‎fixtures/unstable-async/time-slicing/src/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ class App extends PureComponent {
147147

148148
const container = document.getElementById('root');
149149
render(
150-
<React.unstable_AsyncMode>
150+
<React.unstable_ConcurrentMode>
151151
<App />
152-
</React.unstable_AsyncMode>,
152+
</React.unstable_ConcurrentMode>,
153153
container
154154
);

‎packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let ReactFeatureFlags = require('shared/ReactFeatureFlags');
1414

1515
let ReactDOM;
1616

17-
const AsyncMode = React.unstable_AsyncMode;
17+
const ConcurrentMode = React.unstable_ConcurrentMode;
1818

1919
const setUntrackedInputValue = Object.getOwnPropertyDescriptor(
2020
HTMLInputElement.prototype,
@@ -108,9 +108,9 @@ describe('ReactDOMFiberAsync', () => {
108108
}
109109
}
110110
ReactDOM.render(
111-
<AsyncMode>
111+
<ConcurrentMode>
112112
<Counter />
113-
</AsyncMode>,
113+
</ConcurrentMode>,
114114
container,
115115
);
116116
expect(asyncValueRef.current.textContent).toBe('');
@@ -137,17 +137,17 @@ describe('ReactDOMFiberAsync', () => {
137137

138138
it('renders synchronously', () => {
139139
ReactDOM.render(
140-
<AsyncMode>
140+
<ConcurrentMode>
141141
<div>Hi</div>
142-
</AsyncMode>,
142+
</ConcurrentMode>,
143143
container,
144144
);
145145
expect(container.textContent).toEqual('Hi');
146146

147147
ReactDOM.render(
148-
<AsyncMode>
148+
<ConcurrentMode>
149149
<div>Bye</div>
150-
</AsyncMode>,
150+
</ConcurrentMode>,
151151
container,
152152
);
153153
expect(container.textContent).toEqual('Bye');
@@ -197,7 +197,7 @@ describe('ReactDOMFiberAsync', () => {
197197
expect(container.textContent).toEqual('1');
198198
});
199199

200-
it('AsyncMode creates an async subtree', () => {
200+
it('ConcurrentMode creates an async subtree', () => {
201201
let instance;
202202
class Component extends React.Component {
203203
state = {step: 0};
@@ -208,9 +208,9 @@ describe('ReactDOMFiberAsync', () => {
208208
}
209209

210210
ReactDOM.render(
211-
<AsyncMode>
211+
<ConcurrentMode>
212212
<Component />
213-
</AsyncMode>,
213+
</ConcurrentMode>,
214214
container,
215215
);
216216
jest.runAllTimers();
@@ -233,9 +233,9 @@ describe('ReactDOMFiberAsync', () => {
233233

234234
ReactDOM.render(
235235
<div>
236-
<AsyncMode>
236+
<ConcurrentMode>
237237
<Child />
238-
</AsyncMode>
238+
</ConcurrentMode>
239239
</div>,
240240
container,
241241
);
@@ -364,9 +364,9 @@ describe('ReactDOMFiberAsync', () => {
364364
}
365365

366366
ReactDOM.render(
367-
<AsyncMode>
367+
<ConcurrentMode>
368368
<Component />
369-
</AsyncMode>,
369+
</ConcurrentMode>,
370370
container,
371371
);
372372
jest.runAllTimers();
@@ -409,9 +409,9 @@ describe('ReactDOMFiberAsync', () => {
409409
}
410410
}
411411
ReactDOM.render(
412-
<AsyncMode>
412+
<ConcurrentMode>
413413
<Counter />
414-
</AsyncMode>,
414+
</ConcurrentMode>,
415415
container,
416416
);
417417
expect(container.textContent).toEqual('0');

‎packages/react-dom/src/__tests__/ReactDOMRoot-test.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
let React = require('react');
1313
let ReactDOM = require('react-dom');
1414
let ReactDOMServer = require('react-dom/server');
15-
let AsyncMode = React.unstable_AsyncMode;
15+
let ConcurrentMode = React.unstable_ConcurrentMode;
1616

1717
describe('ReactDOMRoot', () => {
1818
let container;
@@ -63,7 +63,7 @@ describe('ReactDOMRoot', () => {
6363
React = require('react');
6464
ReactDOM = require('react-dom');
6565
ReactDOMServer = require('react-dom/server');
66-
AsyncMode = React.unstable_AsyncMode;
66+
ConcurrentMode = React.unstable_ConcurrentMode;
6767
});
6868

6969
it('renders children', () => {
@@ -85,7 +85,7 @@ describe('ReactDOMRoot', () => {
8585

8686
it('`root.render` returns a thenable work object', () => {
8787
const root = ReactDOM.unstable_createRoot(container);
88-
const work = root.render(<AsyncMode>Hi</AsyncMode>);
88+
const work = root.render(<ConcurrentMode>Hi</ConcurrentMode>);
8989
let ops = [];
9090
work.then(() => {
9191
ops.push('inside callback: ' + container.textContent);
@@ -103,7 +103,7 @@ describe('ReactDOMRoot', () => {
103103

104104
it('resolves `work.then` callback synchronously if the work already committed', () => {
105105
const root = ReactDOM.unstable_createRoot(container);
106-
const work = root.render(<AsyncMode>Hi</AsyncMode>);
106+
const work = root.render(<ConcurrentMode>Hi</ConcurrentMode>);
107107
jest.runAllTimers();
108108
let ops = [];
109109
work.then(() => {
@@ -196,9 +196,9 @@ describe('ReactDOMRoot', () => {
196196
const root = ReactDOM.unstable_createRoot(container);
197197
const batch = root.createBatch();
198198
batch.render(
199-
<AsyncMode>
199+
<ConcurrentMode>
200200
<App />
201-
</AsyncMode>,
201+
</ConcurrentMode>,
202202
);
203203

204204
jest.runAllTimers();
@@ -246,7 +246,7 @@ describe('ReactDOMRoot', () => {
246246
it('can wait for a batch to finish', () => {
247247
const root = ReactDOM.unstable_createRoot(container);
248248
const batch = root.createBatch();
249-
batch.render(<AsyncMode>Foo</AsyncMode>);
249+
batch.render(<ConcurrentMode>Foo</ConcurrentMode>);
250250

251251
jest.runAllTimers();
252252

@@ -286,7 +286,7 @@ describe('ReactDOMRoot', () => {
286286

287287
it('can commit an empty batch', () => {
288288
const root = ReactDOM.unstable_createRoot(container);
289-
root.render(<AsyncMode>1</AsyncMode>);
289+
root.render(<ConcurrentMode>1</ConcurrentMode>);
290290

291291
advanceCurrentTime(2000);
292292
// This batch has a later expiration time than the earlier update.

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationModes-test.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -104,36 +104,36 @@ describe('ReactDOMServerIntegration', () => {
104104
});
105105
});
106106

107-
describe('React.unstable_AsyncMode', () => {
108-
itRenders('an async mode with one child', async render => {
107+
describe('React.unstable_ConcurrentMode', () => {
108+
itRenders('an concurrent mode with one child', async render => {
109109
let e = await render(
110-
<React.unstable_AsyncMode>
110+
<React.unstable_ConcurrentMode>
111111
<div>text1</div>
112-
</React.unstable_AsyncMode>,
112+
</React.unstable_ConcurrentMode>,
113113
);
114114
let parent = e.parentNode;
115115
expect(parent.childNodes[0].tagName).toBe('DIV');
116116
});
117117

118-
itRenders('an async mode with several children', async render => {
118+
itRenders('an concurrent mode with several children', async render => {
119119
let Header = props => {
120120
return <p>header</p>;
121121
};
122122
let Footer = props => {
123123
return (
124-
<React.unstable_AsyncMode>
124+
<React.unstable_ConcurrentMode>
125125
<h2>footer</h2>
126126
<h3>about</h3>
127-
</React.unstable_AsyncMode>
127+
</React.unstable_ConcurrentMode>
128128
);
129129
};
130130
let e = await render(
131-
<React.unstable_AsyncMode>
131+
<React.unstable_ConcurrentMode>
132132
<div>text1</div>
133133
<span>text2</span>
134134
<Header />
135135
<Footer />
136-
</React.unstable_AsyncMode>,
136+
</React.unstable_ConcurrentMode>,
137137
);
138138
let parent = e.parentNode;
139139
expect(parent.childNodes[0].tagName).toBe('DIV');
@@ -143,32 +143,32 @@ describe('ReactDOMServerIntegration', () => {
143143
expect(parent.childNodes[4].tagName).toBe('H3');
144144
});
145145

146-
itRenders('a nested async mode', async render => {
146+
itRenders('a nested concurrent mode', async render => {
147147
let e = await render(
148-
<React.unstable_AsyncMode>
149-
<React.unstable_AsyncMode>
148+
<React.unstable_ConcurrentMode>
149+
<React.unstable_ConcurrentMode>
150150
<div>text1</div>
151-
</React.unstable_AsyncMode>
151+
</React.unstable_ConcurrentMode>
152152
<span>text2</span>
153-
<React.unstable_AsyncMode>
154-
<React.unstable_AsyncMode>
155-
<React.unstable_AsyncMode>
153+
<React.unstable_ConcurrentMode>
154+
<React.unstable_ConcurrentMode>
155+
<React.unstable_ConcurrentMode>
156156
{null}
157157
<p />
158-
</React.unstable_AsyncMode>
158+
</React.unstable_ConcurrentMode>
159159
{false}
160-
</React.unstable_AsyncMode>
161-
</React.unstable_AsyncMode>
162-
</React.unstable_AsyncMode>,
160+
</React.unstable_ConcurrentMode>
161+
</React.unstable_ConcurrentMode>
162+
</React.unstable_ConcurrentMode>,
163163
);
164164
let parent = e.parentNode;
165165
expect(parent.childNodes[0].tagName).toBe('DIV');
166166
expect(parent.childNodes[1].tagName).toBe('SPAN');
167167
expect(parent.childNodes[2].tagName).toBe('P');
168168
});
169169

170-
itRenders('an empty async mode', async render => {
171-
expect(await render(<React.unstable_AsyncMode />)).toBe(null);
170+
itRenders('an empty concurrent mode', async render => {
171+
expect(await render(<React.unstable_ConcurrentMode />)).toBe(null);
172172
});
173173
});
174174
});

‎packages/react-dom/src/client/ReactDOM.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,12 @@ ReactWork.prototype._onCommit = function(): void {
330330
}
331331
};
332332

333-
function ReactRoot(container: Container, isAsync: boolean, hydrate: boolean) {
334-
const root = DOMRenderer.createContainer(container, isAsync, hydrate);
333+
function ReactRoot(
334+
container: Container,
335+
isConcurrent: boolean,
336+
hydrate: boolean,
337+
) {
338+
const root = DOMRenderer.createContainer(container, isConcurrent, hydrate);
335339
this._internalRoot = root;
336340
}
337341
ReactRoot.prototype.render = function(
@@ -497,8 +501,8 @@ function legacyCreateRootFromDOMContainer(
497501
}
498502
}
499503
// Legacy roots are not async by default.
500-
const isAsync = false;
501-
return new ReactRoot(container, isAsync, shouldHydrate);
504+
const isConcurrent = false;
505+
return new ReactRoot(container, isConcurrent, shouldHydrate);
502506
}
503507

504508
function legacyRenderSubtreeIntoContainer(

‎packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.internal.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ describe('SimpleEventPlugin', function() {
426426
// Intentionally not using the updater form here
427427
() => this.setState({highPriCount: this.state.highPriCount + 1})
428428
}>
429-
<React.unstable_AsyncMode>
429+
<React.unstable_ConcurrentMode>
430430
<Button highPriCount={this.state.highPriCount} />
431-
</React.unstable_AsyncMode>
431+
</React.unstable_ConcurrentMode>
432432
</div>
433433
);
434434
}

‎packages/react-dom/src/server/ReactPartialRenderer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
REACT_FORWARD_REF_TYPE,
3333
REACT_FRAGMENT_TYPE,
3434
REACT_STRICT_MODE_TYPE,
35-
REACT_ASYNC_MODE_TYPE,
35+
REACT_CONCURRENT_MODE_TYPE,
3636
REACT_PLACEHOLDER_TYPE,
3737
REACT_PORTAL_TYPE,
3838
REACT_PROFILER_TYPE,
@@ -896,7 +896,7 @@ class ReactDOMServerRenderer {
896896

897897
switch (elementType) {
898898
case REACT_STRICT_MODE_TYPE:
899-
case REACT_ASYNC_MODE_TYPE:
899+
case REACT_CONCURRENT_MODE_TYPE:
900900
case REACT_PROFILER_TYPE:
901901
case REACT_FRAGMENT_TYPE: {
902902
const nextChildren = toArray(

‎packages/react-is/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ ReactIs.isValidElementType(React.createFactory("div")); // true
4444

4545
### Determining an Element's Type
4646

47-
#### AsyncMode
47+
#### ConcurrentMode
4848

4949
```js
5050
import React from "react";
5151
import * as ReactIs from 'react-is';
5252

53-
ReactIs.isAsyncMode(<React.unstable_AsyncMode />); // true
54-
ReactIs.typeOf(<React.unstable_AsyncMode />) === ReactIs.AsyncMode; // true
53+
ReactIs.isConcurrentMode(<React.unstable_ConcurrentMode />); // true
54+
ReactIs.typeOf(<React.unstable_ConcurrentMode />) === ReactIs.ConcurrentMode; // true
5555
```
5656

5757
#### Context

0 commit comments

Comments
 (0)