Make receiveCommand args non-nullable (#51806)

javache · facebook-github-bot · commit 198c6fc81cda · 2025-06-06T22:07:09.000-07:00
Summary: Pull Request resolved: #51806 Correct the type of args, which is always non-null. This is backwards-compatible as subclasses can override this method with a more permissive nullable type and still be substitutable. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D75869317 fbshipit-source-id: 8f6c9119140794447eca55be24483a35450d7bb6
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
@@ -74,7 +74,7 @@ const PropSetterTemplate = ({propCases}: {propCases: string}) =>
 const CommandsTemplate = ({commandCases}: {commandCases: string}) =>
   `
   @Override
-  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+  public void receiveCommand(T view, String commandName, ReadableArray args) {
     switch (commandName) {
       ${commandCases}
     }
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
@@ -221,7 +221,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+  public void receiveCommand(T view, String commandName, ReadableArray args) {
     switch (commandName) {
       case \\"flashScrollIndicators\\":
         mViewManager.flashScrollIndicators(view);
@@ -272,7 +272,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+  public void receiveCommand(T view, String commandName, ReadableArray args) {
     switch (commandName) {
       case \\"handleRootTag\\":
         mViewManager.handleRootTag(view, args.getDouble(0));
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -4646,6 +4646,7 @@ public abstract class com/facebook/react/uimanager/ViewManager : com/facebook/re
 
 public abstract interface class com/facebook/react/uimanager/ViewManagerDelegate {
 	public abstract synthetic fun kotlinCompat$receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
+	public synthetic fun kotlinCompat$receiveCommandNullableArgs (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
 	public abstract synthetic fun kotlinCompat$setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
 	public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V
 	public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -268,14 +268,14 @@ public boolean getViewExists(int reactTag) {
 
   @Deprecated
   public void receiveCommand(
-      int surfaceId, int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+      int surfaceId, int reactTag, int commandId, ReadableArray commandArgs) {
     UiThreadUtil.assertOnUiThread();
     getSurfaceManagerEnforced(surfaceId, "receiveCommand:int")
         .receiveCommand(reactTag, commandId, commandArgs);
   }
 
   public void receiveCommand(
-      int surfaceId, int reactTag, String commandId, @Nullable ReadableArray commandArgs) {
+      int surfaceId, int reactTag, String commandId, ReadableArray commandArgs) {
     UiThreadUtil.assertOnUiThread();
     getSurfaceManagerEnforced(surfaceId, "receiveCommand:string")
         .receiveCommand(reactTag, commandId, commandArgs);
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
@@ -698,7 +698,7 @@ public void updateProps(int reactTag, ReadableMap props) {
   }
 
   @Deprecated
-  public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+  public void receiveCommand(int reactTag, int commandId, ReadableArray commandArgs) {
     if (isStopped()) {
       return;
     }
@@ -726,8 +726,7 @@ public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray
     viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);
   }
 
-  public void receiveCommand(
-      int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
+  public void receiveCommand(int reactTag, @NonNull String commandId, ReadableArray commandArgs) {
     if (isStopped()) {
       return;
     }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt
@@ -14,7 +14,7 @@ internal class DispatchIntCommandMountItem(
     private val surfaceId: Int,
     private val reactTag: Int,
     private val commandId: Int,
-    private val commandArgs: ReadableArray?
+    private val commandArgs: ReadableArray
 ) : DispatchCommandMountItem() {
 
   override fun getSurfaceId(): Int = surfaceId
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt
@@ -14,7 +14,7 @@ internal class DispatchStringCommandMountItem(
     private val surfaceId: Int,
     private val reactTag: Int,
     private val commandId: String,
-    private val commandArgs: ReadableArray?
+    private val commandArgs: ReadableArray
 ) : DispatchCommandMountItem() {
 
   override fun getSurfaceId(): Int = surfaceId
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
@@ -19,7 +19,7 @@ internal object MountItemFactory {
       surfaceId: Int,
       reactTag: Int,
       commandId: Int,
-      commandArgs: ReadableArray?
+      commandArgs: ReadableArray
   ): DispatchCommandMountItem =
       DispatchIntCommandMountItem(surfaceId, reactTag, commandId, commandArgs)
 
@@ -29,7 +29,7 @@ internal object MountItemFactory {
       surfaceId: Int,
       reactTag: Int,
       commandId: String,
-      commandArgs: ReadableArray?
+      commandArgs: ReadableArray
   ): DispatchCommandMountItem =
       DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs)
 
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt
@@ -149,6 +149,5 @@ public abstract class BaseViewManagerDelegate<
   }
 
   @Suppress("ACCIDENTAL_OVERRIDE")
-  public override fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit =
-      Unit
+  public override fun receiveCommand(view: T, commandName: String, args: ReadableArray): Unit = Unit
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -328,7 +328,7 @@ protected void onAfterUpdateTransaction(@NonNull T view) {}
    * @param args optional arguments for the command
    */
   @Deprecated
-  public void receiveCommand(@NonNull T view, int commandId, @Nullable ReadableArray args) {}
+  public void receiveCommand(@NonNull T view, int commandId, ReadableArray args) {}
 
   /**
    * Subclasses may use this method to receive events/commands directly from JS through the {@link
@@ -339,7 +339,7 @@ public void receiveCommand(@NonNull T view, int commandId, @Nullable ReadableArr
    * @param commandId code of the command
    * @param args optional arguments for the command
    */
-  public void receiveCommand(@NonNull T view, String commandId, @Nullable ReadableArray args) {
+  public void receiveCommand(@NonNull T view, String commandId, ReadableArray args) {
     getOrCreateViewManagerDelegate().receiveCommand(view, commandId, args);
   }
 
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt
@@ -55,13 +55,23 @@ public interface ViewManagerDelegate<T : View> {
   @Suppress("INAPPLICABLE_JVM_NAME")
   @JvmName("kotlinCompat\$receiveCommand")
   @JvmSynthetic
-  public fun receiveCommand(view: T, commandName: String, args: ReadableArray?)
+  public fun receiveCommand(view: T, commandName: String, args: ReadableArray)
+
+  @Suppress("INAPPLICABLE_JVM_NAME")
+  @Deprecated(
+      message = "args is not nullable, please update your method signature",
+      replaceWith =
+          ReplaceWith("receiveCommand(view: T, commandName: String, args: ReadableArray)"))
+  @JvmName("kotlinCompat\$receiveCommandNullableArgs")
+  @JvmSynthetic
+  public fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit =
+      receiveCommand(view, commandName, checkNotNull(args))
 
   @Suppress("INAPPLICABLE_JVM_NAME")
   @Deprecated(
       message = "commandName is not nullable, please update your method signature",
       replaceWith = ReplaceWith("receiveCommand(view, commandName, args)"))
   @JvmName("receiveCommand")
   public fun javaCompat_receiveCommand(view: T, commandName: String?, args: ReadableArray?): Unit =
-      receiveCommand(view, checkNotNull(commandName), args)
+      receiveCommand(view, checkNotNull(commandName), checkNotNull(args))
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt
@@ -186,6 +186,6 @@ public object ViewManagerPropertyUpdater {
     }
 
     @Suppress("ACCIDENTAL_OVERRIDE")
-    override fun receiveCommand(view: T, commandName: String, args: ReadableArray?) = Unit
+    override fun receiveCommand(view: T, commandName: String, args: ReadableArray) = Unit
   }
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt
@@ -30,7 +30,7 @@ internal class DebuggingOverlayManager :
 
   override fun getDelegate(): ViewManagerDelegate<DebuggingOverlay> = delegate
 
-  override fun receiveCommand(view: DebuggingOverlay, commandId: String, args: ReadableArray?) =
+  override fun receiveCommand(view: DebuggingOverlay, commandId: String, args: ReadableArray) =
       delegate.receiveCommand(view, commandId, args)
 
   override fun highlightTraceUpdates(
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt
@@ -173,7 +173,7 @@ public class ReactDrawerLayoutManager :
   public override fun receiveCommand(
       view: ReactDrawerLayout,
       commandId: String,
-      args: ReadableArray?
+      args: ReadableArray
   ): Unit = delegate.receiveCommand(view, commandId, args)
 
   public override fun getExportedViewConstants(): Map<String, Any> =
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt
@@ -120,7 +120,7 @@ internal open class SwipeRefreshLayoutManager :
   override fun receiveCommand(
       view: ReactSwipeRefreshLayout,
       commandId: String,
-      args: ReadableArray?
+      args: ReadableArray
   ) = delegate.receiveCommand(view, commandId, args)
 
   override fun getExportedViewConstants(): MutableMap<String, Any> =
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt
@@ -95,7 +95,7 @@ internal class ReactSwitchManager :
     setValueInternal(view, value)
   }
 
-  override fun receiveCommand(view: ReactSwitch, commandId: String, args: ReadableArray?) =
+  override fun receiveCommand(view: ReactSwitch, commandId: String, args: ReadableArray) =
       delegate.receiveCommand(view, commandId, args)
 
   override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactSwitch) {
diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/FabricUIManagerTest.kt
@@ -8,19 +8,19 @@
 package com.facebook.react.fabric
 
 import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.bridge.JavaOnlyArray
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
 import com.facebook.react.uimanager.ViewManagerRegistry
 import com.facebook.react.uimanager.events.BatchEventDispatchedListener
 import com.facebook.testutils.fakes.FakeBatchEventDispatchedListener
 import com.facebook.testutils.shadows.ShadowSoLoader
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.MockedStatic
-import org.mockito.Mockito.mockStatic
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
@@ -37,22 +37,17 @@ class FabricUIManagerTest {
 
   @Before
   fun setup() {
-    featureFlags = mockStatic(ReactNativeFeatureFlags::class.java)
-    featureFlags.`when`<Boolean> { ReactNativeFeatureFlags.enableFabricLogs() }.thenAnswer { false }
+    ReactNativeFeatureFlagsForTests.setUp()
     reactContext = BridgeReactContext(RuntimeEnvironment.getApplication())
     viewManagerRegistry = ViewManagerRegistry(emptyList())
     batchEventDispatchedListener = FakeBatchEventDispatchedListener()
     underTest = FabricUIManager(reactContext, viewManagerRegistry, batchEventDispatchedListener)
   }
 
-  @After
-  fun teardown() {
-    featureFlags.close()
-  }
-
   @Test
   fun createDispatchCommandMountItemForInterop_withValidString_returnsStringEvent() {
-    val command = underTest.createDispatchCommandMountItemForInterop(11, 1, "anEvent", null)
+    val command =
+        underTest.createDispatchCommandMountItemForInterop(11, 1, "anEvent", JavaOnlyArray())
 
     // DispatchStringCommandMountItem is package private so we can `as` check it.
     val className = command::class.java.name.substringAfterLast(".")
@@ -61,7 +56,7 @@ class FabricUIManagerTest {
 
   @Test
   fun createDispatchCommandMountItemForInterop_withValidInt_returnsIntEvent() {
-    val command = underTest.createDispatchCommandMountItemForInterop(11, 1, "42", null)
+    val command = underTest.createDispatchCommandMountItemForInterop(11, 1, "42", JavaOnlyArray())
 
     // DispatchIntCommandMountItem is package private so we can `as` check it.
     val className = command::class.java.name.substringAfterLast(".")
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeViewManager.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeViewManager.kt
@@ -37,7 +37,7 @@ internal class MyNativeViewManager :
   override fun createViewInstance(reactContext: ThemedReactContext): MyNativeView =
       MyNativeView(reactContext)
 
-  override fun receiveCommand(view: MyNativeView, commandName: String, args: ReadableArray?) {
+  override fun receiveCommand(view: MyNativeView, commandName: String, args: ReadableArray) {
     delegate.receiveCommand(view, commandName, args)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ const PropSetterTemplate = ({propCases}: {propCases: string}) =>`
`74`	`74`	`const CommandsTemplate = ({commandCases}: {commandCases: string}) =>`
`75`	`75`	`
`76`	`76`	`@Override`
`77`		`- public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {`
	`77`	`+ public void receiveCommand(T view, String commandName, ReadableArray args) {`
`78`	`78`	`switch (commandName) {`
`79`	`79`	`${commandCases}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ public void updateProps(int reactTag, ReadableMap props) {`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`@Deprecated`
`701`		`- public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {`
	`701`	`+ public void receiveCommand(int reactTag, int commandId, ReadableArray commandArgs) {`
`702`	`702`	`if (isStopped()) {`
`703`	`703`	`return;`
`704`	`704`	`}`
`@@ -726,8 +726,7 @@ public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray`
`726`	`726`	`viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);`
`727`	`727`	`}`
`728`	`728`
`729`		`- public void receiveCommand(`
`730`		`- int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {`
	`729`	`+ public void receiveCommand(int reactTag, @NonNull String commandId, ReadableArray commandArgs) {`
`731`	`730`	`if (isStopped()) {`
`732`	`731`	`return;`
`733`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,5 @@ public abstract class BaseViewManagerDelegate<`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`@Suppress("ACCIDENTAL_OVERRIDE")`
`152`		`- public override fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit =`
`153`		`- Unit`
	`152`	`+ public override fun receiveCommand(view: T, commandName: String, args: ReadableArray): Unit = Unit`
`154`	`153`	`}`