Small perf fix for new iOS view clipping (#46629)

Summary: Pull Request resolved: #46629 If we clipped and had no border or corner radius we would end up hitting this path every time. We can optimize this a bit to avoid that. Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D63299597 fbshipit-source-id: 90031f964b7669049a4a2efe00a553c888d28cd7
facebook · Jan 8, 2025 · 07b7953 · 07b7953
1 parent 30c3912
commit 07b7953
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -1003,15 +1003,10 @@ - (void)invalidateLayer
   }
 
   // clipping
+  self.currentContainerView.layer.mask = nil;
   if (self.currentContainerView.clipsToBounds) {
     BOOL clipToPaddingBox = ReactNativeFeatureFlags::enableIOSViewClipToPaddingBox();
-    if (clipToPaddingBox) {
-      CALayer *maskLayer = [self createMaskLayer:RCTCGRectFromRect(_layoutMetrics.getPaddingFrame())
-                                    cornerInsets:RCTGetCornerInsets(
-                                                     RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii),
-                                                     RCTUIEdgeInsetsFromEdgeInsets(borderMetrics.borderWidths))];
-      self.currentContainerView.layer.mask = maskLayer;
-    } else {
+    if (!clipToPaddingBox) {
       if (borderMetrics.borderRadii.isUniform()) {
         self.currentContainerView.layer.cornerRadius = borderMetrics.borderRadii.topLeft.horizontal;
       } else {
@@ -1033,9 +1028,17 @@ - (void)invalidateLayer
           subview.layer.mask = [self createMaskLayer:subview.bounds cornerInsets:cornerInsets];
         }
       }
+    } else if (
+        !borderMetrics.borderWidths.isUniform() || borderMetrics.borderWidths.left != 0 ||
+        !borderMetrics.borderRadii.isUniform()) {
+      CALayer *maskLayer = [self createMaskLayer:RCTCGRectFromRect(_layoutMetrics.getPaddingFrame())
+                                    cornerInsets:RCTGetCornerInsets(
+                                                     RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii),
+                                                     RCTUIEdgeInsetsFromEdgeInsets(borderMetrics.borderWidths))];
+      self.currentContainerView.layer.mask = maskLayer;
+    } else {
+      self.currentContainerView.layer.cornerRadius = borderMetrics.borderRadii.topLeft.horizontal;
     }
-  } else {
-    self.currentContainerView.layer.mask = nil;
   }
 }