github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-15 01:23:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: restoring scroll position when going back to index page

Browse source
This commit is contained in:
ta264 2020-08-26 22:38:48 +01:00 • committed by Qstick
parent e681469857
commit 1bc52d0138
9 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontend/src/Components/Link/Link.js
View file

@ -38,7 +38,7 @@ class Link extends Component {
const linkProps = { target };
let el = component;
if (to) {
if (to && typeof to === 'string') {
if ((/\w+?:\/\//).test(to)) {
el = 'a';
linkProps.href = to;
@ -56,6 +56,18 @@ class Link extends Component {
linkProps.to = `${window.Lidarr.urlBase}/${to.replace(/^\//, '')}`;
linkProps.target = target;
}
} else if (to && typeof to === 'object') {
el = RouterLink;
linkProps.target = target;
if (to.pathname.startsWith(`${window.Lidarr.urlBase}/`)) {
linkProps.to = to;
} else {
const pathname = `${window.Lidarr.urlBase}/${to.pathname.replace(/^\//, '')}`;
linkProps.to = {
...to,
pathname
};
}
}
if (el === 'button' || el === 'input') {
@ -86,7 +98,7 @@ class Link extends Component {
Link.propTypes = {
className: PropTypes.string,
component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
to: PropTypes.string,
to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
target: PropTypes.string,
isDisabled: PropTypes.bool,
noRouter: PropTypes.bool,