Backport 1.28.1 => main (#2432)

DES-6853 React 17 compatibility (as patch to 1.28) (#2431)

* fix: fixes import in renderReactInWebComponent

* test: fixes unit tests for renderReactInWebComponent

---------

Co-authored-by: Kevin Ghadyani <kevin.ghadyani@okta.com>
build: bump versions for 1.28.1
docs: update CHANGELOG for 1.28.1
chore(odyssey-react-mui): trigger build

Author: bryancunningham-okta

packages/odyssey-react-mui/src/ui-shell/UiShell/renderUiShell.test.tsx

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-import { act } from "@testing-library/react";
+import { act, waitFor } from "@testing-library/react";
 
 import { renderUiShell } from "./renderUiShell";
 import {
@@ -126,9 +126,11 @@ describe("renderUiShell", () => {
       });
     });
 
-    expect(
-      rootElement.querySelector(reactWebComponentElementName)!.shadowRoot,
-    ).toHaveTextContent(appName);
+    await waitFor(() => {
+      expect(
+        rootElement.querySelector(reactWebComponentElementName)!.shadowRoot,
+      ).toHaveTextContent(appName);
+    });
   });
 
   test("renders `UiShell` with immediately updated props", async () => {
@@ -153,9 +155,11 @@ describe("renderUiShell", () => {
       });
     });
 
-    expect(
-      rootElement.querySelector(reactWebComponentElementName)!.shadowRoot,
-    ).toHaveTextContent(appName);
+    await waitFor(() => {
+      expect(
+        rootElement.querySelector(reactWebComponentElementName)!.shadowRoot,
+      ).toHaveTextContent(appName);
+    });
   });
 
   test("renders `<slot>` in the event of an error", async () => {
@@ -184,14 +188,16 @@ describe("renderUiShell", () => {
       );
     });
 
-    consoleErrorSpy.mockRestore();
+    await waitFor(() => {
+      expect(onError).toHaveBeenCalledTimes(1);
+      expect(consoleError).toHaveBeenCalledTimes(1);
+      expect(
+        rootElement
+          .querySelector(reactWebComponentElementName)!
+          .shadowRoot?.querySelector("slot"),
+      ).toBeInstanceOf(HTMLSlotElement);
+    });
 
-    expect(onError).toHaveBeenCalledTimes(1);
-    expect(consoleError).toHaveBeenCalledTimes(1);
-    expect(
-      rootElement
-        .querySelector(reactWebComponentElementName)!
-        .shadowRoot?.querySelector("slot"),
-    ).toBeInstanceOf(HTMLSlotElement);
+    consoleErrorSpy.mockRestore();
   });
 });

packages/odyssey-react-mui/src/ui-shell/renderReactInWebComponent.ts

@@ -25,8 +25,8 @@ export type GetReactComponentInWebComponent = (
 
 export class ReactInWebComponentElement extends HTMLElement {
   getReactComponent: GetReactComponentInWebComponent;
-  reactRoot: Root;
   reactRootElements: ReactRootElements;
+  reactRootPromise: Promise<Root>;
 
   constructor(getReactComponent: GetReactComponentInWebComponent) {
     super();
@@ -50,15 +50,20 @@ export class ReactInWebComponentElement extends HTMLElement {
     shadowRoot.appendChild(this.reactRootElements.stylesRootElement);
     shadowRoot.appendChild(this.reactRootElements.appRootElement);
 
-    this.reactRoot = createRoot(this.reactRootElements.appRootElement);
+    // If we want to support React v17 in the future, we can use a try-catch on the import to grab the old `ReactDOM.render` function if `react-dom/client` errors. --Kevin Ghadyani
+    this.reactRootPromise = import("react-dom/client").then(({ createRoot }) =>
+      createRoot(this.reactRootElements.appRootElement),
+    );
   }
 
   connectedCallback() {
-    this.reactRoot.render(this.getReactComponent(this.reactRootElements));
+    this.reactRootPromise.then((reactRoot) =>
+      reactRoot.render(this.getReactComponent(this.reactRootElements)),
+    );
   }
 
   disconnectedCallback() {
-    this.reactRoot.unmount();
+    this.reactRootPromise.then((reactRoot) => reactRoot.unmount());
   }
 }