From fb845a5ae6ffc3829dd7a01ac9878519f7afebbd Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Thu, 13 Jul 2023 18:16:50 -0700 Subject: [PATCH] Back out "Remove usage of ReactDOM.render for root" Summary: Original commit changeset: 2a975690bab0 Original Phabricator Diff: D47257442 For context: More things need updating and testing. Node, antd, etc. needs all updating. Once this lands, a new release needs to be made triggered by: https://www.internalfb.com/chronos/job/gp/27021599065494131 Differential Revision: D47456598 fbshipit-source-id: 1f96e88744b98c7d477c5ccc43167bde475e3036 --- .../flipper-ui-core/src/startFlipperDesktop.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/desktop/flipper-ui-core/src/startFlipperDesktop.tsx b/desktop/flipper-ui-core/src/startFlipperDesktop.tsx index 566c885f7..b3da546ec 100644 --- a/desktop/flipper-ui-core/src/startFlipperDesktop.tsx +++ b/desktop/flipper-ui-core/src/startFlipperDesktop.tsx @@ -8,8 +8,6 @@ */ import {Provider} from 'react-redux'; -import {createRoot} from 'react-dom/client'; - import {init as initLogger} from './fb-stubs/Logger'; import {initLogTailer} from './consoleLogTailer'; import {SandyApp} from './sandy-chrome/SandyApp'; @@ -46,6 +44,7 @@ import {startGlobalErrorHandling} from './utils/globalErrorHandling'; import {loadTheme} from './utils/loadTheme'; import {connectFlipperServerToStore} from './dispatcher/flipperServer'; import {enableConnectivityHub} from './chrome/ConnectivityHub'; +import ReactDOM from 'react-dom'; class AppFrame extends React.Component< {logger: Logger; persistor: Persistor}, @@ -169,10 +168,14 @@ function init(flipperServer: FlipperServer) { connectFlipperServerToStore(flipperServer, store, logger); - const root = document.getElementById('root'); - if (root) { - createRoot(root).render(); - } + // TODO T116224873: Return the following code back instead of ReactDOM.react when the following issue is fixed: https://github.com/react-component/trigger/issues/288 + // const root = createRoot(document.getElementById('root')!); + // root.render(); + + ReactDOM.render( + , + document.getElementById('root')!, + ); enableConsoleHook(); enableConnectivityHub(flipperServer);