@@ -35,6 +35,7 @@ let PARENT;
35
35
let CHILD ;
36
36
let BUTTON ;
37
37
38
+ let renderTree ;
38
39
let putListener ;
39
40
let deleteAllListeners ;
40
41
@@ -71,7 +72,7 @@ describe('ReactBrowserEventEmitter', () => {
71
72
72
73
const root = ReactDOMClient . createRoot ( container ) ;
73
74
74
- async function renderTree ( ) {
75
+ renderTree = async function ( ) {
75
76
await act ( ( ) => {
76
77
root . render (
77
78
< div ref = { c => ( GRANDPARENT = c ) } { ...GRANDPARENT_PROPS } >
@@ -86,7 +87,7 @@ describe('ReactBrowserEventEmitter', () => {
86
87
</ div > ,
87
88
) ;
88
89
} ) ;
89
- }
90
+ } ;
90
91
91
92
putListener = async function ( node , eventName , listener ) {
92
93
switch ( node ) {
@@ -126,8 +127,6 @@ describe('ReactBrowserEventEmitter', () => {
126
127
} ;
127
128
128
129
idCallOrder = [ ] ;
129
-
130
- return renderTree ( ) ;
131
130
} ) ;
132
131
133
132
afterEach ( ( ) => {
@@ -136,6 +135,7 @@ describe('ReactBrowserEventEmitter', () => {
136
135
} ) ;
137
136
138
137
it ( 'should bubble simply' , async ( ) => {
138
+ await renderTree ( ) ;
139
139
await putListener ( CHILD , ON_CLICK_KEY , recordID . bind ( null , CHILD ) ) ;
140
140
await putListener ( PARENT , ON_CLICK_KEY , recordID . bind ( null , PARENT ) ) ;
141
141
await putListener (
@@ -153,6 +153,7 @@ describe('ReactBrowserEventEmitter', () => {
153
153
} ) ;
154
154
155
155
it ( 'should bubble to the right handler after an update' , async ( ) => {
156
+ await renderTree ( ) ;
156
157
await putListener (
157
158
GRANDPARENT ,
158
159
ON_CLICK_KEY ,
@@ -181,6 +182,7 @@ describe('ReactBrowserEventEmitter', () => {
181
182
} ) ;
182
183
183
184
it ( 'should continue bubbling if an error is thrown' , async ( ) => {
185
+ await renderTree ( ) ;
184
186
await putListener ( CHILD , ON_CLICK_KEY , recordID . bind ( null , CHILD ) ) ;
185
187
await putListener ( PARENT , ON_CLICK_KEY , function ( ) {
186
188
recordID ( PARENT ) ;
@@ -203,6 +205,7 @@ describe('ReactBrowserEventEmitter', () => {
203
205
} ) ;
204
206
205
207
it ( 'should set currentTarget' , async ( ) => {
208
+ await renderTree ( ) ;
206
209
await putListener ( CHILD , ON_CLICK_KEY , function ( event ) {
207
210
recordID ( CHILD ) ;
208
211
expect ( event . currentTarget ) . toBe ( CHILD ) ;
@@ -225,6 +228,7 @@ describe('ReactBrowserEventEmitter', () => {
225
228
} ) ;
226
229
227
230
it ( 'should support stopPropagation()' , async ( ) => {
231
+ await renderTree ( ) ;
228
232
await putListener ( CHILD , ON_CLICK_KEY , recordID . bind ( null , CHILD ) ) ;
229
233
await putListener (
230
234
PARENT ,
@@ -245,6 +249,7 @@ describe('ReactBrowserEventEmitter', () => {
245
249
} ) ;
246
250
247
251
it ( 'should support overriding .isPropagationStopped()' , async ( ) => {
252
+ await renderTree ( ) ;
248
253
// Ew. See D4504876.
249
254
await putListener ( CHILD , ON_CLICK_KEY , recordID . bind ( null , CHILD ) ) ;
250
255
await putListener ( PARENT , ON_CLICK_KEY , function ( e ) {
@@ -266,6 +271,7 @@ describe('ReactBrowserEventEmitter', () => {
266
271
} ) ;
267
272
268
273
it ( 'should stop after first dispatch if stopPropagation' , async ( ) => {
274
+ await renderTree ( ) ;
269
275
await putListener (
270
276
CHILD ,
271
277
ON_CLICK_KEY ,
@@ -285,6 +291,7 @@ describe('ReactBrowserEventEmitter', () => {
285
291
} ) ;
286
292
287
293
it ( 'should not stopPropagation if false is returned' , async ( ) => {
294
+ await renderTree ( ) ;
288
295
await putListener (
289
296
CHILD ,
290
297
ON_CLICK_KEY ,
@@ -315,6 +322,7 @@ describe('ReactBrowserEventEmitter', () => {
315
322
*/
316
323
317
324
it ( 'should invoke handlers that were removed while bubbling' , async ( ) => {
325
+ await renderTree ( ) ;
318
326
const handleParentClick = jest . fn ( ) ;
319
327
const handleChildClick = async function ( event ) {
320
328
await deleteAllListeners ( PARENT ) ;
@@ -328,6 +336,7 @@ describe('ReactBrowserEventEmitter', () => {
328
336
} ) ;
329
337
330
338
it ( 'should not invoke newly inserted handlers while bubbling' , async ( ) => {
339
+ await renderTree ( ) ;
331
340
const handleParentClick = jest . fn ( ) ;
332
341
const handleChildClick = async function ( event ) {
333
342
await putListener ( PARENT , ON_CLICK_KEY , handleParentClick ) ;
@@ -340,6 +349,7 @@ describe('ReactBrowserEventEmitter', () => {
340
349
} ) ;
341
350
342
351
it ( 'should have mouse enter simulated by test utils' , async ( ) => {
352
+ await renderTree ( ) ;
343
353
await putListener ( CHILD , ON_MOUSE_ENTER_KEY , recordID . bind ( null , CHILD ) ) ;
344
354
await act ( ( ) => {
345
355
ReactTestUtils . Simulate . mouseEnter ( CHILD ) ;
0 commit comments