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

Add support for react-router v5 Link components #1422

Merged
merged 5 commits into from
Mar 25, 2020
Merged

Add support for react-router v5 Link components #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1501f98
chore(other): update contributors
jraff Mar 23, 2020
110c121
fix(core-breadcrumbs): prop type warnings for reactRouterLinkComponent
jraff Mar 23, 2020
e199485
fix(core-link): prop type warnings for reactRouterLinkComponent
jraff Mar 23, 2020
bd8f7f1
fix(core-chevron-link): prop type warnings for reactRouterLinkComponent
jraff Mar 23, 2020
136b731
fix(core-button-link): prop type warnings for reactRouterLinkComponent
jraff Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .all-contributorsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,15 @@
"contributions": [
"tds"
]
},
{
"login": "iamstuartwilson",
"name": "Stuart Wilson",
"avatar_url": "https://avatars1.githubusercontent.com/u/3594817?v=4",
"profile": "https://iamstuartwilson.com",
"contributions": [
"tds"
]
}
],
"contributorsPerLine": 7
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ The following group are the active maintainers of this project, and have merge r
<tr>
<td align="center"><a href="https://github.com/hamedmam"><img src="https://avatars1.githubusercontent.com/u/24867760?v=4" width="100px;" alt="Hamed Mamdoohi"/><br /><sub><b>Hamed Mamdoohi</b></sub></a><br /><a href="#tds-hamedmam" title=""></a></td>
<td align="center"><a href="https://github.com/DougTelus"><img src="https://avatars3.githubusercontent.com/u/32107656?v=4" width="100px;" alt="DougL"/><br /><sub><b>DougL</b></sub></a><br /><a href="#tds-DougTelus" title=""></a></td>
<td align="center"><a href="https://iamstuartwilson.com"><img src="https://avatars1.githubusercontent.com/u/3594817?v=4" width="100px;" alt="Stuart Wilson"/><br /><sub><b>Stuart Wilson</b></sub></a><br /><a href="#tds-iamstuartwilson" title=""></a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion packages/Breadcrumbs/Breadcrumbs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Breadcrumbs.propTypes = {
/**
* React Router Link component.
*/
reactRouterLinkComponent: PropTypes.func,
reactRouterLinkComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
/**
* React Router params.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/Breadcrumbs/Item/Item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Item.propTypes = {
*
* React Router Link component. The reactRouterLinkComponent property will be passed down from from the parent `<Breadcrumbs>`.
*/
reactRouterLinkComponent: PropTypes.func,
reactRouterLinkComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
/**
* Breadcrumb text
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/ButtonLink/ButtonLink.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ButtonLink.propTypes = {
/**
* React Router Link component.
*/
reactRouterLinkComponent: PropTypes.func,
reactRouterLinkComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
/**
* Target URL (if using 'reactRouterLinkComponent')
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/ButtonLink/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@tds/shared-styles": "^1.5.2",
"@tds/util-helpers": "^1.4.2",
"@tds/util-prop-types": "^1.3.2",
"prop-types": "^15.5.10"
"prop-types": "^15.7.0"
},
"devDependencies": {
"@tds/core-a11y-content": "^2.1.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/ChevronLink/ChevronLink.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ChevronLink.propTypes = {
/**
* React Router Link component.
*/
reactRouterLinkComponent: PropTypes.func,
reactRouterLinkComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
/**
* Target URL (if using 'reactRouterLinkComponent')
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/Link/Link.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Link.propTypes = {
/**
* React Router Link component.
*/
reactRouterLinkComponent: PropTypes.func,
reactRouterLinkComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
/**
* Target URL (if using 'reactRouterLinkComponent')
*/
Expand Down