Fixes regression of prop parsing for elevation (facebook#38959)

Summary: Pull Request resolved: facebook#38959 When refactoring ViewProps in D47492635, `elevation` prop parsing was dropped. This restores it. ## Changelog: [General] [Fixed] - Fabric regression for elevation prop in Android Reviewed By: mdvacca Differential Revision: D48269510 fbshipit-source-id: 336fad2fd53689102be80624e2b6c71d6d43c24b
rozele · Aug 11, 2023 · 6f1df3b · 6f1df3b
1 parent d655d44
commit 6f1df3b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h
@@ -72,8 +72,6 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps {
 
   LayoutConformance experimental_layoutConformance{};
 
-  Float elevation{}; /* Android-only */
-
 #pragma mark - Convenience Methods
 
   BorderMetrics resolveBorderMetrics(LayoutMetrics const &layoutMetrics) const;

diff --git a/...components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/...components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp
@@ -23,6 +23,14 @@ HostPlatformViewProps::HostPlatformViewProps(
     RawProps const &rawProps,
     bool shouldSetRawProps)
     : BaseViewProps(context, sourceProps, rawProps, shouldSetRawProps),
+      elevation(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.elevation
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "elevation",
+                                                       sourceProps.elevation,
+                                                       {})),
       nativeBackground(
           CoreFeatures::enablePropIteratorSetter
               ? sourceProps.nativeBackground

diff --git a/...r/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h b/...r/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h
@@ -40,6 +40,8 @@ class HostPlatformViewProps : public BaseViewProps {
 
 #pragma mark - Props
 
+  Float elevation{};
+
   std::optional<NativeDrawable> nativeBackground{};
   std::optional<NativeDrawable> nativeForeground{};
 

diff --git a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h
@@ -164,9 +164,11 @@ static inline ShadowNode::Unshared messWithLayoutableOnlyFlag(
                                                  : Transform::Perspective(42);
   }
 
+#ifdef ANDROID
   if (entropy.random<bool>(0.1)) {
     viewProps.elevation = entropy.random<bool>() ? 1 : 0;
   }
+#endif
 
   return shadowNode.clone({newProps});
 }
@@ -195,7 +197,9 @@ static inline ShadowNode::Unshared messWithNodeFlattenednessFlags(
     viewProps.zIndex = {};
     viewProps.pointerEvents = PointerEventsMode::Auto;
     viewProps.transform = Transform::Identity();
+#ifdef ANDROID
     viewProps.elevation = 0;
+#endif
   } else {
     viewProps.nativeId = "42";
     viewProps.backgroundColor = whiteColor();
@@ -204,7 +208,9 @@ static inline ShadowNode::Unshared messWithNodeFlattenednessFlags(
     viewProps.zIndex = {entropy.random<int>()};
     viewProps.pointerEvents = PointerEventsMode::None;
     viewProps.transform = Transform::Perspective(entropy.random<int>());
+#ifdef ANDROID
     viewProps.elevation = entropy.random<int>();
+#endif
   }
 
   return shadowNode.clone({newProps});