feat(android): add NeedsComputedBoxModel trait for clipPath handling

Author: paradowstack

packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp

@@ -16,7 +16,6 @@
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
-#include <react/renderer/components/view/BaseViewProps.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/conversions.h>
@@ -65,9 +64,8 @@ void FabricMountingManager::setComputedBoxModelRegistry(
 
 namespace {
 
-inline bool hasClipPath(const ShadowView& shadowView) {
-  auto props = std::dynamic_pointer_cast<const BaseViewProps>(shadowView.props);
-  return props && props->clipPath.has_value();
+inline bool needsComputedBoxModel(const ShadowView& shadowView) {
+  return shadowView.traits.check(ShadowNodeTraits::Trait::NeedsComputedBoxModel);
 }
 
 #ifdef REACT_NATIVE_DEBUG
@@ -718,14 +716,14 @@ void FabricMountingManager::executeMount(
             }
 
             // Store BoxModel data (margin and padding) only if layout
-            // information has changed and clipPath prop is present. This
-            // information is needed for proper calculation of the clipPath
+            // information has changed and NeedsComputedBoxModel trait is set.
+            // This information is needed for proper calculation of the clipPath
             // geometry box.
-            auto oldHasClipPath = hasClipPath(oldChildShadowView);
-            auto newHasClipPath = hasClipPath(newChildShadowView);
+            auto oldNeedsComputedBoxModel = needsComputedBoxModel(oldChildShadowView);
+            auto newNeedsComputedBoxModel = needsComputedBoxModel(newChildShadowView);
 
             if (computedBoxModelRegistry_) {
-              if (newHasClipPath &&
+              if (newNeedsComputedBoxModel &&
                   (oldChildShadowView.layoutMetrics.marginInsets !=
                        newChildShadowView.layoutMetrics.marginInsets ||
                    oldChildShadowView.layoutMetrics.paddingInsets !=
@@ -735,7 +733,7 @@ void FabricMountingManager::executeMount(
                     newChildShadowView.tag,
                     newChildShadowView.layoutMetrics.marginInsets,
                     newChildShadowView.layoutMetrics.paddingInsets);
-              } else if (oldHasClipPath && !newHasClipPath) {
+              } else if (oldNeedsComputedBoxModel && !newNeedsComputedBoxModel) {
                 computedBoxModelRegistry_->remove(
                     surfaceId, newChildShadowView.tag);
               }
@@ -828,7 +826,7 @@ void FabricMountingManager::executeMount(
             // information has changed and clipPath prop is present. This
             // information is needed for proper calculation of the clipPath
             // geometry box.
-            if (hasClipPath(newChildShadowView)) {
+            if (needsComputedBoxModel(newChildShadowView)) {
               if (computedBoxModelRegistry_) {
                 computedBoxModelRegistry_->store(
                     surfaceId,

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

@@ -90,6 +90,12 @@ void ViewShadowNode::initialize() noexcept {
   } else {
     traits_.unset(ShadowNodeTraits::Trait::ChildrenFormStackingContext);
   }
+
+  if (viewProps.clipPath.has_value()) {
+    traits_.set(ShadowNodeTraits::Trait::NeedsComputedBoxModel);
+  } else {
+    traits_.unset(ShadowNodeTraits::Trait::NeedsComputedBoxModel);
+  }
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/core/ShadowNodeTraits.h

@@ -91,6 +91,11 @@ class ShadowNodeTraits {
     // **Deprecated**: This trait is deprecated and will be removed in a future
     // version of React Native.
     DirtyYogaNode = 1 << 14,
+
+    // Indicates that the `ShadowNode` needs to store computed box model
+    // information (margin and padding) for proper calculation of the clipPath
+    // geometry box.
+    NeedsComputedBoxModel = 1 << 15,
   };
 
   /*