react-native-tvos 0.81.4-0 → 0.82.0-0

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.cpp

@@ -10,16 +10,62 @@
 
 #include <react/renderer/components/FBReactNativeSpec/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
 
 namespace facebook::react {
 
+VirtualViewExperimentalProps::VirtualViewExperimentalProps(
+    const PropsParserContext &context,
+    const VirtualViewExperimentalProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    initialHidden(convertRawProp(context, rawProps, "initialHidden", sourceProps.initialHidden, {false})),
+    renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})) {}
+    
+#ifdef RN_SERIALIZABLE_STATE
+ComponentName VirtualViewExperimentalProps::getDiffPropsImplementationTarget() const {
+  return "VirtualViewExperimental";
+}
+
+folly::dynamic VirtualViewExperimentalProps::getDiffProps(
+    const Props* prevProps) const {
+  static const auto defaultProps = VirtualViewExperimentalProps();
+  const VirtualViewExperimentalProps* oldProps = prevProps == nullptr
+      ? &defaultProps
+      : static_cast<const VirtualViewExperimentalProps*>(prevProps);
+  if (this == oldProps) {
+    return folly::dynamic::object();
+  }
+  folly::dynamic result = HostPlatformViewProps::getDiffProps(prevProps);
+  
+  if (initialHidden != oldProps->initialHidden) {
+    result["initialHidden"] = initialHidden;
+  }
+    
+  if (renderState != oldProps->renderState) {
+    result["renderState"] = renderState;
+  }
+  return result;
+}
+#endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList VirtualViewExperimentalProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("initialHidden", initialHidden, false),
+			debugStringConvertibleItem("renderState", renderState, 0)
+	};
+}
+#endif
 VirtualViewProps::VirtualViewProps(
     const PropsParserContext &context,
     const VirtualViewProps &sourceProps,
     const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
     initialHidden(convertRawProp(context, rawProps, "initialHidden", sourceProps.initialHidden, {false})),
+    removeClippedSubviews(convertRawProp(context, rawProps, "removeClippedSubviews", sourceProps.removeClippedSubviews, {false})),
     renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
@@ -42,12 +88,26 @@ folly::dynamic VirtualViewProps::getDiffProps(
     result["initialHidden"] = initialHidden;
   }
     
+  if (removeClippedSubviews != oldProps->removeClippedSubviews) {
+    result["removeClippedSubviews"] = removeClippedSubviews;
+  }
+    
   if (renderState != oldProps->renderState) {
     result["renderState"] = renderState;
   }
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList VirtualViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("initialHidden", initialHidden, false),
+			debugStringConvertibleItem("removeClippedSubviews", removeClippedSubviews, false),
+			debugStringConvertibleItem("renderState", renderState, 0)
+	};
+}
+#endif
 ActivityIndicatorViewProps::ActivityIndicatorViewProps(
     const PropsParserContext &context,
     const ActivityIndicatorViewProps &sourceProps,
@@ -92,6 +152,17 @@ folly::dynamic ActivityIndicatorViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ActivityIndicatorViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("hidesWhenStopped", hidesWhenStopped, true),
+			debugStringConvertibleItem("animating", animating, true),
+			debugStringConvertibleItem("color", color),
+			debugStringConvertibleItem("size", size, ActivityIndicatorViewSize::Small)
+	};
+}
+#endif
 AndroidDrawerLayoutProps::AndroidDrawerLayoutProps(
     const PropsParserContext &context,
     const AndroidDrawerLayoutProps &sourceProps,
@@ -146,6 +217,19 @@ folly::dynamic AndroidDrawerLayoutProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList AndroidDrawerLayoutProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("keyboardDismissMode", keyboardDismissMode, AndroidDrawerLayoutKeyboardDismissMode::None),
+			debugStringConvertibleItem("drawerBackgroundColor", drawerBackgroundColor),
+			debugStringConvertibleItem("drawerPosition", drawerPosition, AndroidDrawerLayoutDrawerPosition::Left),
+			debugStringConvertibleItem("drawerWidth", drawerWidth),
+			debugStringConvertibleItem("drawerLockMode", drawerLockMode, AndroidDrawerLayoutDrawerLockMode::Unlocked),
+			debugStringConvertibleItem("statusBarBackgroundColor", statusBarBackgroundColor)
+	};
+}
+#endif
 AndroidHorizontalScrollContentViewProps::AndroidHorizontalScrollContentViewProps(
     const PropsParserContext &context,
     const AndroidHorizontalScrollContentViewProps &sourceProps,
@@ -175,6 +259,14 @@ folly::dynamic AndroidHorizontalScrollContentViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList AndroidHorizontalScrollContentViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("removeClippedSubviews", removeClippedSubviews, false)
+	};
+}
+#endif
 AndroidSwipeRefreshLayoutProps::AndroidSwipeRefreshLayoutProps(
     const PropsParserContext &context,
     const AndroidSwipeRefreshLayoutProps &sourceProps,
@@ -229,6 +321,19 @@ folly::dynamic AndroidSwipeRefreshLayoutProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList AndroidSwipeRefreshLayoutProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("enabled", enabled, true),
+			debugStringConvertibleItem("colors", colors),
+			debugStringConvertibleItem("progressBackgroundColor", progressBackgroundColor),
+			debugStringConvertibleItem("size", size, AndroidSwipeRefreshLayoutSize::Default),
+			debugStringConvertibleItem("progressViewOffset", progressViewOffset, 0.0),
+			debugStringConvertibleItem("refreshing", refreshing, false)
+	};
+}
+#endif
 AndroidSwitchProps::AndroidSwitchProps(
     const PropsParserContext &context,
     const AndroidSwitchProps &sourceProps,
@@ -298,6 +403,22 @@ folly::dynamic AndroidSwitchProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList AndroidSwitchProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("disabled", disabled, false),
+			debugStringConvertibleItem("enabled", enabled, true),
+			debugStringConvertibleItem("thumbColor", thumbColor),
+			debugStringConvertibleItem("trackColorForFalse", trackColorForFalse),
+			debugStringConvertibleItem("trackColorForTrue", trackColorForTrue),
+			debugStringConvertibleItem("value", value, false),
+			debugStringConvertibleItem("on", on, false),
+			debugStringConvertibleItem("thumbTintColor", thumbTintColor),
+			debugStringConvertibleItem("trackTintColor", trackTintColor)
+	};
+}
+#endif
 DebuggingOverlayProps::DebuggingOverlayProps(
     const PropsParserContext &context,
     const DebuggingOverlayProps &sourceProps,
@@ -324,6 +445,11 @@ folly::dynamic DebuggingOverlayProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList DebuggingOverlayProps::getDebugProps() const {
+  return ViewProps::getDebugProps();
+}
+#endif
 AndroidProgressBarProps::AndroidProgressBarProps(
     const PropsParserContext &context,
     const AndroidProgressBarProps &sourceProps,
@@ -335,7 +461,7 @@ AndroidProgressBarProps::AndroidProgressBarProps(
     progress(convertRawProp(context, rawProps, "progress", sourceProps.progress, {0.0})),
     animating(convertRawProp(context, rawProps, "animating", sourceProps.animating, {true})),
     color(convertRawProp(context, rawProps, "color", sourceProps.color, {})),
-    testID(convertRawProp(context, rawProps, "testID", sourceProps.testID, {""})) {}
+    testID(convertRawProp(context, rawProps, "testID", sourceProps.testID, {std::string{""}})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
 ComponentName AndroidProgressBarProps::getDiffPropsImplementationTarget() const {
@@ -383,6 +509,20 @@ folly::dynamic AndroidProgressBarProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList AndroidProgressBarProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("styleAttr", styleAttr),
+			debugStringConvertibleItem("typeAttr", typeAttr),
+			debugStringConvertibleItem("indeterminate", indeterminate, false),
+			debugStringConvertibleItem("progress", progress, 0.0),
+			debugStringConvertibleItem("animating", animating, true),
+			debugStringConvertibleItem("color", color),
+			debugStringConvertibleItem("testID", testID, std::string{""})
+	};
+}
+#endif
 PullToRefreshViewProps::PullToRefreshViewProps(
     const PropsParserContext &context,
     const PullToRefreshViewProps &sourceProps,
@@ -432,6 +572,18 @@ folly::dynamic PullToRefreshViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList PullToRefreshViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("tintColor", tintColor),
+			debugStringConvertibleItem("titleColor", titleColor),
+			debugStringConvertibleItem("title", title),
+			debugStringConvertibleItem("progressViewOffset", progressViewOffset, 0.0),
+			debugStringConvertibleItem("refreshing", refreshing, false)
+	};
+}
+#endif
 InputAccessoryProps::InputAccessoryProps(
     const PropsParserContext &context,
     const InputAccessoryProps &sourceProps,
@@ -461,6 +613,14 @@ folly::dynamic InputAccessoryProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList InputAccessoryProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("backgroundColor", backgroundColor)
+	};
+}
+#endif
 ModalHostViewProps::ModalHostViewProps(
     const PropsParserContext &context,
     const ModalHostViewProps &sourceProps,
@@ -540,6 +700,24 @@ folly::dynamic ModalHostViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ModalHostViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("animationType", animationType, ModalHostViewAnimationType::None),
+			debugStringConvertibleItem("presentationStyle", presentationStyle, ModalHostViewPresentationStyle::FullScreen),
+			debugStringConvertibleItem("transparent", transparent, false),
+			debugStringConvertibleItem("statusBarTranslucent", statusBarTranslucent, false),
+			debugStringConvertibleItem("navigationBarTranslucent", navigationBarTranslucent, false),
+			debugStringConvertibleItem("hardwareAccelerated", hardwareAccelerated, false),
+			debugStringConvertibleItem("visible", visible, false),
+			debugStringConvertibleItem("animated", animated, false),
+			debugStringConvertibleItem("allowSwipeDismissal", allowSwipeDismissal, false),
+			debugStringConvertibleItem("supportedOrientations", supportedOrientations, static_cast<ModalHostViewSupportedOrientationsMask>(ModalHostViewSupportedOrientations::Portrait)),
+			debugStringConvertibleItem("identifier", identifier, 0)
+	};
+}
+#endif
 SafeAreaViewProps::SafeAreaViewProps(
     const PropsParserContext &context,
     const SafeAreaViewProps &sourceProps,
@@ -566,6 +744,11 @@ folly::dynamic SafeAreaViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList SafeAreaViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps();
+}
+#endif
 SwitchProps::SwitchProps(
     const PropsParserContext &context,
     const SwitchProps &sourceProps,
@@ -630,12 +813,27 @@ folly::dynamic SwitchProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList SwitchProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("disabled", disabled, false),
+			debugStringConvertibleItem("value", value, false),
+			debugStringConvertibleItem("tintColor", tintColor),
+			debugStringConvertibleItem("onTintColor", onTintColor),
+			debugStringConvertibleItem("thumbTintColor", thumbTintColor),
+			debugStringConvertibleItem("thumbColor", thumbColor),
+			debugStringConvertibleItem("trackColorForFalse", trackColorForFalse),
+			debugStringConvertibleItem("trackColorForTrue", trackColorForTrue)
+	};
+}
+#endif
 UnimplementedNativeViewProps::UnimplementedNativeViewProps(
     const PropsParserContext &context,
     const UnimplementedNativeViewProps &sourceProps,
     const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    name(convertRawProp(context, rawProps, "name", sourceProps.name, {""})) {}
+    name(convertRawProp(context, rawProps, "name", sourceProps.name, {std::string{""}})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
 ComponentName UnimplementedNativeViewProps::getDiffPropsImplementationTarget() const {
@@ -659,5 +857,13 @@ folly::dynamic UnimplementedNativeViewProps::getDiffProps(
   return result;
 }
 #endif
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList UnimplementedNativeViewProps::getDebugProps() const {
+  return ViewProps::getDebugProps() +
+		SharedDebugStringConvertibleList{
+			debugStringConvertibleItem("name", name, std::string{""})
+	};
+}
+#endif
 
 } // namespace facebook::react

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.h

@@ -12,11 +12,33 @@
 #include <cinttypes>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/graphics/Color.h>
 #include <vector>
 
 namespace facebook::react {
 
+class VirtualViewExperimentalProps final : public ViewProps {
+ public:
+  VirtualViewExperimentalProps() = default;
+  VirtualViewExperimentalProps(const PropsParserContext& context, const VirtualViewExperimentalProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool initialHidden{false};
+  int renderState{0};
+
+  #ifdef RN_SERIALIZABLE_STATE
+  ComponentName getDiffPropsImplementationTarget() const override;
+
+  folly::dynamic getDiffProps(const Props* prevProps) const override;
+  #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
+};
+
 class VirtualViewProps final : public ViewProps {
  public:
   VirtualViewProps() = default;
@@ -25,6 +47,7 @@ class VirtualViewProps final : public ViewProps {
 #pragma mark - Props
 
   bool initialHidden{false};
+  bool removeClippedSubviews{false};
   int renderState{0};
 
   #ifdef RN_SERIALIZABLE_STATE
@@ -32,6 +55,10 @@ class VirtualViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 enum class ActivityIndicatorViewSize { Small, Large };
@@ -73,6 +100,10 @@ class ActivityIndicatorViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 enum class AndroidDrawerLayoutKeyboardDismissMode { None, OnDrag };
@@ -160,6 +191,10 @@ class AndroidDrawerLayoutProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class AndroidHorizontalScrollContentViewProps final : public ViewProps {
@@ -176,6 +211,10 @@ class AndroidHorizontalScrollContentViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 enum class AndroidSwipeRefreshLayoutSize { Default, Large };
@@ -219,6 +258,10 @@ class AndroidSwipeRefreshLayoutProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class AndroidSwitchProps final : public ViewProps {
@@ -243,6 +286,10 @@ class AndroidSwitchProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class DebuggingOverlayProps final : public ViewProps {
@@ -259,6 +306,10 @@ class DebuggingOverlayProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class AndroidProgressBarProps final : public ViewProps {
@@ -274,13 +325,17 @@ class AndroidProgressBarProps final : public ViewProps {
   double progress{0.0};
   bool animating{true};
   SharedColor color{};
-  std::string testID{""};
+  std::string testID{std::string{""}};
 
   #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class PullToRefreshViewProps final : public ViewProps {
@@ -301,6 +356,10 @@ class PullToRefreshViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class InputAccessoryProps final : public ViewProps {
@@ -317,6 +376,10 @@ class InputAccessoryProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 enum class ModalHostViewAnimationType { None, Slide, Fade };
@@ -475,6 +538,10 @@ class ModalHostViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class SafeAreaViewProps final : public ViewProps {
@@ -491,6 +558,10 @@ class SafeAreaViewProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class SwitchProps final : public ViewProps {
@@ -514,6 +585,10 @@ class SwitchProps final : public ViewProps {
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 class UnimplementedNativeViewProps final : public ViewProps {
@@ -523,13 +598,17 @@ class UnimplementedNativeViewProps final : public ViewProps {
 
 #pragma mark - Props
 
-  std::string name{""};
+  std::string name{std::string{""}};
 
   #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;
 
   folly::dynamic getDiffProps(const Props* prevProps) const override;
   #endif
+
+  #if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps() const override;
+  #endif
 };
 
 } // namespace facebook::react

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/RCTComponentViewHelpers.h

@@ -13,6 +13,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol RCTVirtualViewExperimentalViewProtocol <NSObject>
+
+@end
+
 @protocol RCTVirtualViewViewProtocol <NSObject>
 
 @end

package/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm

@@ -134,7 +134,7 @@ using namespace facebook::react;
   }
 
   auto imageSource = _state->getData().getImageSource();
-  imageSource.size = {image.size.width, image.size.height};
+  imageSource.size = {.width = image.size.width, .height = image.size.height};
 
   static_cast<const ImageEventEmitter &>(*_eventEmitter).onLoad(imageSource);
   static_cast<const ImageEventEmitter &>(*_eventEmitter).onLoadEnd();

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm

@@ -35,9 +35,13 @@ using namespace facebook::react;
 @end
 
 @implementation RCTPullToRefreshViewComponentView {
-  BOOL _isBeforeInitialLayout;
   UIRefreshControl *_refreshControl;
   RCTScrollViewComponentView *__weak _scrollViewComponentView;
+  // This variable keeps track of whether the view is recycled or not. Once the view is recycled, the component
+  // creates a new instance of UIRefreshControl, resetting the native props to the default values.
+  // However, when recycling, we are keeping around the old _props. The flag is used to force the application
+  // of the current props to the newly created UIRefreshControl the first time that updateProps is called.
+  BOOL _recycled;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -47,8 +51,8 @@ using namespace facebook::react;
     // attaching and detaching of a pull-to-refresh view to a scroll view.
     // The pull-to-refresh view is not a subview of this view.
     self.hidden = YES;
-
-    _isBeforeInitialLayout = YES;
+    _props = PullToRefreshViewShadowNode::defaultSharedProps();
+    _recycled = NO;
     [self _initializeUIRefreshControl];
   }
 
@@ -74,54 +78,53 @@ using namespace facebook::react;
 {
   [super prepareForRecycle];
   _scrollViewComponentView = nil;
-  _props = nil;
-  _isBeforeInitialLayout = YES;
   [self _initializeUIRefreshControl];
+  _recycled = YES;
 }
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  // Prop updates are ignored by _refreshControl until after the initial layout, so just store them in _props until then
-  if (_isBeforeInitialLayout) {
-    _props = std::static_pointer_cast<const PullToRefreshViewProps>(props);
-    return;
-  }
-
   const auto &oldConcreteProps = static_cast<const PullToRefreshViewProps &>(*_props);
   const auto &newConcreteProps = static_cast<const PullToRefreshViewProps &>(*props);
 
-  if (newConcreteProps.tintColor != oldConcreteProps.tintColor) {
+  if (_recycled || newConcreteProps.tintColor != oldConcreteProps.tintColor) {
     _refreshControl.tintColor = RCTUIColorFromSharedColor(newConcreteProps.tintColor);
   }
 
-  if (newConcreteProps.progressViewOffset != oldConcreteProps.progressViewOffset) {
+  if (_recycled || newConcreteProps.progressViewOffset != oldConcreteProps.progressViewOffset) {
     [self _updateProgressViewOffset:newConcreteProps.progressViewOffset];
   }
 
   BOOL needsUpdateTitle = NO;
 
-  if (newConcreteProps.title != oldConcreteProps.title) {
+  if (_recycled || newConcreteProps.title != oldConcreteProps.title) {
     needsUpdateTitle = YES;
   }
 
-  if (newConcreteProps.titleColor != oldConcreteProps.titleColor) {
+  if (_recycled || newConcreteProps.titleColor != oldConcreteProps.titleColor) {
     needsUpdateTitle = YES;
   }
 
   [super updateProps:props oldProps:oldProps];
 
-  if (needsUpdateTitle) {
+  if (_recycled || needsUpdateTitle) {
     [self _updateTitle];
   }
 
   // All prop updates must happen above the call to begin refreshing, or else _refreshControl will ignore the updates
-  if (newConcreteProps.refreshing != oldConcreteProps.refreshing) {
+  if (_recycled || newConcreteProps.refreshing != oldConcreteProps.refreshing) {
     if (newConcreteProps.refreshing) {
       [self beginRefreshingProgrammatically];
     } else {
       [_refreshControl endRefreshing];
     }
   }
+
+  if (_recycled || newConcreteProps.zIndex != oldConcreteProps.zIndex) {
+    _refreshControl.layer.zPosition = newConcreteProps.zIndex.value_or(0);
+  }
+
+  _recycled = NO;
 }
 
 #pragma mark -
@@ -166,10 +169,12 @@ using namespace facebook::react;
 
   // Attempts to begin refreshing before the initial layout are ignored by _refreshControl. So if the control is
   // refreshing when mounted, we need to call beginRefreshing in layoutSubviews or it won't work.
-  if (_isBeforeInitialLayout) {
-    _isBeforeInitialLayout = NO;
+  if (self.window) {
+    const auto &concreteProps = static_cast<const PullToRefreshViewProps &>(*_props);
 
-    [self updateProps:_props oldProps:PullToRefreshViewShadowNode::defaultSharedProps()];
+    if (concreteProps.refreshing) {
+      [self beginRefreshingProgrammatically];
+    }
   }
 }
 
@@ -225,11 +230,12 @@ using namespace facebook::react;
 
   // When refreshing programmatically (i.e. without pulling down), we must explicitly adjust the ScrollView content
   // offset, or else the _refreshControl won't be visible
-  UIScrollView *scrollView = _scrollViewComponentView.scrollView;
-  CGPoint offset = {scrollView.contentOffset.x, scrollView.contentOffset.y - _refreshControl.frame.size.height};
-  [scrollView setContentOffset:offset];
-
-  [_refreshControl beginRefreshing];
+  if (!_refreshControl.isRefreshing) {
+    UIScrollView *scrollView = _scrollViewComponentView.scrollView;
+    CGPoint offset = {scrollView.contentOffset.x, scrollView.contentOffset.y - _refreshControl.frame.size.height};
+    [scrollView setContentOffset:offset];
+    [_refreshControl beginRefreshing];
+  }
 }
 
 #pragma mark - Native commands