Apply suggestions from code review

Co-authored-by: Marc Glasser <marc.aaron.glasser@gmail.com>
Expensify · Jan 25, 2023 · 7e2d106 · 7e2d106
1 parent 93df02a
commit 7e2d106
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/react-native-web/src/exports/Image/index.js b/packages/react-native-web/src/exports/Image/index.js
@@ -362,12 +362,16 @@ const ImageWithHeaders: ImageComponent = React.forwardRef((props, ref) => {
   const { onError, onLoadStart, onLoadEnd } = props;
 
   React.useEffect(() => {
-    if (!hasSourceDiff(nextSource, request.current.source)) return;
+    if (!hasSourceDiff(nextSource, request.current.source)) {
+        return;
+    }
 
     // When source changes we want to clean up any old/running requests
     request.current.cancel();
 
-    if (onLoadStart) onLoadStart();
+    if (onLoadStart) {
+        onLoadStart();
+    }
 
     request.current = ImageLoader.loadWithHeaders(nextSource);
 
@@ -383,8 +387,10 @@ const ImageWithHeaders: ImageComponent = React.forwardRef((props, ref) => {
 
   const propsToPass = {
     ...props,
+
     // Omit `onLoadStart` because we trigger it in the current scope
     onLoadStart: undefined,
+
     // Until the current component resolves the request (using headers)
     // we skip forwarding the source so the base component doesn't attempt
     // to load the original source

diff --git a/packages/react-native-web/src/modules/ImageLoader/index.js b/packages/react-native-web/src/modules/ImageLoader/index.js
@@ -150,10 +150,10 @@ const ImageLoader = {
   },
   loadWithHeaders(source: ImageSource): LoadRequest {
     let uri: string;
-    const abortCtrl = new AbortController();
+    const abortController = new AbortController();
     const request = new Request(source.uri, {
       headers: source.headers,
-      signal: abortCtrl.signal
+      signal: abortController.signal
     });
     request.headers.append('accept', 'image/*');
 
@@ -175,7 +175,7 @@ const ImageLoader = {
       promise,
       source,
       cancel: () => {
-        abortCtrl.abort();
+        abortController.abort();
         URL.revokeObjectURL(uri);
       }
     };