@@ -15,7 +15,6 @@ let ReactCache;
15
15
let ReactDOM ;
16
16
let Suspense ;
17
17
let originalCreateElement ;
18
- let globalImgCache ;
19
18
let TextResource ;
20
19
let textResourceShouldFail ;
21
20
@@ -65,12 +64,8 @@ function AsyncText(props) {
65
64
}
66
65
}
67
66
68
- function ImageLoader ( { src, useImageLoader, ref} ) {
69
- useImageLoader ( src , ref ) ;
70
- }
71
-
72
67
function Img ( { src : maybeSrc , onLoad, useImageLoader, ref} ) {
73
- let src = maybeSrc || 'default' ;
68
+ const src = maybeSrc || 'default' ;
74
69
Scheduler . unstable_yieldValue ( 'Img ' + src ) ;
75
70
return < img src = { src } onLoad = { onLoad } /> ;
76
71
}
@@ -97,12 +92,12 @@ describe.only('ReactDOMImageLoad', () => {
97
92
Suspense = React . Suspense ;
98
93
99
94
onLoadSpy = jest . fn ( reactEvent => {
100
- let src = reactEvent . target . getAttribute ( 'src' ) ;
95
+ const src = reactEvent . target . getAttribute ( 'src' ) ;
101
96
Scheduler . unstable_yieldValue ( 'onLoadSpy [' + src + ']' ) ;
102
97
} ) ;
103
98
104
99
actualLoadSpy = jest . fn ( nativeEvent => {
105
- let src = nativeEvent . target . getAttribute ( 'src' ) ;
100
+ const src = nativeEvent . target . getAttribute ( 'src' ) ;
106
101
Scheduler . unstable_yieldValue ( 'actualLoadSpy [' + src + ']' ) ;
107
102
nativeEvent . __originalDispatch = false ;
108
103
} ) ;
@@ -160,7 +155,7 @@ describe.only('ReactDOMImageLoad', () => {
160
155
161
156
originalCreateElement = document . createElement ;
162
157
document . createElement = function createElement ( tagName , options ) {
163
- let element = originalCreateElement . call ( document , tagName , options ) ;
158
+ const element = originalCreateElement . call ( document , tagName , options ) ;
164
159
if ( tagName === 'img' ) {
165
160
element . addEventListener ( 'load' , actualLoadSpy ) ;
166
161
images . push ( element ) ;
@@ -203,7 +198,7 @@ describe.only('ReactDOMImageLoad', () => {
203
198
'Img default' ,
204
199
'Yield' ,
205
200
] ) ;
206
- let img = last ( images ) ;
201
+ const img = last ( images ) ;
207
202
loadImage ( img ) ;
208
203
expect ( Scheduler ) . toHaveYielded ( [
209
204
'actualLoadSpy [default]' ,
@@ -243,7 +238,7 @@ describe.only('ReactDOMImageLoad', () => {
243
238
'last layout' ,
244
239
] ) ;
245
240
Scheduler . unstable_requestPaint ( ) ;
246
- let img = last ( images ) ;
241
+ const img = last ( images ) ;
247
242
loadImage ( img ) ;
248
243
expect ( Scheduler ) . toHaveYielded ( [
249
244
'actualLoadSpy [default]' ,
@@ -259,7 +254,7 @@ describe.only('ReactDOMImageLoad', () => {
259
254
const root = ReactDOM . createRoot ( container ) ;
260
255
261
256
function Base ( ) {
262
- let [ src , setSrc ] = React . useState ( 'a' ) ;
257
+ const [ src , setSrc ] = React . useState ( 'a' ) ;
263
258
return (
264
259
< PhaseMarkers >
265
260
< Img src = { src } onLoad = { onLoadSpy } />
@@ -283,7 +278,7 @@ describe.only('ReactDOMImageLoad', () => {
283
278
'Img a' ,
284
279
'Yield' ,
285
280
] ) ;
286
- let img = last ( images ) ;
281
+ const img = last ( images ) ;
287
282
loadImage ( img ) ;
288
283
expect ( Scheduler ) . toHaveYielded ( [ 'actualLoadSpy [a]' ] ) ;
289
284
@@ -322,7 +317,7 @@ describe.only('ReactDOMImageLoad', () => {
322
317
'last layout' ,
323
318
'last passive' ,
324
319
] ) ;
325
- let img = last ( images ) ;
320
+ const img = last ( images ) ;
326
321
loadImage ( img ) ;
327
322
expect ( Scheduler ) . toHaveYielded ( [
328
323
'actualLoadSpy [default]' ,
@@ -336,7 +331,7 @@ describe.only('ReactDOMImageLoad', () => {
336
331
const root = ReactDOM . createRoot ( container ) ;
337
332
338
333
function ChildSuppressing ( { children} ) {
339
- let [ showChildren , update ] = React . useState ( true ) ;
334
+ const [ showChildren , update ] = React . useState ( true ) ;
340
335
React . useLayoutEffect ( ( ) => {
341
336
if ( showChildren ) {
342
337
update ( false ) ;
@@ -362,7 +357,7 @@ describe.only('ReactDOMImageLoad', () => {
362
357
'Img default' ,
363
358
'Yield' ,
364
359
] ) ;
365
- let img = last ( images ) ;
360
+ const img = last ( images ) ;
366
361
loadImage ( img ) ;
367
362
expect ( Scheduler ) . toHaveYielded ( [ 'actualLoadSpy [default]' ] ) ;
368
363
expect ( Scheduler ) . toFlushAndYield ( [
@@ -385,7 +380,7 @@ describe.only('ReactDOMImageLoad', () => {
385
380
const root = ReactDOM . createRoot ( container ) ;
386
381
387
382
function Switch ( { children} ) {
388
- let [ shouldShow , updateShow ] = React . useState ( true ) ;
383
+ const [ shouldShow , updateShow ] = React . useState ( true ) ;
389
384
return children ( shouldShow , updateShow ) ;
390
385
}
391
386
@@ -424,7 +419,7 @@ describe.only('ReactDOMImageLoad', () => {
424
419
'Img default' ,
425
420
'Yield' ,
426
421
] ) ;
427
- let img = last ( images ) ;
422
+ const img = last ( images ) ;
428
423
loadImage ( img ) ;
429
424
expect ( Scheduler ) . toHaveYielded ( [ 'actualLoadSpy [default]' ] ) ;
430
425
expect ( Scheduler ) . toFlushAndYield ( [
@@ -447,7 +442,7 @@ describe.only('ReactDOMImageLoad', () => {
447
442
expect ( onLoadSpy ) . not . toHaveBeenCalled ( ) ;
448
443
} ) ;
449
444
450
- xit ( 'captures the load event if it happens in a suspended subtree and replays it between layout and passive effects on resumption' , async function ( ) {
445
+ fit ( 'captures the load event if it happens in a suspended subtree and replays it between layout and passive effects on resumption' , async function ( ) {
451
446
function SuspendingWithImage ( ) {
452
447
Scheduler . unstable_yieldValue ( 'SuspendingWithImage' ) ;
453
448
return (
@@ -514,8 +509,8 @@ describe.only('ReactDOMImageLoad', () => {
514
509
let externalSetSrcAlt = null ;
515
510
516
511
function Base ( ) {
517
- let [ src , setSrc ] = React . useState ( null ) ;
518
- let [ srcAlt , setSrcAlt ] = React . useState ( null ) ;
512
+ const [ src , setSrc ] = React . useState ( null ) ;
513
+ const [ srcAlt , setSrcAlt ] = React . useState ( null ) ;
519
514
externalSetSrc = setSrc ;
520
515
externalSetSrcAlt = setSrcAlt ;
521
516
return srcAlt || src ? < YieldingWithImage src = { srcAlt || src } /> : null ;
@@ -578,6 +573,4 @@ describe.only('ReactDOMImageLoad', () => {
578
573
'Committed' ,
579
574
] ) ;
580
575
} ) ;
581
-
582
- it ( 'load event twice on changing src when dom element is re-used, ensure only second load event is replayed' , async function ( ) { } ) ;
583
576
} ) ;
0 commit comments