@@ -201,7 +201,6 @@ const Image: React.AbstractComponent<
201
201
const hasTextAncestor = React . useContext ( TextAncestorContext ) ;
202
202
const hiddenImageRef = React . useRef ( null ) ;
203
203
const filterRef = React . useRef ( _filterId ++ ) ;
204
- const requestRef = React . useRef ( null ) ;
205
204
const shouldDisplaySource =
206
205
state === LOADED || ( state === LOADING && defaultSource == null ) ;
207
206
const [ flatStyle , _resizeMode , filter , tintColor ] = getFlatStyle (
@@ -257,7 +256,7 @@ const Image: React.AbstractComponent<
257
256
258
257
// Image loading
259
258
React . useEffect ( ( ) => {
260
- abortPendingRequest ( ) ;
259
+ let requestId ;
261
260
262
261
const uri = resolveAssetUri ( source ) ;
263
262
if ( uri != null ) {
@@ -266,7 +265,7 @@ const Image: React.AbstractComponent<
266
265
onLoadStart ( ) ;
267
266
}
268
267
269
- requestRef . current = ImageLoader . load (
268
+ requestId = ImageLoader . load (
270
269
{ uri, headers : source ?. headers } ,
271
270
function load ( result ) {
272
271
updateState ( LOADED ) ;
@@ -295,10 +294,7 @@ const Image: React.AbstractComponent<
295
294
}
296
295
297
296
function abortPendingRequest ( ) {
298
- if ( requestRef . current != null ) {
299
- ImageLoader . abort ( requestRef . current ) ;
300
- requestRef . current = null ;
301
- }
297
+ if ( requestId ) ImageLoader . abort ( requestId ) ;
302
298
}
303
299
304
300
return abortPendingRequest ;
0 commit comments