react-native-tvos 0.77.0-0rc5 → 0.78.0-0rc4

package/ReactCommon/react/performance/timeline/React-performancetimeline.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
   end
 
   s.dependency "React-featureflags"
+  add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   s.dependency "React-timing"
   s.dependency "React-cxxreact"
   s.dependency "RCT-Folly", folly_version

package/ReactCommon/react/renderer/animations/CMakeLists.txt

@@ -24,7 +24,6 @@ target_link_libraries(react_render_animations
         glog
         glog_init
         jsi
-        react_config
         react_debug
         react_render_componentregistry
         react_render_core

package/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp

@@ -56,7 +56,7 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
       // Create the mutation instruction
       mutationsList.emplace_back(ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, mutatedShadowView, keyframe.parentView));
+          keyframe.viewPrev, mutatedShadowView, keyframe.parentTag));
 
       PrintMutationInstruction("Animation Progress:", mutationsList.back());
 

package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp

@@ -13,7 +13,7 @@
 
 #include <react/debug/flags.h>
 #include <react/debug/react_native_assert.h>
-
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/animations/conversions.h>
 #include <react/renderer/animations/utils.h>
 #include <react/renderer/components/image/ImageProps.h>
@@ -392,6 +392,14 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                 if (keyframe.type == AnimationConfigurationType::Update &&
                     mutation.newChildShadowView.tag > 0) {
                   keyframe.viewPrev = mutation.newChildShadowView;
+                  if (ReactNativeFeatureFlags::
+                          fixDifferentiatorEmittingUpdatesWithWrongParentTag()) {
+                    keyframe.parentTag = mutation.parentTag;
+                    react_native_assert(
+                        keyframe.finalMutationsForKeyFrame.size() == 1);
+                    keyframe.finalMutationsForKeyFrame[0].parentTag =
+                        mutation.parentTag;
+                  }
                 }
               }
             }
@@ -418,7 +426,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                     mutation.oldChildShadowView.tag > 0) {
                   executeMutationImmediately =
                       ShadowViewMutation::RemoveMutation(
-                          mutation.parentShadowView,
+                          mutation.parentTag,
                           keyframe.viewPrev,
                           mutation.index);
                 }
@@ -441,9 +449,9 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                   ? mutation.newChildShadowView
                   : viewStart);
           react_native_assert(viewFinal.tag > 0);
-          ShadowView parent = mutation.parentShadowView;
+          Tag parentTag = mutation.parentTag;
           react_native_assert(
-              parent.tag > 0 ||
+              parentTag > 0 ||
               mutation.type == ShadowViewMutation::Type::Update ||
               mutation.type == ShadowViewMutation::Type::Delete);
           Tag tag = viewStart.tag;
@@ -499,7 +507,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                 /* .finalMutationsForKeyFrame = */ {},
                 /* .type = */ AnimationConfigurationType::Create,
                 /* .tag = */ tag,
-                /* .parentView = */ parent,
+                /* .parentTag = */ parentTag,
                 /* .viewStart = */ viewStart,
                 /* .viewEnd = */ viewFinal,
                 /* .viewPrev = */ baselineShadowView,
@@ -537,7 +545,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                 /* .finalMutationsForKeyFrame = */ {mutation},
                 /* .type = */ AnimationConfigurationType::Update,
                 /* .tag = */ tag,
-                /* .parentView = */ parent,
+                /* .parentTag = */ parentTag,
                 /* .viewStart = */ viewStart,
                 /* .viewEnd = */ viewFinal,
                 /* .viewPrev = */ baselineShadowView,
@@ -623,7 +631,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                   /* .finalMutationsForKeyFrame */ {mutation, deleteMutation},
                   /* .type */ AnimationConfigurationType::Delete,
                   /* .tag */ tag,
-                  /* .parentView */ parent,
+                  /* .parentTag */ parentTag,
                   /* .viewStart */ viewStart,
                   /* .viewEnd */ viewFinal,
                   /* .viewPrev */ baselineShadowView,
@@ -1176,19 +1184,17 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
           break;
         case ShadowViewMutation::Type::Insert:
           mutationsList.push_back(ShadowViewMutation::InsertMutation(
-              finalMutation.parentShadowView,
+              finalMutation.parentTag,
               finalMutation.newChildShadowView,
               finalMutation.index));
           break;
         case ShadowViewMutation::Type::Remove:
           mutationsList.push_back(ShadowViewMutation::RemoveMutation(
-              finalMutation.parentShadowView, prev, finalMutation.index));
+              finalMutation.parentTag, prev, finalMutation.index));
           break;
         case ShadowViewMutation::Type::Update:
           mutationsList.push_back(ShadowViewMutation::UpdateMutation(
-              prev,
-              finalMutation.newChildShadowView,
-              finalMutation.parentShadowView));
+              prev, finalMutation.newChildShadowView, finalMutation.parentTag));
           break;
       }
       if (finalMutation.newChildShadowView.tag > 0) {
@@ -1213,7 +1219,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       auto mutatedShadowView =
           createInterpolatedShadowView(1, keyframe.viewStart, keyframe.viewEnd);
       auto generatedPenultimateMutation = ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, mutatedShadowView, keyframe.parentView);
+          keyframe.viewPrev, mutatedShadowView, keyframe.parentTag);
       react_native_assert(
           generatedPenultimateMutation.oldChildShadowView.tag > 0);
       react_native_assert(
@@ -1224,7 +1230,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       mutationsList.push_back(generatedPenultimateMutation);
 
       auto generatedMutation = ShadowViewMutation::UpdateMutation(
-          mutatedShadowView, keyframe.viewEnd, keyframe.parentView);
+          mutatedShadowView, keyframe.viewEnd, keyframe.parentTag);
       react_native_assert(generatedMutation.oldChildShadowView.tag > 0);
       react_native_assert(generatedMutation.newChildShadowView.tag > 0);
       PrintMutationInstruction(
@@ -1233,7 +1239,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       mutationsList.push_back(generatedMutation);
     } else {
       auto mutation = ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, keyframe.viewEnd, keyframe.parentView);
+          keyframe.viewPrev, keyframe.viewEnd, keyframe.parentTag);
       PrintMutationInstruction(
           logPrefix +
               "Animation Complete: Queuing up Final Synthetic Mutation:",
@@ -1292,7 +1298,7 @@ void LayoutAnimationKeyFrameManager::
 
       // Detect if they're in the same view hierarchy, but not equivalent
       // We've already detected direct conflicts and removed them.
-      if (animatedKeyFrame.parentView.tag != mutation.parentShadowView.tag) {
+      if (animatedKeyFrame.parentTag != mutation.parentTag) {
         continue;
       }
 
@@ -1397,7 +1403,7 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
 
       // Detect if they're in the same view hierarchy, but not equivalent
       // (We've already detected direct conflicts and handled them above)
-      if (animatedKeyFrame.parentView.tag != mutation.parentShadowView.tag) {
+      if (animatedKeyFrame.parentTag != mutation.parentTag) {
         continue;
       }
 
@@ -1511,8 +1517,8 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
         // we need to force deletion/removal to happen immediately.
         bool conflicting = animatedKeyFrame.tag == baselineTag ||
             (mutationIsCreateOrDelete &&
-             animatedKeyFrame.parentView.tag == baselineTag &&
-             animatedKeyFrame.parentView.tag != 0);
+             animatedKeyFrame.parentTag == baselineTag &&
+             animatedKeyFrame.parentTag != 0);
 
         // Conflicting animation detected: if we're mutating a tag under
         // animation, or deleting the parent of a tag under animation, or

package/ReactCommon/react/renderer/animations/primitives.h

@@ -70,7 +70,7 @@ struct AnimationKeyFrame {
   // Tag representing the node being animated.
   Tag tag;
 
-  ShadowView parentView;
+  Tag parentTag;
 
   // ShadowView representing the start and end points of this animation.
   ShadowView viewStart;

package/ReactCommon/react/renderer/animations/utils.h

@@ -20,8 +20,7 @@ static inline bool shouldFirstComeBeforeSecondRemovesOnly(
   // come first.
   return (lhs.type == ShadowViewMutation::Type::Remove &&
           lhs.type == rhs.type) &&
-      (lhs.parentShadowView.tag == rhs.parentShadowView.tag) &&
-      (lhs.index > rhs.index);
+      (lhs.parentTag == rhs.parentTag) && (lhs.index > rhs.index);
 }
 
 static inline void handleShouldFirstComeBeforeSecondRemovesOnly(
@@ -31,7 +30,7 @@ static inline void handleShouldFirstComeBeforeSecondRemovesOnly(
   ShadowViewMutation::List finalList;
   for (auto& mutation : list) {
     if (mutation.type == ShadowViewMutation::Type::Remove) {
-      auto key = std::to_string(mutation.parentShadowView.tag);
+      auto key = std::to_string(mutation.parentTag);
       removeMutationsByTag[key].push_back(mutation);
     } else {
       finalList.push_back(mutation);
@@ -104,7 +103,7 @@ static inline bool shouldFirstComeBeforeSecondMutation(
     // Make sure that removes on the same level are sorted - highest indices
     // must come first.
     if (lhs.type == ShadowViewMutation::Type::Remove &&
-        lhs.parentShadowView.tag == rhs.parentShadowView.tag) {
+        lhs.parentTag == rhs.parentTag) {
       if (lhs.index > rhs.index) {
         return true;
       } else {

package/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp

@@ -41,16 +41,38 @@ bool ParagraphAttributes::operator!=(const ParagraphAttributes& rhs) const {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
+  ParagraphAttributes paragraphAttributes{};
   return {
-      debugStringConvertibleItem("maximumNumberOfLines", maximumNumberOfLines),
-      debugStringConvertibleItem("ellipsizeMode", ellipsizeMode),
-      debugStringConvertibleItem("textBreakStrategy", textBreakStrategy),
-      debugStringConvertibleItem("adjustsFontSizeToFit", adjustsFontSizeToFit),
-      debugStringConvertibleItem("minimumFontSize", minimumFontSize),
-      debugStringConvertibleItem("maximumFontSize", maximumFontSize),
-      debugStringConvertibleItem("includeFontPadding", includeFontPadding),
-      debugStringConvertibleItem(
-          "android_hyphenationFrequency", android_hyphenationFrequency)};
+      debugStringConvertibleItem(
+          "maximumNumberOfLines",
+          maximumNumberOfLines,
+          paragraphAttributes.maximumNumberOfLines),
+      debugStringConvertibleItem(
+          "ellipsizeMode", ellipsizeMode, paragraphAttributes.ellipsizeMode),
+      debugStringConvertibleItem(
+          "textBreakStrategy",
+          textBreakStrategy,
+          paragraphAttributes.textBreakStrategy),
+      debugStringConvertibleItem(
+          "adjustsFontSizeToFit",
+          adjustsFontSizeToFit,
+          paragraphAttributes.adjustsFontSizeToFit),
+      debugStringConvertibleItem(
+          "minimumFontSize",
+          minimumFontSize,
+          paragraphAttributes.minimumFontSize),
+      debugStringConvertibleItem(
+          "maximumFontSize",
+          maximumFontSize,
+          paragraphAttributes.maximumFontSize),
+      debugStringConvertibleItem(
+          "includeFontPadding",
+          includeFontPadding,
+          paragraphAttributes.includeFontPadding),
+      debugStringConvertibleItem(
+          "android_hyphenationFrequency",
+          android_hyphenationFrequency,
+          paragraphAttributes.android_hyphenationFrequency)};
 }
 #endif
 

package/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -46,6 +46,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   allowFontScaling = textAttributes.allowFontScaling.has_value()
       ? textAttributes.allowFontScaling
       : allowFontScaling;
+  maxFontSizeMultiplier = !std::isnan(textAttributes.maxFontSizeMultiplier)
+      ? textAttributes.maxFontSizeMultiplier
+      : maxFontSizeMultiplier;
   dynamicTypeRamp = textAttributes.dynamicTypeRamp.has_value()
       ? textAttributes.dynamicTypeRamp
       : dynamicTypeRamp;
@@ -168,6 +171,7 @@ bool TextAttributes::operator==(const TextAttributes& rhs) const {
              rhs.accessibilityRole,
              rhs.role,
              rhs.textTransform) &&
+      floatEquality(maxFontSizeMultiplier, rhs.maxFontSizeMultiplier) &&
       floatEquality(opacity, rhs.opacity) &&
       floatEquality(fontSize, rhs.fontSize) &&
       floatEquality(fontSizeMultiplier, rhs.fontSizeMultiplier) &&
@@ -197,49 +201,101 @@ TextAttributes TextAttributes::defaultTextAttributes() {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
+  const auto& textAttributes = TextAttributes::defaultTextAttributes();
   return {
       // Color
-      debugStringConvertibleItem("backgroundColor", backgroundColor),
-      debugStringConvertibleItem("foregroundColor", foregroundColor),
-      debugStringConvertibleItem("opacity", opacity),
+      debugStringConvertibleItem(
+          "backgroundColor", backgroundColor, textAttributes.backgroundColor),
+      debugStringConvertibleItem(
+          "foregroundColor", foregroundColor, textAttributes.foregroundColor),
+      debugStringConvertibleItem("opacity", opacity, textAttributes.opacity),
 
       // Font
-      debugStringConvertibleItem("fontFamily", fontFamily),
-      debugStringConvertibleItem("fontSize", fontSize),
-      debugStringConvertibleItem("fontSizeMultiplier", fontSizeMultiplier),
-      debugStringConvertibleItem("fontWeight", fontWeight),
-      debugStringConvertibleItem("fontStyle", fontStyle),
-      debugStringConvertibleItem("fontVariant", fontVariant),
-      debugStringConvertibleItem("allowFontScaling", allowFontScaling),
-      debugStringConvertibleItem("dynamicTypeRamp", dynamicTypeRamp),
-      debugStringConvertibleItem("letterSpacing", letterSpacing),
+      debugStringConvertibleItem(
+          "fontFamily", fontFamily, textAttributes.fontFamily),
+      debugStringConvertibleItem("fontSize", fontSize, textAttributes.fontSize),
+      debugStringConvertibleItem(
+          "fontSizeMultiplier",
+          fontSizeMultiplier,
+          textAttributes.fontSizeMultiplier),
+      debugStringConvertibleItem(
+          "fontWeight", fontWeight, textAttributes.fontWeight),
+      debugStringConvertibleItem(
+          "fontStyle", fontStyle, textAttributes.fontStyle),
+      debugStringConvertibleItem(
+          "fontVariant", fontVariant, textAttributes.fontVariant),
+      debugStringConvertibleItem(
+          "allowFontScaling",
+          allowFontScaling,
+          textAttributes.allowFontScaling),
+      debugStringConvertibleItem(
+          "maxFontSizeMultiplier",
+          maxFontSizeMultiplier,
+          textAttributes.maxFontSizeMultiplier),
+      debugStringConvertibleItem(
+          "dynamicTypeRamp", dynamicTypeRamp, textAttributes.dynamicTypeRamp),
+      debugStringConvertibleItem(
+          "letterSpacing", letterSpacing, textAttributes.letterSpacing),
 
       // Paragraph Styles
-      debugStringConvertibleItem("lineHeight", lineHeight),
-      debugStringConvertibleItem("alignment", alignment),
-      debugStringConvertibleItem("baseWritingDirection", baseWritingDirection),
-      debugStringConvertibleItem("lineBreakStrategyIOS", lineBreakStrategy),
-      debugStringConvertibleItem("lineBreakModeIOS", lineBreakMode),
+      debugStringConvertibleItem(
+          "lineHeight", lineHeight, textAttributes.lineHeight),
+      debugStringConvertibleItem(
+          "alignment", alignment, textAttributes.alignment),
+      debugStringConvertibleItem(
+          "baseWritingDirection",
+          baseWritingDirection,
+          textAttributes.baseWritingDirection),
+      debugStringConvertibleItem(
+          "lineBreakStrategyIOS",
+          lineBreakStrategy,
+          textAttributes.lineBreakStrategy),
+      debugStringConvertibleItem(
+          "lineBreakModeIOS", lineBreakMode, textAttributes.lineBreakMode),
 
       // Decoration
-      debugStringConvertibleItem("textDecorationColor", textDecorationColor),
       debugStringConvertibleItem(
-          "textDecorationLineType", textDecorationLineType),
-      debugStringConvertibleItem("textDecorationStyle", textDecorationStyle),
+          "textDecorationColor",
+          textDecorationColor,
+          textAttributes.textDecorationColor),
+      debugStringConvertibleItem(
+          "textDecorationLineType",
+          textDecorationLineType,
+          textAttributes.textDecorationLineType),
+      debugStringConvertibleItem(
+          "textDecorationStyle",
+          textDecorationStyle,
+          textAttributes.textDecorationStyle),
 
       // Shadow
-      debugStringConvertibleItem("textShadowOffset", textShadowOffset),
-      debugStringConvertibleItem("textShadowRadius", textShadowRadius),
-      debugStringConvertibleItem("textShadowColor", textShadowColor),
+      debugStringConvertibleItem(
+          "textShadowOffset",
+          textShadowOffset,
+          textAttributes.textShadowOffset),
+      debugStringConvertibleItem(
+          "textShadowRadius",
+          textShadowRadius,
+          textAttributes.textShadowRadius),
+      debugStringConvertibleItem(
+          "textShadowColor", textShadowColor, textAttributes.textShadowColor),
 
       // Special
-      debugStringConvertibleItem("isHighlighted", isHighlighted),
-      debugStringConvertibleItem("isPressable", isPressable),
-      debugStringConvertibleItem("layoutDirection", layoutDirection),
-      debugStringConvertibleItem("accessibilityRole", accessibilityRole),
-      debugStringConvertibleItem("role", role),
+      debugStringConvertibleItem(
+          "isHighlighted", isHighlighted, textAttributes.isHighlighted),
+      debugStringConvertibleItem(
+          "isPressable", isPressable, textAttributes.isPressable),
+      debugStringConvertibleItem(
+          "layoutDirection", layoutDirection, textAttributes.layoutDirection),
+      debugStringConvertibleItem(
+          "accessibilityRole",
+          accessibilityRole,
+          textAttributes.accessibilityRole),
+      debugStringConvertibleItem("role", role, textAttributes.role),
 
-      debugStringConvertibleItem("textAlignVertical", textAlignVertical),
+      debugStringConvertibleItem(
+          "textAlignVertical",
+          textAlignVertical,
+          textAttributes.textAlignVertical),
   };
 }
 #endif

package/ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -51,6 +51,7 @@ class TextAttributes : public DebugStringConvertible {
   std::optional<FontStyle> fontStyle{};
   std::optional<FontVariant> fontVariant{};
   std::optional<bool> allowFontScaling{};
+  Float maxFontSizeMultiplier{std::numeric_limits<Float>::quiet_NaN()};
   std::optional<DynamicTypeRamp> dynamicTypeRamp{};
   Float letterSpacing{std::numeric_limits<Float>::quiet_NaN()};
   std::optional<TextTransform> textTransform{};
@@ -117,6 +118,7 @@ struct hash<facebook::react::TextAttributes> {
         textAttributes.opacity,
         textAttributes.fontFamily,
         textAttributes.fontSize,
+        textAttributes.maxFontSizeMultiplier,
         textAttributes.fontSizeMultiplier,
         textAttributes.fontWeight,
         textAttributes.fontStyle,

package/ReactCommon/react/renderer/attributedstring/conversions.h

@@ -910,6 +910,7 @@ constexpr static MapBuffer::Key TA_KEY_LINE_BREAK_STRATEGY = 25;
 constexpr static MapBuffer::Key TA_KEY_ROLE = 26;
 constexpr static MapBuffer::Key TA_KEY_TEXT_TRANSFORM = 27;
 constexpr static MapBuffer::Key TA_KEY_ALIGNMENT_VERTICAL = 28;
+constexpr static MapBuffer::Key TA_KEY_MAX_FONT_SIZE_MULTIPLIER = 29;
 
 // constants for ParagraphAttributes serialization
 constexpr static MapBuffer::Key PA_KEY_MAX_NUMBER_OF_LINES = 0;
@@ -1004,6 +1005,10 @@ inline MapBuffer toMapBuffer(const TextAttributes& textAttributes) {
     builder.putBool(
         TA_KEY_ALLOW_FONT_SCALING, *textAttributes.allowFontScaling);
   }
+  if (!std::isnan(textAttributes.maxFontSizeMultiplier)) {
+    builder.putDouble(
+        TA_KEY_MAX_FONT_SIZE_MULTIPLIER, textAttributes.maxFontSizeMultiplier);
+  }
   if (!std::isnan(textAttributes.letterSpacing)) {
     builder.putDouble(TA_KEY_LETTER_SPACING, textAttributes.letterSpacing);
   }

package/ReactCommon/react/renderer/componentregistry/CMakeLists.txt

@@ -23,7 +23,6 @@ target_link_libraries(react_render_componentregistry
         folly_runtime
         glog_init
         jsi
-        react_config
         react_debug
         react_render_core
         react_render_debug

package/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp

@@ -10,10 +10,13 @@
 
 namespace facebook::react {
 
+extern const char ImageManagerKey[] = "ImageManager";
+
 ImageComponentDescriptor::ImageComponentDescriptor(
     const ComponentDescriptorParameters& parameters)
     : ConcreteComponentDescriptor(parameters),
-      imageManager_(std::make_shared<ImageManager>(contextContainer_)){};
+      imageManager_(
+          getManagerByName<ImageManager>(contextContainer_, ImageManagerKey)){};
 
 void ImageComponentDescriptor::adopt(ShadowNode& shadowNode) const {
   ConcreteComponentDescriptor::adopt(shadowNode);

package/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h

@@ -14,6 +14,8 @@ namespace facebook::react {
 
 class ImageManager;
 
+extern const char ImageManagerKey[];
+
 /*
  * Descriptor for <Image> component.
  */

package/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp

@@ -17,8 +17,8 @@ void ImageEventEmitter::onLoad(const ImageSource& source) const {
   dispatchEvent("load", [source](jsi::Runtime& runtime) {
     auto src = jsi::Object(runtime);
     src.setProperty(runtime, "uri", source.uri);
-    src.setProperty(runtime, "width", source.size.width);
-    src.setProperty(runtime, "height", source.size.height);
+    src.setProperty(runtime, "width", source.size.width * source.scale);
+    src.setProperty(runtime, "height", source.size.height * source.scale);
     auto payload = jsi::Object(runtime);
     payload.setProperty(runtime, "source", src);
     return payload;

package/ReactCommon/react/renderer/components/image/ImageProps.cpp

@@ -107,14 +107,14 @@ ImageProps::ImageProps(
                     "resizeMultiplier",
                     sourceProps.resizeMultiplier,
                     {})),
-      shouldNotify(
+      shouldNotifyLoadEvents(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
-              ? sourceProps.shouldNotify
+              ? sourceProps.shouldNotifyLoadEvents
               : convertRawProp(
                     context,
                     rawProps,
-                    "shouldNotify",
-                    sourceProps.shouldNotify,
+                    "shouldNotifyLoadEvents",
+                    sourceProps.shouldNotifyLoadEvents,
                     {})),
       overlayColor(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
@@ -167,7 +167,7 @@ void ImageProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(internal_analyticTag);
     RAW_SET_PROP_SWITCH_CASE_BASIC(resizeMethod);
     RAW_SET_PROP_SWITCH_CASE_BASIC(resizeMultiplier);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(shouldNotify);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(shouldNotifyLoadEvents);
     RAW_SET_PROP_SWITCH_CASE_BASIC(overlayColor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(fadeDuration);
     RAW_SET_PROP_SWITCH_CASE_BASIC(progressiveRenderingEnabled);

package/ReactCommon/react/renderer/components/image/ImageProps.h

@@ -41,7 +41,7 @@ class ImageProps final : public ViewProps {
   std::string internal_analyticTag{};
   std::string resizeMethod{};
   Float resizeMultiplier{};
-  bool shouldNotify{};
+  bool shouldNotifyLoadEvents{};
   SharedColor overlayColor{};
   Float fadeDuration{};
   bool progressiveRenderingEnabled{};

package/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp

@@ -10,6 +10,7 @@
 
 #include <react/renderer/components/image/ImageShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/imagemanager/ImageRequestParams.h>
 #include "ImageState.h"
 
 namespace facebook::react {
@@ -24,20 +25,47 @@ void ImageShadowNode::setImageManager(const SharedImageManager& imageManager) {
 void ImageShadowNode::updateStateIfNeeded() {
   ensureUnsealed();
 
-  auto imageSource = getImageSource();
-  const auto& currentState = getStateData();
-  bool hasSameRadius =
-      getConcreteProps().blurRadius == currentState.getBlurRadius();
-  bool hasSameImageSource = currentState.getImageSource() == imageSource;
-
-  if (hasSameImageSource && hasSameRadius) {
+  const auto& savedState = getStateData();
+  const auto& oldImageSource = savedState.getImageSource();
+  auto newImageSource = getImageSource();
+  const auto& oldImageRequestParams = savedState.getImageRequestParams();
+  const auto& imageProps = getConcreteProps();
+  const auto& newImageRequestParams = ImageRequestParams(
+      imageProps.blurRadius
+#ifdef ANDROID
+      ,
+      imageProps.defaultSource,
+      imageProps.resizeMode,
+      imageProps.resizeMethod,
+      // TODO: should we resizeMultiplier * imageSource.scale ?
+      imageProps.resizeMultiplier,
+      imageProps.shouldNotifyLoadEvents,
+      imageProps.overlayColor,
+      imageProps.tintColor,
+      imageProps.fadeDuration,
+      imageProps.progressiveRenderingEnabled,
+      imageProps.loadingIndicatorSource,
+      imageProps.internal_analyticTag
+#endif
+  );
+
+  if (oldImageSource == newImageSource &&
+      oldImageRequestParams == newImageRequestParams) {
     return;
   }
 
   auto state = ImageState{
-      imageSource,
-      imageManager_->requestImage(imageSource, getSurfaceId()),
-      getConcreteProps().blurRadius};
+      newImageSource,
+      imageManager_->requestImage(
+          newImageSource,
+          getSurfaceId()
+#ifdef ANDROID
+              ,
+          newImageRequestParams,
+          getTag()
+#endif
+              ),
+      newImageRequestParams};
   setStateData(std::move(state));
 }
 

package/ReactCommon/react/renderer/components/image/ImageShadowNode.h

@@ -46,7 +46,7 @@ class ImageShadowNode final : public ConcreteViewShadowNode<
       const ShadowNodeFamily::Shared& /*family*/,
       const ComponentDescriptor& componentDescriptor) {
     auto imageSource = ImageSource{ImageSource::Type::Invalid};
-    return {imageSource, {imageSource, nullptr}, 0};
+    return {imageSource, {imageSource, nullptr}, {}};
   }
 
 #pragma mark - LayoutableShadowNode

package/ReactCommon/react/renderer/components/image/ImageState.cpp

@@ -16,9 +16,8 @@ ImageSource ImageState::getImageSource() const {
 const ImageRequest& ImageState::getImageRequest() const {
   return *imageRequest_;
 }
-
-Float ImageState::getBlurRadius() const {
-  return blurRadius_;
+const ImageRequestParams& ImageState::getImageRequestParams() const {
+  return imageRequestParams_;
 }
 
 } // namespace facebook::react