From c9ac94a000c4d01c3fed7da3bbff1ba641097dea Mon Sep 17 00:00:00 2001 From: Dmitry Rykun Date: Fri, 6 Dec 2024 12:06:33 -0800 Subject: [PATCH] Rename shouldNotify to shouldNotifyLoadEvents (#48100) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/48100 This diff renames `shouldNotify` to `shouldNotifyLoadEvents` as it is named in the spec. Changelog: [Internal] Reviewed By: javache Differential Revision: D66769660 fbshipit-source-id: 64282c08ab82101d51dedb583e0c34476ed90eeb --- .../react/renderer/components/image/ImageProps.cpp | 10 +++++----- .../react/renderer/components/image/ImageProps.h | 2 +- .../renderer/components/image/ImageShadowNode.cpp | 2 +- .../react/renderer/imagemanager/ImageRequestParams.h | 10 +++++----- .../android/react/renderer/imagemanager/conversions.h | 3 ++- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp index ecfa39dfb16..2715e3b3fb1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp +++ b/packages/react-native/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); diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h index 61e1f46f958..60c0863ea03 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h +++ b/packages/react-native/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{}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp index 5fda3ac141a..23b1429eddd 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp @@ -39,7 +39,7 @@ void ImageShadowNode::updateStateIfNeeded() { imageProps.resizeMethod, // TODO: should we resizeMultiplier * imageSource.scale ? imageProps.resizeMultiplier, - imageProps.shouldNotify, + imageProps.shouldNotifyLoadEvents, imageProps.overlayColor, imageProps.tintColor, imageProps.fadeDuration, diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h index 6036262de2e..d66feae53ff 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h @@ -24,7 +24,7 @@ class ImageRequestParams { ImageResizeMode resizeMode, std::string resizeMethod, Float resizeMultiplier, - bool shouldNotify, + bool shouldNotifyLoadEvents, SharedColor overlayColor, SharedColor tintColor, Float fadeDuration, @@ -36,7 +36,7 @@ class ImageRequestParams { resizeMode(resizeMode), resizeMethod(std::move(resizeMethod)), resizeMultiplier(resizeMultiplier), - shouldNotify(shouldNotify), + shouldNotifyLoadEvents(shouldNotifyLoadEvents), overlayColor(overlayColor), tintColor(tintColor), fadeDuration(fadeDuration), @@ -49,7 +49,7 @@ class ImageRequestParams { ImageResizeMode resizeMode{ImageResizeMode::Stretch}; std::string resizeMethod{}; Float resizeMultiplier{}; - bool shouldNotify{}; + bool shouldNotifyLoadEvents{}; SharedColor overlayColor{}; SharedColor tintColor{}; Float fadeDuration{}; @@ -64,7 +64,7 @@ class ImageRequestParams { this->resizeMode, this->resizeMethod, this->resizeMultiplier, - this->shouldNotify, + this->shouldNotifyLoadEvents, this->overlayColor, this->tintColor, this->fadeDuration, @@ -77,7 +77,7 @@ class ImageRequestParams { rhs.resizeMode, rhs.resizeMethod, rhs.resizeMultiplier, - rhs.shouldNotify, + rhs.shouldNotifyLoadEvents, rhs.overlayColor, rhs.tintColor, rhs.fadeDuration, diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h index 1eac2a62398..7f24a575b27 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h @@ -69,7 +69,8 @@ inline void serializeImageRequestParams( builder.putDouble( IS_KEY_RESIZE_MULTIPLIER, imageRequestParams.resizeMultiplier); builder.putBool( - IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS, imageRequestParams.shouldNotify); + IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS, + imageRequestParams.shouldNotifyLoadEvents); if (isColorMeaningful(imageRequestParams.overlayColor)) { builder.putInt( IS_KEY_OVERLAY_COLOR, toAndroidRepr(imageRequestParams.overlayColor));