Back out "Convert ReactViewManager, ReactClippingViewManager to Kotlin"

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -8326,6 +8326,7 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
 	public fun draw (Landroid/graphics/Canvas;)V
 	protected fun drawChild (Landroid/graphics/Canvas;Landroid/view/View;J)Z
 	protected fun getChildDrawingOrder (II)I
+	public fun getChildVisibleRect (Landroid/view/View;Landroid/graphics/Rect;Landroid/graphics/Point;)Z
 	public fun getClippingRect (Landroid/graphics/Rect;)V
 	public fun getHitSlopRect ()Landroid/graphics/Rect;
 	public fun getOverflow ()Ljava/lang/String;
@@ -8370,8 +8371,6 @@ public class com/facebook/react/views/view/ReactViewGroup : android/view/ViewGro
 }
 
 public class com/facebook/react/views/view/ReactViewManager : com/facebook/react/views/view/ReactClippingViewManager {
-	public static final field Companion Lcom/facebook/react/views/view/ReactViewManager$Companion;
-	public static final field REACT_CLASS Ljava/lang/String;
 	public fun <init> ()V
 	public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View;
 	public fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Lcom/facebook/react/views/view/ReactViewGroup;
@@ -8382,7 +8381,7 @@ public class com/facebook/react/views/view/ReactViewManager : com/facebook/react
 	public fun nextFocusLeft (Lcom/facebook/react/views/view/ReactViewGroup;I)V
 	public fun nextFocusRight (Lcom/facebook/react/views/view/ReactViewGroup;I)V
 	public fun nextFocusUp (Lcom/facebook/react/views/view/ReactViewGroup;I)V
-	public synthetic fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)Landroid/view/View;
+	protected synthetic fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)Landroid/view/View;
 	protected fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Lcom/facebook/react/views/view/ReactViewGroup;)Lcom/facebook/react/views/view/ReactViewGroup;
 	public synthetic fun receiveCommand (Landroid/view/View;ILcom/facebook/react/bridge/ReadableArray;)V
 	public synthetic fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
@@ -8411,7 +8410,7 @@ public class com/facebook/react/views/view/ReactViewManager : com/facebook/react
 	public fun setOverflow (Lcom/facebook/react/views/view/ReactViewGroup;Ljava/lang/String;)V
 	public fun setPointerEvents (Lcom/facebook/react/views/view/ReactViewGroup;Ljava/lang/String;)V
 	public fun setTVPreferredFocus (Lcom/facebook/react/views/view/ReactViewGroup;Z)V
-	public synthetic fun setTransformProperty (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableArray;)V
+	protected synthetic fun setTransformProperty (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableArray;)V
 	protected fun setTransformProperty (Lcom/facebook/react/views/view/ReactViewGroup;Lcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableArray;)V
 }
 
@@ -8422,9 +8421,6 @@ public class com/facebook/react/views/view/ReactViewManager$$PropsSetter : com/f
 	public fun setProperty (Lcom/facebook/react/views/view/ReactViewManager;Lcom/facebook/react/views/view/ReactViewGroup;Ljava/lang/String;Ljava/lang/Object;)V
 }
 
-public final class com/facebook/react/views/view/ReactViewManager$Companion {
-}
-
 public final class com/facebook/react/views/view/ViewGroupClickEvent : com/facebook/react/uimanager/events/Event {
 	public fun <init> (I)V
 	public fun <init> (II)V

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -432,21 +432,21 @@ public class ReactModalHostView(context: ThemedReactContext) :
       reactContext.reactApplicationContext.handleException(RuntimeException(t))
     }
 
-    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { eventDispatcher ->
-        jSTouchDispatcher.handleTouchEvent(ev, eventDispatcher, reactContext)
-        jSPointerDispatcher?.handleMotionEvent(ev, eventDispatcher, true)
+        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
+        jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
       }
-      return super.onInterceptTouchEvent(ev)
+      return super.onInterceptTouchEvent(event)
     }
 
     @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(ev: MotionEvent): Boolean {
+    override fun onTouchEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { eventDispatcher ->
-        jSTouchDispatcher.handleTouchEvent(ev, eventDispatcher, reactContext)
-        jSPointerDispatcher?.handleMotionEvent(ev, eventDispatcher, false)
+        jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
+        jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
       }
-      super.onTouchEvent(ev)
+      super.onTouchEvent(event)
       // In case when there is no children interested in handling touch event, we return true from
       // the root view in order to receive subsequent events related to that gesture
       return true

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.view;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.annotations.ReactProp;
+
+/**
+ * View manager which handles clipped subviews. Useful for custom views which extends from {@link
+ * com.facebook.react.views.view.ReactViewGroup}
+ */
+@Nullsafe(Nullsafe.Mode.LOCAL)
+public abstract class ReactClippingViewManager<T extends ReactViewGroup>
+    extends ViewGroupManager<T> {
+
+  @ReactProp(
+      name = com.facebook.react.uimanager.ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS)
+  public void setRemoveClippedSubviews(T view, boolean removeClippedSubviews) {
+    UiThreadUtil.assertOnUiThread();
+
+    view.setRemoveClippedSubviews(removeClippedSubviews);
+  }
+
+  @Override
+  public void addView(T parent, View child, int index) {
+    UiThreadUtil.assertOnUiThread();
+
+    boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
+    if (removeClippedSubviews) {
+      parent.addViewWithSubviewClippingEnabled(child, index);
+    } else {
+      parent.addView(child, index);
+    }
+  }
+
+  @Override
+  public int getChildCount(T parent) {
+    boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
+    if (removeClippedSubviews) {
+      return parent.getAllChildrenCount();
+    } else {
+      return parent.getChildCount();
+    }
+  }
+
+  @Override
+  @Nullable
+  public View getChildAt(T parent, int index) {
+    boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
+    if (removeClippedSubviews) {
+      return parent.getChildAtWithSubviewClippingEnabled(index);
+    } else {
+      return parent.getChildAt(index);
+    }
+  }
+
+  @Override
+  public void removeViewAt(T parent, int index) {
+    UiThreadUtil.assertOnUiThread();
+
+    boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
+    if (removeClippedSubviews) {
+      View child = getChildAt(parent, index);
+      if (child != null) {
+        if (child.getParent() != null) {
+          parent.removeView(child);
+        }
+        parent.removeViewWithSubviewClippingEnabled(child);
+      }
+    } else {
+      parent.removeViewAt(index);
+    }
+  }
+
+  @Override
+  public void removeAllViews(T parent) {
+    UiThreadUtil.assertOnUiThread();
+
+    boolean removeClippedSubviews = parent.getRemoveClippedSubviews();
+    if (removeClippedSubviews) {
+      parent.removeAllViewsWithSubviewClippingEnabled();
+    } else {
+      parent.removeAllViews();
+    }
+  }
+}