Merge branch 'gdp/update-react-to-v18' of github.com:lafranceinsoumis…

…e/agir.lafranceinsoumise.fr into gdp/update-react-to-v18
lafranceinsoumise · Jun 10, 2022 · 3233b2c · 3233b2c
2 parents ce57fbc + a9020bc
commit 3233b2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/agir/lib/components/utils/react.js b/agir/lib/components/utils/react.js
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import React, { useState } from "react";
 import PropTypes from "prop-types";
 
@@ -73,8 +73,11 @@ RootComponent.propTypes = {
 };
 
 export const renderReactComponent = (component, node) => {
-  node &&
-    ReactDOM.render(<React.StrictMode>{component}</React.StrictMode>, node);
+  if (!node) {
+    return;
+  }
+  const root = createRoot(node);
+  root.render(<React.StrictMode>{component}</React.StrictMode>);
 };
 
 export const mergeRefs = (...refs) => {

diff --git a/jest/setup.js b/jest/setup.js
@@ -1 +1,2 @@
 import "@testing-library/jest-dom/extend-expect";
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;