From 85498ad46fcedd14555e83abb04bfac8227798b0 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 9 Jun 2025 05:49:45 -0700 Subject: [PATCH] Remove unnecessary receiveCommand overrides (#51844) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51844 These just redefine the existing `receiveCommand` from the ViewManagerDelegate which already has this codegen'ed Changelog: [Internal] Reviewed By: cortinico, rshest Differential Revision: D75869325 fbshipit-source-id: c8ba482075c2586caf33f46a871b5b5e16fda213 --- .../react/popupmenu/ReactPopupMenuManager.kt | 13 ------------- .../react-native/ReactAndroid/api/ReactAndroid.api | 2 -- .../debuggingoverlay/DebuggingOverlayManager.kt | 3 --- .../react/views/drawer/ReactDrawerLayoutManager.kt | 6 ------ .../views/swiperefresh/SwipeRefreshLayoutManager.kt | 6 ------ .../react/views/switchview/ReactSwitchManager.kt | 4 ---- .../react/uiapp/component/MyNativeViewManager.kt | 4 ---- 7 files changed, 38 deletions(-) diff --git a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt index bdfd3d4c28c..8ff1429c126 100644 --- a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt +++ b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt @@ -39,19 +39,6 @@ public class ReactPopupMenuManager : return REACT_CLASS } - override fun receiveCommand( - view: ReactPopupMenuContainer, - commandId: String, - items: ReadableArray? - ) { - when (commandId) { - "show" -> show(view) - else -> { - // no-op - } - } - } - override fun show(popupMenu: ReactPopupMenuContainer) { popupMenu.showPopupMenu() } diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index f0f53b104ef..605ca8bd2db 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -5447,9 +5447,7 @@ public final class com/facebook/react/views/drawer/ReactDrawerLayoutManager : co public synthetic fun openDrawer (Landroid/view/View;)V public fun openDrawer (Lcom/facebook/react/views/drawer/ReactDrawerLayout;)V 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 public fun receiveCommand (Lcom/facebook/react/views/drawer/ReactDrawerLayout;ILcom/facebook/react/bridge/ReadableArray;)V - public fun receiveCommand (Lcom/facebook/react/views/drawer/ReactDrawerLayout;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public synthetic fun setDrawerBackgroundColor (Landroid/view/View;Ljava/lang/Integer;)V public fun setDrawerBackgroundColor (Lcom/facebook/react/views/drawer/ReactDrawerLayout;Ljava/lang/Integer;)V public synthetic fun setDrawerLockMode (Landroid/view/View;Ljava/lang/String;)V 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 index 9c98ed740fb..47f54580fa3 100644 --- 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,9 +30,6 @@ internal class DebuggingOverlayManager : override fun getDelegate(): ViewManagerDelegate = delegate - override fun receiveCommand(view: DebuggingOverlay, commandId: String, args: ReadableArray) = - delegate.receiveCommand(view, commandId, args) - override fun highlightTraceUpdates( view: DebuggingOverlay, providedTraceUpdates: ReadableArray 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 index 5ee2e3aacc8..3a28e2dd82c 100644 --- 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 @@ -170,12 +170,6 @@ public class ReactDrawerLayoutManager : } } - public override fun receiveCommand( - view: ReactDrawerLayout, - commandId: String, - args: ReadableArray - ): Unit = delegate.receiveCommand(view, commandId, args) - public override fun getExportedViewConstants(): Map = mapOf( DRAWER_POSITION to 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 index 1422a17bbfb..7425b92ea31 100644 --- 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 @@ -117,12 +117,6 @@ internal open class SwipeRefreshLayoutManager : } } - override fun receiveCommand( - view: ReactSwipeRefreshLayout, - commandId: String, - args: ReadableArray - ) = delegate.receiveCommand(view, commandId, args) - override fun getExportedViewConstants(): MutableMap = mutableMapOf( "SIZE" to 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 index 82218941848..0d2a557fcbe 100644 --- 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 @@ -12,7 +12,6 @@ import android.view.View import android.widget.CompoundButton import androidx.annotation.ColorInt import com.facebook.react.bridge.ReactContext -import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.uimanager.BaseViewManager import com.facebook.react.uimanager.PixelUtil @@ -95,9 +94,6 @@ internal class ReactSwitchManager : setValueInternal(view, value) } - override fun receiveCommand(view: ReactSwitch, commandId: String, args: ReadableArray) = - delegate.receiveCommand(view, commandId, args) - override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactSwitch) { view.setOnCheckedChangeListener(ON_CHECKED_CHANGE_LISTENER) } 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 index 2b8d35f2f7c..cd7cc615780 100644 --- 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,10 +37,6 @@ internal class MyNativeViewManager : override fun createViewInstance(reactContext: ThemedReactContext): MyNativeView = MyNativeView(reactContext) - override fun receiveCommand(view: MyNativeView, commandName: String, args: ReadableArray) { - delegate.receiveCommand(view, commandName, args) - } - override fun callNativeMethodToChangeBackgroundColor(view: MyNativeView, color: String) { view.setBackgroundColor(Color.parseColor(color)) }