Skip to content

Commit 28769b4

Browse files
authored
fix(types): fix role prop (#5851)
1 parent 71857c7 commit 28769b4

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@restart/hooks": "^0.3.26",
6363
"@types/invariant": "^2.2.33",
6464
"@types/prop-types": "^15.7.3",
65-
"@types/react": ">=16.14.4",
65+
"@types/react": ">=16.14.8",
6666
"@types/react-transition-group": "^4.4.1",
6767
"@types/warning": "^3.0.0",
6868
"classnames": "^2.3.1",

src/Collapse.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import TransitionWrapper from './TransitionWrapper';
1717

1818
type Dimension = 'height' | 'width';
1919

20-
export interface CollapseProps extends TransitionCallbacks {
20+
export interface CollapseProps
21+
extends TransitionCallbacks,
22+
Pick<React.HTMLAttributes<HTMLElement>, 'role'> {
2123
className?: string;
2224
in?: boolean;
2325
mountOnEnter?: boolean;
@@ -27,7 +29,6 @@ export interface CollapseProps extends TransitionCallbacks {
2729
dimension?: Dimension | (() => Dimension);
2830
getDimensionValue?: (dimension: Dimension, element: HTMLElement) => number;
2931
children: React.ReactElement;
30-
role?: string;
3132
}
3233

3334
const MARGINS: { [d in Dimension]: string[] } = {

src/SafeAnchor.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export interface SafeAnchorProps
99
BsPrefixProps {
1010
href?: string;
1111
disabled?: boolean;
12-
role?: string;
1312
tabIndex?: number;
1413
}
1514

src/Spinner.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export interface SpinnerProps
1010
extends React.HTMLAttributes<HTMLElement>,
1111
BsPrefixProps {
1212
animation: 'border' | 'grow';
13-
role?: string;
1413
size?: 'sm';
1514
variant?: Variant;
1615
}

yarn.lock

+15-1
Original file line numberDiff line numberDiff line change
@@ -1386,14 +1386,28 @@
13861386
dependencies:
13871387
"@types/react" "*"
13881388

1389-
"@types/react@*", "@types/react@>=16.14.4", "@types/react@>=16.9.11":
1389+
"@types/react@*", "@types/react@>=16.9.11":
13901390
version "17.0.2"
13911391
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
13921392
integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
13931393
dependencies:
13941394
"@types/prop-types" "*"
13951395
csstype "^3.0.2"
13961396

1397+
"@types/react@>=16.14.8":
1398+
version "17.0.8"
1399+
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.8.tgz#fe76e3ba0fbb5602704110fd1e3035cf394778e3"
1400+
integrity sha512-3sx4c0PbXujrYAKwXxNONXUtRp9C+hE2di0IuxFyf5BELD+B+AXL8G7QrmSKhVwKZDbv0igiAjQAMhXj8Yg3aw==
1401+
dependencies:
1402+
"@types/prop-types" "*"
1403+
"@types/scheduler" "*"
1404+
csstype "^3.0.2"
1405+
1406+
"@types/scheduler@*":
1407+
version "0.16.1"
1408+
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
1409+
integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
1410+
13971411
"@types/warning@^3.0.0":
13981412
version "3.0.0"
13991413
resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52"

0 commit comments

Comments
 (0)