Merge remote-tracking branch 'origin/main' into hailey/0.76

modules/bottom-sheet/ios/SheetViewController.swift

@@ -64,11 +64,14 @@ class SheetViewController: UIViewController {
 
   func updateDetents(contentHeight: CGFloat, preventExpansion: Bool) {
     if let sheet = self.sheetPresentationController {
-      sheet.animateChanges {
+      // Capture `self` weakly to prevent retain cycles.
-        self.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
+      // Also, capture `sheet` weakly to avoid potential strong references held by animateChanges.
-        if #available(iOS 16.0, *) {
+      sheet.animateChanges { [weak self, weak sheet] in
-          sheet.invalidateDetents()
+          guard let weakSelf = self, let weakSheet = sheet else { return }
-        }
+          weakSelf.setDetents(contentHeight: contentHeight, preventExpansion: preventExpansion)
+          if #available(iOS 16.0, *) {
+              weakSheet.invalidateDetents()
+          }
       }
     }
   }

src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx

@@ -396,10 +396,14 @@ const ImageItem = ({
                 placeholderContentFit="cover"
                 placeholder={{uri: imageSrc.thumbUri}}
                 accessibilityLabel={imageSrc.alt}
-                onLoad={e => {
+                onLoad={
-                  setHasLoaded(true)
+                  hasLoaded
-                  onLoad({width: e.source.width, height: e.source.height})
+                    ? undefined
-                }}
+                    : e => {
+                        setHasLoaded(true)
+                        onLoad({width: e.source.width, height: e.source.height})
+                      }
+                }
                 style={{flex: 1, borderRadius}}
                 accessibilityHint=""
                 accessibilityIgnoresInvertColors

src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.ios.tsx

@@ -228,10 +228,14 @@ const ImageItem = ({
               accessibilityHint=""
               enableLiveTextInteraction={showControls && !scaled}
               accessibilityIgnoresInvertColors
-              onLoad={e => {
+              onLoad={
-                setHasLoaded(true)
+                hasLoaded
-                onLoad({width: e.source.width, height: e.source.height})
+                  ? undefined
-              }}
+                  : e => {
+                      setHasLoaded(true)
+                      onLoad({width: e.source.width, height: e.source.height})
+                    }
+              }
             />
           </Animated.View>
         </Animated.View>

src/view/com/util/images/AutoSizedImage.tsx

@@ -113,9 +113,13 @@ export function AutoSizedImage({
         accessibilityIgnoresInvertColors
         accessibilityLabel={image.alt}
         accessibilityHint=""
-        onLoad={e => {
+        onLoad={
-          setFetchedDims({width: e.source.width, height: e.source.height})
+          fetchedDims
-        }}
+            ? undefined
+            : e => {
+                setFetchedDims({width: e.source.width, height: e.source.height})
+              }
+        }
       />
       <MediaInsetBorder />