From bb374c0fe69d8462b15cb69de6c99be7d59af596 Mon Sep 17 00:00:00 2001
From: Dmytro Rykun <dmitryrykun@meta.com>
Date: Wed, 20 Sep 2023 08:18:22 -0700
Subject: [PATCH] Static view configs take precedence over native view configs

Summary: Changelog: [Internal]

Differential Revision: D49413562

fbshipit-source-id: ba96aede8c056dfe7d187f2d62ae0dcc4db9de6e
---
 .../Libraries/NativeComponent/NativeComponentRegistry.js | 8 +++++---
 packages/rn-tester/js/RNTesterAppShared.js               | 9 ---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js b/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js
index ace5eb38e605cd..c30f44146386fe 100644
--- a/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js
+++ b/packages/react-native/Libraries/NativeComponent/NativeComponentRegistry.js
@@ -60,9 +60,11 @@ export function get<Config>(
       verify: false,
     };
 
-    const viewConfig = native
-      ? getNativeComponentAttributes(name)
-      : createViewConfig(viewConfigProvider());
+    let viewConfig = createViewConfig(viewConfigProvider());
+    if (viewConfig == null) {
+      // Fallback to native view config.
+      viewConfig = getNativeComponentAttributes(name);
+    }
 
     if (verify) {
       const nativeViewConfig = native
diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
index 0949aafca08d92..3cd8e9d9afad5a 100644
--- a/packages/rn-tester/js/RNTesterAppShared.js
+++ b/packages/rn-tester/js/RNTesterAppShared.js
@@ -29,15 +29,6 @@ import {BackHandler, StyleSheet, View, useColorScheme} from 'react-native';
 
 // RNTester App currently uses in memory storage for storing navigation state
 
-if (global.RN$Bridgeless) {
-  require('react-native/Libraries/NativeComponent/NativeComponentRegistry').setRuntimeConfigProvider(
-    name => {
-      // In bridgeless mode, never load native ViewConfig.
-      return {native: false, strict: false, verify: false};
-    },
-  );
-}
-
 const RNTesterApp = (): React.Node => {
   const [state, dispatch] = React.useReducer(
     RNTesterNavigationReducer,