fix(react-render): fix React19 reactRender error (#3380)

Tencent · Feb 24, 2025 · af2d1a8 · af2d1a8
1 parent b323a77
commit af2d1a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/_util/react-render.ts b/src/_util/react-render.ts
@@ -2,6 +2,7 @@
 // @ts-ignore
 import type * as React from 'react';
 import * as ReactDOM from 'react-dom';
+import { createRoot as createRootClient } from 'react-dom/client';
 import type { Root } from 'react-dom/client';
 
 // Let compiler not to search module usage
@@ -16,13 +17,16 @@ const fullClone = {
 
 type CreateRoot = (container: ContainerType) => Root;
 
+// @ts-ignore
 const { version, render: reactRender, unmountComponentAtNode } = fullClone;
 
 let createRoot: CreateRoot;
 try {
   const mainVersion = Number((version || '').split('.')[0]);
-  if (mainVersion >= 18) {
+  if (mainVersion >= 18 && mainVersion < 19) {
     ({ createRoot } = fullClone);
+  } else if (mainVersion >= 19) {
+    createRoot = createRootClient;
   }
 } catch (e) {
   // Do nothing;

diff --git a/src/notification/NotificationList.tsx b/src/notification/NotificationList.tsx
@@ -110,8 +110,8 @@ const NotificationList = forwardRef<NotificationListInstance, NotificationListPr
           return (
             <NotificationComponent
               ref={props.ref}
-              key={props.key}
               {...props}
+              key={props.key}
               onDurationEnd={() => {
                 remove(props.key);
                 onDurationEnd();