Skip to content
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

Jump to bottom

fix: 兼容在 React 19 环境下的 Toast 组件 #6774

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: 兼容在 React 19 环境下的 Toast 组件 #6774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88b4cb
fix: 兼容在 React 19 环境下的 Toast 组件
lujun2 Nov 1, 2024
1300225
fix: 同时兼容 React 19 和 React 16
lujun2 Nov 4, 2024
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
7 changes: 4 additions & 3 deletions src/utils/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ReactElement } from 'react'
import * as ReactDOM from 'react-dom'
import type { Root } from 'react-dom/client'
import { type Root } from 'react-dom/client'

// 移植自rc-util: https://github.com/react-component/util/blob/master/src/React/render.ts

Expand All @@ -21,9 +21,10 @@ const { version, render: reactRender, unmountComponentAtNode } = fullClone
let createRoot: CreateRoot
try {
const mainVersion = Number((version || '').split('.')[0])
if (mainVersion >= 18 && fullClone.createRoot) {
if (mainVersion >= 18) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
createRoot = fullClone.createRoot
const { createRoot: createRootV18 } = require('react-dom/client')
Copy link
Member

Choose a reason for hiding this comment

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

这样也没用，webpack 编译时也会报错。在 antd 侧也有一样的问题，这个只能通过发大版本把旧版本的 react 支持废弃掉才行。

createRoot = createRootV18 || fullClone.createRoot
}
} catch (e) {
// Do nothing;
Expand Down
Loading