react
diff --git a/‎packages/react-native/ReactAndroid/api/ReactAndroid.api‎
Lines changed: 2 additions & 0 deletions b/‎packages/react-native/ReactAndroid/api/ReactAndroid.api‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt‎
Lines changed: 30 additions & 0 deletions b/‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp‎
Lines changed: 7 additions & 3 deletions b/‎packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp‎
Lines changed: 7 additions & 3 deletions
@@ -5313,11 +5313,13 @@ public final class com/facebook/react/views/image/ReactImageManager : com/facebo
 	public final fun setBorderColor (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/Integer;)V
 	public final fun setBorderRadius (Lcom/facebook/react/views/image/ReactImageView;IF)V
 	public final fun setBorderWidth (Lcom/facebook/react/views/image/ReactImageView;F)V
+	public final fun setDefaultSource (Lcom/facebook/react/views/image/ReactImageView;Lcom/facebook/react/bridge/Dynamic;)V
 	public final fun setDefaultSource (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/String;)V
 	public final fun setFadeDuration (Lcom/facebook/react/views/image/ReactImageView;I)V
 	public final fun setHeaders (Lcom/facebook/react/views/image/ReactImageView;Lcom/facebook/react/bridge/ReadableMap;)V
 	public final fun setInternal_AnalyticsTag (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/String;)V
 	public final fun setLoadHandlersRegistered (Lcom/facebook/react/views/image/ReactImageView;Z)V
+	public final fun setLoadingIndicatorSource (Lcom/facebook/react/views/image/ReactImageView;Lcom/facebook/react/bridge/Dynamic;)V
 	public final fun setLoadingIndicatorSource (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/String;)V
 	public final fun setOverlayColor (Lcom/facebook/react/views/image/ReactImageView;Ljava/lang/Integer;)V
 	public final fun setProgressiveRenderingEnabled (Lcom/facebook/react/views/image/ReactImageView;Z)V
 
@@ -12,8 +12,10 @@ import android.graphics.PorterDuff
 import com.facebook.common.logging.FLog
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.AbstractDraweeControllerBuilder
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
@@ -133,16 +135,44 @@ public constructor(
   }
 
   @ReactProp(name = "defaultSource")
+  public fun setDefaultSource(view: ReactImageView, source: Dynamic) {
+    view.setDefaultSource(imageSourceUri(source))
+  }
+
+  @Deprecated(
+      "Retained only for binary/source compatibility; the defaultSource prop is now delivered " +
+          "through the Dynamic overload."
+  )
   public fun setDefaultSource(view: ReactImageView, source: String?) {
     view.setDefaultSource(source)
   }
 
   // In JS this is Image.props.loadingIndicatorSource.uri
   @ReactProp(name = "loadingIndicatorSrc")
+  public fun setLoadingIndicatorSource(view: ReactImageView, source: Dynamic) {
+    view.setLoadingIndicatorSource(imageSourceUri(source))
+  }
+
+  @Deprecated(
+      "Retained only for binary/source compatibility; the loadingIndicatorSrc prop is now " +
+          "delivered through the Dynamic overload."
+  )
   public fun setLoadingIndicatorSource(view: ReactImageView, source: String?) {
     view.setLoadingIndicatorSource(source)
   }
 
+  /**
+   * The legacy raw-props path delivers these props as a plain uri string, but the Props 2.0 diffing
+   * path (`ImageProps::getDiffProps`) serializes the full ImageSource object. Accept both formats
+   * so either pipeline (and either side of a JS/native version skew) keeps working.
+   */
+  private fun imageSourceUri(source: Dynamic): String? =
+      when (source.type) {
+        ReadableType.String -> source.asString()
+        ReadableType.Map -> source.asMap()?.getString("uri")
+        else -> null
+      }
+
   @ReactProp(name = "borderColor", customType = "Color")
   public fun setBorderColor(view: ReactImageView, borderColor: Int?) {
     BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.ALL, borderColor)
 
@@ -27,10 +27,14 @@ ImageProps::ImageProps(
           "defaultSource",
           sourceProps.defaultSource,
           {})),
+      // The wire name of this prop is "loadingIndicatorSrc"
+      // (ImageViewNativeComponent.js / the Android @ReactProp setter);
+      // "loadingIndicatorSource" is only the JS-facing <Image> prop that
+      // Image.android.js translates.
       loadingIndicatorSource(convertRawProp(
           context,
           rawProps,
-          "loadingIndicatorSource",
+          "loadingIndicatorSrc",
           sourceProps.loadingIndicatorSource,
           {})),
       resizeMode(convertRawProp(
@@ -115,7 +119,7 @@ void ImageProps::setProp(
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE(sources, "source");
     RAW_SET_PROP_SWITCH_CASE(defaultSource, "defaultSource");
-    RAW_SET_PROP_SWITCH_CASE(loadingIndicatorSource, "loadingIndicatorSource");
+    RAW_SET_PROP_SWITCH_CASE(loadingIndicatorSource, "loadingIndicatorSrc");
     RAW_SET_PROP_SWITCH_CASE_BASIC(resizeMode);
     RAW_SET_PROP_SWITCH_CASE_BASIC(blurRadius);
     RAW_SET_PROP_SWITCH_CASE_BASIC(capInsets);
@@ -167,7 +171,7 @@ folly::dynamic ImageProps::getDiffProps(const Props* prevProps) const {
   }
 
   if (loadingIndicatorSource != oldProps->loadingIndicatorSource) {
-    result["loadingIndicatorSource"] = toDynamic(loadingIndicatorSource);
+    result["loadingIndicatorSrc"] = toDynamic(loadingIndicatorSource);
   }
 
   if (resizeMode != oldProps->resizeMode) {