diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 60893586c9d..1c0e6f5ccb4 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -2562,31 +2562,6 @@ public class com/facebook/react/fabric/mounting/SurfaceMountingManager { public fun updateState (ILcom/facebook/react/uimanager/StateWrapper;)V } -public abstract interface class com/facebook/react/fabric/mounting/mountitems/BatchMountItem : com/facebook/react/fabric/mounting/mountitems/MountItem { - public abstract fun isBatchEmpty ()Z -} - -public abstract class com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem : com/facebook/react/fabric/mounting/mountitems/MountItem { - public fun ()V - public final fun getRetries ()I - public final fun incrementRetries ()V -} - -public abstract interface class com/facebook/react/fabric/mounting/mountitems/MountItem { - public abstract fun execute (Lcom/facebook/react/fabric/mounting/MountingManager;)V - public abstract fun getSurfaceId ()I -} - -public final class com/facebook/react/fabric/mounting/mountitems/MountItemFactory { - public static final field INSTANCE Lcom/facebook/react/fabric/mounting/mountitems/MountItemFactory; - public static final fun createDestroyViewMountItem (II)Lcom/facebook/react/fabric/mounting/mountitems/MountItem; - public static final fun createDispatchCommandMountItem (IIILcom/facebook/react/bridge/ReadableArray;)Lcom/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem; - public static final fun createDispatchCommandMountItem (IILjava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)Lcom/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem; - public static final fun createIntBufferBatchMountItem (I[I[Ljava/lang/Object;I)Lcom/facebook/react/fabric/mounting/mountitems/MountItem; - public static final fun createPreAllocateViewMountItem (IILjava/lang/String;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/uimanager/StateWrapper;Z)Lcom/facebook/react/fabric/mounting/mountitems/MountItem; - public static final fun createSendAccessibilityEventMountItem (III)Lcom/facebook/react/fabric/mounting/mountitems/MountItem; -} - public abstract interface class com/facebook/react/interfaces/TaskInterface { public abstract fun getError ()Ljava/lang/Exception; public abstract fun getResult ()Ljava/lang/Object; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.kt index 1450d791b87..b1841223635 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.kt @@ -7,7 +7,7 @@ package com.facebook.react.fabric.mounting.mountitems -public interface BatchMountItem : MountItem { +internal interface BatchMountItem : MountItem { /** @return if the BatchMountItem contains any MountItem */ - public fun isBatchEmpty(): Boolean + fun isBatchEmpty(): Boolean } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.kt index e44050f72fe..10dd3a02a03 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.kt @@ -14,13 +14,13 @@ import androidx.annotation.UiThread * DispatchIntCommandMountItem}, we can delete this interface too. It provides a set of common * operations to simplify generic operations on all types of ViewCommands. */ -public abstract class DispatchCommandMountItem : MountItem { +internal abstract class DispatchCommandMountItem : MountItem { private var numRetries: Int = 0 @UiThread - public fun incrementRetries() { + fun incrementRetries() { numRetries++ } - @UiThread public fun getRetries(): Int = numRetries + @UiThread fun getRetries(): Int = numRetries } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.kt index 37181775b21..bb0e23efa72 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.kt @@ -13,9 +13,9 @@ import com.facebook.proguard.annotations.DoNotStripAny import com.facebook.react.fabric.mounting.MountingManager @DoNotStripAny -public interface MountItem { +internal interface MountItem { /** Execute this [MountItem] into the operation queue received by parameter. */ - @UiThread public fun execute(mountingManager: MountingManager) + @UiThread fun execute(mountingManager: MountingManager) - @AnyThread public fun getSurfaceId(): Int + @AnyThread fun getSurfaceId(): Int } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt index d3e71cc0536..c6886a86049 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt @@ -12,10 +12,10 @@ import com.facebook.react.bridge.ReadableMap import com.facebook.react.uimanager.StateWrapper /** Factory class that expose creation of [MountItem] */ -public object MountItemFactory { +internal object MountItemFactory { /** @return a [DispatchCommandMountItem] for commands identified by an int */ @JvmStatic - public fun createDispatchCommandMountItem( + fun createDispatchCommandMountItem( surfaceId: Int, reactTag: Int, commandId: Int, @@ -25,7 +25,7 @@ public object MountItemFactory { /** @return a [DispatchCommandMountItem] for commands identified by a String */ @JvmStatic - public fun createDispatchCommandMountItem( + fun createDispatchCommandMountItem( surfaceId: Int, reactTag: Int, commandId: String, @@ -35,7 +35,7 @@ public object MountItemFactory { /** @return a [MountItem] that will control the execution of an AccessibilityEvent */ @JvmStatic - public fun createSendAccessibilityEventMountItem( + fun createSendAccessibilityEventMountItem( surfaceId: Int, reactTag: Int, eventType: Int @@ -43,7 +43,7 @@ public object MountItemFactory { /** @return a [MountItem] that will be used to preallocate views */ @JvmStatic - public fun createPreAllocateViewMountItem( + fun createPreAllocateViewMountItem( surfaceId: Int, reactTag: Int, component: String, @@ -55,7 +55,7 @@ public object MountItemFactory { /** @return a [MountItem] that will be used to destroy views */ @JvmStatic - public fun createDestroyViewMountItem(surfaceId: Int, reactTag: Int): MountItem = + fun createDestroyViewMountItem(surfaceId: Int, reactTag: Int): MountItem = DestroyUnmountedViewMountItem(surfaceId, reactTag) /** @@ -63,7 +63,7 @@ public object MountItemFactory { * the int[] and Object[] received by parameter */ @JvmStatic - public fun createIntBufferBatchMountItem( + fun createIntBufferBatchMountItem( surfaceId: Int, intBuf: IntArray, objBuf: Array,