refactor: run canvas save/restore conditionally

Author: paradowstack

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt

@@ -480,9 +480,12 @@ public object BackgroundStyleApplicator {
     view.invalidate()
   }
 
+  @JvmStatic
+  public fun getClipPath(view: View): ClipPath? = view.getTag(R.id.clip_path) as? ClipPath
+
   @JvmStatic
   public fun applyClipPathIfPresent(view: View, canvas: Canvas) {
-    val clipPath = view.getTag(R.id.clip_path) as? ClipPath ?: return
+    val clipPath = getClipPath(view) ?: return
     val bounds = getGeometryBoxBounds(view, clipPath.geometryBox, getComputedBorderInsets(view))
     val drawingRect = Rect()
     view.getDrawingRect(drawingRect)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ClipPath.kt

@@ -226,7 +226,7 @@ public enum class GeometryBox {
   }
 }
 
-internal data class ClipPath(
+public data class ClipPath(
     val shape: BasicShape? = null,
     val geometryBox: GeometryBox? = null,
 ) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt

@@ -22,7 +22,6 @@ import android.graphics.Shader.TileMode
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import androidx.core.graphics.withSave
 import com.facebook.common.references.CloseableReference
 import com.facebook.common.util.UriUtil
 import com.facebook.drawee.backends.pipeline.Fresco
@@ -373,9 +372,16 @@ public class ReactImageView(
   public override fun hasOverlappingRendering(): Boolean = false
 
   public override fun draw(canvas: Canvas) {
-    canvas.withSave {
-      BackgroundStyleApplicator.applyClipPathIfPresent(this@ReactImageView, this)
-      super.draw(this)
+    val clipPath = BackgroundStyleApplicator.getClipPath(this)
+    if (clipPath != null) {
+      canvas.save()
+      BackgroundStyleApplicator.applyClipPathIfPresent(this, canvas)
+    }
+
+    super.onDraw(canvas)
+
+    if (clipPath != null) {
+      canvas.restore()
     }
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt

@@ -22,7 +22,6 @@ import android.view.ViewGroup
 import androidx.annotation.ColorInt
 import androidx.annotation.DoNotInline
 import androidx.annotation.RequiresApi
-import androidx.core.graphics.withSave
 import androidx.core.view.ViewCompat
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.uimanager.BackgroundStyleApplicator
@@ -103,9 +102,16 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
   }
 
   override fun draw(canvas: Canvas) {
-    canvas.withSave {
-      BackgroundStyleApplicator.applyClipPathIfPresent(this@PreparedLayoutTextView, this)
-      super.onDraw(canvas)
+    val clipPath = BackgroundStyleApplicator.getClipPath(this)
+    if (clipPath != null) {
+      canvas.save()
+      BackgroundStyleApplicator.applyClipPathIfPresent(this, canvas)
+    }
+
+    super.draw(canvas)
+
+    if (clipPath != null) {
+      canvas.restore()
     }
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -91,7 +91,6 @@ import com.facebook.react.views.text.internal.span.TextInlineImageSpan
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.max
 import kotlin.math.min
-import androidx.core.graphics.withSave
 
 /**
  * A wrapper around the EditText that lets us better control what happens when an EditText gets
@@ -1206,9 +1205,16 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   }
 
   public override fun draw(canvas: Canvas) {
-    canvas.withSave {
-      BackgroundStyleApplicator.applyClipPathIfPresent(this@ReactEditText, this)
-      super.draw(this)
+    val clipPath = BackgroundStyleApplicator.getClipPath(this)
+    if (clipPath != null) {
+      canvas.save()
+      BackgroundStyleApplicator.applyClipPathIfPresent(this, canvas)
+    }
+
+    super.draw(canvas)
+
+    if (clipPath != null) {
+      canvas.restore()
     }
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -928,8 +928,17 @@ public open class ReactViewGroup public constructor(context: Context?) :
       clipToPaddingBox(this, canvas)
     }
 
-    BackgroundStyleApplicator.applyClipPathIfPresent(this, canvas)
+    val clipPath = BackgroundStyleApplicator.getClipPath(this)
+    if (clipPath != null) {
+      canvas.save()
+      BackgroundStyleApplicator.applyClipPathIfPresent(this, canvas)
+    }
+
     super.dispatchDraw(canvas)
+
+    if (clipPath != null) {
+      canvas.restore()
+    }
   }
 
   override fun drawChild(canvas: Canvas, child: View, drawingTime: Long): Boolean {