@@ -13,7 +13,7 @@ import {createEventTarget, setPointerEvent} from 'dom-event-testing-library';
13
13
14
14
let React ;
15
15
let ReactFeatureFlags ;
16
- let ReactDOM ;
16
+ let ReactDOMClient ;
17
17
let useFocus ;
18
18
let act ;
19
19
@@ -23,7 +23,7 @@ function initializeModules(hasPointerEvents) {
23
23
ReactFeatureFlags = require ( 'shared/ReactFeatureFlags' ) ;
24
24
ReactFeatureFlags . enableCreateEventHandleAPI = true ;
25
25
React = require ( 'react' ) ;
26
- ReactDOM = require ( 'react-dom' ) ;
26
+ ReactDOMClient = require ( 'react-dom/client ' ) ;
27
27
act = require ( 'internal-test-utils' ) . act ;
28
28
// TODO: This import throws outside of experimental mode. Figure out better
29
29
// strategy for gated imports.
@@ -45,7 +45,6 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
45
45
} ) ;
46
46
47
47
afterEach ( ( ) => {
48
- ReactDOM . render ( null , container ) ;
49
48
document . body . removeChild ( container ) ;
50
49
container = null ;
51
50
} ) ;
@@ -65,8 +64,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
65
64
} ) ;
66
65
return < div ref = { ref } /> ;
67
66
} ;
67
+ const root = ReactDOMClient . createRoot ( container ) ;
68
68
await act ( ( ) => {
69
- ReactDOM . render ( < Component /> , container ) ;
69
+ root . render ( < Component /> ) ;
70
70
} ) ;
71
71
} ;
72
72
@@ -93,8 +93,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
93
93
} ) ;
94
94
return < div ref = { ref } /> ;
95
95
} ;
96
+ const root = ReactDOMClient . createRoot ( container ) ;
96
97
await act ( ( ) => {
97
- ReactDOM . render ( < Component /> , container ) ;
98
+ root . render ( < Component /> ) ;
98
99
} ) ;
99
100
} ;
100
101
@@ -125,8 +126,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
125
126
</ div >
126
127
) ;
127
128
} ;
129
+ const root = ReactDOMClient . createRoot ( container ) ;
128
130
await act ( ( ) => {
129
- ReactDOM . render ( < Component /> , container ) ;
131
+ root . render ( < Component /> ) ;
130
132
} ) ;
131
133
} ;
132
134
@@ -164,8 +166,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
164
166
</ div >
165
167
) ;
166
168
} ;
169
+ const root = ReactDOMClient . createRoot ( container ) ;
167
170
await act ( ( ) => {
168
- ReactDOM . render ( < Component /> , container ) ;
171
+ root . render ( < Component /> ) ;
169
172
} ) ;
170
173
} ;
171
174
@@ -209,8 +212,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
209
212
</ div >
210
213
) ;
211
214
} ;
215
+ const root = ReactDOMClient . createRoot ( container ) ;
212
216
await act ( ( ) => {
213
- ReactDOM . render ( < Component /> , container ) ;
217
+ root . render ( < Component /> ) ;
214
218
} ) ;
215
219
} ;
216
220
@@ -305,8 +309,9 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
305
309
) ;
306
310
} ;
307
311
312
+ const root = ReactDOMClient . createRoot ( container ) ;
308
313
await act ( ( ) => {
309
- ReactDOM . render ( < Outer /> , container ) ;
314
+ root . render ( < Outer /> ) ;
310
315
} ) ;
311
316
const innerTarget = createEventTarget ( innerRef . current ) ;
312
317
const outerTarget = createEventTarget ( outerRef . current ) ;
0 commit comments