fix: use createRoot instead of ReactDom.render

pull/3056/head
William Grant 1 year ago
parent 329dff1adb
commit 1efc5d2beb

@ -9,9 +9,6 @@ const config = url.parse(window.location.toString(), true).query;
const { locale } = config; const { locale } = config;
const localeMessages = ipcRenderer.sendSync('locale-data'); const localeMessages = ipcRenderer.sendSync('locale-data');
window.React = require('react');
window.ReactDOM = require('react-dom');
window.theme = config.theme; window.theme = config.theme;
window.i18n = i18n.setupi18n(locale, localeMessages); window.i18n = i18n.setupi18n(locale, localeMessages);

@ -14,9 +14,6 @@ const localeMessages = ipcRenderer.sendSync('locale-data');
window._ = require('lodash'); window._ = require('lodash');
window.React = require('react');
window.ReactDOM = require('react-dom');
window.getVersion = () => config.version; window.getVersion = () => config.version;
window.theme = config.theme; window.theme = config.theme;
window.i18n = i18n.setupi18n(locale, localeMessages); window.i18n = i18n.setupi18n(locale, localeMessages);

@ -9,9 +9,6 @@ const config = url.parse(window.location.toString(), true).query;
const { locale } = config; const { locale } = config;
const localeMessages = ipcRenderer.sendSync('locale-data'); const localeMessages = ipcRenderer.sendSync('locale-data');
window.React = require('react');
window.ReactDOM = require('react-dom');
// If the app is locked we can't access the database to check the theme. // If the app is locked we can't access the database to check the theme.
window.theme = 'classic-dark'; window.theme = 'classic-dark';
window.primaryColor = 'green'; window.primaryColor = 'green';

@ -243,9 +243,6 @@ setInterval(() => {
window.nodeSetImmediate(() => {}); window.nodeSetImmediate(() => {});
}, 1000); }, 1000);
window.React = require('react');
window.ReactDOM = require('react-dom');
window.clipboard = clipboard; window.clipboard = clipboard;
window.getSeedNodeList = () => window.getSeedNodeList = () =>

@ -1,6 +1,7 @@
// const $body = $(document.body);
import React from 'react'; import React from 'react';
import { createRoot } from 'react-dom/client';
import { AboutView } from '../components/AboutView'; import { AboutView } from '../components/AboutView';
window.ReactDOM.render(<AboutView />, document.getElementById('root')); const container = document.getElementById('root');
const root = createRoot(container!);
root.render(<AboutView />);

@ -1,4 +1,7 @@
import React from 'react'; import React from 'react';
import { createRoot } from 'react-dom/client';
import { DebugLogView } from '../components/DebugLogView'; import { DebugLogView } from '../components/DebugLogView';
window.ReactDOM.render(<DebugLogView />, document.getElementById('root')); const container = document.getElementById('root');
const root = createRoot(container!);
root.render(<DebugLogView />);

@ -1,6 +1,6 @@
import Backbone from 'backbone'; import Backbone from 'backbone';
import _ from 'lodash'; import _ from 'lodash';
import ReactDOM from 'react-dom'; import { createRoot } from 'react-dom/client';
import nativeEmojiData from '@emoji-mart/data'; import nativeEmojiData from '@emoji-mart/data';
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
@ -310,12 +310,16 @@ async function start() {
void getConversationController() void getConversationController()
.loadPromise() .loadPromise()
?.then(() => { ?.then(() => {
ReactDOM.render(<SessionInboxView />, document.getElementById('root')); const container = document.getElementById('root');
const root = createRoot(container!);
root.render(<SessionInboxView />);
}); });
} }
function showRegistrationView() { function showRegistrationView() {
ReactDOM.render(<SessionRegistrationView />, document.getElementById('root')); const container = document.getElementById('root');
const root = createRoot(container!);
root.render(<SessionRegistrationView />);
switchBodyToRtlIfNeeded(); switchBodyToRtlIfNeeded();
} }
DisappearingMessages.initExpiringMessageListener(); DisappearingMessages.initExpiringMessageListener();

@ -1,6 +1,7 @@
// const $body = $(document.body);
import React from 'react'; import React from 'react';
import { createRoot } from 'react-dom/client';
import { SessionPasswordPrompt } from '../components/SessionPasswordPrompt'; import { SessionPasswordPrompt } from '../components/SessionPasswordPrompt';
window.ReactDOM.render(<SessionPasswordPrompt />, document.getElementById('root')); const container = document.getElementById('root');
const root = createRoot(container!);
root.render(<SessionPasswordPrompt />);

Loading…
Cancel
Save