From 0ab0c5a42e4100113d3824bf612ee89f4a4ac50e Mon Sep 17 00:00:00 2001 From: Paige Sun Date: Fri, 28 Jan 2022 23:38:05 -0800 Subject: [PATCH] Disable static ViewConfigs in bridge mode & enable for bridgeless mode - Remove __fbStaticViewConfig & UIManagerInjection Summary: Changelog: [Internal] Reviewed By: RSNara Differential Revision: D33835081 fbshipit-source-id: ed625de3b2da73f98cdb9c9dc97086aa2c477e3a --- Libraries/ReactNative/DummyUIManager.js | 8 +++++--- Libraries/ReactNative/UIManager.js | 3 +-- Libraries/ReactNative/UIManagerInjection.js | 15 --------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 Libraries/ReactNative/UIManagerInjection.js diff --git a/Libraries/ReactNative/DummyUIManager.js b/Libraries/ReactNative/DummyUIManager.js index a8fba2edc62..126fe9b1d9b 100644 --- a/Libraries/ReactNative/DummyUIManager.js +++ b/Libraries/ReactNative/DummyUIManager.js @@ -19,14 +19,16 @@ module.exports = { 'getViewManagerConfig is unavailable in Bridgeless, use hasViewManagerConfig instead. viewManagerName: ' + viewManagerName, ); - if (viewManagerName === 'RCTVirtualText') { + if ( + viewManagerName === 'RCTVirtualText' || + viewManagerName === 'RCTShimmeringView' + ) { return {}; } return null; }, hasViewManagerConfig: (viewManagerName: string): boolean => { - const staticViewConfigsEnabled = global.__fbStaticViewConfig === true; - if (staticViewConfigsEnabled) { + if (global.__nativeComponentRegistry__hasComponent) { return unstable_hasComponent(viewManagerName); } else { return ( diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js index 98b5c80d0fa..e0ec53c0611 100644 --- a/Libraries/ReactNative/UIManager.js +++ b/Libraries/ReactNative/UIManager.js @@ -34,7 +34,6 @@ export interface UIManagerJSInterface extends Spec { const UIManager: UIManagerJSInterface = global.RN$Bridgeless === true ? require('./DummyUIManager') - : require('./UIManagerInjection').default.unstable_UIManager ?? - require('./PaperUIManager'); + : require('./PaperUIManager'); module.exports = UIManager; diff --git a/Libraries/ReactNative/UIManagerInjection.js b/Libraries/ReactNative/UIManagerInjection.js deleted file mode 100644 index b1f74df852f..00000000000 --- a/Libraries/ReactNative/UIManagerInjection.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow - * @format - */ - -import type {UIManagerJSInterface} from './UIManager'; - -export default { - unstable_UIManager: (null: ?UIManagerJSInterface), -};