Revert "Use RN_SERIALIZABLE_STATE for conditional getDiffProps code (#51516)"

cipolleschi · cipolleschi · commit 4e855dffbbff · 2025-05-26T17:01:23.000+02:00
This reverts commit f900551.
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -439,11 +439,11 @@ jobs:
         uses: ./.github/actions/build-android
         with:
           release-type: ${{ needs.set_release_type.outputs.RELEASE_TYPE }}
-          run-e2e-tests: ${{ github.ref == 'refs/heads/main' || contains(github.ref,  'stable') || inputs.run-e2e-tests }}
+          run-e2e-tests: true # ${{ github.ref == 'refs/heads/main' || contains(github.ref,  'stable') || inputs.run-e2e-tests }}
           gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
 
   test_e2e_android_rntester:
-    if: ${{ github.ref == 'refs/heads/main' || contains(github.ref,  'stable') || inputs.run-e2e-tests }}
+    # if: ${{ github.ref == 'refs/heads/main' || contains(github.ref,  'stable') || inputs.run-e2e-tests }}
     runs-on: 4-core-ubuntu
     needs: [build_android]
     strategy:
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp
@@ -174,7 +174,7 @@ void ImageProps::setProp(
   }
 }
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 static folly::dynamic convertImageSource(const ImageSource& imageSource) {
   folly::dynamic imageSourceResult = folly::dynamic::object();
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -46,8 +46,10 @@ class ImageProps final : public ViewProps {
   Float fadeDuration{};
   bool progressiveRenderingEnabled{};
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
@@ -592,7 +592,7 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 static folly::dynamic convertScrollViewMaintainVisibleContentPosition(
     const ScrollViewMaintainVisibleContentPosition& value) {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
@@ -83,8 +83,10 @@ class ScrollViewProps final : public ViewProps {
   SharedDebugStringConvertibleList getDebugProps() const override;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #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
@@ -357,7 +357,7 @@ SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 static folly::dynamic toDynamic(const Size& size) {
   folly::dynamic sizeResult = folly::dynamic::object();
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
@@ -42,10 +42,12 @@ class BaseTextProps {
   SharedDebugStringConvertibleList getDebugProps() const;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   void appendTextAttributesProps(
       folly::dynamic& result,
       const BaseTextProps* prevProps) const;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
@@ -152,7 +152,7 @@ SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 folly::dynamic ParagraphProps::getDiffProps(const Props* prevProps) const {
   static const auto defaultProps = ParagraphProps();
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h
@@ -58,8 +58,10 @@ class ParagraphProps : public ViewProps, public BaseTextProps {
   SharedDebugStringConvertibleList getDebugProps() const override;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp
@@ -28,7 +28,7 @@ SharedDebugStringConvertibleList RawTextProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 folly::dynamic RawTextProps::getDiffProps(const Props* prevProps) const {
   folly::dynamic result = folly::dynamic::object();
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
@@ -37,8 +37,10 @@ class RawTextProps : public Props {
   SharedDebugStringConvertibleList getDebugProps() const override;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp
@@ -33,7 +33,7 @@ SharedDebugStringConvertibleList TextProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 folly::dynamic TextProps::getDiffProps(const Props* prevProps) const {
   folly::dynamic result = folly::dynamic::object();
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
@@ -35,8 +35,10 @@ class TextProps : public Props, public BaseTextProps {
   SharedDebugStringConvertibleList getDebugProps() const override;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp
@@ -17,8 +17,7 @@ ComponentName UnimplementedViewProps::getComponentName() const {
   return componentName_;
 }
 
-#ifdef RN_SERIALIZABLE_STATE
-
+#ifdef ANDROID
 folly::dynamic UnimplementedViewProps::getDiffProps(
     const Props* prevProps) const {
   static const auto defaultProps = UnimplementedViewProps();
@@ -35,7 +34,6 @@ folly::dynamic UnimplementedViewProps::getDiffProps(
 
   return result;
 }
-
 #endif
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h
@@ -27,8 +27,10 @@ class UnimplementedViewProps final : public ViewProps {
   void setComponentName(ComponentName componentName);
   ComponentName getComponentName() const;
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 
  private:
diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp
@@ -144,7 +144,7 @@ SharedDebugStringConvertibleList HostPlatformViewProps::getDebugProps() const {
 }
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
 
 inline static void updateEventProp(
     folly::dynamic& result,
diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h
@@ -57,8 +57,10 @@ class HostPlatformViewProps : public BaseViewProps {
   SharedDebugStringConvertibleList getDebugProps() const override;
 #endif
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
+
   folly::dynamic getDiffProps(const Props* prevProps) const override;
+
 #endif
 };
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -119,7 +119,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
     // Note that we just check if `Props` has this flag set, no matter
     // the type of ShadowNode; it acts as the single global flag.
     if (ReactNativeFeatureFlags::enableCppPropsIteratorSetter()) {
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
       const auto& dynamic = shadowNodeProps->rawProps;
 #else
       const auto& dynamic = static_cast<folly::dynamic>(rawProps);
diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.cpp b/packages/react-native/ReactCommon/react/renderer/core/Props.cpp
@@ -32,7 +32,7 @@ void Props::initialize(
   nativeId = ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
       ? sourceProps.nativeId
       : convertRawProp(context, rawProps, "nativeID", sourceProps.nativeId, {});
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
   if (ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid()) {
     auto& oldRawProps = sourceProps.rawProps;
     auto newRawProps = rawProps.toDynamic(filterObjectKeys);
diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.h b/packages/react-native/ReactCommon/react/renderer/core/Props.h
@@ -63,12 +63,13 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
 
   std::string nativeId;
 
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
   folly::dynamic rawProps = folly::dynamic::object();
 
   virtual folly::dynamic getDiffProps(const Props* prevProps) const {
     return folly::dynamic::object();
   }
+
 #endif
 
 #if RN_DEBUG_STRING_CONVERTIBLE
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
@@ -50,7 +50,7 @@ ShadowNode::SharedListOfShared ShadowNode::emptySharedShadowNodeSharedList() {
 Props::Shared ShadowNode::propsForClonedShadowNode(
     const ShadowNode& sourceShadowNode,
     const Props::Shared& props) {
-#ifdef RN_SERIALIZABLE_STATE
+#ifdef ANDROID
   bool hasBeenMounted = sourceShadowNode.hasBeenMounted_;
   bool sourceNodeHasRawProps = !sourceShadowNode.getProps()->rawProps.empty();
   if (!hasBeenMounted && sourceNodeHasRawProps && props) {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ void ImageProps::setProp(`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`-#ifdef RN_SERIALIZABLE_STATE`
	`177`	`+#ifdef ANDROID`
`178`	`178`
`179`	`179`	`static folly::dynamic convertImageSource(const ImageSource& imageSource) {`
`180`	`180`	`folly::dynamic imageSourceResult = folly::dynamic::object();`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {`
`592`	`592`	`}`
`593`	`593`	`#endif`
`594`	`594`
`595`		`-#ifdef RN_SERIALIZABLE_STATE`
	`595`	`+#ifdef ANDROID`
`596`	`596`
`597`	`597`	`static folly::dynamic convertScrollViewMaintainVisibleContentPosition(`
`598`	`598`	`const ScrollViewMaintainVisibleContentPosition& value) {`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {`
`357`	`357`	`}`
`358`	`358`	`#endif`
`359`	`359`
`360`		`-#ifdef RN_SERIALIZABLE_STATE`
	`360`	`+#ifdef ANDROID`
`361`	`361`
`362`	`362`	`static folly::dynamic toDynamic(const Size& size) {`
`363`	`363`	`folly::dynamic sizeResult = folly::dynamic::object();`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {`
`152`	`152`	`}`
`153`	`153`	`#endif`
`154`	`154`
`155`		`-#ifdef RN_SERIALIZABLE_STATE`
	`155`	`+#ifdef ANDROID`
`156`	`156`
`157`	`157`	`folly::dynamic ParagraphProps::getDiffProps(const Props* prevProps) const {`
`158`	`158`	`static const auto defaultProps = ParagraphProps();`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ SharedDebugStringConvertibleList RawTextProps::getDebugProps() const {`
`28`	`28`	`}`
`29`	`29`	`#endif`
`30`	`30`
`31`		`-#ifdef RN_SERIALIZABLE_STATE`
	`31`	`+#ifdef ANDROID`
`32`	`32`
`33`	`33`	`folly::dynamic RawTextProps::getDiffProps(const Props* prevProps) const {`
`34`	`34`	`folly::dynamic result = folly::dynamic::object();`