diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index d9e3b901824..6f84e8e24a4 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -413,7 +413,8 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu auto *scrollView = (RCTEnhancedScrollView *)_scrollView; if (oldScrollViewProps.snapToAlignment != newScrollViewProps.snapToAlignment) { - scrollView.snapToAlignment = RCTNSStringFromString(toString(newScrollViewProps.snapToAlignment)); + scrollView.snapToAlignment = + RCTNSStringFromString(toString(newScrollViewProps.snapToAlignment.value_or(ScrollViewSnapToAlignment::Start))); } scrollView.snapToStart = newScrollViewProps.snapToStart; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp index cb5407ea853..5b6f2863435 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp @@ -80,7 +80,7 @@ BaseScrollViewProps::BaseScrollViewProps( rawProps, "decelerationRate", sourceProps.decelerationRate, - (Float)0.998)), + kDefaultDecelerationRate)), endDraggingSensitivityMultiplier(convertRawProp( context, rawProps, @@ -427,10 +427,7 @@ SharedDebugStringConvertibleList BaseScrollViewProps::getDebugProps() const { "snapToInterval", snapToInterval, defaultScrollViewProps.snapToInterval), - debugStringConvertibleItem( - "snapToAlignment", - snapToAlignment, - defaultScrollViewProps.snapToAlignment), + debugStringConvertibleItem("snapToAlignment", snapToAlignment), debugStringConvertibleItem( "disableIntervalMomentum", disableIntervalMomentum, diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h index 3a3ebbe84b9..4e4b5d44785 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h @@ -41,7 +41,13 @@ class BaseScrollViewProps : public ViewProps { bool automaticallyAdjustContentInsets{}; bool automaticallyAdjustsScrollIndicatorInsets{true}; bool automaticallyAdjustKeyboardInsets{false}; - Float decelerationRate{0.998f}; +#ifdef ANDROID + // ReactScrollView's initial rate. + static constexpr Float kDefaultDecelerationRate = 0.985f; +#else + static constexpr Float kDefaultDecelerationRate = 0.998f; +#endif + Float decelerationRate{kDefaultDecelerationRate}; Float endDraggingSensitivityMultiplier{1}; bool directionalLockEnabled{}; ScrollViewIndicatorStyle indicatorStyle{}; @@ -63,7 +69,7 @@ class BaseScrollViewProps : public ViewProps { Point contentOffset{}; EdgeInsets scrollIndicatorInsets{}; Float snapToInterval{}; - ScrollViewSnapToAlignment snapToAlignment{}; + std::optional snapToAlignment{}; bool disableIntervalMomentum{false}; std::vector snapToOffsets{}; bool snapToStart{true}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp index a9a83ef67db..2aa02d73854 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp @@ -49,7 +49,13 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps( rawProps, "endFillColor", sourceProps.endFillColor, - clearColor())) {} + clearColor())), + scrollsChildToFocus(convertRawProp( + context, + rawProps, + "scrollsChildToFocus", + sourceProps.scrollsChildToFocus, + true)) {} void HostPlatformScrollViewProps::setProp( const PropsParserContext& context, @@ -69,6 +75,7 @@ void HostPlatformScrollViewProps::setProp( RAW_SET_PROP_SWITCH_CASE_BASIC(fadingEdgeLength); RAW_SET_PROP_SWITCH_CASE_BASIC(overScrollMode); RAW_SET_PROP_SWITCH_CASE_BASIC(endFillColor); + RAW_SET_PROP_SWITCH_CASE_BASIC(scrollsChildToFocus); } } @@ -96,7 +103,11 @@ SharedDebugStringConvertibleList HostPlatformScrollViewProps::getDebugProps() debugStringConvertibleItem( "endFillColor", endFillColor, - defaultScrollViewProps.endFillColor)}; + defaultScrollViewProps.endFillColor), + debugStringConvertibleItem( + "scrollsChildToFocus", + scrollsChildToFocus, + defaultScrollViewProps.scrollsChildToFocus)}; } #endif @@ -301,17 +312,9 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps( } if (snapToAlignment != oldProps->snapToAlignment) { - switch (snapToAlignment) { - case ScrollViewSnapToAlignment::Start: - result["snapToAlignment"] = "start"; - break; - case ScrollViewSnapToAlignment::Center: - result["snapToAlignment"] = "center"; - break; - case ScrollViewSnapToAlignment::End: - result["snapToAlignment"] = "end"; - break; - } + result["snapToAlignment"] = snapToAlignment.has_value() + ? toString(*snapToAlignment) + : folly::dynamic(nullptr); } if (disableIntervalMomentum != oldProps->disableIntervalMomentum) { @@ -380,6 +383,10 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps( result["endFillColor"] = *endFillColor; } + if (scrollsChildToFocus != oldProps->scrollsChildToFocus) { + result["scrollsChildToFocus"] = scrollsChildToFocus; + } + return result; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h index 7ac321ec89f..49fcc1cb7f7 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h @@ -38,6 +38,7 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps { folly::dynamic fadingEdgeLength{}; std::string overScrollMode{"auto"}; SharedColor endFillColor{clearColor()}; + bool scrollsChildToFocus{true}; #pragma mark - DebugStringConvertible diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewPropsDiffTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewPropsDiffTest.cpp new file mode 100644 index 00000000000..8c46c2b2db8 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewPropsDiffTest.cpp @@ -0,0 +1,70 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include + +#include +#include + +#ifdef RN_SERIALIZABLE_STATE + +namespace facebook::react { + +namespace { + +using folly::dynamic; + +void expectPayloads(const std::vector& commits) { + expectPayloadsMatchRawProps(commits); +} + +} // namespace + +// ReactScrollViewManager has a setter for it; with +// enableExclusivePropsUpdateAndroid there is no rawProps fallback. +TEST(ScrollViewPropsDiffTest, emitsScrollsChildToFocus) { + expectPayloads({{dynamic::object("scrollsChildToFocus", false)}}); +} + +// Android ScrollViews start with snapping alignment disabled, and +// setSnapToAlignment disables it for null. +TEST( + ScrollViewPropsDiffTest, + keepsAnExplicitSnapToAlignmentStartApartFromUnset) { + expectPayloads({ + {dynamic::object("snapToAlignment", "start")}, + {dynamic::object("snapToAlignment", "center")}, + {dynamic::object("snapToAlignment", nullptr)}, + }); +} + +// Android ScrollViews start decelerating at 0.985 (ReactScrollViewHelper). +// A removed rate restores it; Props 1.5 sends null, which the setter reads as +// 0. +TEST(ScrollViewPropsDiffTest, emitsAnExplicitDecelerationRate) { + expectPayloads({ + {dynamic::object("decelerationRate", 0.998)}, + {dynamic::object("decelerationRate", nullptr), + dynamic::object("decelerationRate", 0.985)}, + }); +} + +// The ScrollView managers turn both off for null. +TEST(ScrollViewPropsDiffTest, removingNestedScrollAndMomentumEventsEmitsFalse) { + expectPayloads({ + {dynamic::object("nestedScrollEnabled", true)( + "sendMomentumEvents", true)}, + {dynamic::object("nestedScrollEnabled", nullptr)( + "sendMomentumEvents", nullptr), + dynamic::object("nestedScrollEnabled", false)( + "sendMomentumEvents", false)}, + }); +} + +} // namespace facebook::react + +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp index 135463aa2d0..407445b5a6b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp @@ -13,6 +13,8 @@ #include #include +#include + namespace facebook::react { static TextAttributes convertRawProp( @@ -436,7 +438,9 @@ void BaseTextProps::appendTextAttributesProps( if (!floatEquality( textAttributes.letterSpacing, oldProps->textAttributes.letterSpacing)) { - result["letterSpacing"] = textAttributes.letterSpacing; + result["letterSpacing"] = std::isnan(textAttributes.letterSpacing) + ? folly::dynamic(nullptr) + : textAttributes.letterSpacing; } if (textAttributes.textTransform != oldProps->textAttributes.textTransform) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphPropsDiffTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphPropsDiffTest.cpp new file mode 100644 index 00000000000..96ede0ca8e1 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphPropsDiffTest.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include + +#include +#include + +#ifdef RN_SERIALIZABLE_STATE + +namespace facebook::react { + +using folly::dynamic; + +// ReactTextViewManager resets letterSpacing to 0 for null; +// ReactTextView.setLetterSpacing ignores NaN. +TEST(ParagraphPropsDiffTest, removingLetterSpacingEmitsNull) { + expectPayloadsMatchRawProps({ + {dynamic::object("letterSpacing", 4.0)}, + {dynamic::object("letterSpacing", nullptr)}, + }); +} + +} // namespace facebook::react + +#endif diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api index 02764f509d5..18ddfbbbca4 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api @@ -1439,8 +1439,9 @@ class facebook::react::BaseScrollViewProps : public facebook::react::HostPlatfor public facebook::react::Point contentOffset; public facebook::react::ScrollViewIndicatorStyle indicatorStyle; public facebook::react::ScrollViewKeyboardDismissMode keyboardDismissMode; - public facebook::react::ScrollViewSnapToAlignment snapToAlignment; + public static constexpr facebook::react::Float kDefaultDecelerationRate; public std::optional maintainVisibleContentPosition; + public std::optional snapToAlignment; public std::vector snapToOffsets; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } @@ -2049,6 +2050,7 @@ class facebook::react::HostPlatformScrollViewProps : public facebook::react::Bas public HostPlatformScrollViewProps() = default; public HostPlatformScrollViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformScrollViewProps& sourceProps, const facebook::react::RawProps& rawProps); public bool nestedScrollEnabled; + public bool scrollsChildToFocus; public bool sendMomentumEvents; public facebook::react::SharedColor endFillColor; public folly::dynamic fadingEdgeLength; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api index 535f7407c0a..aebfecbad2b 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api @@ -4026,8 +4026,9 @@ class facebook::react::BaseScrollViewProps : public facebook::react::HostPlatfor public facebook::react::Point contentOffset; public facebook::react::ScrollViewIndicatorStyle indicatorStyle; public facebook::react::ScrollViewKeyboardDismissMode keyboardDismissMode; - public facebook::react::ScrollViewSnapToAlignment snapToAlignment; + public static constexpr facebook::react::Float kDefaultDecelerationRate; public std::optional maintainVisibleContentPosition; + public std::optional snapToAlignment; public std::vector snapToOffsets; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } diff --git a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api index e85fe6f6fe5..7837bbde743 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api @@ -780,8 +780,9 @@ class facebook::react::BaseScrollViewProps : public facebook::react::HostPlatfor public facebook::react::Point contentOffset; public facebook::react::ScrollViewIndicatorStyle indicatorStyle; public facebook::react::ScrollViewKeyboardDismissMode keyboardDismissMode; - public facebook::react::ScrollViewSnapToAlignment snapToAlignment; + public static constexpr Float kDefaultDecelerationRate; public std::optional maintainVisibleContentPosition; + public std::optional snapToAlignment; public std::vector snapToOffsets; public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); }