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 index 102fd7f35d1..5bfc7112dd6 100644 --- 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 @@ -21,6 +21,7 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.common.annotations.UnstableReactNativeAPI; +import com.facebook.react.common.build.ReactBuildConfig; import com.facebook.react.common.mapbuffer.MapBuffer; import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags; import com.facebook.react.touch.JSResponderHandler; @@ -406,6 +407,11 @@ public abstract class ViewManager * Map contains the names (key) and types (value) of the ViewManager's props. */ public Map getNativeProps() { + if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE + && ReactNativeFeatureFlags.enableBridgelessArchitecture() + && ReactNativeFeatureFlags.disableShadowNodeOnNewArchitectureAndroid()) { + return ViewManagerPropertyUpdater.getNativeProps(getClass(), null); + } return ViewManagerPropertyUpdater.getNativeProps(getClass(), getShadowNodeClass()); } 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 index cdac6cfac77..356fabe4b57 100644 --- 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 @@ -84,11 +84,13 @@ public object ViewManagerPropertyUpdater { @JvmStatic public fun getNativeProps( viewManagerTopClass: Class>, - shadowNodeTopClass: Class + shadowNodeTopClass: Class? ): Map { val props: MutableMap = HashMap() findManagerSetter(viewManagerTopClass).getProperties(props) - findNodeSetter(shadowNodeTopClass).getProperties(props) + if (shadowNodeTopClass != null) { + findNodeSetter(shadowNodeTopClass).getProperties(props) + } return props }