Skip to content

Make Image fadeDuration and progressiveRenderingEnabled optional in C++ #58863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bartlomiejbloniarz wants to merge 1 commit into from
Closed

Make Image fadeDuration and progressiveRenderingEnabled optional in C++ #58863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...act-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public constructor(
view.setProgressiveRenderingEnabled(enabled)
}

@ReactProp(name = "fadeDuration")
@ReactProp(name = "fadeDuration", defaultInt = -1)
public fun setFadeDuration(view: ReactImageView, durationMs: Int) {
view.setFadeDuration(durationMs)
}
Expand Down
8 changes: 6 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,15 @@ folly::dynamic ImageProps::getDiffProps(const Props* prevProps) const {
}

if (fadeDuration != oldProps->fadeDuration) {
result["fadeDuration"] = fadeDuration;
result["fadeDuration"] =
fadeDuration.has_value() ? folly::dynamic(*fadeDuration) : nullptr;
}

if (progressiveRenderingEnabled != oldProps->progressiveRenderingEnabled) {
result["progressiveRenderingEnabled"] = progressiveRenderingEnabled;
result["progressiveRenderingEnabled"] =
progressiveRenderingEnabled.has_value()
? folly::dynamic(*progressiveRenderingEnabled)
: nullptr;
}

return result;
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class ImageProps final : public ViewProps {
Float resizeMultiplier{1.f};
bool shouldNotifyLoadEvents{};
SharedColor overlayColor{};
Float fadeDuration{300.f};
bool progressiveRenderingEnabled{};
std::optional<Float> fadeDuration{};
std::optional<bool> progressiveRenderingEnabled{};

#ifdef RN_SERIALIZABLE_STATE
ComponentName getDiffPropsImplementationTarget() const override;
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ void ImageShadowNode::updateStateIfNeeded() {
imageProps.shouldNotifyLoadEvents,
imageProps.overlayColor,
imageProps.tintColor,
imageProps.fadeDuration,
imageProps.progressiveRenderingEnabled,
imageProps.fadeDuration.value_or(300.f),
imageProps.progressiveRenderingEnabled.value_or(false),
imageProps.loadingIndicatorSource,
imageProps.internal_analyticTag,
Size{
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,17 +2573,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public virtual facebook::react::ComponentName getDiffPropsImplementationTarget() const override;
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2555,17 +2555,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public virtual facebook::react::ComponentName getDiffPropsImplementationTarget() const override;
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2570,17 +2570,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public virtual facebook::react::ComponentName getDiffPropsImplementationTarget() const override;
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4954,17 +4954,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4929,17 +4929,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4951,17 +4951,17 @@ class facebook::react::ImageManager {
class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::Float blurRadius;
public facebook::react::Float fadeDuration;
public facebook::react::Float resizeMultiplier;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::Float> fadeDuration;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,18 +1708,18 @@ class facebook::react::ImageManager {

class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public Float blurRadius;
public Float fadeDuration;
public Float resizeMultiplier;
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<Float> fadeDuration;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,18 +1691,18 @@ class facebook::react::ImageManager {

class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public Float blurRadius;
public Float fadeDuration;
public Float resizeMultiplier;
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<Float> fadeDuration;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
4 changes: 2 additions & 2 deletions scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,18 +1705,18 @@ class facebook::react::ImageManager {

class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps {
public Float blurRadius;
public Float fadeDuration;
public Float resizeMultiplier;
public ImageProps() = default;
public ImageProps(const facebook::react::PropsParserContext& context, const facebook::react::ImageProps& sourceProps, const facebook::react::RawProps& rawProps);
public bool progressiveRenderingEnabled;
public bool shouldNotifyLoadEvents;
public facebook::react::EdgeInsets capInsets;
public facebook::react::ImageResizeMode resizeMode;
public facebook::react::ImageSource defaultSource;
public facebook::react::ImageSource loadingIndicatorSource;
public facebook::react::ImageSources sources;
public facebook::react::SharedColor overlayColor;
public std::optional<Float> fadeDuration;
public std::optional<bool> progressiveRenderingEnabled;
public std::optional<facebook::react::SharedColor> tintColor;
public std::string resizeMethod;
public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value);
Expand Down
Loading