@@ -206,7 +206,6 @@ const Image: React.AbstractComponent<
206
206
const hasTextAncestor = React . useContext ( TextAncestorContext ) ;
207
207
const hiddenImageRef = React . useRef ( null ) ;
208
208
const filterRef = React . useRef ( _filterId ++ ) ;
209
- const requestRef = React . useRef ( null ) ;
210
209
const shouldDisplaySource =
211
210
state === LOADED || ( state === LOADING && defaultSource == null ) ;
212
211
const [ flatStyle , _resizeMode , filter , tintColor ] = getFlatStyle (
@@ -262,7 +261,7 @@ const Image: React.AbstractComponent<
262
261
263
262
// Image loading
264
263
React . useEffect ( ( ) => {
265
- abortPendingRequest ( ) ;
264
+ let requestId ;
266
265
267
266
const uri = resolveAssetUri ( source ) ;
268
267
if ( uri != null ) {
@@ -271,7 +270,7 @@ const Image: React.AbstractComponent<
271
270
onLoadStart ( ) ;
272
271
}
273
272
274
- requestRef . current = ImageLoader . load (
273
+ requestId = ImageLoader . load (
275
274
{ uri, headers : source ?. headers } ,
276
275
function load ( result ) {
277
276
updateState ( LOADED ) ;
@@ -300,10 +299,7 @@ const Image: React.AbstractComponent<
300
299
}
301
300
302
301
function abortPendingRequest ( ) {
303
- if ( requestRef . current != null ) {
304
- ImageLoader . abort ( requestRef . current ) ;
305
- requestRef . current = null ;
306
- }
302
+ if ( requestId ) ImageLoader . abort ( requestId ) ;
307
303
}
308
304
309
305
return abortPendingRequest ;
0 commit comments