From 6876775dc73075ff3fdcf82c7a7875976ba155c3 Mon Sep 17 00:00:00 2001
From: Thomas Nardone <tnardone@meta.com>
Date: Tue, 14 May 2024 09:21:15 -0700
Subject: [PATCH] Fix ViewManager.receiveCommand nullability (#44531)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44531

Changelog: [Internal]

Properly propagate the `Nullable` to the delegates.

Reviewed By: rshest

Differential Revision: D57218665

fbshipit-source-id: 2783ad9b37688e0928ad2e3cf6a2ab1f41190fe7
---
 .../src/generators/components/GeneratePropsJavaDelegate.js    | 2 +-
 .../__snapshots__/GeneratePropsJavaDelegate-test.js.snap      | 4 ++--
 .../com/facebook/react/uimanager/BaseViewManagerDelegate.java | 2 +-
 .../com/facebook/react/uimanager/ViewManagerDelegate.java     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
index e45a4df573b..a758d69ecc3 100644
--- 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, ReadableArray args) {
+  public void receiveCommand(T view, String commandName, @Nullable 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
index 3e4de5ef984..681a198f252 100644
--- 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
@@ -213,7 +213,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
     switch (commandName) {
       case \\"flashScrollIndicators\\":
         mViewManager.flashScrollIndicators(view);
@@ -263,7 +263,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
     switch (commandName) {
       case \\"handleRootTag\\":
         mViewManager.handleRootTag(view, args.getDouble(0));
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
index 2a845e1903c..7ec47a15619 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
@@ -137,5 +137,5 @@ public abstract class BaseViewManagerDelegate<T extends View, U extends BaseView
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {}
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {}
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java
index f8ca8f7c2cf..40eff75b9d1 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java
@@ -21,5 +21,5 @@ import com.facebook.react.bridge.ReadableArray;
 public interface ViewManagerDelegate<T extends View> {
   void setProperty(T view, String propName, @Nullable Object value);
 
-  void receiveCommand(T view, String commandName, ReadableArray args);
+  void receiveCommand(T view, String commandName, @Nullable ReadableArray args);
 }