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(Typescript): fix type conflict with @type/react, close #4313 #4317

Merged
merged 1 commit into from
Apr 19, 2023
Merged

fix(Typescript): fix type conflict with @type/react, close #4313 #4317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@
"@babel/plugin-syntax-jsx": "^7.12.1",
"@commitlint/cli": "^7.0.0",
"@octokit/rest": "^18.0.9",
"@types/react": "^16.8.13",
"@types/node": "^17.0.41",
"@types/react": "^16.14.37",
"autoprefixer": "^7.1.4",
"axe-core": "~3.2.0",
"babel-core": "^6.26.0",
Expand Down Expand Up @@ -229,6 +230,7 @@
"remark": "^9.0.0",
"sass": "^1.35.2",
"sassaby-next": "^3.0.0",
"semver": "^7.3.5",
"simulate-event": "^1.4.0",
"sinon": "^5.0.10",
"solarlunar": "^2.0.7",
Expand All @@ -242,8 +244,7 @@
"urllib": "^2.36.1",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.x",
"whatwg-fetch": "^2.0.3",
"semver": "^7.3.5"
"whatwg-fetch": "^2.0.3"
},
"peerDependencies": {
"@alifd/meet-react": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion types/badge/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from 'react';
import CommonProps from '../util';

export interface BadgeProps extends React.HTMLAttributes<HTMLElement>, CommonProps {
export interface BadgeProps extends Omit<React.HTMLAttributes<HTMLElement>, 'content'>, CommonProps {
/**
* 徽章依托的内容
*/
Expand Down
2 changes: 1 addition & 1 deletion types/dialog/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface HTMLAttributesWeak extends React.HTMLAttributes<HTMLElement> {
title?: any;
}

export interface DialogProps extends HTMLAttributesWeak, CommonProps {
export interface DialogProps extends Omit<HTMLAttributesWeak, 'content'>, CommonProps {
/**
* 是否显示
*/
Expand Down
2 changes: 1 addition & 1 deletion types/drawer/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface HTMLAttributesWeak extends PopupProps {
onClose?: any;
}

export interface DrawerProps extends HTMLAttributesWeak, CommonProps {
export interface DrawerProps extends Omit<HTMLAttributesWeak, 'content'>, CommonProps {
/**
* [废弃]同closeMode, 控制对话框关闭的方式，值可以为字符串或者布尔值，其中字符串是由以下值组成：
* **mask** 表示点击遮罩区域可以关闭对话框
Expand Down
2 changes: 1 addition & 1 deletion types/message/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export interface MessageProps extends HTMLAttributesWeak, CommonProps {
animation?: boolean;
}

export interface MessageQuickProps extends HTMLAttributesWeak, CommonProps {
export interface MessageQuickProps extends Omit<HTMLAttributesWeak, 'content'>, CommonProps {
/**
* 反馈类型
*/
Expand Down
2 changes: 1 addition & 1 deletion types/step/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface HTMLAttributesWeak extends React.HTMLAttributes<HTMLElement> {
onClick?: any;
}

export interface ItemProps extends HTMLAttributesWeak, CommonProps {
export interface ItemProps extends Omit<HTMLAttributesWeak, 'content'>, CommonProps {
/**
* 步骤的状态，如不传，会根据外层的 Step 的 current 属性生成，可选值为 `wait`, `process`, `finish`
*/
Expand Down
2 changes: 1 addition & 1 deletion types/timeline/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface HTMLAttributesWeak extends React.HTMLAttributes<HTMLElement> {
title?: any;
}

export interface ItemProps extends HTMLAttributesWeak, CommonProps {
export interface ItemProps extends Omit<HTMLAttributesWeak, 'content'>, CommonProps {
/**
* 节点状态
*/
Expand Down