Skip to content

React 18 upgrade #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 8, 2025
Merged

React 18 upgrade #755

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f591c4
react 18 upgrade
zoran995 Feb 26, 2025
2bd8709
flush sync root render
zoran995 Jun 27, 2025
084b7ea
update after review
zoran995 Jul 4, 2025
a9c35a8
use terriajs 8.10.0
zoran995 Jul 8, 2025
b76b3a7
Merge remote-tracking branch 'origin/main' into react-18-upgrade
zoran995 Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 11 additions & 32 deletions lib/Views/render.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,21 @@
import ReactDOM from "react-dom";
import RedBox from "redbox-react";
import React from "react";
import { createRoot } from "react-dom/client";
import { flushSync } from "react-dom";

import Variables from "../Styles/variables.scss";
import UI from "./UserInterface";

export default function renderUi(terria, allBaseMaps, viewState) {
let render = () => {
ReactDOM.render(
const container = document.getElementById("ui");
const root = createRoot(container);

Copy link
Contributor

@na9da na9da Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to leave a comment here as to why we need flushSync

flushSync(() =>
root.render(
<UI
terria={terria}
allBaseMaps={allBaseMaps}
viewState={viewState}
themeOverrides={Variables}
/>,
document.getElementById("ui")
);
};

if (module.hot && process.env.NODE_ENV !== "production") {
// Support hot reloading of components
// and display an overlay for runtime errors
const renderApp = render;
const renderError = (error) => {
console.error(error);
console.error(error.stack);
ReactDOM.render(<RedBox error={error} />, document.getElementById("ui"));
};
render = () => {
try {
renderApp();
} catch (error) {
renderError(error);
}
};
module.hot.accept("./UserInterface", () => {
setTimeout(render);
});
}

render();
/>
)
);
}
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
},
"resolutions": {
"underscore": "^1.12.1",
"@types/react": "^17.0.3",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.1",
"@types/lodash": "4.14.182",
"@types/css-font-loading-module": "^0.0.13",
"@types/node": "^22.13.1"
Expand Down Expand Up @@ -67,9 +68,8 @@
"prettier": "2.7.1",
"pretty-quick": "^4.0.0",
"prop-types": "^15.6.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"redbox-react": "^1.3.6",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"resolve-url-loader": "^5.0.0",
"sass": "^1.81.0",
"sass-loader": "^16.0.3",
Expand Down
Loading
Loading