Skip to content

Commit

Permalink
Rename AsyncMode -> ConcurrentMode (#13732)
Browse files Browse the repository at this point in the history
* Rename AsyncMode -> ConcurrentMode
  • Loading branch information
trueadm authored Sep 26, 2018
1 parent 7601c37 commit 0dc0ddc
Show file tree
Hide file tree
Showing 29 changed files with 211 additions and 170 deletions.
4 changes: 2 additions & 2 deletions fixtures/unstable-async/time-slicing/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ class App extends PureComponent {

const container = document.getElementById('root');
render(
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<App />
</React.unstable_AsyncMode>,
</React.unstable_ConcurrentMode>,
container
);
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let ReactFeatureFlags = require('shared/ReactFeatureFlags');

let ReactDOM;

const AsyncMode = React.unstable_AsyncMode;
const ConcurrentMode = React.unstable_ConcurrentMode;

const setUntrackedInputValue = Object.getOwnPropertyDescriptor(
HTMLInputElement.prototype,
Expand Down Expand Up @@ -108,9 +108,9 @@ describe('ReactDOMFiberAsync', () => {
}
}
ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<Counter />
</AsyncMode>,
</ConcurrentMode>,
container,
);
expect(asyncValueRef.current.textContent).toBe('');
Expand All @@ -137,17 +137,17 @@ describe('ReactDOMFiberAsync', () => {

it('renders synchronously', () => {
ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<div>Hi</div>
</AsyncMode>,
</ConcurrentMode>,
container,
);
expect(container.textContent).toEqual('Hi');

ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<div>Bye</div>
</AsyncMode>,
</ConcurrentMode>,
container,
);
expect(container.textContent).toEqual('Bye');
Expand Down Expand Up @@ -197,7 +197,7 @@ describe('ReactDOMFiberAsync', () => {
expect(container.textContent).toEqual('1');
});

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

ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<Component />
</AsyncMode>,
</ConcurrentMode>,
container,
);
jest.runAllTimers();
Expand All @@ -233,9 +233,9 @@ describe('ReactDOMFiberAsync', () => {

ReactDOM.render(
<div>
<AsyncMode>
<ConcurrentMode>
<Child />
</AsyncMode>
</ConcurrentMode>
</div>,
container,
);
Expand Down Expand Up @@ -364,9 +364,9 @@ describe('ReactDOMFiberAsync', () => {
}

ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<Component />
</AsyncMode>,
</ConcurrentMode>,
container,
);
jest.runAllTimers();
Expand Down Expand Up @@ -409,9 +409,9 @@ describe('ReactDOMFiberAsync', () => {
}
}
ReactDOM.render(
<AsyncMode>
<ConcurrentMode>
<Counter />
</AsyncMode>,
</ConcurrentMode>,
container,
);
expect(container.textContent).toEqual('0');
Expand Down
16 changes: 8 additions & 8 deletions packages/react-dom/src/__tests__/ReactDOMRoot-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
let React = require('react');
let ReactDOM = require('react-dom');
let ReactDOMServer = require('react-dom/server');
let AsyncMode = React.unstable_AsyncMode;
let ConcurrentMode = React.unstable_ConcurrentMode;

describe('ReactDOMRoot', () => {
let container;
Expand Down Expand Up @@ -63,7 +63,7 @@ describe('ReactDOMRoot', () => {
React = require('react');
ReactDOM = require('react-dom');
ReactDOMServer = require('react-dom/server');
AsyncMode = React.unstable_AsyncMode;
ConcurrentMode = React.unstable_ConcurrentMode;
});

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

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

it('resolves `work.then` callback synchronously if the work already committed', () => {
const root = ReactDOM.unstable_createRoot(container);
const work = root.render(<AsyncMode>Hi</AsyncMode>);
const work = root.render(<ConcurrentMode>Hi</ConcurrentMode>);
jest.runAllTimers();
let ops = [];
work.then(() => {
Expand Down Expand Up @@ -196,9 +196,9 @@ describe('ReactDOMRoot', () => {
const root = ReactDOM.unstable_createRoot(container);
const batch = root.createBatch();
batch.render(
<AsyncMode>
<ConcurrentMode>
<App />
</AsyncMode>,
</ConcurrentMode>,
);

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

jest.runAllTimers();

Expand Down Expand Up @@ -286,7 +286,7 @@ describe('ReactDOMRoot', () => {

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

advanceCurrentTime(2000);
// This batch has a later expiration time than the earlier update.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,36 +104,36 @@ describe('ReactDOMServerIntegration', () => {
});
});

describe('React.unstable_AsyncMode', () => {
itRenders('an async mode with one child', async render => {
describe('React.unstable_ConcurrentMode', () => {
itRenders('an concurrent mode with one child', async render => {
let e = await render(
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<div>text1</div>
</React.unstable_AsyncMode>,
</React.unstable_ConcurrentMode>,
);
let parent = e.parentNode;
expect(parent.childNodes[0].tagName).toBe('DIV');
});

itRenders('an async mode with several children', async render => {
itRenders('an concurrent mode with several children', async render => {
let Header = props => {
return <p>header</p>;
};
let Footer = props => {
return (
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<h2>footer</h2>
<h3>about</h3>
</React.unstable_AsyncMode>
</React.unstable_ConcurrentMode>
);
};
let e = await render(
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<div>text1</div>
<span>text2</span>
<Header />
<Footer />
</React.unstable_AsyncMode>,
</React.unstable_ConcurrentMode>,
);
let parent = e.parentNode;
expect(parent.childNodes[0].tagName).toBe('DIV');
Expand All @@ -143,32 +143,32 @@ describe('ReactDOMServerIntegration', () => {
expect(parent.childNodes[4].tagName).toBe('H3');
});

itRenders('a nested async mode', async render => {
itRenders('a nested concurrent mode', async render => {
let e = await render(
<React.unstable_AsyncMode>
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<React.unstable_ConcurrentMode>
<div>text1</div>
</React.unstable_AsyncMode>
</React.unstable_ConcurrentMode>
<span>text2</span>
<React.unstable_AsyncMode>
<React.unstable_AsyncMode>
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<React.unstable_ConcurrentMode>
<React.unstable_ConcurrentMode>
{null}
<p />
</React.unstable_AsyncMode>
</React.unstable_ConcurrentMode>
{false}
</React.unstable_AsyncMode>
</React.unstable_AsyncMode>
</React.unstable_AsyncMode>,
</React.unstable_ConcurrentMode>
</React.unstable_ConcurrentMode>
</React.unstable_ConcurrentMode>,
);
let parent = e.parentNode;
expect(parent.childNodes[0].tagName).toBe('DIV');
expect(parent.childNodes[1].tagName).toBe('SPAN');
expect(parent.childNodes[2].tagName).toBe('P');
});

itRenders('an empty async mode', async render => {
expect(await render(<React.unstable_AsyncMode />)).toBe(null);
itRenders('an empty concurrent mode', async render => {
expect(await render(<React.unstable_ConcurrentMode />)).toBe(null);
});
});
});
12 changes: 8 additions & 4 deletions packages/react-dom/src/client/ReactDOM.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,12 @@ ReactWork.prototype._onCommit = function(): void {
}
};

function ReactRoot(container: Container, isAsync: boolean, hydrate: boolean) {
const root = DOMRenderer.createContainer(container, isAsync, hydrate);
function ReactRoot(
container: Container,
isConcurrent: boolean,
hydrate: boolean,
) {
const root = DOMRenderer.createContainer(container, isConcurrent, hydrate);
this._internalRoot = root;
}
ReactRoot.prototype.render = function(
Expand Down Expand Up @@ -497,8 +501,8 @@ function legacyCreateRootFromDOMContainer(
}
}
// Legacy roots are not async by default.
const isAsync = false;
return new ReactRoot(container, isAsync, shouldHydrate);
const isConcurrent = false;
return new ReactRoot(container, isConcurrent, shouldHydrate);
}

function legacyRenderSubtreeIntoContainer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,9 @@ describe('SimpleEventPlugin', function() {
// Intentionally not using the updater form here
() => this.setState({highPriCount: this.state.highPriCount + 1})
}>
<React.unstable_AsyncMode>
<React.unstable_ConcurrentMode>
<Button highPriCount={this.state.highPriCount} />
</React.unstable_AsyncMode>
</React.unstable_ConcurrentMode>
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-dom/src/server/ReactPartialRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
REACT_FORWARD_REF_TYPE,
REACT_FRAGMENT_TYPE,
REACT_STRICT_MODE_TYPE,
REACT_ASYNC_MODE_TYPE,
REACT_CONCURRENT_MODE_TYPE,
REACT_PLACEHOLDER_TYPE,
REACT_PORTAL_TYPE,
REACT_PROFILER_TYPE,
Expand Down Expand Up @@ -896,7 +896,7 @@ class ReactDOMServerRenderer {

switch (elementType) {
case REACT_STRICT_MODE_TYPE:
case REACT_ASYNC_MODE_TYPE:
case REACT_CONCURRENT_MODE_TYPE:
case REACT_PROFILER_TYPE:
case REACT_FRAGMENT_TYPE: {
const nextChildren = toArray(
Expand Down
6 changes: 3 additions & 3 deletions packages/react-is/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ ReactIs.isValidElementType(React.createFactory("div")); // true

### Determining an Element's Type

#### AsyncMode
#### ConcurrentMode

```js
import React from "react";
import * as ReactIs from 'react-is';

ReactIs.isAsyncMode(<React.unstable_AsyncMode />); // true
ReactIs.typeOf(<React.unstable_AsyncMode />) === ReactIs.AsyncMode; // true
ReactIs.isConcurrentMode(<React.unstable_ConcurrentMode />); // true
ReactIs.typeOf(<React.unstable_ConcurrentMode />) === ReactIs.ConcurrentMode; // true
```

#### Context
Expand Down
Loading

0 comments on commit 0dc0ddc

Please sign in to comment.