@jobber/components-native 0.91.0 → 0.91.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jobber/components-native",
-    "version": "0.91.0",
+    "version": "0.91.1",
     "license": "MIT",
     "description": "React Native implementation of Atlantis",
     "repository": {
@@ -94,5 +94,5 @@
         "react-native-safe-area-context": "^5.4.0",
         "react-native-svg": ">=12.0.0"
     },
-    "gitHead": "29381f7508578c0518fd4cecd07d021df83e08fc"
+    "gitHead": "5f68cfee448c36f14f589edd6359c9cb30c8ab79"
 }

package/dist/src/FormatFile/components/MediaView/MediaView.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { ImageBackground, View } from "react-native";
 import { useStyles } from "./MediaView.style";
 import { StatusCode } from "../../types";
@@ -14,20 +14,37 @@ export function MediaView({ accessibilityLabel, showOverlay, showError, file, st
     const { useCreateThumbnail } = useAtlantisFormatFileContext();
     const { thumbnail, error } = useCreateThumbnail(file);
     const [isLoading, setIsLoading] = useState(false);
+    /**
+     * Tracks whether onLoadEnd has fired to prevent race conditions.
+     * ImageBackground can fire onLoadEnd before onLoadStart when loading cached images,
+     * which would cause isLoading to get stuck at true, showing an infinite spinner.
+     */
+    const hasLoadedRef = useRef(false);
     const a11yLabel = computeA11yLabel({
         accessibilityLabel,
         showOverlay,
         showError,
         t,
     });
-    const hasError = showError || error;
-    const uri = thumbnail || file.thumbnailUrl || file.source;
-    const styles = useStyles();
+    const hasError = showError || error, uri = thumbnail || file.thumbnailUrl || file.source, styles = useStyles();
+    const handleLoadStart = () => {
+        if (!hasLoadedRef.current) {
+            setIsLoading(true);
+        }
+    };
+    const handleLoadEnd = () => {
+        hasLoadedRef.current = true;
+        setIsLoading(false);
+    };
+    useEffect(() => {
+        hasLoadedRef.current = false;
+        setIsLoading(false);
+    }, [uri]);
     return (React.createElement(View, { accessible: true, accessibilityLabel: a11yLabel },
         React.createElement(ImageBackground, { style: [
                 styles.imageBackground,
                 styleInGrid ? styles.imageBackgroundGrid : styles.imageBackgroundFlat,
-            ], resizeMode: styleInGrid ? "cover" : "contain", source: { uri }, testID: "test-image", onLoadStart: () => setIsLoading(true), onLoadEnd: () => setIsLoading(false) },
+            ], resizeMode: styleInGrid ? "cover" : "contain", source: { uri }, testID: "test-image", onLoadStart: handleLoadStart, onLoadEnd: handleLoadEnd },
             React.createElement(Overlay, { isLoading: isLoading, showOverlay: showOverlay, hasError: hasError, file: file, onUploadComplete: onUploadComplete, styles: styles }))));
 }
 function Overlay({ isLoading, showOverlay, hasError, file, onUploadComplete, styles, }) {