|
10 | 10 | 'use strict'; |
11 | 11 |
|
12 | 12 | let React; |
13 | | -let ReactDOM; |
| 13 | +let ReactDOMClient; |
| 14 | +let act; |
14 | 15 |
|
15 | 16 | describe('ReactEventIndependence', () => { |
16 | 17 | beforeEach(() => { |
17 | 18 | jest.resetModules(); |
18 | 19 |
|
19 | 20 | React = require('react'); |
20 | | - ReactDOM = require('react-dom'); |
| 21 | + ReactDOMClient = require('react-dom/client'); |
| 22 | + act = require('internal-test-utils').act; |
21 | 23 | }); |
22 | 24 |
|
23 | | - it('does not crash with other react inside', () => { |
| 25 | + it('does not crash with other react inside', async () => { |
24 | 26 | let clicks = 0; |
25 | 27 | const container = document.createElement('div'); |
26 | 28 | document.body.appendChild(container); |
| 29 | + const root = ReactDOMClient.createRoot(container); |
27 | 30 | try { |
28 | | - const div = ReactDOM.render( |
29 | | - <div |
30 | | - onClick={() => clicks++} |
31 | | - dangerouslySetInnerHTML={{ |
32 | | - __html: '<button data-reactid=".z">click me</div>', |
33 | | - }} |
34 | | - />, |
35 | | - container, |
36 | | - ); |
| 31 | + await act(() => { |
| 32 | + root.render( |
| 33 | + <div |
| 34 | + onClick={() => clicks++} |
| 35 | + dangerouslySetInnerHTML={{ |
| 36 | + __html: '<button data-reactid=".z">click me</div>', |
| 37 | + }} |
| 38 | + />, |
| 39 | + ); |
| 40 | + }); |
37 | 41 |
|
38 | | - div.firstChild.click(); |
| 42 | + container.firstElementChild.click(); |
39 | 43 | expect(clicks).toBe(1); |
40 | 44 | } finally { |
41 | 45 | document.body.removeChild(container); |
42 | 46 | } |
43 | 47 | }); |
44 | 48 |
|
45 | | - it('does not crash with other react outside', () => { |
| 49 | + it('does not crash with other react outside', async () => { |
46 | 50 | let clicks = 0; |
47 | 51 | const outer = document.createElement('div'); |
48 | 52 | document.body.appendChild(outer); |
| 53 | + const root = ReactDOMClient.createRoot(outer); |
49 | 54 | try { |
50 | 55 | outer.setAttribute('data-reactid', '.z'); |
51 | | - const inner = ReactDOM.render( |
52 | | - <button onClick={() => clicks++}>click me</button>, |
53 | | - outer, |
54 | | - ); |
55 | | - inner.click(); |
| 56 | + await act(() => { |
| 57 | + root.render(<button onClick={() => clicks++}>click me</button>); |
| 58 | + }); |
| 59 | + outer.firstElementChild.click(); |
56 | 60 | expect(clicks).toBe(1); |
57 | 61 | } finally { |
58 | 62 | document.body.removeChild(outer); |
59 | 63 | } |
60 | 64 | }); |
61 | 65 |
|
62 | | - it('does not when event fired on unmounted tree', () => { |
| 66 | + it('does not when event fired on unmounted tree', async () => { |
63 | 67 | let clicks = 0; |
64 | 68 | const container = document.createElement('div'); |
65 | 69 | document.body.appendChild(container); |
66 | 70 | try { |
67 | | - const button = ReactDOM.render( |
68 | | - <button onClick={() => clicks++}>click me</button>, |
69 | | - container, |
70 | | - ); |
| 71 | + const root = ReactDOMClient.createRoot(container); |
| 72 | + |
| 73 | + await act(() => { |
| 74 | + root.render(<button onClick={() => clicks++}>click me</button>); |
| 75 | + }); |
| 76 | + |
| 77 | + const button = container.firstChild; |
71 | 78 |
|
72 | 79 | // Now we unmount the component, as if caused by a non-React event handler |
73 | 80 | // for the same click we're about to simulate, like closing a layer: |
74 | | - ReactDOM.unmountComponentAtNode(container); |
| 81 | + root.unmount(); |
75 | 82 | button.click(); |
76 | 83 |
|
77 | 84 | // Since the tree is unmounted, we don't dispatch the click event. |
|
0 commit comments