Skip to content

Commit fbcd8db

Browse files
committed
[change] rename ImageLoader.abort to .release
The method is mostly used as cleanup (e.g. useEffect cleanup, or releasing resources when component unmounts) Simplified the `useEffect` for loading images a bit
1 parent 88a77ea commit fbcd8db

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

packages/react-native-web/src/exports/Image/index.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,12 @@ const Image: React.AbstractComponent<
256256

257257
// Image loading
258258
React.useEffect(() => {
259-
let requestId;
260-
261259
const uri = resolveAssetUri(source);
262260
if (uri != null) {
263261
updateState(LOADING);
264-
if (onLoadStart) {
265-
onLoadStart();
266-
}
262+
if (onLoadStart) onLoadStart();
267263

268-
requestId = ImageLoader.load(
264+
const requestId = ImageLoader.load(
269265
{ uri, headers: source?.headers },
270266
function load(result) {
271267
updateState(LOADED);
@@ -291,13 +287,13 @@ const Image: React.AbstractComponent<
291287
}
292288
}
293289
);
294-
}
295290

296-
function abortPendingRequest() {
297-
if (requestId) ImageLoader.abort(requestId);
298-
}
291+
const effectCleanup = () => {
292+
if (requestId) ImageLoader.release(requestId);
293+
};
299294

300-
return abortPendingRequest;
295+
return effectCleanup;
296+
}
301297
}, [source, updateState, onError, onLoad, onLoadEnd, onLoadStart]);
302298

303299
return (

packages/react-native-web/src/modules/ImageLoader/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ let id = 0;
7474
const requests = {};
7575

7676
const ImageLoader = {
77-
abort(requestId: number) {
77+
release(requestId: number) {
7878
const request = requests[requestId];
7979
if (request) {
8080
const { image, cleanup } = request;
@@ -105,7 +105,7 @@ const ImageLoader = {
105105
}
106106
}
107107
if (complete) {
108-
ImageLoader.abort(requestId);
108+
ImageLoader.release(requestId);
109109
clearInterval(interval);
110110
}
111111
}
@@ -114,7 +114,7 @@ const ImageLoader = {
114114
if (typeof failure === 'function') {
115115
failure();
116116
}
117-
ImageLoader.abort(requestId);
117+
ImageLoader.release(requestId);
118118
clearInterval(interval);
119119
}
120120
},

0 commit comments

Comments
 (0)