Skip to content

Commit

Permalink
Update all the instances of ReactDom.render to createRoot() under
Browse files Browse the repository at this point in the history
`/client`
  • Loading branch information
southp committed Oct 18, 2024
1 parent e3b0492 commit 5e3f084
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 25 deletions.
7 changes: 3 additions & 4 deletions client/boot/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { geolocateCurrencySymbol } from '@automattic/format-currency';
import { getLanguageSlugs } from '@automattic/i18n-utils';
import { JETPACK_PRICING_PAGE } from '@automattic/urls';
import debugFactory from 'debug';
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import Modal from 'react-modal';
import store from 'store';
import emailVerification from 'calypso/components/email-verification';
Expand Down Expand Up @@ -403,9 +403,8 @@ const setupMiddlewares = ( currentUser, reduxStore, reactQueryClient ) => {
};

function renderLayout( reduxStore, reactQueryClient ) {
ReactDom.render(
<ProviderWrappedLayout store={ reduxStore } queryClient={ reactQueryClient } />,
document.getElementById( 'wpcom' )
createRoot( document.getElementById( 'wpcom' ) ).render(
<ProviderWrappedLayout store={ reduxStore } queryClient={ reactQueryClient } />
);
}

Expand Down
6 changes: 3 additions & 3 deletions client/controller/web-util.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import ReactDom from 'react-dom';
import { createRoot, hydrateRoot } from 'react-dom/client';

export function render( context ) {
ReactDom.render( context.layout, document.getElementById( 'wpcom' ) );
createRoot( document.getElementById( 'wpcom' ) ).render( context.layout );
}

export function hydrate( context ) {
ReactDom.hydrate( context.layout, document.getElementById( 'wpcom' ) );
hydrateRoot( document.getElementById( 'wpcom' ), context.layout );
}
7 changes: 3 additions & 4 deletions client/lib/account-settings-helper/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import languages from '@automattic/languages';
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import { useInView } from 'react-intersection-observer';
import { Provider, useDispatch, useSelector } from 'react-redux';
import ColorSchemePicker from 'calypso/blocks/color-scheme-picker';
Expand Down Expand Up @@ -66,9 +66,8 @@ export function AccountSettingsHelper() {
);
}
export default ( element, store ) =>
ReactDom.render(
createRoot( element ).render(
<Provider store={ store }>
<AccountSettingsHelper />
</Provider>,
element
</Provider>
);
4 changes: 2 additions & 2 deletions client/lib/auth-helper/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import config from '@automattic/calypso-config';
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';

import './style.scss';

Expand Down Expand Up @@ -40,4 +40,4 @@ function AuthHelper() {
);
}

export default ( element ) => ReactDom.render( <AuthHelper />, element );
export default ( element ) => createRoot( element ).render( <AuthHelper /> );
4 changes: 2 additions & 2 deletions client/lib/features-helper/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import FeatureList from './feature-list';

import './style.scss';
Expand All @@ -7,5 +7,5 @@ import './style.scss';
* @param element HTML Element
*/
export default function injectFeatureHelper( element ) {
ReactDom.render( <FeatureList />, element );
createRoot( element ).render( <FeatureList /> );
}
7 changes: 3 additions & 4 deletions client/lib/preferences-helper/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Provider } from 'react-redux';
import PreferenceList from './preference-list';

import './style.scss';

export default function injectPreferenceHelper( element, store ) {
ReactDom.render(
createRoot( element ).render(
<Provider store={ store }>
<PreferenceList />
</Provider>,
element
</Provider>
);
}
4 changes: 2 additions & 2 deletions client/lib/react-query-devtools-helper/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import config from '@automattic/calypso-config';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { useEffect, useState } from 'react';
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import { setStoredItem, getStoredItem } from 'calypso/lib/browser-storage';

import './style.scss';
Expand Down Expand Up @@ -59,4 +59,4 @@ function ReactQueryDevtoolsHelper() {
);
}

export default ( element ) => ReactDom.render( <ReactQueryDevtoolsHelper />, element );
export default ( element ) => createRoot( element ).render( <ReactQueryDevtoolsHelper /> );
7 changes: 3 additions & 4 deletions client/lib/store-sandbox-helper/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ToggleControl } from '@wordpress/components';
import { useState, useEffect } from 'react';
import ReactDom from 'react-dom';
import { createRoot } from 'react-dom/client';
import useStoreSandboxStatusQuery from 'calypso/data/store-sandbox/use-store-sandbox-status';
import wp from 'calypso/lib/wp';

Expand Down Expand Up @@ -74,9 +74,8 @@ export function StoreSandboxHelper() {
);
}
export default ( element: HTMLElement ) =>
ReactDom.render(
createRoot( element ).render(
<QueryClientProvider client={ new QueryClient() }>
<StoreSandboxHelper />
</QueryClientProvider>,
element
</QueryClientProvider>
);

0 comments on commit 5e3f084

Please sign in to comment.