Skip to content
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

Jump to bottom

Convert ReactMultiChildText to createRoot #28140

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Convert ReactMultiChildText to createRoot #28140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
92 changes: 56 additions & 36 deletions packages/react-dom/src/__tests__/ReactMultiChildText-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

const React = require('react');
const ReactDOMClient = require('react-dom/client');
const ReactTestUtils = require('react-dom/test-utils');
const act = require('internal-test-utils').act;

// Helpers
Expand Down Expand Up @@ -174,46 +173,67 @@ describe('ReactMultiChildText', () => {
]);
});

it('should throw if rendering both HTML and children', () => {
expect(function () {
ReactTestUtils.renderIntoDocument(
<div dangerouslySetInnerHTML={{__html: 'abcdef'}}>ghjkl</div>,
);
}).toThrow();
it('should throw if rendering both HTML and children', async () => {
const container = document.createElement('div');
const root = ReactDOMClient.createRoot(container);
await expect(
act(() => {
root.render(
<div dangerouslySetInnerHTML={{__html: 'abcdef'}}>ghjkl</div>,
);
}),
).rejects.toThrow();
});

it('should render between nested components and inline children', () => {
ReactTestUtils.renderIntoDocument(
<div>
<h1>
<span />
<span />
</h1>
</div>,
);

expect(function () {
ReactTestUtils.renderIntoDocument(
<div>
<h1>A</h1>
</div>,
);
}).not.toThrow();

expect(function () {
ReactTestUtils.renderIntoDocument(
<div>
<h1>{['A']}</h1>
</div>,
);
}).not.toThrow();
it('should render between nested components and inline children', async () => {
let container = document.createElement('div');
let root = ReactDOMClient.createRoot(container);

expect(function () {
ReactTestUtils.renderIntoDocument(
await act(() => {
root.render(
<div>
<h1>{['A', 'B']}</h1>
<h1>
<span />
<span />
</h1>
</div>,
);
}).not.toThrow();
});

container = document.createElement('div');
root = ReactDOMClient.createRoot(container);
await expect(
act(() => {
root.render(
<div>
<h1>A</h1>
</div>,
);
}),
).resolves.not.toThrow();

container = document.createElement('div');
root = ReactDOMClient.createRoot(container);
await expect(
act(() => {
root.render(
<div>
<h1>{['A']}</h1>
</div>,
);
}),
).resolves.not.toThrow();

container = document.createElement('div');
root = ReactDOMClient.createRoot(container);
await expect(
act(() => {
root.render(
<div>
<h1>{['A', 'B']}</h1>
</div>,
);
}),
).resolves.not.toThrow();
});
});