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

alibaba-fusion · Apr 19, 2023 · 41a2011 · 41a2011
1 parent c994892
commit 41a2011
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -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",
@@ -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",
@@ -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",

diff --git a/types/badge/index.d.ts b/types/badge/index.d.ts
@@ -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 {
     /**
      * 徽章依托的内容
      */

diff --git a/types/dialog/index.d.ts b/types/dialog/index.d.ts
@@ -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 {
     /**
      * 是否显示
      */

diff --git a/types/drawer/index.d.ts b/types/drawer/index.d.ts
@@ -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** 表示点击遮罩区域可以关闭对话框

diff --git a/types/message/index.d.ts b/types/message/index.d.ts
@@ -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 {
     /**
      * 反馈类型
      */

diff --git a/types/step/index.d.ts b/types/step/index.d.ts
@@ -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`
      */

diff --git a/types/timeline/index.d.ts b/types/timeline/index.d.ts
@@ -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 {
     /**
      * 节点状态
      */